@cloudbase/oauth 2.5.41-beta.0 → 2.5.43-beta.0

package/src/auth/apis.ts

@@ -48,18 +48,19 @@ import {
 import { SimpleStorage, RequestFunction } from '../oauth2client/interface'
 import { OAuth2Client, defaultStorage } from '../oauth2client/oauth2client'
 import { Credentials } from '../oauth2client/models'
-import { Captcha } from '../captcha/captcha'
+import { Captcha, CaptchaOptions } from '../captcha/captcha'
 import { deepClone } from '../utils'
 import { getEncryptInfo } from '../utils/encrypt'
 
 export interface AuthOptions {
-  apiOrigin: string;
-  clientId: string;
-  credentialsClient?: OAuth2Client;
-  request?: RequestFunction;
-  baseRequest?: RequestFunction;
-  storage?: SimpleStorage;
-  anonymousSignInFunc?: (Credentials) => Promise<Credentials | void>;
+  apiOrigin: string
+  clientId: string
+  credentialsClient?: OAuth2Client
+  request?: RequestFunction
+  baseRequest?: RequestFunction
+  storage?: SimpleStorage
+  anonymousSignInFunc?: (Credentials) => Promise<Credentials | void>
+  captchaOptions?: Partial<CaptchaOptions>
 }
 
 /**
@@ -100,6 +101,7 @@ export class Auth {
         clientId: opts.clientId,
         request: baseRequest,
         storage: opts.storage,
+        ...opts.captchaOptions,
       })
       request = captcha.request.bind(captcha)
     }
@@ -142,13 +144,10 @@ export class Auth {
     }
 
     const body = await this.getEncryptParams(res.params)
-    const credentials: Credentials = await this.config.request<Credentials>(
-      res.url,
-      {
-        method: 'POST',
-        body,
-      }
-    )
+    const credentials: Credentials = await this.config.request<Credentials>(res.url, {
+      method: 'POST',
+      body,
+    })
     await this.config.credentialsClient.setCredentials({
       ...credentials,
       version,
@@ -161,15 +160,12 @@ export class Auth {
    * @return {Promise<Credentials>} A Promise<Credentials> object.
    */
   public async signInAnonymously(data: {
-    provider_token?: string;
-  } = {}): Promise<Credentials> {
-    const credentials: Credentials = await this.config.request<Credentials>(
-      ApiUrls.AUTH_SIGN_IN_ANONYMOUSLY_URL,
-      {
-        method: 'POST',
-        body: data,
-      }
-    )
+    provider_token?: string
+  } = {},): Promise<Credentials> {
+    const credentials: Credentials = await this.config.request<Credentials>(ApiUrls.AUTH_SIGN_IN_ANONYMOUSLY_URL, {
+      method: 'POST',
+      body: data,
+    })
     await this.config.credentialsClient.setCredentials(credentials)
     return Promise.resolve(credentials)
   }
