@authing/react-ui-components 2.4.55 → 2.4.56-alpha.0

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@authing/react-ui-components",
-  "version": "2.4.55",
+  "version": "2.4.56-alpha.0",
   "private": false,
   "main": "lib/index.min.js",
   "typings": "lib/index.d.ts",
   "dependencies": {
     "antd": "^4.8.0",
-    "authing-js-sdk": "4.22.24-alpha",
+    "authing-js-sdk": "4.22.26-alpha.9",
     "qs": "^6.9.4"
   },
   "peerDependencies": {
@@ -185,5 +185,5 @@
     "webpack-manifest-plugin": "2.2.0",
     "workbox-webpack-plugin": "5.1.4"
   },
-  "gitHead": "8c8162fd4a91c1d1376bf68d4592f90572cc3a7e"
+  "gitHead": "7bb7b153c3c4836b084f4cb08fe8124af5d8e5fd"
 }

package/src/components/AuthingGuard/Forms/QrCodeLoginForm/index.tsx

@@ -14,6 +14,7 @@ export const QrCodeLoginForm: FC<QrLoginFormProps> = ({
   onFail,
   onSuccess,
   type,
+  idpId,
 }) => {
   const {
     state: { authClient, config },
@@ -31,6 +32,7 @@ export const QrCodeLoginForm: FC<QrLoginFormProps> = ({
 
   useEffect(() => {
     client.startScanning('authingGuardQrcode', {
+      extIdpConnId: idpId,
       autoExchangeUserInfo: true,
       ...config.qrCodeScanOptions,
       onStart(timer) {
@@ -46,7 +48,7 @@ export const QrCodeLoginForm: FC<QrLoginFormProps> = ({
       },
     })
     return () => clearInterval(timerRef.current)
-  }, [client, config.qrCodeScanOptions, onFail, onSuccess])
+  }, [client, config.qrCodeScanOptions, idpId, onFail, onSuccess])
 
   return (
     <div className="authing-guard-qr-form">

package/src/components/AuthingGuard/Forms/SocialAndIdpLogin/index.tsx

@@ -218,7 +218,7 @@ export const SocialAndIdpLogin: FC<SocialAndIdpLoginProps> = ({
       }
 
       const onLogin = () => {
-        authClient.social.authorize(item.provider, {
+        authClient.social.authorize(item.identifier, {
           onSuccess(user) {
             onSuccess(user)
           },
@@ -254,12 +254,12 @@ export const SocialAndIdpLogin: FC<SocialAndIdpLoginProps> = ({
           }
           onClick={onLogin}
         >
-          {item.tooltip?.[i18n.language as Lang] || item.name}
+          {item.tooltip?.[i18n.language as Lang] || item.displayName}
         </Button>
       ) : (
         <Tooltip
           key={item.provider}
-          title={item.tooltip?.[i18n.language as Lang] || item.name}
+          title={item.tooltip?.[i18n.language as Lang] || item.displayName}
         >
           <div className="authing-social-login-item" onClick={onLogin}>
             <IconFont type={iconType} />

package/src/components/AuthingGuard/GuardLayout/index.tsx

@@ -156,6 +156,9 @@ const useGuardConfig = () => {
       appConfig.loginTabs?.list ||
       defaultGuardConfig.loginMethods
 
+    // 扫码多源配置
+    const qrcodeTabsSettings = appConfig.qrcodeTabsSettings ?? {}
+
     // 账密登录的登录拆分
     const passwordLoginMethods =
       userConfig.passwordLoginMethods ||
@@ -168,6 +171,8 @@ const useGuardConfig = () => {
       appConfig.loginTabs?.default ||
       defaultGuardConfig.defaultLoginMethod
 
+    const loginMethodTitleMapping = appConfig.loginTabs?.title
+
     // 注册方式
     const registerMethods =
       userConfig.registerMethods ||
@@ -233,18 +238,24 @@ const useGuardConfig = () => {
         defaultRegisterMethod,
         enterpriseConnectionObjs,
         publicKey: appConfig.publicKey,
+        qrcodeTabsSettings,
         agreementEnabled: appConfig.agreementEnabled,
         agreements: appConfig.agreements,
+        loginMethodTitleMapping: loginMethodTitleMapping,
       }
     )
   }, [
     userConfig,
     appConfig.loginTabs?.list,
+    appConfig.loginTabs?.defaultV2,
     appConfig.loginTabs?.default,
+    appConfig.loginTabs?.title,
+    appConfig.qrcodeTabsSettings,
     appConfig.passwordTabConfig?.enabledLoginMethods,
     appConfig.registerTabs?.list,
     appConfig.registerTabs?.default,
     appConfig.name,
+    appConfig.description,
     appConfig.logo,
     appConfig.ssoPageComponentDisplay?.autoRegisterThenLoginHintInfo,
     appConfig.ssoPageComponentDisplay?.registerBtn,

package/src/components/AuthingGuard/LoginLayout/index.tsx

@@ -1,7 +1,7 @@
 import { message } from 'antd'
 import { User } from 'authing-js-sdk'
 import { FormInstance } from 'antd/lib/form'
-import React, { useCallback, useRef } from 'react'
+import React, { useCallback, useMemo, useRef } from 'react'
 
 import { useGuardContext } from '../../../context/global/context'
 import {
@@ -75,36 +75,36 @@ const useNormalLoginTabs = ({ onSuccess, onFail }: BaseFormProps) => {
   }
 
   const LOGIN_FORM_MAP = {
-    [LoginMethods.Password]: (
+    [LoginMethods.Password]: (props: any) => (
       <PasswordLoginForm
-        {...formProps}
+        {...props}
         ref={(v) => (formRef.current[LoginMethods.Password] = v!)}
       />
     ),
-    [LoginMethods.PhoneCode]: (
+    [LoginMethods.PhoneCode]: (props: any) => (
       <PhoneCodeLoginForm
-        {...formProps}
+        {...props}
         ref={(v) => (formRef.current[LoginMethods.PhoneCode] = v!)}
       />
     ),
-    [LoginMethods.AppQr]: (
-      <QrCodeLoginForm type={LoginMethods.AppQr} {...formProps} />
+    [LoginMethods.AppQr]: (props: any) => (
+      <QrCodeLoginForm type={LoginMethods.AppQr} {...props} />
     ),
-    [LoginMethods.WxMinQr]: (
-      <QrCodeLoginForm type={LoginMethods.WxMinQr} {...formProps} />
+    [LoginMethods.WxMinQr]: (props: any) => (
+      <QrCodeLoginForm type={LoginMethods.WxMinQr} {...props} />
     ),
-    [LoginMethods.LDAP]: (
+    [LoginMethods.LDAP]: (props: any) => (
       <LdapLoginForm
-        {...formProps}
+        {...props}
         ref={(v) => (formRef.current[LoginMethods.LDAP] = v!)}
       />
     ),
-    [LoginMethods.WechatMpQrcode]: (
-      <QrCodeLoginForm type={LoginMethods.WechatMpQrcode} {...formProps} />
+    [LoginMethods.WechatMpQrcode]: (props: any) => (
+      <QrCodeLoginForm type={LoginMethods.WechatMpQrcode} {...props} />
     ),
-    [LoginMethods.AD]: (
+    [LoginMethods.AD]: (props: any) => (
       <ADLoginForm
-        {...formProps}
+        {...props}
         ref={(v) => (formRef.current[LoginMethods.AD] = v!)}
       />
     ),
@@ -113,14 +113,46 @@ const useNormalLoginTabs = ({ onSuccess, onFail }: BaseFormProps) => {
   const {
     state: { config },
   } = useGuardContext()
-  const { loginMethods = [] } = config
+  const {
+    loginMethods = [],
+    loginMethodTitleMapping,
+    qrcodeTabsSettings,
+  } = config
 
-  const tabs = loginMethods.map((item) => ({
-    key: item,
-    label: LOGIN_METHODS_MAP()?.[item]!,
-    component: LOGIN_FORM_MAP[item],
-  }))
+  let tabs: any[] = []
 
+  // 兼容 密码登陆 donglyc
+  let filterLoginMethods = loginMethods.filter(
+    (d) => d.indexOf('password') === -1
+  )
+  const hasPassword = loginMethods.some((d) => d.indexOf('password') !== -1)
+  if (hasPassword) filterLoginMethods.push(LoginMethods.Password)
+
+  filterLoginMethods.forEach((method: LoginMethods) => {
+    if (
+      [LoginMethods.WechatMpQrcode, LoginMethods.WxMinQr].includes(method) &&
+      qrcodeTabsSettings[method]
+    ) {
+      tabs.push(
+        ...qrcodeTabsSettings[method].map((idp) => {
+          return {
+            key: idp.id,
+            label: idp.title || loginMethodTitleMapping[method],
+            component: LOGIN_FORM_MAP[method]({
+              ...formProps,
+              idp,
+            }),
+          }
+        })
+      )
+    } else {
+      tabs.push({
+        key: method,
+        label: LOGIN_METHODS_MAP()[method],
+        component: LOGIN_FORM_MAP[method](formProps),
+      })
+    }
+  })
   return {
     tabs,
   }
@@ -133,13 +165,25 @@ const SHOW_SOCIAL_LOGIN_TAB = [
 ]
 export const LoginLayout = () => {
   const {
-    state: { activeTabs },
+    state: { activeTabs, config },
     setValue,
   } = useGuardContext()
+  const { qrcodeTabsSettings } = config
 
   const { onFail, onSuccess } = useFormActions()
   const { tabs } = useNormalLoginTabs({ onSuccess, onFail })
 
+  const activeKey = useMemo(() => {
+    const activeTab = activeTabs[GuardScenes.Login]
+    if (
+      [LoginMethods.WechatMpQrcode, LoginMethods.WxMinQr].includes(activeTab) &&
+      qrcodeTabsSettings[activeTab]
+    ) {
+      return qrcodeTabsSettings[activeTab].find((item) => item.isDefault)?.id
+    }
+    return activeTab
+  }, [activeTabs, qrcodeTabsSettings])
+
   return (
     <>
       <AuthingTabs
@@ -150,7 +194,7 @@ export const LoginLayout = () => {
             [GuardScenes.Login]: t,
           })
         }
-        activeKey={activeTabs[GuardScenes.Login]}
+        activeKey={activeKey}
       />
 
       {SHOW_SOCIAL_LOGIN_TAB.includes(activeTabs[GuardScenes.Login]) && (

package/src/components/AuthingGuard/api/appConfig.ts

@@ -1,5 +1,9 @@
 import { requestClient } from './http'
-import { Lang, Protocol } from '../../../components/AuthingGuard/types'
+import {
+  Lang,
+  LoginMethods,
+  Protocol,
+} from '../../../components/AuthingGuard/types'
 import {
   IAzureAdConnectionConfig,
   ICasConnectionConfig,
@@ -25,6 +29,15 @@ export const ApplicationMfaTypeLabel: () => Record<
   [ApplicationMfaType.EMAIL]: i18n.t('common.EmailVerification'),
 })
 
+export type QrcodeTabsSettings = Record<
+  LoginMethods,
+  Array<{
+    id: string
+    title: string
+    isDefault?: boolean
+  }>
+>
+
 export interface OidcClientMetadata {
   grant_types: string[]
   client_id: string
@@ -83,9 +96,13 @@ export interface ApplicationConfig {
     default: string
     title: { [x: string]: string }
   }
+
+  qrcodeTabsSettings: QrcodeTabsSettings
+
   loginTabs: {
     list: string[]
     default: string
+    defaultV2?: string
     title: { [x: string]: string }
   }
   socialConnections: SocialConnectionItem[]

package/src/components/AuthingGuard/api/userPoolConfig.ts

@@ -72,8 +72,10 @@ export interface ICasConnectionConfig {
 }
 export interface SocialConnectionItem {
   name: string
+  displayName: string
   logo: string
   description: string
+  identifier: string
   provider: SocialConnectionProvider
   authorizationUrl: string
   tooltip: Record<Lang, string>

package/src/components/AuthingGuard/style.less

@@ -70,6 +70,7 @@
     }
   }
 }
+
 .authing-data-tips__top {
   position: relative;
   &::after {

package/src/components/AuthingGuard/types/Forms.ts

@@ -27,6 +27,7 @@ export interface LdapLoginFormProps extends BaseFormProps {
 
 export interface QrLoginFormProps extends BaseFormProps {
   type: LoginMethods.AppQr | LoginMethods.WxMinQr | LoginMethods.WechatMpQrcode
+  idpId?: string
 }
 
 export interface EmailRegisterFormProps extends BaseFormProps {

package/src/components/AuthingGuard/types/GuardConfig.ts

@@ -13,6 +13,7 @@ import {
   ApplicationConfig,
   PasswordLoginMethods,
   Agreement,
+  QrcodeTabsSettings,
 } from '../../../components/AuthingGuard/api'
 import { Lang } from './Locales'
 
@@ -412,6 +413,8 @@ export interface GuardConfig extends UserConfig {
   publicKey: ApplicationConfig['publicKey']
   agreementEnabled: boolean
   agreements: Agreement[]
+  loginMethodTitleMapping: Record<string, string>
+  qrcodeTabsSettings: QrcodeTabsSettings
 }
 
 export interface LocalesConfig {

package/src/index.tsx

@@ -4,6 +4,8 @@ import ReactDOM from 'react-dom'
 import { Lang } from './components'
 import { AuthingGuard } from './components/AuthingGuard'
 
+import { SocialConnectionProvider } from 'authing-js-sdk'
+
 import {
   GuardMode,
   // LoginMethods,
@@ -21,8 +23,9 @@ const App = () => {
 
   const config: UserConfig = {
     mode: GuardMode.Modal,
-    appHost: 'https://core.dev2.authing-inc.co/',
-    // apiHost: 'http://console.authing.localhost:3000',
+    // appHost: 'https://core.dev2.authing-inc.co',
+    apiHost: 'http://console.authing.localhost:3000',
+    // appHost: 'http://0w9ugz.authing.localhost:3000',
     // apiHost: 'http://192.168.50.57:3000',
     // loginMethods: Object.values(LoginMethods),
     // logo:
@@ -53,7 +56,7 @@ const App = () => {
     //   }
     // `,
     // // autoRegister: true,
-    // socialConnections: [SocialConnections.AppleWeb],
+    socialConnections: [SocialConnectionProvider.WECHATPC],
   }
 
   const [visible, setVisible] = useState(false)
@@ -70,6 +73,14 @@ const App = () => {
   return (
     // eslint-disable-next-line react/jsx-no-undef
     <>
+      <Button
+        type="primary"
+        onClick={() => {
+          //
+        }}
+      >
+        add socialConnections
+      </Button>
       <Button
         type="primary"
         onClick={() => {
@@ -114,8 +125,8 @@ const App = () => {
         }}
         // onLoad={(a) => console.log(a, '加载完成')}
         // onPwdResetError={(e) => console.log(e)}
-        appId="6191cf610f772aa56dc70637"
-        tenantId="6194a41abf23c1d5268b362a"
+        appId="61ada57aef5ed526528ed5b6"
+        // tenantId="61a5ed126cddae656cce9007"
         // appId="5fd877fb0ba0421962eced94"
         config={config}
       />