app update

SupercondActor · Mar 15, 2019 · 3713290 · 3713290
1 parent 50fb6b6
commit 3713290
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 7 deletions.
diff --git a/SupercondActorTypes.d.ts b/SupercondActorTypes.d.ts
@@ -13,6 +13,26 @@
         url: string;
         query: IKeyValuePair[];
         bodyJson: string;
+        authClaims: IAuthClaim[];
+    }
+
+    interface IAuthClaim {
+        type: string;
+        subject: IAuthClaimsIdentity;
+        originalIssuer: string;
+        issuer: string;
+        valueType: string;
+        value: string;
+        properties: IKeyValuePair[];
+    }
+
+    interface IAuthClaimsIdentity {
+        authenticationType: string;
+        isAuthenticated: boolean;
+        label: string;
+        name: string;
+        nameClaimType: string;
+        roleClaimType: string;
     }
 
     interface IKeyValuePair {
@@ -238,14 +258,24 @@
         instanceCount: number;
         metadataJson?: string;
         serviceScript?: string;
-        enableADAuthentication: boolean;
+        apiAuthenticationType: number;
+        apiAuthenticationConfig?: IApiAuthConfig;
         configureProxy: boolean;
         proxyConfiguration?: IKeyValuePair[];
         serveFiles: boolean;
         filesConfig?: IApiServiceFiles;
         stopRequested?: boolean;
     }
 
+    interface IApiAuthConfig {
+        authority: string;
+        validIssuers: string[];
+        validAudiences: string[];
+        disableIssuerValidation: boolean;
+        disableAudienceValidation: boolean;
+        disableLifetimeValidation: boolean;
+    }
+
     interface IApiServiceFiles {
         defaultFile: string;
         apiUrlPrefix: string;

diff --git a/spec/support/SupercondActorMock.ts b/spec/support/SupercondActorMock.ts
@@ -13,6 +13,7 @@ export class _SupercondActor_RequestMock implements SupercondActor.IApiRequest {
     url = '';
     query = [];
     bodyJson = '{}';
+    authClaims = [];
 }
 
 export class _SupercondActor_ResponseMock implements SupercondActor.IApiResponse {
@@ -53,7 +54,10 @@ class SupercondActorPlatformConfigMock implements SupercondActor.IPlatformConfig
     }
     getApiAuthConfigurationAsync(): Promise<SupercondActor.IApiAuthConfiguration> {
         return new Promise((resolve, reject) => {
-            resolve(null);
+            resolve({
+                clientID: 'clientID-12345',
+                tenantID: 'tenantID-12345'
+            });
         });
     }
 }
@@ -187,7 +191,15 @@ class SupercondActorApiServiceConfigMock implements SupercondActor.IApiServiceCo
     serviceScript = '';
     metadataJson = '{}';
     removalRequested = false;
-    enableADAuthentication = false;
+    apiAuthenticationType = 0;
+    apiAuthenticationConfig = {
+        "authority": "",
+        "validIssuers": [],
+        "validAudiences": [],
+        "disableIssuerValidation": false,
+        "disableAudienceValidation": false,
+        "disableLifetimeValidation": false
+    };
     configureProxy = true;
     serveFiles = false;
     filesConfig = null;

diff --git a/src/app/test-manager.ts b/src/app/test-manager.ts
@@ -84,7 +84,7 @@ export class TestManager {
             groupName: 'Generated Services',
             instanceCount: -1,
             metadataJson: '{ "description": "Generated by TestManager scheduled service" }',
-            enableADAuthentication: false,
+            apiAuthenticationType: 0,
             configureProxy: true,
             serveFiles: false,
             proxyConfiguration: [
@@ -109,7 +109,7 @@ return results;`,
             groupName: 'Generated Services',
             instanceCount: -1,
             metadataJson: '{ "description": "Generated by TestManager scheduled service" }',
-            enableADAuthentication: false,
+            apiAuthenticationType: 0,
             configureProxy: true,
             serveFiles: false,
             proxyConfiguration: [

diff --git a/src/index.ts b/src/index.ts
@@ -7,7 +7,8 @@ import { TestManager } from "./app/test-manager";
 // in your service's job script at runtime.
 
 (global as any).MyServiceTypes = {
-    // It's OK to delare global types here, 
-    // BUT DON'T CREATE GLOBAL INSTANCES OR VARIABLES - THAT LEADS TO MULTITHREADING PROBLEMS!!!
+    // It's OK to delare global types or immutable variables here, 
+    // BUT DON'T CREATE GLOBAL INSTANCES OR VARIABLES THAT CAN CHANGE -
+    // IT WILL LEAD TO MULTITHREADING PROBLEMS!!!
     TestManager: TestManager
 };