Merge branch 'poke-master' into feature/upgrade-angular-8

Author: Lodewijk Wensveen

projects/lib/src/oauth-service.ts

@@ -373,24 +373,36 @@ export class OAuthService extends AuthConfig {
     password: string,
     headers: HttpHeaders = new HttpHeaders()
   ): Promise<object> {
-    if (!this.validateUrlForHttps(this.tokenEndpoint)) {
+    const parameters = {
+            username: userName,
+            password: password,
+        };
+        return this.fetchTokenUsingGrant('password', parameters, headers);
+    }
+
+    /**
+     * Uses a custom grant type to retrieve tokens.
+     * @param grantType Grant type.
+     * @param parameters Parameters to pass.
+     * @param headers Optional additional HTTP headers.
+     */
+    public fetchTokenUsingGrant(grantType: string, parameters: object, headers: HttpHeaders = new HttpHeaders()): Promise<TokenResponse> {if (!this.validateUrlForHttps(this.tokenEndpoint)) {
       throw new Error(
         'tokenEndpoint must use http, or config value for property requireHttps must allow http'
       );
     }
 
-    return new Promise((resolve, reject) => {
+
       /**
        * A `HttpParameterCodec` that uses `encodeURIComponent` and `decodeURIComponent` to
        * serialize and parse URL parameter keys and values.
        *
        * @stable
        */
       let params = new HttpParams({encoder: new WebHttpUrlEncodingCodec()})
-        .set('grant_type', 'password')
+        .set('grant_type', grantType)
         .set('scope', this.scope)
-        .set('username', userName)
-        .set('password', password);
+        ;
 
       if (this.useHttpBasicAuthForPasswordFlow) {
         const header = btoa(`${this.clientId}:${this.dummyClientSecret}`);
@@ -413,15 +425,18 @@ export class OAuthService extends AuthConfig {
         }
       }
 
-      headers = headers.set(
+      // set explicit parameters last, to allow overwriting
+        for (const key of Object.keys(parameters)) {
+            params = params.set(key, parameters[key]);
+        }headers = headers.set(
         'Content-Type',
         'application/x-www-form-urlencoded'
       );
 
-      this.http
+      returnthis.http
         .post<TokenResponse>(this.tokenEndpoint, params, {headers})
-        .subscribe(
-          tokenResponse => {
+        .toPromise()
+          .then(tokenResponse => {
             this.debug('tokenResponse', tokenResponse);
             this.storeAccessTokenResponse(
               tokenResponse.access_token,
@@ -430,16 +445,25 @@ export class OAuthService extends AuthConfig {
               tokenResponse.scope
             );
 
-            this.eventsSubject.next(new OAuthSuccessEvent('token_received'));
-            resolve(tokenResponse);
-          },
-          err => {
-            this.logger.error('Error performing password flow', err);
+            if (tokenResponse.id_token) {
+                    return this.processIdToken(tokenResponse.id_token, tokenResponse.access_token)
+                        .then(idTokenResult => {
+                            this.storeIdToken(idTokenResult);
+                            return tokenResponse;
+                        });
+                }
+
+                return tokenResponse;
+            })
+            .then(tokenResponse => {this.eventsSubject.next(new OAuthSuccessEvent('token_received'));
+            return tokenResponse;
+          })
+          .catch(err => {
+            this.logger.error(`Error performing ${grantType} flow`, err);
             this.eventsSubject.next(new OAuthErrorEvent('token_error', err));
-            reject(err);
-          }
-        );
-    });
+            throw err;
+          });
+
   }
 
   /**

projects/lib/src/types.ts

@@ -110,6 +110,7 @@ export interface ParsedIdToken {
  * http://openid.net/specs/openid-connect-core-1_0.html#TokenEndpoint
  */
 export interface TokenResponse {
+  id_token?: string;
   access_token: string;
   token_type: string;
   expires_in: number;