@cloudbase/oauth 2.19.2 → 2.19.3

package/src/auth/consts.ts

@@ -1,62 +1,64 @@
+export const AUTH_API_PREFIX = '/auth'
+
 export enum ApiUrls {
-  AUTH_SIGN_UP_URL = '/auth/v1/signup',
-  AUTH_TOKEN_URL = '/auth/v1/token',
-  AUTH_REVOKE_URL = '/auth/v1/revoke',
-  WEDA_USER_URL = '/auth/v1/plugin/weda/userinfo',
-  AUTH_RESET_PASSWORD = '/auth/v1/reset',
-  AUTH_GET_DEVICE_CODE = '/auth/v1/device/code',
-  CHECK_USERNAME = '/auth/v1/checkUsername',
-  CHECK_IF_USER_EXIST = '/auth/v1/checkIfUserExist',
-  GET_PROVIDER_TYPE = '/auth/v1/mgr/provider/providerSubType',
+  AUTH_SIGN_UP_URL = '/v1/signup',
+  AUTH_TOKEN_URL = '/v1/token',
+  AUTH_REVOKE_URL = '/v1/revoke',
+  WEDA_USER_URL = '/v1/plugin/weda/userinfo',
+  AUTH_RESET_PASSWORD = '/v1/reset',
+  AUTH_GET_DEVICE_CODE = '/v1/device/code',
+  CHECK_USERNAME = '/v1/checkUsername',
+  CHECK_IF_USER_EXIST = '/v1/checkIfUserExist',
+  GET_PROVIDER_TYPE = '/v1/mgr/provider/providerSubType',
 
-  AUTH_SIGN_IN_URL = '/auth/v1/signin',
-  AUTH_SIGN_IN_ANONYMOUSLY_URL = '/auth/v1/signin/anonymously',
-  AUTH_SIGN_IN_WITH_PROVIDER_URL = '/auth/v1/signin/with/provider',
-  AUTH_SIGN_IN_WITH_WECHAT_URL = '/auth/v1/signin/wechat/noauth',
-  AUTH_SIGN_IN_CUSTOM = '/auth/v1/signin/custom',
+  AUTH_SIGN_IN_URL = '/v1/signin',
+  AUTH_SIGN_IN_ANONYMOUSLY_URL = '/v1/signin/anonymously',
+  AUTH_SIGN_IN_WITH_PROVIDER_URL = '/v1/signin/with/provider',
+  AUTH_SIGN_IN_WITH_WECHAT_URL = '/v1/signin/wechat/noauth',
+  AUTH_SIGN_IN_CUSTOM = '/v1/signin/custom',
 
-  PROVIDER_TOKEN_URL = '/auth/v1/provider/token',
-  PROVIDER_URI_URL = '/auth/v1/provider/uri',
+  PROVIDER_TOKEN_URL = '/v1/provider/token',
+  PROVIDER_URI_URL = '/v1/provider/uri',
 
-  USER_ME_URL = '/auth/v1/user/me',
-  AUTH_SIGNOUT_URL = '/auth/v1/user/signout',
-  USER_QUERY_URL = '/auth/v1/user/query',
-  USER_PRIFILE_URL = '/auth/v1/user/profile',
-  USER_BASIC_EDIT_URL = '/auth/v1/user/basic/edit',
-  USER_TRANS_BY_PROVIDER_URL = '/auth/v1/user/trans/by/provider',
-  PROVIDER_LIST = '/auth/v1/user/provider',
-  PROVIDER_BIND_URL = '/auth/v1/user/provider/bind',
-  PROVIDER_UNBIND_URL = '/auth/v1/user/provider',
-  CHECK_PWD_URL = '/auth/v1/user/sudo',
-  SUDO_URL = '/auth/v1/user/sudo',
-  BIND_CONTACT_URL = '/auth/v1/user/contact',
-  AUTH_SET_PASSWORD = '/auth/v1/user/password',
-  AUTHORIZE_DEVICE_URL = '/auth/v1/user/device/authorize',
-  AUTHORIZE_URL = '/auth/v1/user/authorize',
-  AUTHORIZE_INFO_URL = '/auth/v1/user/authorize/info',
-  AUTHORIZED_DEVICES_DELETE_URL = '/auth/v1/user/authorized/devices/',
-  AUTH_REVOKE_ALL_URL = '/auth/v1/user/revoke/all',
-  GET_USER_BEHAVIOR_LOG = '/auth/v1/user/security/history',
+  USER_ME_URL = '/v1/user/me',
+  AUTH_SIGNOUT_URL = '/v1/user/signout',
+  USER_QUERY_URL = '/v1/user/query',
+  USER_PRIFILE_URL = '/v1/user/profile',
+  USER_BASIC_EDIT_URL = '/v1/user/basic/edit',
+  USER_TRANS_BY_PROVIDER_URL = '/v1/user/trans/by/provider',
+  PROVIDER_LIST = '/v1/user/provider',
+  PROVIDER_BIND_URL = '/v1/user/provider/bind',
+  PROVIDER_UNBIND_URL = '/v1/user/provider',
+  CHECK_PWD_URL = '/v1/user/sudo',
+  SUDO_URL = '/v1/user/sudo',
+  BIND_CONTACT_URL = '/v1/user/contact',
+  AUTH_SET_PASSWORD = '/v1/user/password',
+  AUTHORIZE_DEVICE_URL = '/v1/user/device/authorize',
+  AUTHORIZE_URL = '/v1/user/authorize',
+  AUTHORIZE_INFO_URL = '/v1/user/authorize/info',
+  AUTHORIZED_DEVICES_DELETE_URL = '/v1/user/authorized/devices/',
+  AUTH_REVOKE_ALL_URL = '/v1/user/revoke/all',
+  GET_USER_BEHAVIOR_LOG = '/v1/user/security/history',
 
-  VERIFICATION_URL = '/auth/v1/verification',
-  VERIFY_URL = '/auth/v1/verification/verify',
+  VERIFICATION_URL = '/v1/verification',
+  VERIFY_URL = '/v1/verification/verify',
 
-  CAPTCHA_DATA_URL = '/auth/v1/captcha/data',
-  VERIFY_CAPTCHA_DATA_URL = '/auth/v1/captcha/data/verify',
-  GET_CAPTCHA_URL = '/auth/v1/captcha/init',
+  CAPTCHA_DATA_URL = '/v1/captcha/data',
+  VERIFY_CAPTCHA_DATA_URL = '/v1/captcha/data/verify',
+  GET_CAPTCHA_URL = '/v1/captcha/init',
 
-  GET_MINIPROGRAM_QRCODE = '/auth/v1/qrcode/generate',
-  GET_MINIPROGRAM_QRCODE_STATUS = '/auth/v1/qrcode/get/status',
+  GET_MINIPROGRAM_QRCODE = '/v1/qrcode/generate',
+  GET_MINIPROGRAM_QRCODE_STATUS = '/v1/qrcode/get/status',
 }
 
 export enum ApiUrlsV2 {
-  AUTH_SIGN_IN_URL = '/auth/v2/signin/username',
-  AUTH_TOKEN_URL = '/auth/v2/token',
-  USER_ME_URL = '/auth/v2/user/me',
-  VERIFY_URL = '/auth/v2/signin/verificationcode',
-  AUTH_SIGN_IN_WITH_PROVIDER_URL = '/auth/v2/signin/with/provider',
-  AUTH_PUBLIC_KEY = '/auth/v2/signin/publichkey',
-  AUTH_RESET_PASSWORD = '/auth/v2/signin/password/update'
+  AUTH_SIGN_IN_URL = '/v2/signin/username',
+  AUTH_TOKEN_URL = '/v2/token',
+  USER_ME_URL = '/v2/user/me',
+  VERIFY_URL = '/v2/signin/verificationcode',
+  AUTH_SIGN_IN_WITH_PROVIDER_URL = '/v2/signin/with/provider',
+  AUTH_PUBLIC_KEY = '/v2/signin/publichkey',
+  AUTH_RESET_PASSWORD = '/v2/signin/password/update'
 }
 
 export enum VerificationUsages {

package/src/index.ts

@@ -1,6 +1,8 @@
 import { OAuth2Client } from './oauth2client/oauth2client'
 import { AuthOptions, Auth } from './auth/apis'
+import { AUTH_API_PREFIX } from './auth/consts'
 export { Auth } from './auth/apis'
+export { AUTH_API_PREFIX } from './auth/consts'
 export * as authModels from './auth/models'
 export type { ProviderProfile } from './auth/models'
 export type { Credentials, OAuth2ClientOptions, ResponseError, AuthClientRequestOptions } from './oauth2client/models'
@@ -11,9 +13,10 @@ export class CloudbaseOAuth {
   public authApi: Auth
 
   constructor(authOptions: AuthOptions) {
-    const { apiOrigin, clientId, env, storage, request, baseRequest, anonymousSignInFunc, wxCloud, adapter, onCredentialsError } = authOptions
+    const { apiOrigin, apiPath = AUTH_API_PREFIX, clientId, env, storage, request, baseRequest, anonymousSignInFunc, wxCloud, adapter, onCredentialsError, headers, i18n } = authOptions
     this.oauth2client = new OAuth2Client({
       apiOrigin,
+      apiPath,
       clientId,
       env,
       storage,
@@ -21,6 +24,8 @@ export class CloudbaseOAuth {
       anonymousSignInFunc,
       wxCloud,
       onCredentialsError,
+      headers: headers || {},
+      i18n,
     })
 
     this.authApi = new Auth({

package/src/oauth2client/models.ts

@@ -1,6 +1,7 @@
 import { SimpleStorage } from './interface'
 import { ErrorType } from './consts'
 import { AuthOptions } from '../auth/apis'
+import { ICloudbaseConfig } from '@cloudbase/types'
 
 /** Credentials **/
 export interface Credentials {
@@ -52,6 +53,7 @@ export interface AuthClientRequestOptions extends RequestOptions {
 export interface OAuth2ClientOptions {
   devMode?: boolean;
   apiOrigin: string;
+  apiPath?: string;
   clientId: string;
   env: string;
   // default value is 1,min value is 0, max value is 5
@@ -68,4 +70,5 @@ export interface OAuth2ClientOptions {
   anonymousSignInFunc?: (Credentials) => Promise<Credentials | void>
   wxCloud?: any;
   onCredentialsError?: AuthOptions['onCredentialsError']
+  i18n?: ICloudbaseConfig['i18n']
 }

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'
 
@@ -19,6 +19,8 @@ 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'
@@ -293,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>
@@ -323,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) {
@@ -357,6 +363,10 @@ 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
+    })
   }
 
   /**
@@ -390,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,
@@ -426,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