⚡ 优化身份提供商

eiam-console/src/main/console-fe/src/pages/authn/IdentityProvider/components/Config/Config.tsx

@@ -18,15 +18,14 @@
 import { ProFormSwitch } from '@ant-design/pro-components';
 import { IdentityProviderType } from '../../constant';
 import DingTalkOauthConfig from './DingTalkOauthConfig';
-import DingTalkScanCode from './DingTalkScanCodeConfig';
 import FeiShuScanCodeConfig from './FeiShuScanCodeConfig';
 import QqOauthConfig from './QqOauthConfig';
 import WeChatScanCode from './WeChatScanCodeConfig';
-import WeWorkScanCode from './WeWorkScanCodeConfig';
+import WeChatWorkConfig from './WeChatWorkConfig';
 import GithubOauthConfig from './GithubOauthConfig';
 import GiteeOauthConfig from './GiteeOauthConfig';
+import AliPayOauthConfig from './AliPayOauthConfig';
 import { useIntl } from '@umijs/max';
-import AliPayOauthConfig from '@/pages/authn/IdentityProvider/components/Config/AliPayOauthConfig';
 
 /**
  * Config
@@ -41,8 +40,7 @@ const Config = (props: { type: IdentityProviderType | string; isCreate?: boolean
   return (
     <>
       {type === IdentityProviderType.wechat_qr && <WeChatScanCode isCreate={isCreate} />}
-      {type === IdentityProviderType.wechatwork_qr && <WeWorkScanCode isCreate={isCreate} />}
-      {type === IdentityProviderType.dingtalk_qr && <DingTalkScanCode isCreate={isCreate} />}
+      {type === IdentityProviderType.wechatwork_oauth && <WeChatWorkConfig isCreate={isCreate} />}
       {type === IdentityProviderType.dingtalk_oauth && <DingTalkOauthConfig isCreate={isCreate} />}
       {type === IdentityProviderType.qq_oauth && <QqOauthConfig isCreate={isCreate} />}
       {type === IdentityProviderType.feishu_oauth && <FeiShuScanCodeConfig isCreate={isCreate} />}

eiam-console/src/main/console-fe/src/pages/authn/IdentityProvider/components/Config/DingTalkScanCodeConfig.tsx

@@ -1,61 +0,0 @@
-/*
- * eiam-console - Employee Identity and Access Management
- * Copyright © 2022-Present Jinan Yuanchuang Network Technology Co., Ltd. (support@topiam.cn)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-import { ProFormText } from '@ant-design/pro-components';
-import CallbackUrl from './CallbackUrl';
-import { useIntl } from '@umijs/max';
-
-/**
- * 钉钉扫码登录
- *
- * @constructor
- */
-const DingTalkScanCode = (props: { isCreate: boolean }) => {
-  const { isCreate } = props;
-  const intl = useIntl();
-
-  return (
-    <>
-      <ProFormText
-        name={['config', 'appKey']}
-        label="AppKey"
-        rules={[{ required: true }]}
-        extra={intl.formatMessage({
-          id: 'pages.authn.identity_provider.config.ding_talk_oauth.app_id.extra',
-        })}
-        fieldProps={{ autoComplete: 'off' }}
-        placeholder={intl.formatMessage({
-          id: 'pages.authn.identity_provider.config.ding_talk_oauth.app_id.placeholder',
-        })}
-      />
-      <ProFormText.Password
-        rules={[{ required: true }]}
-        name={['config', 'appSecret']}
-        label="AppSecret"
-        extra={intl.formatMessage({
-          id: 'pages.authn.identity_provider.config.ding_talk_oauth.app_id.extra',
-        })}
-        placeholder={intl.formatMessage({
-          id: 'pages.authn.identity_provider.config.ding_talk_oauth.app_secret.placeholder',
-        })}
-        fieldProps={{ autoComplete: 'off' }}
-      />
-      {!isCreate && <CallbackUrl />}
-    </>
-  );
-};
-export default DingTalkScanCode;

eiam-console/src/main/console-fe/src/pages/authn/IdentityProvider/components/Config/WeChatWorkConfig.tsx

@@ -21,7 +21,7 @@ import CallbackUrl from './CallbackUrl';
 import { useIntl } from '@umijs/max';
 
 /**
- * 企业微信扫码登录
+ * 企业微信认证
  *
  * @constructor
  */

eiam-console/src/main/console-fe/src/pages/authn/IdentityProvider/components/CreateModal/CreateModal.tsx

@@ -23,9 +23,9 @@ import {
   ProFormTextArea,
 } from '@ant-design/pro-components';
 import { useAsyncEffect } from 'ahooks';
-import { Spin } from 'antd';
+import { Avatar, Space, Spin } from 'antd';
 import { useForm } from 'antd/es/form/Form';
