@cloudbase/auth 2.24.8 → 2.24.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/auth",
-  "version": "2.24.8",
+  "version": "2.24.10",
   "description": "cloudbase javascript sdk auth componets",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -32,14 +32,14 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@cloudbase/adapter-wx_mp": "^1.2.1",
-    "@cloudbase/oauth": "2.24.8",
-    "@cloudbase/utilities": "2.24.8"
+    "@cloudbase/oauth": "2.24.10",
+    "@cloudbase/utilities": "2.24.10"
   },
   "devDependencies": {
-    "@cloudbase/types": "2.24.8",
+    "@cloudbase/types": "2.24.10",
     "@types/node": "^22.1.0",
     "terser-webpack-plugin": "^3.0.2",
     "webpack-bundle-analyzer": "^4.9.1"
   },
-  "gitHead": "f8deb2e86298c7729687df544d833cacdfe4bdad"
+  "gitHead": "1295166f18177e01052fb4c058483a8cd0f2f969"
 }

package/src/index.ts

@@ -78,9 +78,8 @@ interface UserInfo {
   created_from?: string
 }
 
-export const eventBus = new CloudbaseEventEmitter()
 
-const onCredentialsError = (params) => {
+const onCredentialsError = eventBus => (params) => {
   eventBus.fire(EVENTS.LOGIN_STATE_CHANGED, { ...params, eventType: LOGIN_STATE_CHANGED_TYPE.CREDENTIALS_ERROR })
 }
 
@@ -1218,7 +1217,7 @@ class Auth extends SbaseApi {
   }
 
   public async onLoginStateChanged(callback: Function) {
-    eventBus.on(EVENTS.LOGIN_STATE_CHANGED, async (params) => {
+    this.config.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() : {}
       callback.call(this, { ...params, ...loginState })
@@ -1387,9 +1386,9 @@ class Auth extends SbaseApi {
       }
     }
 
-    eventBus.fire(EVENTS.LOGIN_STATE_CHANGED, { eventType: LOGIN_STATE_CHANGED_TYPE.SIGN_IN })
+    this.config.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 })
+    this.config.eventBus?.fire(EVENTS.AUTH_STATE_CHANGED, { event: AUTH_STATE_CHANGED_TYPE.SIGNED_IN })
     return loginState
   }
 
