Merge refs/heads/master into version_4.3.0

server/providers.js

@@ -21,7 +21,7 @@ function applyMapping (profile, provider) {
     const additionalParams = profile.extras
 
     delete profile.extras
-    logger.log2('silly', `Raw profile is ${JSON.stringify(profile._json)}`)
+    logger.log2('debug', `Raw profile is ${JSON.stringify(profile)}`)
     logger.log2('info', `Applying mapping '${mapping}' to profile`)
 
     mappedProfile = require('./mappings/' + mapping)(profile, additionalParams)

test/providers.test.js

@@ -4,8 +4,11 @@ const providers = rewire('../server/providers.js')
 const config = require('config')
 const PassportSAMLStrategy = require('passport-saml').Strategy
 const helper = require('./helper')
+const fs = require('fs').promises
+const path = require('path')
 
 const assert = chai.assert
+const passportConfigAuthorizedResponse = config.get('passportConfigAuthorizedResponse')
 
 describe('providers.js', () => {
   describe('setupStrategy', () => {
@@ -20,7 +23,7 @@ describe('providers.js', () => {
     const passportStrategies = providers.__get__('passportStrategies')
     const setupStrategy = providers.__get__('setupStrategy')
     const testProvider = {
-      ...config.passportConfigAuthorizedResponse.providers[0],
+      ...passportConfigAuthorizedResponse.providers[0],
       verifyCallbackArity: 0
     }
 
@@ -57,7 +60,7 @@ describe('providers.js', () => {
     })
 
     it('Passport SAML Provider with redis setup should initialize the passport-saml strategy', () => {
-      const testProvider = config.passportConfigAuthorizedResponse.providers.find(
+      const testProvider = passportConfigAuthorizedResponse.providers.find(
         provider => provider.id === 'saml-redis-test'
       )
       try {
@@ -70,4 +73,41 @@ describe('providers.js', () => {
       }
     })
   })
+
+  describe('applyMapping', () => {
+    const applyMappingRewire = providers.__get__('applyMapping')
+    const fakeProfile = {
+      sub: 'loganXMen',
+      email: '[email protected]',
+      name: 'Logan',
+      given_name: 'Hugh Jackman'
+    }
+
+    it('should be a function', () => {
+      assert.isFunction(applyMappingRewire)
+    })
+
+    it('should return mapped data as per mapping file config', () => {
+      global.providers = passportConfigAuthorizedResponse.providers
+      const mappedProfileResult = applyMappingRewire(fakeProfile, 'oidccedev6privatejwt')
+      const fakeMappedProfile = {
+        uid: fakeProfile.sub,
+        mail: fakeProfile.email,
+        cn: fakeProfile.given_name,
+        displayName: fakeProfile.name,
+        givenName: fakeProfile.given_name,
+        sn: undefined
+      }
+
+      assert.deepStrictEqual(mappedProfileResult, fakeMappedProfile)
+    })
+
+    it('should log user profile data in log file', async () => {
+      const passportLogFilePath = path.join(__dirname, '../server/utils/logs/passport.log')
+      const data = await fs.readFile(passportLogFilePath, 'binary')
+      assert(data.includes('Raw profile is'))
+      assert(data.includes(fakeProfile.email))
+      assert(data.includes(fakeProfile.name))
+    })
+  })
 })