@cloudbase/auth 3.0.3 → 3.0.4

package/src/adapter.ts

@@ -180,6 +180,7 @@ const dealUserAdapter = (config: AuthOptions, adapter: SDKAdapterInterface) => {
       const reqClassParams = {
         timeout: 10000,
         restrictedMethods: ['get', 'post', 'upload', 'download', 'request'],
+        auth: config.auth,
       }
       const adapterReq = new adapter.reqClass(reqClassParams)
       data.baseRequest = async function (url: string, options?: { method?: string; [key: string]: any }) {

package/src/index.ts

@@ -14,6 +14,7 @@ import {
   weAppJwtDecodeAll,
   AuthError,
   authModels,
+  DEFAULT_NODE_ACCESS_SCOPE,
 } from '@cloudbase/oauth'
 import { useAuthAdapter } from './adapter'
 import {
@@ -362,18 +363,20 @@ export class LoginState implements ILoginState {
   }
 }
 
+interface IAuthConfig extends ICloudbaseAuthConfig {
+  cache: ICloudbaseCache
+  request?: ICloudbaseRequest
+  runtime?: string
+}
+
 class Auth {
-  readonly config: ICloudbaseAuthConfig
+  readonly config: IAuthConfig
   oauthInstance: CloudbaseOAuth
   readonly cache: ICloudbaseCache
   private listeners: Map<string, Set<OnAuthStateChangeCallback>> = new Map()
   private hasListenerSetUp = false
 
-  constructor(config: ICloudbaseAuthConfig & {
-    cache: ICloudbaseCache
-    request?: ICloudbaseRequest
-    runtime?: string
-  },) {
+  constructor(config: IAuthConfig) {
     this.config = config
     this.oauthInstance = config.oauthInstance
     this.cache = config.cache
@@ -1026,6 +1029,10 @@ class Auth {
     return null
   }
 
+  /**
+   * @deprecated 使用 getCurrentUser 代替，因为与node-sdk方法名冲突
+   * @returns
+   */
   @catchErrorsDecorator({
     title: '获取用户信息失败',
     messages: [
@@ -1344,18 +1351,30 @@ class Auth {
   }
 
   async setAccessKey() {
+    let accessToken = ''
+    let scope = ''
     if (this.config.accessKey) {
-      try {
-        this.oauthInstance.oauth2client.setAccessKeyCredentials({
-          access_token: this.config.accessKey,
-          token_type: 'Bearer',
-          scope: 'accessKey',
-          expires_at: new Date(+new Date() + +new Date()),
-          expires_in: +new Date() + +new Date(),
-        })
-      } catch (error) {
-        console.warn('accessKey error: ', error)
-      }
+      accessToken = this.config.accessKey
+      scope = 'accessKey'
+    } else if (this.config.auth?.secretId && this.config.auth?.secretKey) {
+      accessToken = ''
+      scope = DEFAULT_NODE_ACCESS_SCOPE
+    }
+
+    if (!scope) {
+      return
+    }
+
+    try {
+      this.oauthInstance.oauth2client.setAccessKeyCredentials({
+        access_token: accessToken,
+        token_type: 'Bearer',
+        scope,
+        expires_at: new Date(+new Date() + +new Date()),
+        expires_in: +new Date() + +new Date(),
+      })
+    } catch (error) {
+      console.warn('accessKey error: ', error)
     }
   }
 
@@ -1924,7 +1943,7 @@ class Auth {
    */
   async getUser(): Promise<GetUserRes> {
     try {
-      const user = this.convertToUser(await this.getUserInfo())
+      const user = this.convertToUser(await this.getCurrentUser())
       return { data: { user }, error: null }
     } catch (error) {
       return { data: {}, error: new AuthError(error) }
@@ -2057,7 +2076,12 @@ class Auth {
     try {
       const providers = await this.oauthInstance.authApi.getProviders()
 
-      return { data: { identities: providers?.data?.filter(v => !!v.bind) as unknown as GetUserIdentitiesRes['data']['identities'] }, error: null }
+      return {
+        data: {
+          identities: providers?.data?.filter(v => !!v.bind) as unknown as GetUserIdentitiesRes['data']['identities'],
+        },
+        error: null,
+      }
     } catch (error) {
       return { data: {}, error: new AuthError(error) }
     }
@@ -2569,7 +2593,10 @@ class Auth {
   }
 }
 
-type TInitAuthOptions = Pick<ICloudbaseAuthConfig, 'region' | 'persistence' | 'i18n' | 'accessKey' | 'useWxCloud'> &
+type TInitAuthOptions = Pick<
+ICloudbaseAuthConfig,
+'region' | 'persistence' | 'i18n' | 'accessKey' | 'useWxCloud' | 'auth'
+> &
 Partial<AuthOptions> & {
   detectSessionInUrl?: boolean
 }
@@ -2622,6 +2649,7 @@ export function generateAuthInstance(
     headers: { 'X-SDK-Version': `@cloudbase/js-sdk/${config.sdkVersion}`, ...(config.headers || {}) },
     detectSessionInUrl: config.detectSessionInUrl,
     debug,
+    auth: options.app?.config?.auth,
   }),)
 
   const authInstance = new Auth({
@@ -2638,6 +2666,7 @@ export function generateAuthInstance(
     runtime: runtime || 'web',
     _fromApp: cloudbase,
     oauthInstance,
+    auth: options.app?.config?.auth,
   })
 
   // Initialize session with user info callback