@authing/react-ui-components 3.0.2-beta.2 → 3.0.2-beta.6

package/components/MFA/core/totp.tsx

@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next'
 import { useAsyncFn } from 'react-use'
 import { GuardModuleType } from '../../Guard/module'
 import { useGuardHttp } from '../../_utils/guradHttp'
-import { GuardMFAInitData, MFAConfig } from '../props'
+import { GuardMFAInitData, MFAConfig } from '../interface'
 import { message as Message } from 'antd'
 import SubmitButton from '../../SubmitButton'
 import { VerifyCodeFormItem } from '../VerifyCodeInput/VerifyCodeFormItem'

package/components/MFA/index.tsx

@@ -7,7 +7,7 @@ import { MFASms } from './core/sms'
 import { MFAFace } from './core/face'
 import { MFATotp } from './core/totp'
 import { MFAMethods } from './mfaMethods'
-import { GuardMFAViewProps, MFAType } from './props'
+import { GuardMFAViewProps, MFAType } from './interface'
 import { useAuthClient } from '../Guard/authClient'
 import { codeMap } from './codemap'
 import './styles.less'

package/components/MFA/mfaMethods/index.tsx

@@ -2,7 +2,7 @@ import React, { useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Button } from 'antd'
 import { IconFont } from '../../IconFont'
-import { GuardMFAInitData, MFAType } from '../props'
+import { GuardMFAInitData, MFAType } from '../interface'
 import { i18n } from '../../_utils/locales'
 import './style.less'
 

package/components/Register/index.tsx

@@ -7,7 +7,7 @@ import { useAuthClient } from '../Guard/authClient'
 import { GuardModuleType } from '../Guard/module'
 import { RegisterWithEmail } from './core/WithEmail'
 import { RegisterWithPhone } from './core/WithPhone'
