@cloudbase/auth 2.5.49-beta.0 → 2.5.49-beta.2

package/src/index.ts

@@ -1,9 +1,9 @@
-import { ICloudbase } from '@cloudbase/types'
-import { utils, constants, helpers, events } from '@cloudbase/utilities'
-import { ICloudbaseCache } from '@cloudbase/types/cache'
-import { ICloudbaseRequest } from '@cloudbase/types/request'
-import { ICloudbaseAuthConfig, IUser, IUserInfo, ILoginState } from '@cloudbase/types/auth'
-import { ICloudbaseComponent } from '@cloudbase/types/component'
+import type { ICloudbase, ICloudbaseConfig } from '@cloudbase/types'
+import { utils, constants, helpers, events, cache } from '@cloudbase/utilities'
+import type { ICloudbaseCache } from '@cloudbase/types/cache'
+import type { ICloudbaseRequest } from '@cloudbase/types/request'
+import type { ICloudbaseAuthConfig, IUser, IUserInfo, ILoginState } from '@cloudbase/types/auth'
+import type { ICloudbaseComponent } from '@cloudbase/types/component'
 
 import { authModels, CloudbaseOAuth, AuthOptions, Credentials } from '@cloudbase/oauth'
 import { GrantProviderTokenResponse, ProviderSubType } from '@cloudbase/oauth/dist/cjs/auth/models'
@@ -17,6 +17,7 @@ const { printWarn, throwError } = utils
 const { ERRORS, COMMUNITY_SITE_URL } = constants
 const { catchErrorsDecorator } = helpers
 const { CloudbaseEventEmitter } = events
+const { CloudbaseCache } = cache
 
 const COMPONENT_NAME = 'auth'
 
@@ -306,7 +307,7 @@ class Auth {
     ],
   })
   public async bindPhoneNumber(params: authModels.BindPhoneRequest) {
-    return this.oauthInstance.authApi.bindPhone(params)
+    return this.oauthInstance.authApi.editContact(params)
   }
 
   /**
@@ -342,7 +343,7 @@ class Auth {
     ],
   })
   public bindEmail(params: authModels.BindEmailRequest) {
-    return this.oauthInstance.authApi.bindEmail(params)
+    return this.oauthInstance.authApi.editContact(params)
   }
 
   /**
@@ -1095,7 +1096,7 @@ class Auth {
   }
 
   public async getMiniProgramQrCodeStatus(params: authModels.GetMiniProgramQrCodeStatusRequest,): Promise<authModels.GetMiniProgramQrCodeStatusResponse> {
-    return this.oauthInstance.authApi.checkMiniProgramCode(params)
+    return this.oauthInstance.authApi.getMiniProgramQrCodeStatus(params)
   }
 
   private async createLoginState(params?: { version?: string; query?: any }): Promise<LoginState> {
@@ -1112,10 +1113,64 @@ class Auth {
   }
 }
 
+type TInitAuthOptions = Pick<ICloudbaseAuthConfig, 'region' | 'persistence'> & Partial<AuthOptions>
+
+export function generateAuthInstance(
+  config: TInitAuthOptions,
+  options?: {
+    clientId: ICloudbaseConfig['clientId']
+    env: ICloudbaseConfig['env']
+    apiOrigin: string
+    cache?: ICloudbaseCache
+    platform?: ICloudbase['platform']
+    app?: ICloudbase
+    debug?: ICloudbaseAuthConfig['debug']
+  },
+) {
+  const { runtime } = options?.platform || {}
+
+  const { env, clientId, debug, cache, app: cloudbase } = options || {}
+  let { apiOrigin } = options || {}
+  if (!apiOrigin) {
+    apiOrigin = `https://${env}.${config.region}.tcb-api.tencentcloudapi.com`
+  }
+  const oauthInstance = new CloudbaseOAuth(useAuthAdapter({
+    env,
+    clientId,
+    apiOrigin,
+    // @todo 以下最好走adaptor处理，目前oauth模块没按adaptor接口设计
+    storage: config?.storage,
+    baseRequest: config?.baseRequest,
+    request: config?.request,
+    anonymousSignInFunc: config?.anonymousSignInFunc,
+    captchaOptions: config?.captchaOptions,
+    wxCloud: config?.wxCloud,
+  }),)
+
+  const authInstance = new Auth({
+    env,
+    region: config.region,
+    persistence: config.persistence,
+    debug,
+    cache:
+      cache
+      || new CloudbaseCache({
+        persistence: config.persistence,
+        keys: { userInfoKey: `user_info_${env}` },
+        platformInfo: options?.platform,
+      }),
+    runtime: runtime || 'web',
+    _fromApp: cloudbase,
+    oauthInstance,
+  })
+
+  return { authInstance, oauthInstance }
+}
+
 const component: ICloudbaseComponent = {
   name: COMPONENT_NAME,
   namespace: 'auth',
-  entity(config: Pick<ICloudbaseAuthConfig, 'region' | 'persistence'> & Partial<AuthOptions> = {
+  entity(config: TInitAuthOptions = {
     region: '',
     persistence: 'local',
   },) {
@@ -1123,41 +1178,34 @@ const component: ICloudbaseComponent = {
       printWarn(ERRORS.INVALID_OPERATION, 'every cloudbase instance should has only one auth object')
       return this.authInstance
     }
-    const { adapter, runtime } = this.platform
+    const { adapter } = this.platform
     // 如不明确指定persistence则优先取各平台adapter首选，其次localStorage
     const newPersistence = config.persistence || adapter.primaryStorage
     if (newPersistence && newPersistence !== this.config.persistence) {
       this.updateConfig({ persistence: newPersistence })
     }
 
-    const { env, persistence, debug, clientId, storage, wxCloud } = this.config
-    const oauthInstance = new CloudbaseOAuth(useAuthAdapter({
-      env,
-      clientId,
-      apiOrigin: this.request.getBaseEndPoint(),
-      // @todo 以下最好走adaptor处理，目前oauth模块没按adaptor接口设计
-      storage: config?.storage || storage,
-      baseRequest: config?.baseRequest,
-      request: config?.request,
-      anonymousSignInFunc: config?.anonymousSignInFunc,
-      captchaOptions: config?.captchaOptions,
-      wxCloud: config?.wxCloud || wxCloud,
-    }),)
+    const { authInstance, oauthInstance } = generateAuthInstance(
+      {
+        wxCloud: this.config.wxCloud,
+        storage: this.config.storage,
+        ...config,
+        persistence: this.config.persistence,
+      },
+      {
+        env: this.config.env,
+        clientId: this.config.clientId,
+        apiOrigin: this.request.getBaseEndPoint(),
+        platform: this.platform,
+        cache: this.cache,
+        app: this,
+        debug: this.config.debug,
+      },
+    )
 
     this.oauthInstance = oauthInstance
 
-    this.authInstance = new Auth({
-      env,
-      region: config.region,
-      persistence,
-      debug,
-      cache: this.cache,
-      // request: this.request,
-      runtime,
-      _fromApp: this,
-      // oauthInstance: this.oauthInstance || (this as any).oauth()
-      oauthInstance,
-    })
+    this.authInstance = authInstance
 
     return this.authInstance
   },