@cloudbase/oauth 2.19.1 → 2.19.3

package/src/oauth2client/oauth2client.ts

@@ -1,5 +1,5 @@
 import { ErrorType } from './consts'
-import { ApiUrls, ApiUrlsV2 } from '../auth/consts'
+import { ApiUrls, ApiUrlsV2, AUTH_API_PREFIX } from '../auth/consts'
 
 import { AuthClient, SimpleStorage } from './interface'
 
@@ -18,6 +18,9 @@ import { getPathName } from '../utils/index'
 import { SinglePromise } from '../utils/function/single-promise'
 import { weBtoa } from '../utils/base64'
 import { isMatch } from '../utils/cloudbase-adapter-wx_mp'
+import { AuthOptions } from '../auth/apis'
+import { ICloudbaseConfig } from '@cloudbase/types'
+import { langEvent } from '@cloudbase/utilities'
 
 const RequestIdHeaderName = 'x-request-id'
 const DeviceIdHeaderName = 'x-device-id'
@@ -292,7 +295,9 @@ export class OAuth2Client implements AuthClient {
   private static retryInterval = 1000
 
   private apiOrigin: string
+  private apiPath: string
   private clientId: string
+  private i18n: ICloudbaseConfig['i18n']
   private retry: number
   private clientSecret?: string
   private baseRequest: <T>(url: string, options?: RequestOptions) => Promise<T>
@@ -306,6 +311,7 @@ export class OAuth2Client implements AuthClient {
   private anonymousSignInFunc: (Credentials) => Promise<Credentials | void>
   private wxCloud: any
   private basicAuth: string
+  private onCredentialsError: AuthOptions['onCredentialsError'] | undefined
 
   /**
    * constructor
@@ -321,7 +327,9 @@ export class OAuth2Client implements AuthClient {
     }
 
     this.apiOrigin = options.apiOrigin
+    this.apiPath = options.apiPath || AUTH_API_PREFIX
     this.clientId = options.clientId
+    this.i18n = options.i18n
     this.singlePromise = new SinglePromise({ clientId: this.clientId })
     this.retry = this.formatRetry(options.retry, OAuth2Client.defaultRetry)
     if (options.baseRequest) {
@@ -354,6 +362,11 @@ export class OAuth2Client implements AuthClient {
     }
     this.refreshTokenFunc = options.refreshTokenFunc || this.defaultRefreshTokenFunc
     this.anonymousSignInFunc = options.anonymousSignInFunc
+    this.onCredentialsError = options.onCredentialsError
+
+    langEvent.bus.on(langEvent.LANG_CHANGE_EVENT, (params) => {
+      this.i18n = params.data?.i18n || this.i18n
+    })
   }
 
   /**
@@ -387,7 +400,7 @@ export class OAuth2Client implements AuthClient {
       options = {}
     }
     const retry: number = this.formatRetry(options.retry, this.retry)
-    options.headers = options.headers || {}
+    options.headers = { ...options.headers, [this.i18n?.LANG_HEADER_KEY]: this.i18n?.lang }
     if (this.headers) {
       options.headers = {
         ...this.headers,
@@ -423,7 +436,7 @@ export class OAuth2Client implements AuthClient {
       }
     }
     if (url.startsWith('/')) {
-      url = this.apiOrigin + url
+      url = `${this.apiOrigin}${this.apiPath}${url}`
     }
     let response: T | null = null
     const maxRequestTimes: number = retry + 1
@@ -499,7 +512,9 @@ export class OAuth2Client implements AuthClient {
   public async getCredentials(): Promise<Credentials | null> {
     let credentials: Credentials = await this.localCredentials.getCredentials()
     if (!credentials) {
-      return this.unAuthenticatedError('credentials not found')
+      const msg = 'credentials not found'
+      this.onCredentialsError?.({ msg })
+      return this.unAuthenticatedError(msg)
     }
     if (isCredentialsExpired(credentials)) {
       if (credentials.refresh_token) {
@@ -509,13 +524,16 @@ export class OAuth2Client implements AuthClient {
           if (credentials.scope === 'anonymous') {
             credentials = await this.anonymousLogin(credentials)
           } else {
+            this.onCredentialsError?.({ msg: error.error_description })
             return Promise.reject(error)
           }
         }
       } else if (credentials.scope === 'anonymous') {
         credentials = await this.anonymousLogin(credentials)
       } else {
-        return this.unAuthenticatedError('no refresh token found in credentials')
+        const msg = 'no refresh token found in credentials'
+        this.onCredentialsError?.({ msg })
+        return this.unAuthenticatedError(msg)
       }
     }
     return credentials
@@ -536,7 +554,9 @@ export class OAuth2Client implements AuthClient {
   public async getScope(): Promise<string> {
     const credentials: Credentials = await this.localCredentials.getCredentials()
     if (!credentials) {
-      return this.unAuthenticatedError('credentials not found')
+      const msg = 'credentials not found'
+      this.onCredentialsError?.({ msg })
+      return this.unAuthenticatedError(msg)
     }
     return credentials.scope
   }
@@ -544,7 +564,9 @@ export class OAuth2Client implements AuthClient {
   public async getGroups(): Promise<string[]> {
     const credentials: Credentials = await this.localCredentials.getCredentials()
     if (!credentials) {
-      return this.unAuthenticatedError('credentials not found')
+      const msg = 'credentials not found'
+      this.onCredentialsError?.({ msg })
+      return this.unAuthenticatedError(msg)
     }
     return credentials.groups
   }
@@ -557,7 +579,9 @@ export class OAuth2Client implements AuthClient {
   public async refreshToken(credentials: Credentials): Promise<Credentials> {
     return this.singlePromise.run('_refreshToken', async () => {
       if (!credentials || !credentials.refresh_token) {
-        return this.unAuthenticatedError('no refresh token found in credentials')
+        const msg = 'no refresh token found in credentials'
+        this.onCredentialsError?.({ msg })
+        return this.unAuthenticatedError(msg)
       }
       try {
         const newCredentials: Credentials = await this.refreshTokenFunc(credentials.refresh_token, credentials)
@@ -566,8 +590,11 @@ export class OAuth2Client implements AuthClient {
       } catch (error) {
         if (error.error === ErrorType.INVALID_GRANT) {
           await this.localCredentials.setCredentials(null)
-          return this.unAuthenticatedError(error.error_description)
+          const msg = error.error_description
+          this.onCredentialsError?.({ msg })
+          return this.unAuthenticatedError(msg)
         }
+        this.onCredentialsError?.({ msg: error.error_description })
         return Promise.reject(error)
       }
     })
@@ -666,7 +693,9 @@ export class OAuth2Client implements AuthClient {
    */
   private async defaultRefreshTokenFunc(refreshToken?: string, credentials?: Credentials): Promise<Credentials> {
     if (refreshToken === undefined || refreshToken === '') {
-      return this.unAuthenticatedError('refresh token not found')
+      const msg = 'refresh token not found'
+      this.onCredentialsError?.({ msg })
+      return this.unAuthenticatedError(msg)
     }
 
     let url: string = ApiUrls.AUTH_TOKEN_URL