-import { useState } from 'react';
+import React, { useState } from 'react';
 import {
   DRAWER_FORM_ITEM_LAYOUT,
   IdentityProviderCategory,
@@ -33,6 +33,7 @@ import {
 } from '../../constant';
 import Config from '../Config';
 import { useIntl } from '@umijs/max';
+import { ICON_LIST } from '@/components/IconFont/constant';
 
 export type CreateDrawerProps = {
   visible?: boolean;
@@ -50,7 +51,7 @@ export default (props: CreateDrawerProps) => {
       if (category === IdentityProviderCategory.enterprise) {
         form?.setFieldsValue({
           displayed: true,
-          type: IdentityProviderType.dingtalk_qr,
+          type: IdentityProviderType.dingtalk_oauth,
         });
       }
       if (category === IdentityProviderCategory.social) {
@@ -108,36 +109,51 @@ export default (props: CreateDrawerProps) => {
                   required: true,
                 },
               ]}
+              fieldProps={{
+                optionRender: ({ data }) => {
+                  return (
+                    <Space>
+                      <Avatar shape={'square'} src={ICON_LIST[data?.icon]} />
+                      {data.label}
+                    </Space>
+                  );
+                },
+              }}
               options={[
                 {
                   value: IdentityProviderType.wechat_qr,
                   label: intl.formatMessage({
                     id: 'pages.authn.identity_provider.create_modal.form.type.wechat_qr',
                   }),
+                  icon: IdentityProviderType.wechat_qr,
                 },
                 {
                   value: IdentityProviderType.qq_oauth,
                   label: intl.formatMessage({
                     id: 'pages.authn.identity_provider.create_modal.form.type.qq',
                   }),
+                  icon: IdentityProviderType.qq_oauth,
                 },
                 {
                   value: IdentityProviderType.alipay_oauth,
                   label: intl.formatMessage({
                     id: 'pages.authn.identity_provider.create_modal.form.type.alipay_oauth',
                   }),
+                  icon: IdentityProviderType.alipay_oauth,
                 },
                 {
                   value: IdentityProviderType.github_oauth,
                   label: intl.formatMessage({
                     id: 'pages.authn.identity_provider.create_modal.form.type.github',
                   }),
+                  icon: IdentityProviderType.github_oauth,
                 },
                 {
                   value: IdentityProviderType.gitee_oauth,
                   label: intl.formatMessage({
                     id: 'pages.authn.identity_provider.create_modal.form.type.gitee',
                   }),
+                  icon: IdentityProviderType.gitee_oauth,
                 },
               ]}
             />
@@ -166,30 +182,37 @@ export default (props: CreateDrawerProps) => {
                   required: true,
                 },
               ]}
+              fieldProps={{
+                optionRender: ({ data }) => {
+                  return (
+                    <Space>
+                      <Avatar shape={'square'} src={ICON_LIST[data?.icon]} />
+                      {data.label}
+                    </Space>
+                  );
+                },
+              }}
               options={[
                 {
                   value: IdentityProviderType.dingtalk_oauth,
                   label: intl.formatMessage({
                     id: 'pages.authn.identity_provider.create_modal.form.type.dingtalk_oauth',
                   }),
-                },
-                {
-                  value: IdentityProviderType.dingtalk_qr,
-                  label: intl.formatMessage({
-                    id: 'pages.authn.identity_provider.create_modal.form.type.dingtalk_qr',
-                  }),
+                  icon: IdentityProviderType.dingtalk_oauth,
                 },
                 {
                   value: IdentityProviderType.feishu_oauth,
                   label: intl.formatMessage({
                     id: 'pages.authn.identity_provider.create_modal.form.type.feishu_oauth',
                   }),
+                  icon: IdentityProviderType.feishu_oauth,
                 },
                 {
-                  value: IdentityProviderType.wechatwork_qr,
+                  value: IdentityProviderType.wechatwork_oauth,
                   label: intl.formatMessage({
-                    id: 'pages.authn.identity_provider.create_modal.form.type.wechatwork_qr',
+                    id: 'pages.authn.identity_provider.create_modal.form.type.wechatwork_oauth',
                   }),
+                  icon: IdentityProviderType.wechatwork_oauth,
                 },
               ]}
             />

eiam-console/src/main/console-fe/src/pages/authn/IdentityProvider/constant.ts

@@ -28,8 +28,7 @@ export enum IdentityProviderCategory {
  */
 export enum IdentityProviderType {
   //企业
-  wechatwork_qr = 'wechatwork_qr',
-  dingtalk_qr = 'dingtalk_qr',
+  wechatwork_oauth = 'wechatwork_oauth',
   feishu_oauth = 'feishu_oauth',
   dingtalk_oauth = 'dingtalk_oauth',
   //社交
@@ -44,8 +43,7 @@ export enum IdentityProviderType {
  * 是否回调的提供商
  */
 export const EXIST_CALLBACK = [
-  IdentityProviderType.wechatwork_qr,
-  IdentityProviderType.dingtalk_qr,
+  IdentityProviderType.wechatwork_oauth,
   IdentityProviderType.dingtalk_oauth,
   IdentityProviderType.wechat_qr,
   IdentityProviderType.qq_oauth,

eiam-console/src/main/console-fe/src/pages/authn/IdentityProvider/locales/zh-CN.ts

@@ -42,9 +42,8 @@ export default {
   'pages.authn.identity_provider.create_modal.form.type.github': 'GitHub认证',
   'pages.authn.identity_provider.create_modal.form.type.alipay_oauth': '支付宝认证',
   'pages.authn.identity_provider.create_modal.form.type.dingtalk_oauth': '钉钉认证',
-  'pages.authn.identity_provider.create_modal.form.type.dingtalk_qr': '钉钉扫码认证',
   'pages.authn.identity_provider.create_modal.form.type.feishu_oauth': '飞书认证',
-  'pages.authn.identity_provider.create_modal.form.type.wechatwork_qr': '企业微信扫码认证',
+  'pages.authn.identity_provider.create_modal.form.type.wechatwork_oauth': '企业微信认证',
   'pages.authn.identity_provider.create_modal.form.name': '认证源名称',
   'pages.authn.identity_provider.create_modal.form.name.placeholder': '请输入认证源名称',
   'pages.authn.identity_provider.create_modal.form.name.rule.0.message': '认证源名称为必填项',