copy all token response values back

brockallen · brockallen · commit 25c2c66ae0c6 · 2018-12-06T09:49:50.000-08:00
diff --git a/src/ResponseValidator.js b/src/ResponseValidator.js
@@ -243,16 +243,21 @@ export class ResponseValidator {
         };
 
         return this._tokenClient.exchangeCode(request).then(tokenResponse => {
-            if (tokenResponse.id_token) {
+            
+            for(var key in tokenResponse) {
+                response[key] = tokenResponse[key];
+            }
+
+            if (response.id_token) {
                 Log.debug("ResponseValidator._validateCode: token response successful, parsing id_token");
-                var jwt = this._joseUtil.parseJwt(tokenResponse.id_token);
-                tokenResponse.profile = jwt.payload;
+                var jwt = this._joseUtil.parseJwt(response.id_token);
+                response.profile = jwt.payload;
             }
             else {
                 Log.debug("ResponseValidator._validateCode: token response successful, returning response");
             }
             
-            return tokenResponse;
+            return response;
         });
     }
 
diff --git a/src/SigninResponse.js b/src/SigninResponse.js
@@ -23,11 +23,7 @@ export class SigninResponse {
         this.scope = values.scope;
         this.profile = undefined; // will be set from ResponseValidator
 
-        let expires_in = parseInt(values.expires_in);
-        if (typeof expires_in === 'number' && expires_in > 0) {
-            let now = parseInt(Date.now() / 1000);
-            this.expires_at = now + expires_in;
-        }
+        this.expires_in = values.expires_in;
     }
 
     get expires_in() {
@@ -37,6 +33,13 @@ export class SigninResponse {
         }
         return undefined;
     }
+    set expires_in(value){
+        let expires_in = parseInt(value);
+        if (typeof expires_in === 'number' && expires_in > 0) {
+            let now = parseInt(Date.now() / 1000);
+            this.expires_at = now + expires_in;
+        }
+    }
 
     get expired() {
         let expires_in = this.expires_in;
