@cloudbase/oauth 2.17.13 → 2.17.15

package/src/captcha/captcha.ts

@@ -4,6 +4,7 @@ import { AuthClientRequestOptions } from '../oauth2client/models'
 import { defaultStorage } from '../oauth2client/oauth2client'
 import { isInMpWebView, isMp } from '../utils/mp'
 import MyURLSearchParams from '../utils/urlSearchParams'
+import { SDKAdapterInterface } from '@cloudbase/adapter-interface'
 
 export interface CaptchaOptions {
   clientId: string
@@ -11,6 +12,7 @@ export interface CaptchaOptions {
   storage: SimpleStorage
   // 打开网页并通过URL回调获取 CaptchaToken，针对不通的平台，该函数可以自定义实现, 默认集成浏览器端认证
   openURIWithCallback?: OpenURIWithCallbackFuction
+  adapter?: SDKAdapterInterface & { isMatch?: () => boolean }
 }
 
 type OpenURIWithCallbackFuction = (url: string) => Promise<CaptchaToken>
@@ -51,6 +53,10 @@ export class Captcha {
     this.tokenSectionName = `captcha_${opts.clientId}`
   }
 
+  public isMatch() {
+    return this.config.adapter?.isMatch?.() || isMp()
+  }
+
   /**
    * request http like simple fetch api, exp:request('/v1/user/me', {withCredentials:true})
    * @param {string} url
@@ -83,7 +89,7 @@ export class Captcha {
   }
 
   private getDefaultOpenURIWithCallback(): OpenURIWithCallbackFuction {
-    if (!isMp() && !isInMpWebView()) {
+    if (!this.isMatch() && !isInMpWebView()) {
       if (window.location.search.indexOf('__captcha') > 0) {
         document.body.style.display = 'none'
       }
@@ -168,7 +174,7 @@ export class Captcha {
       captcha_token?: string
       expires_in?: number
     }
-    if (!isMp() && !isInMpWebView()) {
+    if (!this.isMatch() && !isInMpWebView()) {
       const redirect_uri = `${window.location.origin + window.location.pathname}?__captcha=on`
       captchaTokenResp = await this.config.request<GetCaptchaResponse>(ApiUrls.GET_CAPTCHA_URL, {
         method: 'POST',

package/src/index.ts

@@ -11,7 +11,7 @@ export class CloudbaseOAuth {
   public authApi: Auth
 
   constructor(authOptions: AuthOptions) {
-    const { apiOrigin, clientId, env, storage, request, baseRequest, anonymousSignInFunc, wxCloud } = authOptions
+    const { apiOrigin, clientId, env, storage, request, baseRequest, anonymousSignInFunc, wxCloud, adapter } = authOptions
     this.oauth2client = new OAuth2Client({
       apiOrigin,
       clientId,
@@ -27,6 +27,7 @@ export class CloudbaseOAuth {
       ...authOptions,
       // 兼容老逻辑，有值传入则不走Auth内的验证码请求逻辑
       request: request ? this.oauth2client.request.bind(this.oauth2client) : undefined,
+      adapter,
     })
   }
 }

package/src/utils/function/single-promise.ts

@@ -1,12 +1,14 @@
 /**
  * Single Promise
  */
+
+let jsSdkFnPromiseMap = new Map()
 export class SinglePromise {
   private clientId: string
 
   constructor(options) {
     this.clientId = options?.clientId || ''
-    globalThis.jsSdkFnPromiseMap =  (globalThis.jsSdkFnPromiseMap || new Map()) as Map<string, Promise<any>>
+    jsSdkFnPromiseMap = (jsSdkFnPromiseMap || new Map()) as Map<string, Promise<any>>
   }
 
   /**
@@ -17,7 +19,7 @@ export class SinglePromise {
    */
   async run<T>(key: string, fn: () => Promise<T>): Promise<T> {
     key = `${this.clientId}_${key}`
-    let result: Promise<any> = globalThis.jsSdkFnPromiseMap.get(key)
+    let result: Promise<any> = jsSdkFnPromiseMap.get(key)
 
     if (!(result as any)) {
       result = new Promise<any>((resolve, reject) => {
@@ -31,11 +33,11 @@ export class SinglePromise {
           } catch (error) {
             reject(error)
           } finally {
-            globalThis.jsSdkFnPromiseMap.delete(key)
+            jsSdkFnPromiseMap.delete(key)
           }
         })()
       })
-      globalThis.jsSdkFnPromiseMap.set(key, result)
+      jsSdkFnPromiseMap.set(key, result)
     }
     return result
   }

package/src/utils/mp.ts

@@ -1,4 +1,8 @@
 export function isMp() {
+  if (typeof globalThis === 'undefined') {
+    return false
+  }
+
   const { wx } = globalThis as any
   if (typeof wx === 'undefined') {
     return false

package/webpack/webpack.miniprogram.js

@@ -16,6 +16,7 @@ const params = {
   externals: {},
   definePlugin: {
     'process.env.NODE_ENV': JSON.stringify('production'), // 注入环境变量，用于业务代码判断
+    'process.env.IS_MP_BUILD': 'true',
     'globalThis.IS_MP_BUILD': true,
   },
 }