fix: change conformIdTokenClaims default value to true

BREAKING CHANGE: change conformIdTokenClaims default value to true
panva · Sep 26, 2018 · ef40f6d · ef40f6d
1 parent 35f13bc
commit ef40f6d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/docs/configuration.md b/docs/configuration.md
@@ -747,7 +747,7 @@ Enable/disable features.
   backchannelLogout: false,
   claimsParameter: false,
   clientCredentials: false,
-  conformIdTokenClaims: false,
+  conformIdTokenClaims: true,
   deviceCode: false,
   encryption: false,
   frontchannelLogout: false,

diff --git a/example/support/configuration.js b/example/support/configuration.js
@@ -31,7 +31,6 @@ module.exports.provider = {
 
     backchannelLogout: true, // defaults to false
     claimsParameter: true, // defaults to false
-    conformIdTokenClaims: true, // defaults to false
     deviceCode: true, // defaults to false
     encryption: true, // defaults to false
     frontchannelLogout: true, // defaults to false

diff --git a/lib/helpers/defaults.js b/lib/helpers/defaults.js
@@ -308,7 +308,7 @@ const DEFAULTS = {
      * @skip
      *
      */
-    conformIdTokenClaims: false, // TODO: true in next major
+    conformIdTokenClaims: true,
 
     /*
      * features.deviceCode

diff --git a/test/device_code/device_code_grant.test.js b/test/device_code/device_code_grant.test.js
@@ -12,8 +12,8 @@ function errorDetail(spy) {
   return spy.args[0][0].error_detail;
 }
 
-describe('grant_type=urn:ietf:params:oauth:grant-type:device_code w/ conformIdTokenClaims', () => {
-  before(bootstrap(__dirname, { config: 'device_code_conform' }));
+describe('grant_type=urn:ietf:params:oauth:grant-type:device_code w/ conformIdTokenClaims=false', () => {
+  before(bootstrap(__dirname, { config: 'device_code_non_conform' })); // agent
 
   it('returns the right stuff', async function () {
     const spy = sinon.spy();
@@ -39,7 +39,7 @@ describe('grant_type=urn:ietf:params:oauth:grant-type:device_code w/ conformIdTo
       })
       .expect((response) => {
         expect(response.body).to.have.keys('access_token', 'id_token', 'expires_in', 'token_type', 'scope', 'refresh_token');
-        expect(JSON.parse(base64url.decode(response.body.id_token.split('.')[1]))).not.to.have.property('given_name');
+        expect(JSON.parse(base64url.decode(response.body.id_token.split('.')[1]))).to.have.property('given_name');
       });
   });
 });
@@ -71,7 +71,7 @@ describe('grant_type=urn:ietf:params:oauth:grant-type:device_code', () => {
       })
       .expect((response) => {
         expect(response.body).to.have.keys('access_token', 'id_token', 'expires_in', 'token_type', 'scope', 'refresh_token');
-        expect(JSON.parse(base64url.decode(response.body.id_token.split('.')[1]))).to.have.property('given_name');
+        expect(JSON.parse(base64url.decode(response.body.id_token.split('.')[1]))).not.to.have.property('given_name');
       });
   });
 

diff --git a/...device_code/device_code_conform.config.js → ...ce_code/device_code_non_conform.config.js b/...device_code/device_code_conform.config.js → ...ce_code/device_code_non_conform.config.js
@@ -2,6 +2,6 @@ const { cloneDeep } = require('lodash');
 
 const config = cloneDeep(require('./device_code.config'));
 
-config.config.features.conformIdTokenClaims = true;
+config.config.features.conformIdTokenClaims = false;
 
 module.exports = config;