-import { GuardRegisterViewProps } from './props'
+import { GuardRegisterViewProps } from './interface'
 import { codeMap } from './codemap'
 
 export const GuardRegisterView: React.FC<GuardRegisterViewProps> = ({

package/components/_utils/config.ts

@@ -18,8 +18,7 @@ export const initConfig = async (
   config: Partial<IG2Config>,
   defaultConfig: IG2Config
 ): Promise<{ config: GuardLocalConfig; publicConfig: ApplicationConfig }> => {
-  if (!getPublicConfig(appId))
-    await requestPublicConfig(appId, config.host ?? defaultConfig.host)
+  if (!getPublicConfig(appId)) await requestPublicConfig(appId)
   const mergedConfig = mergeConfig(
     config,
     defaultConfig,
@@ -93,8 +92,7 @@ const mergeConfig = (
 }
 
 const requestPublicConfig = async (
-  appId: string,
-  host: string
+  appId: string
 ): Promise<ApplicationConfig> => {
   let res: AuthingResponse<ApplicationConfig>
 

package/components/_utils/guradHttp.ts

@@ -36,6 +36,10 @@ export class GuardHttp {
     this.headers['x-authing-app-tenant-id'] = tenantId
   }
 
+  setBaseUrl(baseUrl: string) {
+    this.getRequestClient().setBaseUrl(baseUrl)
+  }
+
   public getHeaders = () => this.headers
 
   public get = async <T>(

package/components/_utils/index.ts

@@ -198,9 +198,13 @@ export const assembledAppHost = (identifier: string, host: string) => {
 
   const splitHost = hostUrl.hostname.split('.')
 
+  const port = hostUrl.port
+
   splitHost.shift()
 
-  return `${hostUrl.protocol}//${identifier}.${splitHost.join('.')}`
+  return `${hostUrl.protocol}//${identifier}.${splitHost.join('.')}${
+    port && `:${port}`
+  }`
 }
 
 export enum PasswordStrength {

package/components/_utils/locales/en/common.json

@@ -223,5 +223,7 @@
   "pToLogin": "seconds later back",
   "resetSuccess": "Reset successfully",
   "resetSuccessMessage": "The password is reset successfully, you can continue to log in with the new password",
-  "totpCode": "Security code"
+  "totpCode": "Security code",
+  "welcome": "Welcome",
+  "initPasswordText": "To ensure account security, please set your initial password."
 }

package/components/_utils/locales/zh/common.json

@@ -223,5 +223,7 @@
   "pToLogin": "秒后返回登录",
   "resetSuccess": "重置成功",
   "resetSuccessMessage": "密码重置成功，您可以使用新密码继续登录",
-  "totpCode": "安全码"
+  "totpCode": "安全码",
+  "welcome": "欢迎访问",
+  "initPasswordText": "为了保障账号安全，请设置你的初始密码。"
 }

package/components/_utils/locales/zh/user.json

@@ -27,6 +27,7 @@
   "needSameWithNewPwd": "需要与新密码一致",
   "confirmModify": "确认修改",
   "modifyPwd": "修改密码",
+  "modifyPwdText": "你的密码连续使用超过 {{number}} 个月，可能存在风险。请重新设置密码。",
   "personalInfo": "个人信息",
   "accPwd": "账号密码",
   "authenticationInfo": "认证信息",

package/components/index.ts

@@ -1,12 +1,9 @@
+export * from './_utils/config'
+export type { AuthenticationClientOptions } from 'authing-js-sdk'
+
 export * from './AuthingGuard/types'
 export * from './AuthingGuard/hooks'
-export type { AuthenticationClientOptions } from 'authing-js-sdk'
+export * from './AuthingGuard'
 
 export * from './Guard'
 export * from './Type'
-export * from './BindTotp/interface'
-export * from './CompleteInfo/interface'
-export * from './DownloadAuthenticator/interface'
-export * from './Error/interface'
-export * from './ForgetPassword/interface'
-export * from './_utils/config'

package/examples.tsx

@@ -3,7 +3,7 @@ import ReactDOM from 'react-dom'
 
 import reportWebVitals from './reportWebVitals'
 import { message } from 'antd'
-import { Guard } from './components/Guard'
+import { Guard } from './components'
 
 const App = () => {
   return (
@@ -15,8 +15,9 @@ const App = () => {
       }}
     >
       <Guard
-        appId="618e093c3a9138c729fe7d0b"
-        // tenantId="6194a41abf23c1d5268b362a"
+        appId="619747787da1b9eb2e9ee7d5"
+        // appId="6191cf610f772aa56dc70637"
+        // tenantId="6194a41abf23c1d5268b362a1"
         onLogin={(u) => {
           message.info('🏁 用户业务层终点，登录完成。')
           console.log(u)
@@ -42,38 +43,37 @@ const App = () => {
         onRegisterTabChange={(registerMethod) => {
           console.log('📁 onRegisterTabChange 触发', registerMethod)
         }}
-        config={
-          {
-            // host: 'https://core.dev2.authing-inc.co/',
-            // registerMethods: [RegisterMethods.Email],
-            // autoRegister: true,
-            // defaultRegisterMethod: RegisterMethods.Phone,
-            // disableRegister: false,
-            // disableResetPwd: false,
-            // defaultLoginMethod: LoginMethods.WxMinQr, // 指定默认登录方式，如果这个方式不存在于 LoginMethods，那么就当作没有传入
-            // loginMethods: [],
-            // LoginMethods.Password,
-            //   LoginMethods.PhoneCode,
-            // LoginMethods.WxMinQr,
-            // ],
-            // socialConnections: [
-            //   SocialConnectionProvider.ALIPAY,
-            //   SocialConnectionProvider.APPLE_WEB,
-            // ], // 指定可选的社会化登录方式
-            // qrCodeScanOptions?: Parameters<QrCodeAuthenticationClient['startScanning']>[1]
-            // passwordLoginMethods?: PasswordLoginMethods[]
-            // enterpriseConnections: [] // 这个有啥用？
-            // publicKey?: string
-            // lang: 'en-US',
-            // lang: 'zh-CN',
-            // mode: GuardMode.Modal,
-            // logo: '',
-            // clickCloseable: false, // clickCloseable	Modal 模式时是否隐藏登录框右上角的关闭按钮
-            // escCloseable: true, //
-            // target: '#c1',
-            // socialConnectionsBtnShape: 'rectangle',
-          }
-        }
+        config={{
+          // host: 'https://core.dev2.authing-inc.co/',
+          host: 'http://core.authing.localhost:3000/',
+          // registerMethods: [RegisterMethods.Email],
+          // autoRegister: true,
+          // defaultRegisterMethod: RegisterMethods.Phone,
+          // disableRegister: false,
+          // disableResetPwd: false,
+          // defaultLoginMethod: LoginMethods.WxMinQr, // 指定默认登录方式，如果这个方式不存在于 LoginMethods，那么就当作没有传入
+          // loginMethods: [],
+          // LoginMethods.Password,
+          //   LoginMethods.PhoneCode,
+          // LoginMethods.WxMinQr,
+          // ],
+          // socialConnections: [
+          //   SocialConnectionProvider.ALIPAY,
+          //   SocialConnectionProvider.APPLE_WEB,
+          // ], // 指定可选的社会化登录方式
+          // qrCodeScanOptions?: Parameters<QrCodeAuthenticationClient['startScanning']>[1]
+          // passwordLoginMethods?: PasswordLoginMethods[]
+          // enterpriseConnections: [] // 这个有啥用？
+          // publicKey?: string
+          // lang: 'en-US',
+          // lang: 'zh-CN',
+          // mode: GuardMode.Modal,
+          // logo: '',
+          // clickCloseable: false, // clickCloseable	Modal 模式时是否隐藏登录框右上角的关闭按钮
+          // escCloseable: true, //
+          // target: '#c1',
+          // socialConnectionsBtnShape: 'rectangle',
+        }}
       />
     </div>
   )

package/lib/index.d.ts

@@ -1050,7 +1050,7 @@ declare module '@authing/react-ui-components/components/BindTotp/index' {
 declare module '@authing/react-ui-components/components/BindTotp/interface' {
   import { IG2Config, IG2Events, IG2FCProps } from '@authing/react-ui-components/components/Type/index';
   import { AuthenticationClient, User } from '@authing/react-ui-components/components/index';
-  import { GuardMFAInitData } from '@authing/react-ui-components/components/MFA/props';
+  import { GuardMFAInitData } from '@authing/react-ui-components/components/MFA/interface';
   export interface BindTotpConfig extends IG2Config {
   }
   export const getDefaultMFAConfig: () => BindTotpConfig;
@@ -1125,7 +1125,7 @@ declare module '@authing/react-ui-components/components/CompleteInfo/interface'
   import { IG2Config, IG2Events, IG2FCProps } from '@authing/react-ui-components/components/Type/index';
   export interface CompleteInfoConfig extends IG2Config {
   }
-  export const getDefaultLoginConfig: () => CompleteInfoConfig;
+  export const getDefaultCompleteInfoConfig: () => CompleteInfoConfig;
   export interface CompleteInfoEvents extends IG2Events {
       onRegisterInfoCompleted?: (user: User, udfs: {
           definition: any;
@@ -1254,8 +1254,8 @@ declare module '@authing/react-ui-components/components/Guard/authClient' {
 
 }
 declare module '@authing/react-ui-components/components/Guard/config' {
-  import { LoginConfig } from '@authing/react-ui-components/components/Login/props';
-  import { RegisterConfig } from '@authing/react-ui-components/components/Register/props';
+  import { LoginConfig } from '@authing/react-ui-components/components/Login/interface';
+  import { RegisterConfig } from '@authing/react-ui-components/components/Register/interface';
   export interface GuardComponentConifg extends Partial<GuardLocalConfig> {
   }
   export interface GuardLocalConfig extends RegisterConfig, LoginConfig {
@@ -1266,8 +1266,8 @@ declare module '@authing/react-ui-components/components/Guard/config' {
 declare module '@authing/react-ui-components/components/Guard/event' {
   import { CompleteInfoEvents } from '@authing/react-ui-components/components/CompleteInfo/interface';
   import { ForgetPasswordEvents } from '@authing/react-ui-components/components/ForgetPassword/interface';
-  import { LoginEvents } from '@authing/react-ui-components/components/Login/props';
-  import { RegisterEvents } from '@authing/react-ui-components/components/Register/props';
+  import { LoginEvents } from '@authing/react-ui-components/components/Login/interface';
+  import { RegisterEvents } from '@authing/react-ui-components/components/Register/interface';
   export interface GuardEvents extends LoginEvents, RegisterEvents, CompleteInfoEvents, ForgetPasswordEvents {
   }
   export const guardEventsFilter: (props: any) => GuardEvents;
@@ -1338,6 +1338,9 @@ declare module '@authing/react-ui-components/components/Guard/stateMachine' {
       setConfig: (config: GuardLocalConfig) => void;
   }
   export const useHistoryHijack: (back?: (() => void) | undefined) => ((state?: any) => void)[];
+  export const initGuardStateMachine: (changeMouleEvent: ChangeModuleEvent, initData: ModuleState) => GuardStateMachine;
+  export const getGuardStateMachine: () => GuardStateMachine;
+  export const useGuardStateMachine: () => GuardStateMachine;
 
 }
 declare module '@authing/react-ui-components/components/IconFont/iconfont' {
@@ -1496,12 +1499,12 @@ declare module '@authing/react-ui-components/components/Login/core/withWechatmpQ
 }
 declare module '@authing/react-ui-components/components/Login/index' {
   /// <reference types="react" />
-  import { GuardLoginViewProps } from '@authing/react-ui-components/components/Login/props';
+  import { GuardLoginViewProps } from '@authing/react-ui-components/components/Login/interface';
   import './styles.less';
   export const GuardLoginView: (props: GuardLoginViewProps) => JSX.Element;
 
 }
-declare module '@authing/react-ui-components/components/Login/props' {
+declare module '@authing/react-ui-components/components/Login/interface' {
   import { IG2Config, IG2Events, IG2FCProps, IG2FCViewProps } from '@authing/react-ui-components/components/Type/index';
   import { SocialConnectionProvider } from 'authing-js-sdk';
   import { QrCodeAuthenticationClient } from 'authing-js-sdk/build/main/lib/authentication/QrCodeAuthenticationClient';
@@ -1537,7 +1540,7 @@ declare module '@authing/react-ui-components/components/Login/props' {
 }
 declare module '@authing/react-ui-components/components/Login/socialLogin/index' {
   import React from 'react';
-  import { LoginConfig } from '@authing/react-ui-components/components/Login/props';
+  import { LoginConfig } from '@authing/react-ui-components/components/Login/interface';
   import './style.less';
   export interface SocialLoginProps {
       appId: string;
@@ -1580,7 +1583,7 @@ declare module '@authing/react-ui-components/components/MFA/codemap' {
 }
 declare module '@authing/react-ui-components/components/MFA/core/email' {
   import React from 'react';
-  import { MFAConfig } from '@authing/react-ui-components/components/MFA/props';
+  import { MFAConfig } from '@authing/react-ui-components/components/MFA/interface';
   interface BindMFAEmailProps {
       mfaToken: string;
       onBind: (email: string) => void;
@@ -1626,7 +1629,7 @@ declare module '@authing/react-ui-components/components/MFA/core/face_deps' {
 }
 declare module '@authing/react-ui-components/components/MFA/core/sms' {
   import React from 'react';
-  import { MFAConfig } from '@authing/react-ui-components/components/MFA/props';
+  import { MFAConfig } from '@authing/react-ui-components/components/MFA/interface';
   export interface BindMFASmsProps {
       mfaToken: string;
       onBind: (phone: string) => void;
@@ -1651,7 +1654,7 @@ declare module '@authing/react-ui-components/components/MFA/core/sms' {
 }
 declare module '@authing/react-ui-components/components/MFA/core/totp' {
   import React from 'react';
-  import { GuardMFAInitData, MFAConfig } from '@authing/react-ui-components/components/MFA/props';
+  import { GuardMFAInitData, MFAConfig } from '@authing/react-ui-components/components/MFA/interface';
   export interface BindMFATotpProps {
       initData: GuardMFAInitData;
       changeModule: any;
@@ -1673,24 +1676,12 @@ declare module '@authing/react-ui-components/components/MFA/core/totp' {
 }
 declare module '@authing/react-ui-components/components/MFA/index' {
   import React from 'react';
-  import { GuardMFAViewProps } from '@authing/react-ui-components/components/MFA/props';
+  import { GuardMFAViewProps } from '@authing/react-ui-components/components/MFA/interface';
   import './styles.less';
   export const GuardMFAView: React.FC<GuardMFAViewProps>;
 
 }
-declare module '@authing/react-ui-components/components/MFA/mfaMethods/index' {
-  import React from 'react';
-  import { GuardMFAInitData, MFAType } from '@authing/react-ui-components/components/MFA/props';
-  import './style.less';
-  export interface MFAMethodsProps {
-      applicationMfa: GuardMFAInitData['applicationMfa'];
-      method: MFAType;
-      onChangeMethod: (type: MFAType) => void;
-  }
-  export const MFAMethods: React.FC<MFAMethodsProps>;
-
-}
-declare module '@authing/react-ui-components/components/MFA/props' {
+declare module '@authing/react-ui-components/components/MFA/interface' {
   import { IG2Config, IG2Events, IG2FCProps } from '@authing/react-ui-components/components/Type/index';
   import { AuthenticationClient, User } from '@authing/react-ui-components/components/index';
   export interface MFAConfig extends IG2Config {
@@ -1730,6 +1721,18 @@ declare module '@authing/react-ui-components/components/MFA/props' {
       initData: GuardMFAInitData;
   }
 
+}
+declare module '@authing/react-ui-components/components/MFA/mfaMethods/index' {
+  import React from 'react';
+  import { GuardMFAInitData, MFAType } from '@authing/react-ui-components/components/MFA/interface';
+  import './style.less';
+  export interface MFAMethodsProps {
+      applicationMfa: GuardMFAInitData['applicationMfa'];
+      method: MFAType;
+      onChangeMethod: (type: MFAType) => void;
+  }
+  export const MFAMethods: React.FC<MFAMethodsProps>;
+
 }
 declare module '@authing/react-ui-components/components/NeedHelpView/core/describeQuestions' {
   /// <reference types="react" />
@@ -1828,11 +1831,11 @@ declare module '@authing/react-ui-components/components/Register/core/WithPhone'
 }
 declare module '@authing/react-ui-components/components/Register/index' {
   import React from 'react';
-  import { GuardRegisterViewProps } from '@authing/react-ui-components/components/Register/props';
+  import { GuardRegisterViewProps } from '@authing/react-ui-components/components/Register/interface';
   export const GuardRegisterView: React.FC<GuardRegisterViewProps>;
 
 }
-declare module '@authing/react-ui-components/components/Register/props' {
+declare module '@authing/react-ui-components/components/Register/interface' {
   import { RegisterMethods } from 'authing-js-sdk';
   import { IG2FCProps, IG2Config, IG2Events } from '@authing/react-ui-components/components/Type/index';
   import { AuthenticationClient, User, EmailRegisterParams, PhoneRegisterParams } from '@authing/react-ui-components/components/index';
@@ -1965,15 +1968,10 @@ declare module '@authing/react-ui-components/components/Type/index' {
   export const getDefaultG2Config: () => IG2Config;
 
 }
-declare module '@authing/react-ui-components/components/ValidatorRules/EmailFormItem' {
+declare module '@authing/react-ui-components/components/ValidatorRules/ValidatorFormItem' {
   import React from 'react';
   import { ICheckProps, ValidatorFormItemProps } from '@authing/react-ui-components/components/ValidatorRules/index';
   export const EmailFormItem: React.ForwardRefExoticComponent<ValidatorFormItemProps & React.RefAttributes<ICheckProps>>;
-
-}
-declare module '@authing/react-ui-components/components/ValidatorRules/PhoneFormItem' {
-  import React from 'react';
-  import { ICheckProps, ValidatorFormItemProps } from '@authing/react-ui-components/components/ValidatorRules/index';
   export const PhoneFormItem: React.ForwardRefExoticComponent<ValidatorFormItemProps & React.RefAttributes<ICheckProps>>;
 
 }
@@ -1984,11 +1982,16 @@ declare module '@authing/react-ui-components/components/ValidatorRules/index' {
       form?: FormInstance;
       checkRepeat?: boolean;
   }
+  export interface ValidatorFormItemMetaProps extends ValidatorFormItemProps {
+      userPoolId?: string;
+      form?: FormInstance;
+      checkRepeat?: boolean;
+      method: 'email' | 'phone';
+  }
   export interface ICheckProps {
-      check: () => void;
+      check: (values: any) => void;
   }
-  export { EmailFormItem } from '@authing/react-ui-components/components/ValidatorRules/EmailFormItem';
-  export { PhoneFormItem } from '@authing/react-ui-components/components/ValidatorRules/PhoneFormItem';
+  export { EmailFormItem, PhoneFormItem } from '@authing/react-ui-components/components/ValidatorRules/ValidatorFormItem';
 
 }
 declare module '@authing/react-ui-components/components/VerifyCodeInput/index' {
@@ -2039,6 +2042,7 @@ declare module '@authing/react-ui-components/components/_utils/guradHttp' {
       setUserpoolId(userpoolId: string): void;
       setAppId(appId: string): void;
       setTenantId(tenantId: string): void;
+      setBaseUrl(baseUrl: string): void;
       getHeaders: () => Record<string, string>;
       get: <T>(path: string, query?: Record<string, any>, config?: RequestInit | undefined) => Promise<import("@authing/react-ui-components/components/_utils/http").AuthingResponse<T>>;
       post: <T>(path: string, data: any, config?: {
@@ -2057,7 +2061,7 @@ declare module '@authing/react-ui-components/components/_utils/hooks/index' {
   import { GuardModuleType } from '@authing/react-ui-components/components/Guard/module';
   export const useChangeModule: () => (nextModuleType: GuardModuleType, nextData?: any) => void;
   export const useAppId: (appId?: string | undefined) => string;
-  export const useDebounce: (fn: any, delay: number) => (...args: any[]) => Promise<void>;
+  export const useDebounce: (fn: any, delay: number) => (...args: any[]) => void;
 
 }
 declare module '@authing/react-ui-components/components/_utils/http' {
@@ -2249,17 +2253,13 @@ declare module '@authing/react-ui-components/components/context/module/context'
 
 }
 declare module '@authing/react-ui-components/components/index' {
+  export * from '@authing/react-ui-components/components/_utils/config';
+  export type { AuthenticationClientOptions } from 'authing-js-sdk';
   export * from '@authing/react-ui-components/components/AuthingGuard/types/index';
   export * from '@authing/react-ui-components/components/AuthingGuard/hooks/index';
-  export type { AuthenticationClientOptions } from 'authing-js-sdk';
+  export * from '@authing/react-ui-components/components/AuthingGuard/index';
   export * from '@authing/react-ui-components/components/Guard/index';
   export * from '@authing/react-ui-components/components/Type/index';
-  export * from '@authing/react-ui-components/components/BindTotp/interface';
-  export * from '@authing/react-ui-components/components/CompleteInfo/interface';
-  export * from '@authing/react-ui-components/components/DownloadAuthenticator/interface';
-  export * from '@authing/react-ui-components/components/Error/interface';
-  export * from '@authing/react-ui-components/components/ForgetPassword/interface';
-  export * from '@authing/react-ui-components/components/_utils/config';
 
 }
 declare module '@authing/react-ui-components/reportWebVitals' {