process id_token on response

brockallen · brockallen · commit 8300c538b036 · 2018-12-06T09:26:45.000-08:00
diff --git a/src/ResponseValidator.js b/src/ResponseValidator.js
@@ -235,14 +235,24 @@ export class ResponseValidator {
     }
 
     _validateCode(state, response) {
-        var args = {
+        var request = {
+            client_id: state.client_id,
             code : response.code,
             redirect_uri: state.redirect_uri,
             code_verifier: state.code_verifier,
         };
-        return this._tokenClient.exchangeCode(args).then(tokenResponse => {
-            response.id_token = tokenResponse.id_token;
-            response.access_token = tokenResponse.access_token;
+
+        return this._tokenClient.exchangeCode(request).then(tokenResponse => {
+            if (tokenResponse.id_token) {
+                Log.debug("ResponseValidator._validateCode: token response successful, parsing id_token");
+                var jwt = this._joseUtil.parseJwt(tokenResponse.id_token);
+                tokenResponse.profile = jwt.payload;
+            }
+            else {
+                Log.debug("ResponseValidator._validateCode: token response successful, returning response");
+            }
+            
+            return tokenResponse;
         });
     }
 
diff --git a/src/TokenClient.js b/src/TokenClient.js
@@ -18,7 +18,6 @@ export class TokenClient {
     }
 
     exchangeCode(args = {}) {
-        args.client_id = args.client_id || settings.client_id;
         args.grant_type = args.grant_type || "authorization_code";
 
         if (!args.code) {

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ export class TokenClient {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`exchangeCode(args = {}) {`
`21`		`- args.client_id = args.client_id \|\| settings.client_id;`
`22`	`21`	`args.grant_type = args.grant_type \|\| "authorization_code";`
`23`	`22`
`24`	`23`	`if (!args.code) {`