@cloudbase/auth 2.23.3 → 2.24.0

package/src/index.ts

@@ -5,7 +5,14 @@ import type { ICloudbaseAuthConfig, IUser, IUserInfo, ILoginState } from '@cloud
 import type { ICloudbaseComponent } from '@cloudbase/types/component'
 import type { GrantProviderTokenResponse, ProviderSubType } from '@cloudbase/oauth/dist/cjs/auth/models'
 import type { authModels, AuthOptions, Credentials } from '@cloudbase/oauth'
-import { CloudbaseOAuth, AUTH_API_PREFIX } from '@cloudbase/oauth'
+import {
+  CloudbaseOAuth,
+  AUTH_API_PREFIX,
+  LOGIN_STATE_CHANGED_TYPE,
+  EVENTS,
+  AUTH_STATE_CHANGED_TYPE,
+  OAUTH_TYPE,
+} from '@cloudbase/oauth'
 import { useAuthAdapter } from './adapter'
 import {
   printWarn,
@@ -18,23 +25,13 @@ import {
   adapterForWxMp,
   useDefaultAdapter,
 } from './utilities'
+import { SbaseApi } from './sbaseApi'
 
 declare const cloudbase: ICloudbase
 declare const wx: any
 
 const COMPONENT_NAME = 'auth'
 
-const LOGIN_STATE_CHANGED_TYPE = {
-  SIGN_OUT: 'sign_out',
-  SIGN_IN: 'sign_in',
-  CREDENTIALS_ERROR: 'credentials_error',
-}
-
-const EVENTS = {
-  // 登录态改变后触发
-  LOGIN_STATE_CHANGED: 'loginStateChanged',
-}
-
 interface UserInfo {
   uid?: string
   gender?: string
@@ -51,7 +48,7 @@ interface UserInfo {
   created_from?: string
 }
 
-const eventBus = new CloudbaseEventEmitter()
+export const eventBus = new CloudbaseEventEmitter()
 
 const onCredentialsError = (params) => {
   eventBus.fire(EVENTS.LOGIN_STATE_CHANGED, { ...params, eventType: LOGIN_STATE_CHANGED_TYPE.CREDENTIALS_ERROR })
@@ -62,14 +59,14 @@ interface IUserOptions {
   oauthInstance: CloudbaseOAuth
 }
 
-class User implements IUser {
+export class User implements IUser {
   public uid?: string
   public gender?: string
   public picture?: string
   public email?: string
   public emailVerified?: boolean
   public phoneNumber?: string
-  public username?: string
+  public username?: string // 用户名称，长度 5-24 位，支持字符中英文、数字、特殊字符（仅支持_-），不支持中文
   public name?: string
   public providers?: {
     id?: string
@@ -221,12 +218,21 @@ class User implements IUser {
     return newUserInfo
   }
 
-  private getLocalUserInfo(key: string): string | boolean {
+  public getLocalUserInfo(key?: string): string | boolean | Record<string, any> {
     const { userInfoKey } = this.cache.keys
     const userInfo = this.cache.getStore(userInfoKey)
+
+    if (!key) return userInfo || {}
+
     return userInfo[key]
   }
 
+  public setLocalUserInfo(userInfo: any) {
+    const { userInfoKey } = this.cache.keys
+    this.cache.setStore(userInfoKey, userInfo)
+    this.setUserInfo()
+  }
+
   private async getLocalUserInfoAsync(key: string): Promise<string> {
     const { userInfoKey } = this.cache.keys
     const userInfo = await this.cache.getStoreAsync(userInfoKey)
@@ -251,16 +257,11 @@ class User implements IUser {
       'created_from',
       'providers',
       'username',
+      'created_at',
     ].forEach((infoKey) => {
       this[infoKey] = userInfo[infoKey]
     })
   }
-
-  private setLocalUserInfo(userInfo: any) {
-    const { userInfoKey } = this.cache.keys
-    this.cache.setStore(userInfoKey, userInfo)
-    this.setUserInfo()
-  }
 }
 interface ILoginStateOptions extends IUserOptions {
   envId: string
@@ -297,16 +298,13 @@ export class LoginState implements ILoginState {
   }
 }
 
-class Auth {
-  private readonly config: ICloudbaseAuthConfig
-  private readonly cache: ICloudbaseCache
-
-  private oauthInstance: CloudbaseOAuth
-
-  constructor(config: ICloudbaseAuthConfig & { cache: ICloudbaseCache; request?: ICloudbaseRequest; runtime?: string },) {
-    this.config = config
-    this.cache = config.cache
-    this.oauthInstance = config.oauthInstance
+class Auth extends SbaseApi {
+  constructor(config: ICloudbaseAuthConfig & {
+    cache: ICloudbaseCache
+    request?: ICloudbaseRequest
+    runtime?: string
+  },) {
+    super(config)
     this.setAccessKey()
   }
 
@@ -437,35 +435,36 @@ class Auth {
       `如果问题依然存在，建议到官方问答社区提问或寻找帮助：${COMMUNITY_SITE_URL}`,
     ],
   })
-  public async getCurrentUser() {
+  public async getCurrentUser(): Promise<(authModels.UserInfo & Partial<User>) | null> {
     const loginState = await this.getLoginState()
     if (loginState) {
+      const userInfo = loginState.user.getLocalUserInfo() as authModels.UserInfo
       await loginState.user.checkLocalInfoAsync()
-      return loginState.user || null
+      return { ...loginState.user, ...userInfo }
     }
     return null
   }
 
-  /**
-   * 匿名登录
-   * @returns {Promise<LoginState>}
-   * @memberof Auth
-   */
-  @catchErrorsDecorator({
-    title: '匿名登录失败',
-    messages: [
-      '请确认以下各项：',
-      '  1 - 当前环境是否开启了匿名登录',
-      '  2 - 调用 auth().signInAnonymously() 的语法或参数是否正确',
-      `如果问题依然存在，建议到官方问答社区提问或寻找帮助：${COMMUNITY_SITE_URL}`,
-    ],
-  })
-  public async signInAnonymously(data: {
-    provider_token?: string
-  } = {},): Promise<LoginState> {
-    await this.oauthInstance.authApi.signInAnonymously(data)
-    return this.createLoginState()
-  }
+  // /**
+  //  * 匿名登录
+  //  * @returns {Promise<LoginState>}
+  //  * @memberof Auth
+  //  */
+  // @catchErrorsDecorator({
+  //   title: '匿名登录失败',
+  //   messages: [
+  //     '请确认以下各项：',
+  //     '  1 - 当前环境是否开启了匿名登录',
+  //     '  2 - 调用 auth().signInAnonymously() 的语法或参数是否正确',
+  //     `如果问题依然存在，建议到官方问答社区提问或寻找帮助：${COMMUNITY_SITE_URL}`,
+  //   ],
+  // })
+  // public async signInAnonymously(data: {
+  //   provider_token?: string
+  // } = {},): Promise<LoginState> {
+  // await this.oauthInstance.authApi.signInAnonymously(data)
+  // return this.createLoginState()
+  // }
 
   /**
    * 匿名登录
@@ -615,76 +614,76 @@ class Auth {
    * @returns {Promise<LoginState>}
    * @memberof Auth
    */
-  @catchErrorsDecorator({
-    title: '小程序openId静默登录失败',
-    messages: [
-      '请确认以下各项：',
-      '  1 - 当前环境是否开启了小程序openId静默登录',
-      '  2 - 调用 auth().signInWithOpenId() 的语法或参数是否正确',
-      `如果问题依然存在，建议到官方问答社区提问或寻找帮助：${COMMUNITY_SITE_URL}`,
-    ],
-  })
-  public async signInWithOpenId({ useWxCloud = true } = {}): Promise<LoginState> {
-    if (!adapterForWxMp.isMatch()) {
-      throw Error('wx api undefined')
-    }
-    const wxInfo = wx.getAccountInfoSync().miniProgram
-
-    const mainFunc = async (code) => {
-      let result: GrantProviderTokenResponse | undefined = undefined
-      let credentials: Credentials | undefined = undefined
-
-      try {
-        result = await this.oauthInstance.authApi.grantProviderToken(
-          {
-            provider_id: wxInfo?.appId,
-            provider_code: code,
-            provider_params: {
-              provider_code_type: 'open_id',
-              appid: wxInfo?.appId,
-            },
-          },
-          useWxCloud,
-        )
-
-        if ((result as any)?.error_code || !result.provider_token) {
-          throw result
-        }
-
-        credentials = await this.oauthInstance.authApi.signInWithProvider(
-          { provider_token: result.provider_token },
-          useWxCloud,
-        )
-
-        if ((credentials as any)?.error_code) {
-          throw credentials
-        }
-      } catch (error) {
-        throw error
-      }
-      await this.oauthInstance.oauth2client.setCredentials(credentials as Credentials)
-    }
-
-    await new Promise((resolve, reject) => {
-      wx.login({
-        success: async (res: { code: string }) => {
-          try {
-            await mainFunc(res.code)
-            resolve(true)
-          } catch (error) {
-            reject(error)
-          }
-        },
-        fail: (res: any) => {
-          const error = new Error(res?.errMsg)
-          ;(error as any).code = res?.errno
-          reject(error)
-        },
-      })
-    })
-
-    return this.createLoginState()
-  }
+  // @catchErrorsDecorator({
+  //   title: '小程序openId静默登录失败',
+  //   messages: [
+  //     '请确认以下各项：',
+  //     '  1 - 当前环境是否开启了小程序openId静默登录',
+  //     '  2 - 调用 auth().signInWithOpenId() 的语法或参数是否正确',
+  //     `如果问题依然存在，建议到官方问答社区提问或寻找帮助：${COMMUNITY_SITE_URL}`,
+  //   ],
+  // })
+  // public async signInWithOpenId({ useWxCloud = true } = {}): Promise<LoginState> {
+  //   if (!adapterForWxMp.isMatch()) {
+  //     throw Error('wx api undefined')
+  //   }
+  //   const wxInfo = wx.getAccountInfoSync().miniProgram
+
+  //   const mainFunc = async (code) => {
+  //     let result: GrantProviderTokenResponse | undefined = undefined
+  //     let credentials: Credentials | undefined = undefined
+
+  //     try {
+  //       result = await this.oauthInstance.authApi.grantProviderToken(
+  //         {
+  //           provider_id: wxInfo?.appId,
+  //           provider_code: code,
+  //           provider_params: {
+  //             provider_code_type: 'open_id',
+  //             appid: wxInfo?.appId,
+  //           },
+  //         },
+  //         useWxCloud,
+  //       )
+
+  //       if ((result as any)?.error_code || !result.provider_token) {
+  //         throw result
+  //       }
+
+  //       credentials = await this.oauthInstance.authApi.signInWithProvider(
+  //         { provider_token: result.provider_token },
+  //         useWxCloud,
+  //       )
+
+  //       if ((credentials as any)?.error_code) {
+  //         throw credentials
+  //       }
+  //     } catch (error) {
+  //       throw error
+  //     }
+  //     await this.oauthInstance.oauth2client.setCredentials(credentials as Credentials)
+  //   }
+
+  //   await new Promise((resolve, reject) => {
+  //     wx.login({
+  //       success: async (res: { code: string }) => {
+  //         try {
+  //           await mainFunc(res.code)
+  //           resolve(true)
+  //         } catch (error) {
+  //           reject(error)
+  //         }
+  //       },
+  //       fail: (res: any) => {
+  //         const error = new Error(res?.errMsg)
+  //         ;(error as any).code = res?.errno
+  //         reject(error)
+  //       },
+  //     })
+  //   })
+
+  //   return this.createLoginState()
+  // }
 
   /**
    * 小程序unionId静默登录
@@ -760,59 +759,59 @@ class Auth {
    * @returns {Promise<LoginState>}
    * @memberof Auth
    */
-  @catchErrorsDecorator({
-    title: '小程序手机号授权登录失败',
-    messages: [
-      '请确认以下各项：',
-      '  1 - 当前环境是否开启了小程序手机号授权登录',
-      '  2 - 调用 auth().signInWithPhoneAuth() 的语法或参数是否正确',
-      `如果问题依然存在，建议到官方问答社区提问或寻找帮助：${COMMUNITY_SITE_URL}`,
-    ],
-  })
-  public async signInWithPhoneAuth({ phoneCode = '' }): Promise<LoginState> {
-    if (!adapterForWxMp.isMatch()) {
-      throw Error('wx api undefined')
-    }
-    const wxInfo = wx.getAccountInfoSync().miniProgram
-    const providerInfo = {
-      provider_params: { provider_code_type: 'phone' },
-      provider_id: wxInfo.appId,
-    }
-
-    const { code } = await wx.login()
-    ;(providerInfo as any).provider_code = code
-
-    try {
-      let providerToken = await this.oauthInstance.authApi.grantProviderToken(providerInfo)
-      if (providerToken.error_code) {
-        throw providerToken
-      }
-
-      providerToken = await this.oauthInstance.authApi.patchProviderToken({
-        provider_token: providerToken.provider_token,
-        provider_id: wxInfo.appId,
-        provider_params: {
-          code: phoneCode,
-          provider_code_type: 'phone',
-        },
-      })
-      if (providerToken.error_code) {
-        throw providerToken
-      }
-
-      const signInRes = await this.oauthInstance.authApi.signInWithProvider({
-        provider_token: providerToken.provider_token,
-      })
-
-      if ((signInRes as any)?.error_code) {
-        throw signInRes
-      }
-    } catch (error) {
-      throw error
-    }
-
-    return this.createLoginState()
-  }
+  // @catchErrorsDecorator({
+  //   title: '小程序手机号授权登录失败',
+  //   messages: [
+  //     '请确认以下各项：',
+  //     '  1 - 当前环境是否开启了小程序手机号授权登录',
+  //     '  2 - 调用 auth().signInWithPhoneAuth() 的语法或参数是否正确',
+  //     `如果问题依然存在，建议到官方问答社区提问或寻找帮助：${COMMUNITY_SITE_URL}`,
+  //   ],
+  // })
+  // public async signInWithPhoneAuth({ phoneCode = '' }): Promise<LoginState> {
+  //   if (!adapterForWxMp.isMatch()) {
+  //     throw Error('wx api undefined')
+  //   }
+  //   const wxInfo = wx.getAccountInfoSync().miniProgram
+  //   const providerInfo = {
+  //     provider_params: { provider_code_type: 'phone' },
+  //     provider_id: wxInfo.appId,
+  //   }
+
+  //   const { code } = await wx.login()
+  //   ;(providerInfo as any).provider_code = code
+
+  //   try {
+  //     let providerToken = await this.oauthInstance.authApi.grantProviderToken(providerInfo)
+  //     if (providerToken.error_code) {
+  //       throw providerToken
+  //     }
+
+  //     providerToken = await this.oauthInstance.authApi.patchProviderToken({
+  //       provider_token: providerToken.provider_token,
+  //       provider_id: wxInfo.appId,
+  //       provider_params: {
+  //         code: phoneCode,
+  //         provider_code_type: 'phone',
+  //       },
+  //     })
+  //     if (providerToken.error_code) {
+  //       throw providerToken
+  //     }
+
+  //     const signInRes = await this.oauthInstance.authApi.signInWithProvider({
+  //       provider_token: providerToken.provider_token,
+  //     })
+
+  //     if ((signInRes as any)?.error_code) {
+  //       throw signInRes
+  //     }
+  //   } catch (error) {
+  //     throw error
+  //   }
+
+  //   return this.createLoginState()
+  // }
 
   /**
    * 小程序短信验证码登陆
@@ -894,21 +893,21 @@ class Auth {
    * @returns {Promise<LoginState>}
    * @memberof Auth
    */
-  @catchErrorsDecorator({
-    title: '自定义登录失败',
-    messages: [
-      '请确认以下各项：',
-      '  1 - 当前环境是否开启了自定义登录',
-      '  2 - 调用 auth().signInWithCustomTicket() 的语法或参数是否正确',
-      '  3 - ticket 是否归属于当前环境',
-      '  4 - 创建 ticket 的自定义登录私钥是否过期',
-      `如果问题依然存在，建议到官方问答社区提问或寻找帮助：${COMMUNITY_SITE_URL}`,
-    ],
-  })
-  public async signInWithCustomTicket(): Promise<LoginState> {
-    await this.oauthInstance.authApi.signInWithCustomTicket()
-    return this.createLoginState()
-  }
+  // @catchErrorsDecorator({
+  //   title: '自定义登录失败',
+  //   messages: [
+  //     '请确认以下各项：',
+  //     '  1 - 当前环境是否开启了自定义登录',
+  //     '  2 - 调用 auth().signInWithCustomTicket() 的语法或参数是否正确',
+  //     '  3 - ticket 是否归属于当前环境',
+  //     '  4 - 创建 ticket 的自定义登录私钥是否过期',
+  //     `如果问题依然存在，建议到官方问答社区提问或寻找帮助：${COMMUNITY_SITE_URL}`,
+  //   ],
+  // })
+  // public async signInWithCustomTicket(): Promise<LoginState> {
+  //   await this.oauthInstance.authApi.signInWithCustomTicket()
+  //   return this.createLoginState()
+  // }
 
   /**
    *
@@ -921,25 +920,25 @@ class Auth {
     return this.createLoginState(params)
   }
 
-  /**
-   *
-   * @param {authModels.SignUpRequest} params
-   * @returns {Promise<LoginState>}
-   * @memberof Auth
-   */
-  @catchErrorsDecorator({
-    title: '注册失败',
-    messages: [
-      '请确认以下各项：',
-      '  1 - 当前环境是否开启了指定登录方式',
-      '  2 - 调用 auth().signUp() 的语法或参数是否正确',
-      `如果问题依然存在，建议到官方问答社区提问或寻找帮助：${COMMUNITY_SITE_URL}`,
-    ],
-  })
-  public async signUp(params: authModels.SignUpRequest): Promise<LoginState> {
-    await this.oauthInstance.authApi.signUp(params)
-    return this.createLoginState()
-  }
+  // /**
+  //  *
+  //  * @param {authModels.SignUpRequest} params
+  //  * @returns {Promise<LoginState>}
+  //  * @memberof Auth
+  //  */
+  // @catchErrorsDecorator({
+  //   title: '注册失败',
+  //   messages: [
+  //     '请确认以下各项：',
+  //     '  1 - 当前环境是否开启了指定登录方式',
+  //     '  2 - 调用 auth().signUp() 的语法或参数是否正确',
+  //     `如果问题依然存在，建议到官方问答社区提问或寻找帮助：${COMMUNITY_SITE_URL}`,
+  //   ],
+  // })
+  // public async signUp(params: authModels.SignUpRequest): Promise<any> {
+  //   await this.oauthInstance.authApi.signUp(params)
+  //   return this.createLoginState()
+  // }
 
   /**
    * 设置密码
@@ -975,22 +974,25 @@ class Auth {
   /**
    * 登出
    */
-  @catchErrorsDecorator({
-    title: '用户登出失败',
-    messages: [
-      '请确认以下各项：',
-      '  1 - 调用 auth().signOut() 的语法或参数是否正确',
-      '  2 - 当前用户是否为匿名登录（匿名登录不支持signOut）',
-      `如果问题依然存在，建议到官方问答社区提问或寻找帮助：${COMMUNITY_SITE_URL}`,
-    ],
-  })
-  public async signOut(params?: authModels.SignoutRequest): Promise<void | authModels.SignoutReponse> {
-    const { userInfoKey } = this.cache.keys
-    const res = await this.oauthInstance.authApi.signOut(params)
-    await this.cache.removeStoreAsync(userInfoKey)
-    eventBus.fire(EVENTS.LOGIN_STATE_CHANGED, { eventType: LOGIN_STATE_CHANGED_TYPE.SIGN_OUT })
-    return res
-  }
+  // @catchErrorsDecorator({
+  //   title: '用户登出失败',
+  //   messages: [
+  //     '请确认以下各项：',
+  //     '  1 - 调用 auth().signOut() 的语法或参数是否正确',
+  //     '  2 - 当前用户是否为匿名登录（匿名登录不支持signOut）',
+  //     `如果问题依然存在，建议到官方问答社区提问或寻找帮助：${COMMUNITY_SITE_URL}`,
+  //   ],
+  // })
+  // public async signOut(params?: authModels.SignoutRequest): Promise<void | authModels.SignoutReponse> {
+  //   const { userInfoKey } = this.cache.keys
+  //   const res = await this.oauthInstance.authApi.signOut(params)
+  //   await this.cache.removeStoreAsync(userInfoKey)
+
+  //   eventBus.fire(EVENTS.LOGIN_STATE_CHANGED, { eventType: LOGIN_STATE_CHANGED_TYPE.SIGN_OUT })
+
+  //   eventBus.fire(EVENTS.AUTH_STATE_CHANGED, { event: AUTH_STATE_CHANGED_TYPE.SIGNED_OUT })
+  //   return res
+  // }
 
   /**
    * 获取本地登录态-同步
@@ -1059,8 +1061,8 @@ class Auth {
       `如果问题依然存在，建议到官方问答社区提问或寻找帮助：${COMMUNITY_SITE_URL}`,
     ],
   })
-  public async getUserInfo(params?: { version?: string }): Promise<IUserInfo> {
-    return this.oauthInstance.authApi.getUserInfo(params)
+  public async getUserInfo(): Promise<(authModels.UserInfo & Partial<User>) | null> {
+    return this.getCurrentUser()
   }
 
   @catchErrorsDecorator({
@@ -1188,7 +1190,7 @@ class Auth {
   public async onLoginStateChanged(callback: Function) {
     eventBus.on(EVENTS.LOGIN_STATE_CHANGED, async (params) => {
       // getLoginState会重复触发getCredentials，导致死循环，所以getCredentials出错不再出发getLoginState
-      const loginState = params?.data?.eventType !== LOGIN_STATE_CHANGED_TYPE.CREDENTIALS_ERROR ? await this.getLoginState() : {}
+      const loginState =        params?.data?.eventType !== LOGIN_STATE_CHANGED_TYPE.CREDENTIALS_ERROR ? await this.getLoginState() : {}
       callback.call(this, { ...params, ...loginState })
     })
     // 立刻执行一次回调
@@ -1259,53 +1261,10 @@ class Auth {
     return this.oauthInstance.authApi.getUserBehaviorLog(params)
   }
 
-  /**
-   * 跳转系统默认登录页
-   * @returns {Promise<authModels.ToDefaultLoginPage>}
-   * @memberof Auth
-   */
-  public async toDefaultLoginPage(params: authModels.ToDefaultLoginPage = {}): Promise<void> {
-    const configVersion = params.config_version || 'env'
-    const query = Object.keys(params.query || {})
-      .map(key => `${key}=${params.query[key]}`)
-      .join('&')
-
-    if (adapterForWxMp.isMatch()) {
-      wx.navigateTo({ url: `/packages/$wd_system/pages/login/index${query ? `?${query}` : ''}` })
-    } else {
-      const redirectUri = params.redirect_uri || window.location.href
-      const urlObj = new URL(redirectUri)
-      const loginPage = `${urlObj.origin}/__auth/?app_id=${params.app_id || ''}&env_id=${this.config.env}&client_id=${
-        this.config.clientId || this.config.env
-      }&config_version=${configVersion}&redirect_uri=${encodeURIComponent(redirectUri)}${query ? `&${query}` : ''}`
-      window.location.href = loginPage
-    }
-  }
-
-  private async createLoginState(
-    params?: { version?: string; query?: any },
-    options?: { asyncRefreshUser?: boolean },
-  ): Promise<LoginState> {
-    const loginState = new LoginState({
-      envId: this.config.env,
-      cache: this.cache,
-      oauthInstance: this.oauthInstance,
-    })
-
-    await loginState.checkLocalStateAsync()
-    if (options?.asyncRefreshUser) {
-      loginState.user.refresh(params)
-    } else {
-      await loginState.user.refresh(params)
-    }
-    eventBus.fire(EVENTS.LOGIN_STATE_CHANGED, { eventType: LOGIN_STATE_CHANGED_TYPE.SIGN_IN })
-    return loginState
-  }
-
   /**
    * sms/email 验证码登录/注册，逻辑一致收敛
    */
-  private async signInWithUsername({
+  public async signInWithUsername({
     verificationInfo = { verification_id: '', is_user: false },
     verificationCode = '',
     username: rawUsername = '',
@@ -1327,7 +1286,7 @@ class Auth {
       const { verification_token } = verifyRes
 
       // 手机登录参数
-      let username = /^\+\d{1,3}\s+\d+/.test(rawUsername) ? rawUsername : `+86 ${rawUsername}`
+      let username = /^\+\d{1,3}\s+/.test(rawUsername) ? rawUsername : `+86 ${rawUsername}`
       let signUpParam: any = { phone_number: username }
 
       // 邮箱登录参数
@@ -1376,7 +1335,35 @@ class Auth {
     }
   }
 
-  private async setAccessKey() {
+  async createLoginState(
+    params?: { version?: string; query?: any },
+    options?: { asyncRefreshUser?: boolean; userInfo?: any },
+  ): Promise<LoginState> {
+    const loginState = new LoginState({
+      envId: this.config.env,
+      cache: this.cache,
+      oauthInstance: this.oauthInstance,
+    })
+
+    await loginState.checkLocalStateAsync()
+
+    if (options?.userInfo) {
+      loginState.user.setLocalUserInfo(options.userInfo)
+    } else {
+      if (options?.asyncRefreshUser) {
+        loginState.user.refresh(params)
+      } else {
+        await loginState.user.refresh(params)
+      }
+    }
+
+    eventBus.fire(EVENTS.LOGIN_STATE_CHANGED, { eventType: LOGIN_STATE_CHANGED_TYPE.SIGN_IN })
+
+    eventBus.fire(EVENTS.AUTH_STATE_CHANGED, { event: AUTH_STATE_CHANGED_TYPE.SIGNED_IN })
+    return loginState
+  }
+
+  async setAccessKey() {
     if (this.config.accessKey) {
       try {
         this.oauthInstance.oauth2client.setAccessKeyCredentials({
@@ -1393,7 +1380,10 @@ class Auth {
   }
 }
 
-type TInitAuthOptions = Pick<ICloudbaseAuthConfig, 'region' | 'persistence' | 'i18n' | 'accessKey' | 'useWxCloud'> & Partial<AuthOptions>
+type TInitAuthOptions = Pick<ICloudbaseAuthConfig, 'region' | 'persistence' | 'i18n' | 'accessKey' | 'useWxCloud'> &
+Partial<AuthOptions> & {
+  detectSessionInUrl?: boolean
+}
 
 export function generateAuthInstance(
   config: TInitAuthOptions,
@@ -1405,10 +1395,11 @@ export function generateAuthInstance(
     platform?: ICloudbase['platform']
     app?: ICloudbase
     debug?: ICloudbaseAuthConfig['debug']
+    detectSessionInUrl?: ICloudbaseAuthConfig['detectSessionInUrl']
   },
 ) {
   const { region = 'ap-shanghai', i18n, accessKey, useWxCloud } = config
-  const platform = options?.platform || (useDefaultAdapter() as ICloudbasePlatformInfo)
+  const platform = options?.platform || (useDefaultAdapter.bind(options)() as ICloudbasePlatformInfo)
   const { runtime, adapter } = platform
 
   const { env, clientId, debug, cache, app: cloudbase } = options || {}
@@ -1423,6 +1414,7 @@ export function generateAuthInstance(
     i18n,
     accessKey,
     useWxCloud,
+    eventBus,
   }
 
   const oauthInstance = new CloudbaseOAuth(useAuthAdapter({
@@ -1439,6 +1431,8 @@ export function generateAuthInstance(
     adapter,
     onCredentialsError,
     headers: { 'X-SDK-Version': `@cloudbase/js-sdk/${config.sdkVersion}`, ...(config.headers || {}) },
+    detectSessionInUrl: config.detectSessionInUrl,
+    debug,
   }),)
 
   const authInstance = new Auth({
@@ -1458,21 +1452,47 @@ export function generateAuthInstance(
     oauthInstance,
   })
 
+  // Initialize session with user info callback
+  // This handles OAuth callback URL detection and creates login state atomically
+  oauthInstance.initializeSession(async (data, error) => {
+    if (!data) return
+
+    if (data.type === OAUTH_TYPE.SIGN_IN) {
+      if (error) {
+        eventBus.fire(EVENTS.AUTH_STATE_CHANGED, {
+          event: AUTH_STATE_CHANGED_TYPE.SIGNED_IN,
+          info: { ...data, error },
+        })
+      } else if (data.user) {
+        // 使用已获取的 user 信息创建 LoginState，复用 createLoginState 逻辑
+        // 但跳过 refresh() 避免再次请求 API 导致死锁
+        authInstance.createLoginState({}, { userInfo: data.user })
+      }
+    } else if (data.type === OAUTH_TYPE.BIND_IDENTITY) {
+      eventBus.fire(EVENTS.AUTH_STATE_CHANGED, {
+        event: AUTH_STATE_CHANGED_TYPE.BIND_IDENTITY,
+        info: { ...data, error },
+      })
+    }
+  })
+
   return { authInstance, oauthInstance }
 }
 
 const component: ICloudbaseComponent = {
   name: COMPONENT_NAME,
   namespace: 'auth',
-  entity(config: TInitAuthOptions = {
-    region: '',
-    persistence: 'local',
-    apiPath: AUTH_API_PREFIX,
-  },) {
-    if (this.authInstance) {
-      printWarn(ERRORS.INVALID_OPERATION, 'every cloudbase instance should has only one auth object')
+  entity(config?: TInitAuthOptions) {
+    if (this.authInstance && !config) {
+      // printWarn(ERRORS.INVALID_OPERATION, 'every cloudbase instance should has only one auth object')
       return this.authInstance
     }
+
+    config = config || {
+      region: '',
+      persistence: 'local',
+      apiPath: AUTH_API_PREFIX,
+    }
     const { adapter } = this.platform
     // 如不明确指定persistence则优先取各平台adapter首选，其次localStorage
     const newPersistence = config.persistence || adapter.primaryStorage
@@ -1490,6 +1510,7 @@ const component: ICloudbaseComponent = {
         accessKey: this.config.accessKey,
         useWxCloud: this.config.useWxCloud,
         sdkVersion: this.version,
+        detectSessionInUrl: this.config.auth?.detectSessionInUrl,
       },
       {
         env: this.config.env,