Merge pull request #2552 from Azure/hotfix/proxy-config-login-error

Fixes a login issue related to proxy config

Author: gingi

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 2.14.2
+
+### Bugs
+
+* Fixes login failures when proxy is misconfigured [\#2551]
+
 # 2.14.1
 
 ### Bugs

package.json

@@ -16,7 +16,7 @@
     "name": "Microsoft Corporation",
     "email": "[email protected]"
   },
-  "version": "2.14.1",
+  "version": "2.14.2",
   "main": "build/client/main.prod.js",
   "scripts": {
     "ts": "ts-node --project tsconfig.node.json --files",

src/client/core/aad/auth-provider.ts

@@ -172,8 +172,8 @@ export default class AuthProvider {
 
     private async _createClient(tenantId: string):
         Promise<PublicClientApplication> {
-        const proxySettings = await this.app.proxySettings.settings;
-        const proxyUrl = proxySettings?.http.toString();
+        const proxyUrl = await this._loadProxyUrl();
+
         if (proxyUrl) {
             log.info(`[${tenantId}] Proxying auth endpoints through ` +
                 proxyUrl);
@@ -197,6 +197,12 @@ export default class AuthProvider {
         });
     }
 
+    private async _loadProxyUrl() {
+        const proxySettings = await this.app.proxySettings.settings;
+        const protocolUrl = proxySettings?.https ?? proxySettings?.http;
+        return protocolUrl?.toString();
+    }
+
     private async _getAccount(tenantId: string): Promise<AccountInfo> {
         if (tenantId in this._accounts) {
             return this._accounts[tenantId];