itizawa 6 лет назад
Родитель
Сommit
86a72c9fab

+ 1 - 1
resource/locales/en-US/translation.json

@@ -490,7 +490,7 @@
     "Treat username matching as identical_warn": "WARNING: Be aware of security because the system treats the same user as a match of <code>username</code>.",
     "Treat username matching as identical_warn": "WARNING: Be aware of security because the system treats the same user as a match of <code>username</code>.",
     "Treat email matching as identical": "Automatically bind external accounts newly logged in to local accounts when <code>%s</code> match",
     "Treat email matching as identical": "Automatically bind external accounts newly logged in to local accounts when <code>%s</code> match",
     "Treat email matching as identical_warn": "WARNING: Be aware of security because the system treats the same user as a match of <code>%s</code>.",
     "Treat email matching as identical_warn": "WARNING: Be aware of security because the system treats the same user as a match of <code>%s</code>.",
-    "Use env var if empty": "Use env var <code>%s</code> if empty",
+    "Use env var if empty": "Use env var <code>{{env}}</code> if empty",
     "Use default if both are empty": "If both ​​are empty, the default value <code>{{target}}</code> is used.",
     "Use default if both are empty": "If both ​​are empty, the default value <code>{{target}}</code> is used.",
     "missing mandatory configs": "The following mandatory items are not set in either database nor environment variables.",
     "missing mandatory configs": "The following mandatory items are not set in either database nor environment variables.",
     "Local": {
     "Local": {

+ 2 - 2
resource/locales/ja/translation.json

@@ -485,7 +485,7 @@
     "Treat username matching as identical_warn": "警告: <code>username</code> の一致を以て同一ユーザーであるとみなすので、セキュリティに注意してください",
     "Treat username matching as identical_warn": "警告: <code>username</code> の一致を以て同一ユーザーであるとみなすので、セキュリティに注意してください",
     "Treat email matching as identical": "新規ログイン時、<code>email</code> が一致したローカルアカウントが存在した場合は自動的に紐付ける",
     "Treat email matching as identical": "新規ログイン時、<code>email</code> が一致したローカルアカウントが存在した場合は自動的に紐付ける",
     "Treat email matching as identical_warn": "警告: <code>email</code> の一致を以て同一ユーザーであるとみなすので、セキュリティに注意してください",
     "Treat email matching as identical_warn": "警告: <code>email</code> の一致を以て同一ユーザーであるとみなすので、セキュリティに注意してください",
-    "Use env var if empty": "空の場合、環境変数 <code>%s</code> を利用します",
+    "Use env var if empty": "空の場合、環境変数 <code>{{env}}</code> を利用します",
     "Use default if both are empty": "どちらの値も空の場合、デフォルト値 <code>{{target}}</code> を利用します",
     "Use default if both are empty": "どちらの値も空の場合、デフォルト値 <code>{{target}}</code> を利用します",
     "missing mandatory configs": "以下の必須項目の値がデータベースと環境変数のどちらにも設定されていません",
     "missing mandatory configs": "以下の必須項目の値がデータベースと環境変数のどちらにも設定されていません",
     "Local": {
     "Local": {
@@ -572,7 +572,7 @@
         "name": "OpenID Connect",
         "name": "OpenID Connect",
         "id_detail": "OIDC claims で一意に識別可能な値を格納している属性",
         "id_detail": "OIDC claims で一意に識別可能な値を格納している属性",
         "username_detail": "新規ユーザーのアカウント名(<code>username</code>)に関連付ける属性",
         "username_detail": "新規ユーザーのアカウント名(<code>username</code>)に関連付ける属性",
-        "name_detail": "hoge",
+        "name_detail": "新規ユーザー名(<code>name</code>)に関連付ける属性",
         "mapping_detail": "hoge",
         "mapping_detail": "hoge",
         "register_1": "hoge",
         "register_1": "hoge",
         "register_2": "hoge",
         "register_2": "hoge",

+ 16 - 0
src/client/js/components/Admin/Security/OidcSecuritySetting.jsx

@@ -161,6 +161,22 @@ class OidcSecurityManagement extends React.Component {
             </div>
             </div>
           </div>
           </div>
 
 
+          <div className="row mb-5">
+            <label htmlFor="oidcAttrMapName" className="col-xs-3 text-right">{ t('Name') }</label>
+            <div className="col-xs-6">
+              <input
+                className="form-control"
+                type="text"
+                name="oidcAttrMapName"
+                value={adminOidcSecurityContainer.state.oidcAttrMapName}
+                onChange={e => adminOidcSecurityContainer.changeOidcAttrMapName(e.target.value)}
+              />
+              <p className="help-block">
+                <small dangerouslySetInnerHTML={{ __html: t('security_setting.OAuth.OIDC.name_detail') }} />
+              </p>
+            </div>
+          </div>
+
         </React.Fragment>
         </React.Fragment>
         )}
         )}
       </React.Fragment>
       </React.Fragment>

+ 8 - 0
src/client/js/services/AdminOidcSecurityContainer.js

@@ -25,6 +25,7 @@ export default class AdminOidcSecurityContainer extends Container {
       oidcClientSecret: '',
       oidcClientSecret: '',
       oidcAttrMapId: '',
       oidcAttrMapId: '',
       oidcAttrMapUserName: '',
       oidcAttrMapUserName: '',
+      oidcAttrMapName: '',
     };
     };
 
 
     this.init();
     this.init();
@@ -84,4 +85,11 @@ export default class AdminOidcSecurityContainer extends Container {
     this.setState({ oidcAttrMapUserName: inputValue });
     this.setState({ oidcAttrMapUserName: inputValue });
   }
   }
 
 
+  /**
+   * Change oidcAttrMapName
+   */
+  changeOidcAttrMapName(inputValue) {
+    this.setState({ oidcAttrMapName: inputValue });
+  }
+
 }
 }