Upgraded client-oauth2 library. Removed auth flow filters. (#699)

Azure · Jun 11, 2020 · b10ea62 · b10ea62
1 parent 359f832
commit b10ea62
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 34 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -70,7 +70,7 @@
         "@webcomponents/shadydom": "^1.7.3",
         "adal-vanilla": "^1.0.18",
         "applicationinsights-js": "^1.0.21",
-        "client-oauth2": "^4.2.5",
+        "client-oauth2": "4.3.0",
         "core-js": "^3.6.5",
         "d3": "^5.16.0",
         "google-maps": "^4.2.3",

diff --git a/src/models/authorizationServer.ts b/src/models/authorizationServer.ts
@@ -21,7 +21,6 @@ export class AuthorizationServer {
             ? contract.properties.defaultScope.split(" ")
             : [];
 
-        // Temporarily filtering out other flows, until backend starts support them.
-        this.grantTypes = contract.properties.grantTypes.filter(x => x === GrantTypes.implicit);
+        this.grantTypes = contract.properties.grantTypes;
     }
 }
diff --git a/src/services/oauthService.ts b/src/services/oauthService.ts
@@ -12,11 +12,7 @@ export class OAuthService {
         try {
             const pageOfAuthservers = await this.mapiClient.get<PageContract<AuthorizationServerContract>>("/authorizationServers");
 
-            return pageOfAuthservers
-                .value
-                .map(authServer => new AuthorizationServer(authServer))
-                // Temporarily filtering out other flows, until backend starts support them.
-                .filter(authServer => authServer.grantTypes.includes(GrantTypes.implicit)); 
+            return pageOfAuthservers.value.map(authServer => new AuthorizationServer(authServer));
         }
         catch (error) {
             throw new Error(`Unable to fetch configured authorization servers.`);
@@ -30,7 +26,7 @@ export class OAuthService {
             case GrantTypes.implicit:
                 accessToken = await this.authenticateImplicit(authorizationServer);
                 break;
-                
+
             case GrantTypes.authorizationCode:
                 accessToken = await this.authenticateCode(authorizationServer);
                 break;
@@ -47,38 +43,42 @@ export class OAuthService {
     }
 
     public authenticateImplicit(authorizationServer: AuthorizationServer): Promise<string> {
+        const redirectUri = `https://${location.hostname}/signin-oauth/implicit/callback`;
+
         const oauthClient = new ClientOAuth2({
             clientId: authorizationServer.clientId,
             accessTokenUri: authorizationServer.tokenEndpoint,
             authorizationUri: authorizationServer.authorizationEndpoint,
-            redirectUri: `https://${location.hostname}/signin-oauth/implicit/callback`,
+            redirectUri: redirectUri,
             scopes: authorizationServer.scopes
         });
 
         return new Promise((resolve, reject) => {
             window.open(oauthClient.token.getUri(), "_blank", "width=400,height=500");
 
             const receiveMessage = async (event: MessageEvent) => {
-                const uri = event.data["uri"];
+                const tokenHash = event.data["uri"];
 
-                if (!uri) {
+                if (!tokenHash) {
                     return;
                 }
 
-                const user = await oauthClient.token.getToken(uri);
-                resolve(`${user.tokenType} ${user.accessToken}`);
+                const oauthToken = await oauthClient.token.getToken(redirectUri + tokenHash);
+                resolve(`${oauthToken.tokenType} ${oauthToken.accessToken}`);
             };
 
             window.addEventListener("message", receiveMessage, false);
         });
     }
 
     public async authenticateCode(authorizationServer: AuthorizationServer): Promise<string> {
+        const redirectUri = `https://${location.hostname}/signin-oauth/code/callback/${authorizationServer.id}`;
+
         const oauthClient = new ClientOAuth2({
             clientId: authorizationServer.clientId,
             accessTokenUri: authorizationServer.tokenEndpoint,
             authorizationUri: authorizationServer.authorizationEndpoint,
-            redirectUri: `https://${location.hostname}/signin-oauth/code/callback/${authorizationServer.id}`,
+            redirectUri: redirectUri,
             scopes: authorizationServer.scopes
         });