Uses proxy settings for authentication.

gingi · gingi · commit 8c099882bcbb · 2022-06-07T18:18:06.000-04:00
diff --git a/src/client/core/aad/auth-provider.ts b/src/client/core/aad/auth-provider.ts
@@ -74,7 +74,7 @@ export default class AuthProvider {
          *
          * Until this is resolved, we use one client application per tenant.
          */
-        const client = this._getClient(tenantId);
+        const client = await this._getClient(tenantId);
 
         const authRequest = this._authRequest(resourceURI, tenantId);
         try {
@@ -157,24 +157,39 @@ export default class AuthProvider {
         }
     }
 
-    protected _getClient(tenantId: string): PublicClientApplication {
+    protected async _getClient(tenantId: string):
+        Promise<PublicClientApplication> {
         if (tenantId in this._clients) {
             return this._clients[tenantId];
         }
-        const client = this._createClient(tenantId);
+        const client = await this._createClient(tenantId);
         if (!this._primaryClient) {
             this._primaryClient = client;
         }
         this._clients[tenantId] = client;
         return client;
     }
 
-    private _createClient(tenantId: string): PublicClientApplication {
-        return  new PublicClientApplication({
+    private async _createClient(tenantId: string):
+        Promise<PublicClientApplication> {
+        const proxySettings = await this.app.proxySettings.settings;
+        const proxyUrl = proxySettings?.http.toString();
+        if (proxyUrl) {
+            log.info(`[${tenantId}] Proxying auth endpoints through ` +
+                proxyUrl);
+        }
+
+        const authority =
+            `${this.app.properties.azureEnvironment.aadUrl}${tenantId}/`;
+
+        return new PublicClientApplication({
+            system: {
+                proxyUrl
+            },
             auth: {
                 clientId: this.config.clientId,
-                authority:
-                    `${this.app.properties.azureEnvironment.aadUrl}${tenantId}/`
+                authority,
+                knownAuthorities: [authority]
             },
             cache: {
                 cachePlugin: this._cachePlugin
diff --git a/src/client/proxy/proxy-settings.ts b/src/client/proxy/proxy-settings.ts
@@ -8,7 +8,7 @@ import {
     ProxyCredentials, ProxySetting, ProxySettings,
 } from "get-proxy-settings";
 import { BehaviorSubject } from "rxjs";
-import { filter, map, take } from "rxjs/operators";
+import { map, take } from "rxjs/operators";
 
 export interface ProxySettingConfiguration {
     settings: ProxySettings | null;
@@ -30,7 +30,6 @@ export class ProxySettingsManager {
 
     public get settings(): Promise<ProxySettings | null> {
         return this._settings.pipe(
-            filter(x => x !== null),
             take(1),
             map(x => x?.settings),
         ).toPromise();
