[feature](System/OAuth): add email and wechat fields

actiontech · Jan 11, 2024 · 4b7f7d7 · 4b7f7d7
1 parent 9e7a17c
commit 4b7f7d7
Show file tree

Hide file tree

Showing 5 changed files with 82 additions and 6 deletions.
diff --git a/packages/base/src/locale/en-US/dmsSystem.ts b/packages/base/src/locale/en-US/dmsSystem.ts
@@ -121,9 +121,15 @@ export default {
     accessTokenKeyNameTips:
       'sqle会在获取用户ID时将access_token放在这个key对应的value中, 此参数会作为get请求的参数发送给用户ID获取地址',
 
-    userIdKeyName: 'user_id Key名称',
+    userIdKeyName: '用户UID的JSON路径',
     userIdKeyNameTips:
-      'sqle会尝试使用此key从第三方平台的响应中解析出用户ID,用户ID应当为唯一ID',
+      'sqle会尝试使用此路径，从第三方平台获取用户信息的响应中解析出用户ID，用户ID应当为唯一ID',
+    userEmailTagName: '用户邮箱的JSON路径',
+    userEmailTagNameTips:
+      'sqle会尝试使用此路径，从第三方平台获取用户信息的响应中解析出用户邮箱',
+    userWechatTagName: '用户微信ID的JSON路径',
+    userWechatTagNameTips:
+      'sqle会尝试使用此路径，从第三方平台获取用户信息的响应中解析出用户微信ID',
 
     loginButtonText: '登录按钮文字',
     loginButtonTextTips: 'login页面oauth登录按钮文字',

diff --git a/packages/base/src/locale/zh-CN/dmsSystem.ts b/packages/base/src/locale/zh-CN/dmsSystem.ts
@@ -121,9 +121,15 @@ export default {
     accessTokenKeyNameTips:
       'sqle会在获取用户ID时将access_token放在这个key对应的value中, 此参数会作为get请求的参数发送给用户ID获取地址',
 
-    userIdKeyName: 'user_id Key名称',
+    userIdKeyName: '用户UID的JSON路径',
     userIdKeyNameTips:
-      'sqle会尝试使用此key从第三方平台的响应中解析出用户ID,用户ID应当为唯一ID',
+      'sqle会尝试使用此路径，从第三方平台获取用户信息的响应中解析出用户ID，用户ID应当为唯一ID',
+    userEmailTagName: '用户邮箱的JSON路径',
+    userEmailTagNameTips:
+      'sqle会尝试使用此路径，从第三方平台获取用户信息的响应中解析出用户邮箱',
+    userWechatTagName: '用户微信ID的JSON路径',
+    userWechatTagNameTips:
+      'sqle会尝试使用此路径，从第三方平台获取用户信息的响应中解析出用户微信ID',
 
     loginButtonText: '登录按钮文字',
     loginButtonTextTips: 'login页面oauth登录按钮文字',

diff --git a/packages/base/src/page/System/LoginConnection/Oauth/index.tsx b/packages/base/src/page/System/LoginConnection/Oauth/index.tsx
@@ -97,7 +97,9 @@ const Oauth = () => {
       server_user_id_url: value.serverUserIdUrl,
       access_token_tag: value.accessTokenKeyName,
       login_tip: value.loginButtonText,
-      user_id_tag: value.userIdKeyName
+      user_id_tag: value.userIdKeyName,
+      user_email_tag: value.userEmailTag,
+      user_wechat_tag: value.userWechatTag
     };
 
     if (!!value.scopes) {
@@ -131,7 +133,9 @@ const Oauth = () => {
       scopes: oauthConfig?.scopes?.join(','),
       accessTokenKeyName: oauthConfig?.access_token_tag,
       loginButtonText: oauthConfig?.login_tip,
-      userIdKeyName: oauthConfig?.user_id_tag
+      userIdKeyName: oauthConfig?.user_id_tag,
+      userEmailTag: oauthConfig?.user_email_tag,
+      userWechatTag: oauthConfig?.user_wechat_tag
     });
   }, [form, oauthConfig]);
 
@@ -244,6 +248,32 @@ const Oauth = () => {
           dataIndex: 'user_id_tag',
           hidden: !oauthConfig?.enable_oauth2
         },
+        {
+          label: (
+            <BasicToolTips
+              title={t('dmsSystem.oauth.userEmailTagNameTips')}
+              suffixIcon={<IconTipGray />}
+            >
+              {t('dmsSystem.oauth.userEmailTagName')}
+            </BasicToolTips>
+          ),
+          span: 3,
+          dataIndex: 'user_email_tag',
+          hidden: !oauthConfig?.enable_oauth2
+        },
+        {
+          label: (
+            <BasicToolTips
+              title={t('dmsSystem.oauth.userWechatTagNameTips')}
+              suffixIcon={<IconTipGray />}
+            >
+              {t('dmsSystem.oauth.userWechatTagName')}
+            </BasicToolTips>
+          ),
+          span: 3,
+          dataIndex: 'user_wechat_tag',
+          hidden: !oauthConfig?.enable_oauth2
+        },
         {
           label: (
             <BasicToolTips
@@ -459,6 +489,30 @@ const Oauth = () => {
                   >
                     <BasicInput />
                   </FormItemLabel>
+                  <FormItemLabel
+                    className="has-label-tip"
+                    label={
+                      <CustomLabelContent
+                        title={t('dmsSystem.oauth.userEmailTagName')}
+                        tips={t('dmsSystem.oauth.userEmailTagNameTips')}
+                      />
+                    }
+                    name="userEmailTag"
+                  >
+                    <BasicInput />
+                  </FormItemLabel>
+                  <FormItemLabel
+                    className="has-label-tip"
+                    label={
+                      <CustomLabelContent
+                        title={t('dmsSystem.oauth.userWechatTagName')}
+                        tips={t('dmsSystem.oauth.userWechatTagNameTips')}
+                      />
+                    }
+                    name="userWechatTag"
+                  >
+                    <BasicInput />
+                  </FormItemLabel>
                   <FormItemLabel
                     className="has-label-tip"
                     label={

diff --git a/packages/base/src/page/System/LoginConnection/Oauth/index.type.ts b/packages/base/src/page/System/LoginConnection/Oauth/index.type.ts
@@ -10,4 +10,6 @@ export type OauthFormField = {
   accessTokenKeyName: string;
   userIdKeyName: string;
   loginButtonText: string;
+  userEmailTag: string;
+  userWechatTag: string;
 };
diff --git a/packages/shared/lib/api/base/service/common.d.ts b/packages/shared/lib/api/base/service/common.d.ts
@@ -412,6 +412,10 @@ export interface IGetOauth2ConfigurationResData {
   server_user_id_url?: string;
 
   user_id_tag?: string;
+
+  user_email_tag?: string;
+
+  user_wechat_tag?: string;
 }
 
 export interface IGetOauth2ConfigurationResDataReply {
@@ -946,6 +950,10 @@ export interface IOauth2Configuration {
   server_user_id_url?: string;
 
   user_id_tag?: string;
+
+  user_email_tag?: string;
+
+  user_wechat_tag?: string;
 }
 
 export interface IOpPermissionItem {