@@ -1444,7 +1443,7 @@ export function generateAuthInstance(
     i18n,
     accessKey,
     useWxCloud,
-    eventBus,
+    eventBus: new CloudbaseEventEmitter(),
   }
 
   const oauthInstance = new CloudbaseOAuth(useAuthAdapter({
@@ -1459,7 +1458,7 @@ export function generateAuthInstance(
     captchaOptions: config?.captchaOptions,
     wxCloud: config?.wxCloud,
     adapter,
-    onCredentialsError,
+    onCredentialsError: onCredentialsError(commonOpts.eventBus),
     headers: { 'X-SDK-Version': `@cloudbase/js-sdk/${config.sdkVersion}`, ...(config.headers || {}) },
     detectSessionInUrl: config.detectSessionInUrl,
     debug,
@@ -1489,7 +1488,7 @@ export function generateAuthInstance(
 
     if (data.type === OAUTH_TYPE.SIGN_IN) {
       if (error) {
-        eventBus.fire(EVENTS.AUTH_STATE_CHANGED, {
+        commonOpts.eventBus.fire(EVENTS.AUTH_STATE_CHANGED, {
           event: AUTH_STATE_CHANGED_TYPE.SIGNED_IN,
           info: { ...data, error },
         })
@@ -1499,7 +1498,7 @@ export function generateAuthInstance(
         authInstance.createLoginState({}, { userInfo: data.user })
       }
     } else if (data.type === OAUTH_TYPE.BIND_IDENTITY) {
-      eventBus.fire(EVENTS.AUTH_STATE_CHANGED, {
+      commonOpts.eventBus.fire(EVENTS.AUTH_STATE_CHANGED, {
         event: AUTH_STATE_CHANGED_TYPE.BIND_IDENTITY,
         info: { ...data, error },
       })
@@ -1509,55 +1508,65 @@ export function generateAuthInstance(
   return { authInstance, oauthInstance }
 }
 
+const NAMESPACE = 'auth'
+
 const component: ICloudbaseComponent = {
   name: COMPONENT_NAME,
-  namespace: 'auth',
+  namespace: NAMESPACE,
   entity(config?: TInitAuthOptions) {
-    if (this.authInstance && !config) {
-      // printWarn(ERRORS.INVALID_OPERATION, 'every cloudbase instance should has only one auth object')
-      return this.authInstance
-    }
+    const auth = function (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
-    if (newPersistence && newPersistence !== this.config.persistence) {
-      this.updateConfig({ persistence: newPersistence })
-    }
+      config = config || {
+        region: '',
+        persistence: 'local',
+        apiPath: AUTH_API_PREFIX,
+      }
+      const { adapter } = this.platform
+      // 如不明确指定persistence则优先取各平台adapter首选，其次localStorage
+      const newPersistence = config.persistence || adapter.primaryStorage
+      if (newPersistence && newPersistence !== this.config.persistence) {
+        this.updateConfig({ persistence: newPersistence })
+      }
 
-    const { authInstance, oauthInstance } = generateAuthInstance(
-      {
-        wxCloud: this.config.wxCloud,
-        storage: this.config.storage,
-        ...config,
-        persistence: this.config.persistence,
-        i18n: this.config.i18n,
-        accessKey: this.config.accessKey,
-        useWxCloud: this.config.useWxCloud,
-        sdkVersion: this.version,
-        detectSessionInUrl: this.config.auth?.detectSessionInUrl,
-      },
-      {
-        env: this.config.env,
-        clientId: this.config.clientId,
-        apiOrigin: this.request.getBaseEndPoint(this.config.endPointMode || 'CLOUD_API'),
-        platform: this.platform,
-        cache: this.cache,
-        app: this,
-        debug: this.config.debug,
-      },
-    )
+      const { authInstance, oauthInstance } = generateAuthInstance(
+        {
+          wxCloud: this.config.wxCloud,
+          storage: this.config.storage,
+          ...config,
+          persistence: this.config.persistence,
+          i18n: this.config.i18n,
+          accessKey: this.config.accessKey,
+          useWxCloud: this.config.useWxCloud,
+          sdkVersion: this.version,
+          detectSessionInUrl: this.config.auth?.detectSessionInUrl,
+        },
+        {
+          env: this.config.env,
+          clientId: this.config.clientId,
+          apiOrigin: this.request.getBaseEndPoint(this.config.endPointMode || 'CLOUD_API'),
+          platform: this.platform,
+          cache: this.cache,
+          app: this,
+          debug: this.config.debug,
+        },
+      )
 
-    this.oauthInstance = oauthInstance
+      this.oauthInstance = oauthInstance
+
+      this.authInstance = authInstance
 
-    this.authInstance = authInstance
+      return this.authInstance
+    }
 
-    return this.authInstance
+    const authProto = auth.call(this, config)
+    Object.assign(auth, authProto)
+    Object.setPrototypeOf(auth, Object.getPrototypeOf(authProto))
+    this[NAMESPACE] = auth
+    return auth
   },
 }
 

package/src/sbaseApi.ts

@@ -40,7 +40,7 @@ import {
   VerifyOAuthReq,
   VerifyOtpReq,
 } from './type'
-import { eventBus, LoginState, User } from '.'
+import { LoginState, User } from '.'
 import { saveToBrowserSession, getBrowserSession, removeBrowserSession, addUrlSearch } from './utils'
 import { utils } from '@cloudbase/utilities'
 import { adapterForWxMp } from './utilities'
@@ -265,9 +265,9 @@ export class SbaseApi {
       await this.cache.removeStoreAsync(userInfoKey)
       this.setAccessKey()
 
-      eventBus.fire(EVENTS.LOGIN_STATE_CHANGED, { eventType: LOGIN_STATE_CHANGED_TYPE.SIGN_OUT })
+      this.config.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 })
+      this.config.eventBus?.fire(EVENTS.AUTH_STATE_CHANGED, { event: AUTH_STATE_CHANGED_TYPE.SIGNED_OUT })
 
       // res返回是为了兼容v2版本
       return { ...res, data: {}, error: null }
@@ -661,7 +661,7 @@ export class SbaseApi {
                 verification_token: verificationTokenRes.verification_token,
               })
 
-              eventBus.fire(EVENTS.AUTH_STATE_CHANGED, { event: AUTH_STATE_CHANGED_TYPE.PASSWORD_RECOVERY })
+              this.config.eventBus?.fire(EVENTS.AUTH_STATE_CHANGED, { event: AUTH_STATE_CHANGED_TYPE.PASSWORD_RECOVERY })
 
               const res = await this.signInWithPassword({
                 email: isEmail ? emailOrPhone : undefined,
@@ -925,7 +925,7 @@ export class SbaseApi {
               const {
                 data: { user },
               } = await this.getUser()
-              eventBus.fire(EVENTS.AUTH_STATE_CHANGED, { event: AUTH_STATE_CHANGED_TYPE.USER_UPDATED })
+              this.config.eventBus?.fire(EVENTS.AUTH_STATE_CHANGED, { event: AUTH_STATE_CHANGED_TYPE.USER_UPDATED })
 
               return { data: { user }, error: null }
             } catch (error) {
@@ -940,7 +940,7 @@ export class SbaseApi {
       const {
         data: { user },
       } = await this.getUser()
-      eventBus.fire(EVENTS.AUTH_STATE_CHANGED, { event: AUTH_STATE_CHANGED_TYPE.USER_UPDATED })
+      this.config.eventBus?.fire(EVENTS.AUTH_STATE_CHANGED, { event: AUTH_STATE_CHANGED_TYPE.USER_UPDATED })
 
       return { data: { user, ...extraRes }, error: null }
     } catch (error) {
@@ -1158,7 +1158,7 @@ export class SbaseApi {
 
       const { data: { session } = {} } = await this.getSession()
 
-      eventBus.fire(EVENTS.AUTH_STATE_CHANGED, { event: AUTH_STATE_CHANGED_TYPE.SIGNED_IN })
+      this.config.eventBus?.fire(EVENTS.AUTH_STATE_CHANGED, { event: AUTH_STATE_CHANGED_TYPE.SIGNED_IN })
 
       return { data: { user: session.user, session }, error: null }
     } catch (error) {
@@ -1398,7 +1398,7 @@ export class SbaseApi {
     try {
       const credentials: Credentials = await this.oauthInstance.oauth2client.localCredentials.getCredentials()
       if (credentials) {
-        eventBus.fire(EVENTS.AUTH_STATE_CHANGED, { event: AUTH_STATE_CHANGED_TYPE.INITIAL_SESSION })
+        this.config.eventBus?.fire(EVENTS.AUTH_STATE_CHANGED, { event: AUTH_STATE_CHANGED_TYPE.INITIAL_SESSION })
       }
     } catch (error) {
       // Ignore errors when checking for existing credentials
@@ -1408,7 +1408,7 @@ export class SbaseApi {
   }
 
   private setupListeners() {
-    eventBus.on(EVENTS.AUTH_STATE_CHANGED, async (params) => {
+    this.config.eventBus?.on(EVENTS.AUTH_STATE_CHANGED, async (params) => {
       const event = params?.data?.event
       const info = params?.data?.info
       const {

package/src/type.ts

@@ -1,4 +1,27 @@
-import type { authModels, AuthError, OAUTH_TYPE } from '@cloudbase/oauth'
+import type { authModels, OAUTH_TYPE } from '@cloudbase/oauth'
+
+class AuthError extends Error {
+  /**
+   * Error code associated with the error. Most errors coming from
+   * HTTP responses will have a code, though some errors that occur
+   * before a response is received will not have one present. In that
+   * case {@link #status} will also be undefined.
+   */
+  code: (string & {}) | undefined
+
+  /** HTTP status code that caused the error. */
+  status: number | undefined
+
+  protected __isAuthError = true
+
+  constructor(error) {
+    super(error.error_description || error.message)
+    this.name = 'AuthError'
+    this.status = error.error
+    this.code = error.error_code
+  }
+}
+
 
 export interface SignInAnonymouslyReq {
   provider_token?: string // 提供令牌