typo

src/client/js/components/Admin/Security/SamlSecuritySetting.jsx

@@ -21,7 +21,7 @@ class SamlSecurityManagement extends React.Component {
       envIssuer: '',
       envCert: '',
       envAttrMapId: '',
-      envAttrMapUserName: '',
+      envAttrMapUsername: '',
       envAttrMapMail: '',
       envAttrMapFirstName: '',
       envAttrMapLastName: '',
@@ -41,7 +41,7 @@ class SamlSecurityManagement extends React.Component {
         envIssuer: samlAuth.samlEnvVarIssuer,
         envCert: samlAuth.samlEnvVarCert,
         envAttrMapId: samlAuth.samlEnvVarAttrMapId,
-        envAttrMapUserName: samlAuth.samlEnvVarAttrMapUserName,
+        envAttrMapUsername: samlAuth.samlEnvVarAttrMapUsername,
         envAttrMapMail: samlAuth.samlEnvVarAttrMapMail,
         envAttrMapFirstName: samlAuth.samlEnvVarAttrMapFirstName,
         envAttrMapLastName: samlAuth.samlEnvVarAttrMapLastName,
@@ -301,7 +301,7 @@ pWVdnzS1VCO8fKsJ7YYIr+JmHvseph3kFUOI5RqkCcMZlKUv83aUThsTHw==
                       className="form-control"
                       type="text"
                       readOnly={useOnlyEnvVars}
-                      defaultValue={adminSamlSecurityContainer.state.samlAttrMapUserName}
+                      defaultValue={adminSamlSecurityContainer.state.samlAttrMapUsername}
                       onChange={e => adminSamlSecurityContainer.changeSamlAttrMapUserName(e.target.value)}
                     />
                     <p className="help-block">
@@ -312,7 +312,7 @@ pWVdnzS1VCO8fKsJ7YYIr+JmHvseph3kFUOI5RqkCcMZlKUv83aUThsTHw==
                     <input
                       className="form-control"
                       type="text"
-                      value={this.state.envAttrMapUserName || ''}
+                      value={this.state.envAttrMapUsername || ''}
                       readOnly
                     />
                     <p className="help-block">

src/client/js/services/AdminSamlSecurityContainer.js

@@ -28,7 +28,7 @@ export default class AdminSamlSecurityContainer extends Container {
       samlIssuer: '',
       samlCert: '',
       samlAttrMapId: '',
-      samlAttrMapUserName: '',
+      samlAttrMapUsername: '',
       samlAttrMapMail: '',
       samlAttrMapFirstName: '',
       samlAttrMapLastName: '',
@@ -52,7 +52,7 @@ export default class AdminSamlSecurityContainer extends Container {
         samlIssuer: samlAuth.samlIssuer,
         samlCert: samlAuth.samlCert,
         samlAttrMapId: samlAuth.samlAttrMapId,
-        samlAttrMapUserName: samlAuth.samlAttrMapUserName,
+        samlAttrMapUsername: samlAuth.samlAttrMapUsername,
         samlAttrMapMail: samlAuth.samlAttrMapMail,
         samlAttrMapFirstName: samlAuth.samlAttrMapFirstName,
         samlAttrMapLastName: samlAuth.samlAttrMapLastName,
@@ -105,10 +105,10 @@ export default class AdminSamlSecurityContainer extends Container {
   }
 
   /**
-   * Change samlAttrMapUserName
+   * Change samlAttrMapUsername
    */
   changeSamlAttrMapUserName(inputValue) {
-    this.setState({ samlAttrMapUserName: inputValue });
+    this.setState({ samlAttrMapUsername: inputValue });
   }
 
   /**
@@ -163,7 +163,7 @@ export default class AdminSamlSecurityContainer extends Container {
       issuer: this.state.samlIssuer,
       cert: this.state.samlCert,
       attrMapId: this.state.samlAttrMapId,
-      attrMapUsername: this.state.samlAttrMapUserName,
+      attrMapUsername: this.state.samlAttrMapUsername,
       attrMapMail: this.state.samlAttrMapMail,
       attrMapFirstName: this.state.samlAttrMapFirstName,
       attrMapLastName: this.state.samlAttrMapLastName,
@@ -182,7 +182,7 @@ export default class AdminSamlSecurityContainer extends Container {
       samlIssuer: securitySettingParams.samlIssuer,
       samlCert: securitySettingParams.samlCert,
       samlAttrMapId: securitySettingParams.samlAttrMapId,
-      samlAttrMapUserName: securitySettingParams.samlAttrMapUserName,
+      samlAttrMapUsername: securitySettingParams.samlAttrMapUsername,
       samlAttrMapMail: securitySettingParams.samlAttrMapMail,
       samlAttrMapFirstName: securitySettingParams.samlAttrMapFirstName,
       samlAttrMapLastName: securitySettingParams.samlAttrMapLastName,

src/server/routes/apiv3/security-setting.js

@@ -55,7 +55,7 @@ const validator = {
     body('issuer').if((value, { req }) => req.body.samlIssuer).isString(),
     body('cert').if((value, { req }) => req.body.samlCert).isString(),
     body('attrMapId').if((value, { req }) => req.body.samlAttrMapId).isString(),
-    body('attrMapUserName').if((value, { req }) => req.body.samlAttrMapUserName).isString(),
+    body('attrMapUsername').if((value, { req }) => req.body.samlAttrMapUsername).isString(),
     body('attrMapMail').if((value, { req }) => req.body.samlAttrMapMail).isString(),
     body('attrMapFirstName').if((value, { req }) => req.body.samlAttrMapFirstName).isString(),
     body('attrMapLastName').if((value, { req }) => req.body.samlAttrMapLastName).isString(),
@@ -360,8 +360,8 @@ module.exports = (crowi) => {
         samlEnvVarCert: await crowi.configManager.getConfigFromEnvVars('crowi', 'security:passport-saml:cert'),
         samlAttrMapId: await crowi.configManager.getConfigFromDB('crowi', 'security:passport-saml:attrMapId'),
         samlEnvVarAttrMapId: await crowi.configManager.getConfigFromEnvVars('crowi', 'security:passport-saml:attrMapId'),
-        samlAttrMapUserName: await crowi.configManager.getConfigFromDB('crowi', 'security:passport-saml:attrMapUsername'),
-        samlEnvVarAttrMapUserName: await crowi.configManager.getConfigFromEnvVars('crowi', 'security:passport-saml:attrMapUsername'),
+        samlAttrMapUsername: await crowi.configManager.getConfigFromDB('crowi', 'security:passport-saml:attrMapUsername'),
+        samlEnvVarAttrMapUsername: await crowi.configManager.getConfigFromEnvVars('crowi', 'security:passport-saml:attrMapUsername'),
         samlAttrMapMail: await crowi.configManager.getConfigFromDB('crowi', 'security:passport-saml:attrMapMail'),
         samlEnvVarAttrMapMail: await crowi.configManager.getConfigFromEnvVars('crowi', 'security:passport-saml:attrMapMail'),
         samlAttrMapFirstName: await crowi.configManager.getConfigFromDB('crowi', 'security:passport-saml:attrMapFirstName'),
@@ -672,7 +672,7 @@ module.exports = (crowi) => {
       'security:passport-saml:issuer': req.body.issuer,
       'security:passport-saml:cert': req.body.cert,
       'security:passport-saml:attrMapId': req.body.attrMapId,
-      'security:passport-saml:attrMapUsername': req.body.attrMapUserName,
+      'security:passport-saml:attrMapUsername': req.body.attrMapUsername,
       'security:passport-saml:attrMapMail': req.body.attrMapMail,
       'security:passport-saml:attrMapFirstName': req.body.attrMapFirstName,
       'security:passport-saml:attrMapLastName': req.body.attrMapLastName,
@@ -690,7 +690,7 @@ module.exports = (crowi) => {
         samlIssuer: await crowi.configManager.getConfigFromDB('crowi', 'security:passport-saml:issuer'),
         samlCert: await crowi.configManager.getConfigFromDB('crowi', 'security:passport-saml:cert'),
         samlAttrMapId: await crowi.configManager.getConfigFromDB('crowi', 'security:passport-saml:attrMapId'),
-        samlAttrMapUserName: await crowi.configManager.getConfigFromDB('crowi', 'security:passport-saml:attrMapUsername'),
+        samlAttrMapUsername: await crowi.configManager.getConfigFromDB('crowi', 'security:passport-saml:attrMapUsername'),
         samlAttrMapMail: await crowi.configManager.getConfigFromDB('crowi', 'security:passport-saml:attrMapMail'),
         samlAttrMapFirstName: await crowi.configManager.getConfigFromDB('crowi', 'security:passport-saml:attrMapFirstName'),
         samlAttrMapLastName: await crowi.configManager.getConfigFromDB('crowi', 'security:passport-saml:attrMapLastName'),