return to original code

packages/app/src/server/routes/login-passport.js

@@ -468,7 +468,7 @@ module.exports = function(crowi, app) {
     const providerId = 'saml';
     const strategyName = 'saml';
     const attrMapId = crowi.configManager.getConfig('crowi', 'security:passport-saml:attrMapId');
-    const attrMapUsername = crowi.configManager.getConfig('crowi', 'security:passport-saml:attrMapUsername') || 'username';
+    const attrMapUsername = crowi.configManager.getConfig('crowi', 'security:passport-saml:attrMapUsername');
     const attrMapMail = crowi.configManager.getConfig('crowi', 'security:passport-saml:attrMapMail');
     const attrMapFirstName = crowi.configManager.getConfig('crowi', 'security:passport-saml:attrMapFirstName') || 'firstName';
     const attrMapLastName = crowi.configManager.getConfig('crowi', 'security:passport-saml:attrMapLastName') || 'lastName';

packages/app/src/server/service/passport.ts

@@ -94,6 +94,7 @@ class PassportService implements S2sMessageHandlable {
     'security:passport-saml:issuer',
     'security:passport-saml:cert',
     'security:passport-saml:attrMapId',
+    'security:passport-saml:attrMapUsername',
     'security:passport-saml:attrMapMail',
   ];