@@ -180,13 +176,10 @@ export class Auth {
    * @return {Promise<Credentials>} A Promise<Credentials> object.
    */
   public async signUp(params: SignUpRequest): Promise<Credentials> {
-    const data: Credentials = await this.config.request<Credentials>(
-      ApiUrls.AUTH_SIGN_UP_URL,
-      {
-        method: 'POST',
-        body: params,
-      }
-    )
+    const data: Credentials = await this.config.request<Credentials>(ApiUrls.AUTH_SIGN_UP_URL, {
+      method: 'POST',
+      body: params,
+    })
     await this.config.credentialsClient.setCredentials(data)
     return Promise.resolve(data)
   }
@@ -196,7 +189,7 @@ export class Auth {
    * @return {Object} A Promise<void> object.
    */
   public async signOut(): Promise<any> {
-    const accessToken: string =      await this.config.credentialsClient.getAccessToken()
+    const accessToken: string = await this.config.credentialsClient.getAccessToken()
     const data = await this.config.request(ApiUrls.AUTH_REVOKE_URL, {
       method: 'POST',
       body: {
@@ -223,15 +216,12 @@ export class Auth {
         withCredentials = true
       }
     }
-    return this.config.request<GetVerificationResponse>(
-      ApiUrls.VERIFICATION_URL,
-      {
-        method: 'POST',
-        body: params,
-        withCaptcha: true,
-        withCredentials,
-      }
-    )
+    return this.config.request<GetVerificationResponse>(ApiUrls.VERIFICATION_URL, {
+      method: 'POST',
+      body: params,
+      withCaptcha: true,
+      withCredentials,
+    })
   }
 
   /**
@@ -262,15 +252,12 @@ export class Auth {
    * @return {Promise<GenProviderRedirectUriResponse>} A Promise<GenProviderRedirectUriResponse> object.
    */
   public async genProviderRedirectUri(params: GenProviderRedirectUriRequest): Promise<GenProviderRedirectUriResponse> {
-    let url = `${ApiUrls.PROVIDER_URI_URL}?client_id=${
-      this.config.clientId
-    }&provider_id=${params.provider_id}&redirect_uri=${encodeURIComponent(params.provider_redirect_uri)}&state=${params.state}`
+    let url = `${ApiUrls.PROVIDER_URI_URL}?client_id=${this.config.clientId}&provider_id=${
+      params.provider_id
+    }&redirect_uri=${encodeURIComponent(params.provider_redirect_uri)}&state=${params.state}`
     const { other_params: otherParams } = params
     if (otherParams) {
-      if (
-        typeof otherParams.sign_out_uri === 'string'
-        && otherParams.sign_out_uri.length > 0
-      ) {
+      if (typeof otherParams.sign_out_uri === 'string' && otherParams.sign_out_uri.length > 0) {
         url += `&other_params[sign_out_uri]=${otherParams.sign_out_uri}`
       }
     }
@@ -285,13 +272,10 @@ export class Auth {
    * @return {Promise<GrantProviderTokenResponse>} A Promise<GrantProviderTokenResponse> object.
    */
   public async grantProviderToken(params: GrantProviderTokenRequest): Promise<GrantProviderTokenResponse> {
-    return this.config.request<GrantProviderTokenResponse>(
-      ApiUrls.PROVIDER_TOKEN_URL,
-      {
-        method: 'POST',
-        body: params,
-      }
-    )
+    return this.config.request<GrantProviderTokenResponse>(ApiUrls.PROVIDER_TOKEN_URL, {
+      method: 'POST',
+      body: params,
+    })
   }
 
   /**
@@ -300,13 +284,10 @@ export class Auth {
    * @return {Promise<PatchProviderTokenResponse>} A Promise<PatchProviderTokenResponse> object.
    */
   public async patchProviderToken(params: PatchProviderTokenRequest): Promise<PatchProviderTokenResponse> {
-    return this.config.request<PatchProviderTokenResponse>(
-      ApiUrls.PROVIDER_TOKEN_URL,
-      {
-        method: 'PATCH',
-        body: params,
-      }
-    )
+    return this.config.request<PatchProviderTokenResponse>(ApiUrls.PROVIDER_TOKEN_URL, {
+      method: 'PATCH',
+      body: params,
+    })
   }
 
   /**
@@ -315,17 +296,11 @@ export class Auth {
    * @return {Promise<Credentials>} A Promise<Credentials> object.
    */
   public async signInWithProvider(params: SignInWithProviderRequest): Promise<Credentials> {
-    const res = this.getParamsByVersion(
-      params,
-      'AUTH_SIGN_IN_WITH_PROVIDER_URL'
-    )
-    const credentials: Credentials = await this.config.request<Credentials>(
-      res.url,
-      {
-        method: 'POST',
-        body: res.params,
-      }
-    )
+    const res = this.getParamsByVersion(params, 'AUTH_SIGN_IN_WITH_PROVIDER_URL')
+    const credentials: Credentials = await this.config.request<Credentials>(res.url, {
+      method: 'POST',
+      body: res.params,
+    })
     await this.config.credentialsClient.setCredentials({
       ...credentials,
       version: params?.version || 'v1',
@@ -350,9 +325,7 @@ export class Auth {
    * Get the user profile.
    * @return {Promise<UserProfile>} A Promise<UserProfile> object.
    */
-  public async getUserProfile(params: {
-    version?: string;
-  }): Promise<UserProfile> {
+  public async getUserProfile(params: { version?: string }): Promise<UserProfile> {
     return this.getUserInfo(params)
   }
 
@@ -433,14 +406,11 @@ export class Auth {
    * @return {Promise<Credentials>} A Promise<Credentials> object.
    */
   public async transByProvider(params: TransByProviderRequest): Promise<Credentials> {
-    return this.config.request<Credentials>(
-      ApiUrls.USER_TRANS_BY_PROVIDER_URL,
-      {
-        method: 'PATCH',
-        body: params,
-        withCredentials: true,
-      }
-    )
+    return this.config.request<Credentials>(ApiUrls.USER_TRANS_BY_PROVIDER_URL, {
+      method: 'PATCH',
+      body: params,
+      withCredentials: true,
+    })
   }
 
   /**
@@ -473,13 +443,10 @@ export class Auth {
    * @return {Promise<any>}
    */
   public async unbindProvider(params: UnbindProviderRequest): Promise<void> {
-    return this.config.request<any>(
-      `${ApiUrls.PROVIDER_UNBIND_URL}/${params.provider_id}`,
-      {
-        method: 'DELETE',
-        withCredentials: true,
-      }
-    )
+    return this.config.request<any>(`${ApiUrls.PROVIDER_UNBIND_URL}/${params.provider_id}`, {
+      method: 'DELETE',
+      withCredentials: true,
+    })
   }
 
   /**
@@ -567,15 +534,12 @@ export class Auth {
    */
   public async getCurUserVerification(params: GetVerificationRequest): Promise<GetVerificationResponse> {
     params.target = 'CUR_USER'
-    return this.config.request<GetVerificationResponse>(
-      ApiUrls.VERIFICATION_URL,
-      {
-        method: 'POST',
-        body: params,
-        withCredentials: true,
-        withCaptcha: true,
-      }
-    )
+    return this.config.request<GetVerificationResponse>(ApiUrls.VERIFICATION_URL, {
+      method: 'POST',
+      body: params,
+      withCredentials: true,
+      withCaptcha: true,
+    })
   }
 
   /**
@@ -584,16 +548,13 @@ export class Auth {
    * @return {Promise<GetVerificationResponse>} A Promise<GetVerificationResponse> object.
    */
   public async changeBindedProvider(params: ChangeBindedProviderRequest): Promise<ChangeBindedProviderResponse> {
-    return this.config.request<ChangeBindedProviderResponse>(
-      `${ApiUrls.PROVIDER_LIST}/${params.provider_id}/trans`,
-      {
-        method: 'POST',
-        body: {
-          provider_trans_token: params.trans_token,
-        },
-        withCredentials: true,
-      }
-    )
+    return this.config.request<ChangeBindedProviderResponse>(`${ApiUrls.PROVIDER_LIST}/${params.provider_id}/trans`, {
+      method: 'POST',
+      body: {
+        provider_trans_token: params.trans_token,
+      },
+      withCredentials: true,
+    })
   }
 
   /**
@@ -618,13 +579,10 @@ export class Auth {
     // let url = new URL(ApiUrls.USER_QUERY_URL);
     const searchParams = new URLSearchParams(params as any)
     // url.search = searchParams.toString();
-    return this.config.request<QueryUserProfileResponse>(
-      `${ApiUrls.USER_QUERY_URL}?${searchParams.toString()}`,
-      {
-        method: 'GET',
-        withCredentials: true,
-      }
-    )
+    return this.config.request<QueryUserProfileResponse>(`${ApiUrls.USER_QUERY_URL}?${searchParams.toString()}`, {
+      method: 'GET',
+      withCredentials: true,
+    })
   }
 
   /**
@@ -639,9 +597,7 @@ export class Auth {
    * SignInWithCustomTicket custom signIn
    * @constructor
    */
-  public async signInWithCustomTicket(params?: {
-    version?: string;
-  }): Promise<Credentials> {
+  public async signInWithCustomTicket(params?: { version?: string }): Promise<Credentials> {
     const customTicket = await this.getCustomSignTicketFn()
     return this.signInWithProvider({
       ...params,
@@ -689,12 +645,9 @@ export class Auth {
   public async checkIfUserExist(params: CheckIfUserExistRequest): Promise<CheckIfUserExistResponse> {
     const searchParams = new URLSearchParams(params as any)
 
-    return this.config.request<CheckIfUserExistResponse>(
-      `${ApiUrls.CHECK_IF_USER_EXIST}?${searchParams.toString()}`,
-      {
-        method: 'GET',
-      }
-    )
+    return this.config.request<CheckIfUserExistResponse>(`${ApiUrls.CHECK_IF_USER_EXIST}?${searchParams.toString()}`, {
+      method: 'GET',
+    })
   }
 
   public async loginScope(): Promise<string> {
@@ -706,7 +659,7 @@ export class Auth {
   }
 
   public async refreshTokenForce(params: { version?: string }) {
-    const credentials: Credentials =      await this.config.credentialsClient.getCredentials()
+    const credentials: Credentials = await this.config.credentialsClient.getCredentials()
     return await this.config.credentialsClient.refreshToken({
       ...credentials,
       version: params?.version || 'v1',
@@ -773,4 +726,24 @@ export class Auth {
       },
     })
   }
+
+  /**
+   * get provider sub type
+   * @returns
+   */
+  public async varifyCaptchaData({ token, key }: { token: string; key: string }) {
+    return this.config.request<{ captcha_token: string; expires_in: number }>(ApiUrls.VARIFY_CAPTCHA_DATA_URL, {
+      method: 'POST',
+      body: { token, key },
+      withCredentials: false,
+    })
+  }
+
+  public async createCaptchaData({ state, redirect_uri = undefined }) {
+    return this.config.request<{ captcha_token: string; expires_in: number }>(ApiUrls.CAPTCHA_DATA_URL, {
+      method: 'POST',
+      body: { state, redirect_uri },
+      withCredentials: false,
+    })
+  }
 }

package/src/auth/consts.ts

@@ -15,6 +15,10 @@ export enum ApiUrls {
   USER_TRANS_BY_PROVIDER_URL = '/auth/v1/user/trans/by/provider',
   VERIFICATION_URL = '/auth/v1/verification',
   VERIFY_URL = '/auth/v1/verification/verify',
+  CAPTCHA_DATA_URL = '/auth/v1/captcha/data',
+  VARIFY_CAPTCHA_DATA_URL = '/auth/v1/captcha/data/verify',
+  GET_CAPTCHA_URL = '/auth/v1/captcha/init',
+
   PROVIDER_LIST = '/auth/v1/user/provider',
   PROVIDER_UNBIND_URL = '/auth/v1/user/provider',
   CHECK_PWD_URL = '/auth/v1/user/sudo',
@@ -25,7 +29,7 @@ export enum ApiUrls {
   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'
+  GET_PROVIDER_TYPE = '/auth/v1/mgr/provider/providerSubType',
 }
 
 export enum ApiUrlsV2 {
@@ -34,7 +38,7 @@ export enum ApiUrlsV2 {
   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_PUBLIC_KEY = '/auth/v2/signin/publichkey',
 }
 
 export enum VerificationUsages {

package/src/captcha/captcha.ts

@@ -1,25 +1,27 @@
+import { ApiUrls, ErrorType } from '../auth/consts'
 import { SimpleStorage, RequestFunction } from '../oauth2client/interface'
 import { AuthClientRequestOptions } from '../oauth2client/models'
 import { defaultStorage } from '../oauth2client/oauth2client'
+import { isInMpWebView, isMp } from '../utils/mp'
 
 export interface CaptchaOptions {
   clientId: string
-  request: RequestFunction;
-  storage: SimpleStorage;
+  request: RequestFunction
+  storage: SimpleStorage
   // 打开网页并通过URL回调获取 CaptchaToken，针对不通的平台，该函数可以自定义实现, 默认集成浏览器端认证
-  openURIWithCallback?: OpenURIWithCallbackFuction;
+  openURIWithCallback?: OpenURIWithCallbackFuction
 }
 
-type OpenURIWithCallbackFuction = (url: string) => Promise<CaptchaToken>;
+type OpenURIWithCallbackFuction = (url: string) => Promise<CaptchaToken>
 
 export interface CaptchaToken {
   captcha_token: string
   expires_in: number
-  expires_at?: Date | null;
+  expires_at?: Date | null
 }
 
 export interface CaptchaRequestOptions extends AuthClientRequestOptions {
-  withCaptcha?: boolean;
+  withCaptcha?: boolean
 }
 
 export interface GetCaptchaResponse {
@@ -28,8 +30,6 @@ export interface GetCaptchaResponse {
   url?: string
 }
 
-const GET_CAPTCHA_URL = '/auth/v1/captcha/init'
-
 export class Captcha {
   private config: CaptchaOptions
   private tokenSectionName: string
@@ -45,6 +45,7 @@ export class Captcha {
     if (!opts.storage) {
       opts.storage = defaultStorage
     }
+
     this.config = opts
     this.tokenSectionName = `captcha_${opts.clientId}`
   }
@@ -54,10 +55,7 @@ export class Captcha {
    * @param {string} url
    * @param {AuthClientRequestOptions} options
    */
-  public async request<T>(
-    url: string,
-    options?: CaptchaRequestOptions,
-  ): Promise<T> {
+  public async request<T>(url: string, options?: CaptchaRequestOptions): Promise<T> {
     if (!options) {
       options = {}
     }
@@ -74,8 +72,8 @@ export class Captcha {
     try {
       resp = await this.config.request<T>(reqURL, options)
     } catch (err) {
-      if (err.error === 'captcha_required' || err.error === 'captcha_invalid') {
-        url = await this.appendCaptchaTokenToURL(url, state, err.error === 'captcha_invalid')
+      if (err.error === ErrorType.CAPTCHA_REQUIRED || err.error === ErrorType.CAPTCHA_INVALID) {
+        url = await this.appendCaptchaTokenToURL(url, state, err.error === ErrorType.CAPTCHA_INVALID)
         return this.config.request<T>(url, options)
       }
       return Promise.reject(err)
@@ -84,16 +82,18 @@ export class Captcha {
   }
 
   private getDefaultOpenURIWithCallback(): OpenURIWithCallbackFuction {
-    if (window.location.search.indexOf('__captcha') > 0) {
-      document.body.style.display = 'none'
-    }
-    if (document.getElementById('captcha_panel_wrap') === null) {
-      const elementDiv = document.createElement('div')
-      elementDiv.style.cssText =        'background-color: rgba(0, 0, 0, 0.7);position: fixed;left: 0px;right: 0px;top: 0px;bottom: 0px;padding: 9vw 0 0 0;display: none;z-index:100;'
-      elementDiv.setAttribute('id', 'captcha_panel_wrap')
-      setTimeout(() => {
-        document.body.appendChild(elementDiv)
-      }, 0)
+    if (!isMp() && !isInMpWebView()) {
+      if (window.location.search.indexOf('__captcha') > 0) {
+        document.body.style.display = 'none'
+      }
+      if (document.getElementById('captcha_panel_wrap') === null) {
+        const elementDiv = document.createElement('div')
+        elementDiv.style.cssText =          'background-color: rgba(0, 0, 0, 0.7);position: fixed;left: 0px;right: 0px;top: 0px;bottom: 0px;padding: 9vw 0 0 0;display: none;z-index:100;'
+        elementDiv.setAttribute('id', 'captcha_panel_wrap')
+        setTimeout(() => {
+          document.body.appendChild(elementDiv)
+        }, 0)
+      }
     }
     return this.defaultOpenURIWithCallback
   }
@@ -101,13 +101,27 @@ export class Captcha {
   /**
    * 默认通过浏览器打开网页并获取回调
    */
-  private async defaultOpenURIWithCallback(url: string): Promise<CaptchaToken> {
+  private async defaultOpenURIWithCallback(
+    url: string,
+    opts?: { width?: string; height?: string },
+  ): Promise<CaptchaToken> {
+    const { width = '355px', height = '355px' } = opts || {}
+
+    const matched = url.match(/^(data:.*)$/)
+    if (matched) {
+      return Promise.reject({
+        error: ErrorType.UNIMPLEMENTED,
+        error_description: 'need to impl captcha data',
+      })
+    }
+
     const target = document.getElementById('captcha_panel_wrap')
     const iframe = document.createElement('iframe')
     target.innerHTML = ''
+
     iframe.setAttribute('src', url)
     iframe.setAttribute('id', 'review-panel-iframe')
-    iframe.style.cssText = 'min-width:355px;display:block;height:355px;margin:0 auto;background-color: rgb(255, 255, 255);border: none;'
+    iframe.style.cssText = `min-width:${width};display:block;height:${height};margin:0 auto;background-color: rgb(255, 255, 255);border: none;`
     target.appendChild(iframe)
     target.style.display = 'block'
     return new Promise<CaptchaToken>((resolve, reject) => {
@@ -115,12 +129,7 @@ export class Captcha {
         try {
           const windowLocation = window.location
           const iframeLocation = iframe.contentWindow.location
-          if (
-            iframeLocation.host
-            + iframeLocation.pathname
-            === windowLocation.host
-            + windowLocation.pathname
-          ) {
+          if (iframeLocation.host + iframeLocation.pathname === windowLocation.host + windowLocation.pathname) {
             target.style.display = 'none'
             const iframeUrlParams = new URLSearchParams(iframeLocation.search)
             const captchToken = iframeUrlParams.get('captcha_token')
@@ -153,23 +162,50 @@ export class Captcha {
         return captchaToken
       }
     }
-    const redirectURL = `${window.location.origin + window.location.pathname}?__captcha=on`
-    const captchaTokenResp = await this.config.request<GetCaptchaResponse>(GET_CAPTCHA_URL, {
-      method: 'POST',
-      body: {
-        client_id: this.config.clientId,
-        redirect_uri: redirectURL,
-        state,
-      },
-      withCredentials: false,
-    })
-    if (captchaTokenResp.captcha_token) {
-      const captchaToken = {
-        captcha_token: captchaTokenResp.captcha_token,
-        expires_in: captchaTokenResp.expires_in,
+    let captchaTokenResp: {
+      url?: string
+      captcha_token?: string
+      expires_in?: number
+    }
+    if (!isMp() && !isInMpWebView()) {
+      const redirect_uri = `${window.location.origin + window.location.pathname}?__captcha=on`
+      captchaTokenResp = await this.config.request<GetCaptchaResponse>(ApiUrls.GET_CAPTCHA_URL, {
+        method: 'POST',
+        body: {
+          client_id: this.config.clientId,
+          redirect_uri,
+          state,
+        },
+        withCredentials: false,
+      })
+      if (captchaTokenResp.captcha_token) {
+        const captchaToken = {
+          captcha_token: captchaTokenResp.captcha_token,
+          expires_in: captchaTokenResp.expires_in,
+        }
+        this.saveCaptchaToken(captchaToken)
+        return captchaTokenResp.captcha_token
+      }
+    } else {
+      /**
+       * https://iwiki.woa.com/p/4010699417
+       */
+      const captchaDataResp = await this.config.request<{
+        data: string
+        type: 'image'
+        token: string
+        expires_in: number
+      }>(ApiUrls.CAPTCHA_DATA_URL, {
+        method: 'POST',
+        body: {
+          state,
+          redirect_uri: '',
+        },
+        withCredentials: false,
+      })
+      captchaTokenResp = {
+        url: `${captchaDataResp.data}?state=${encodeURIComponent(state)}&token=${encodeURIComponent(captchaDataResp.token,)}`,
       }
-      this.saveCaptchaToken(captchaToken)
-      return captchaTokenResp.captcha_token
     }
     const captchaToken = await this.config.openURIWithCallback(captchaTokenResp.url)
     this.saveCaptchaToken(captchaToken)
@@ -187,13 +223,13 @@ export class Captcha {
   }
 
   private async saveCaptchaToken(token: CaptchaToken) {
-    token.expires_at = new Date(Date.now() + (token.expires_in - 10) * 1000,)
+    token.expires_at = new Date(Date.now() + (token.expires_in - 10) * 1000)
     const tokenStr: string = JSON.stringify(token)
     await this.config.storage.setItem(this.tokenSectionName, tokenStr)
   }
 
   private async findCaptchaToken(): Promise<string> {
-    const tokenStr: string = await this.config.storage.getItem(this.tokenSectionName,)
+    const tokenStr: string = await this.config.storage.getItem(this.tokenSectionName)
     if (tokenStr !== undefined && tokenStr !== null) {
       try {
         const captchaToken = JSON.parse(tokenStr)

package/src/oauth2client/consts.ts

@@ -1,3 +1,4 @@
+import { ErrorType as _ErrorType } from '../auth/consts'
 export enum Syntax {
   CLIENT_ID = 'client_id',
   CLIENT_SECRET = 'client_secret',
@@ -38,8 +39,8 @@ export enum ErrorType {
   UNAVAILABLE = 'unavailable',
   DATA_LOSS = 'data_loss',
   // CommonError
-  CAPTCHA_REQUIRED = 'captcha_required',
-  CAPTCHA_INVALID = 'captcha_invalid',
+  CAPTCHA_REQUIRED = _ErrorType.CAPTCHA_REQUIRED,
+  CAPTCHA_INVALID = _ErrorType.CAPTCHA_INVALID,
   INVALID_PASSWORD = 'invalid_password',
   INVALID_STATUS = 'invalid_status',
   USER_PENDING = 'user_pending',