@cloudbase/oauth 2.23.3 → 2.24.0

package/dist/cjs/utils/base64.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.weappJwtDecode = exports.base64_url_decode = exports.weAtob = exports.weBtoa = void 0;
+exports.weappJwtDecodeAll = exports.weappJwtDecode = exports.base64_url_decode = exports.weAtob = exports.weBtoa = void 0;
 var b64 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
 var b64re = /^(?:[A-Za-z\d+/]{4})*?(?:[A-Za-z\d+/]{2}(?:==)?|[A-Za-z\d+/]{3}=?)?$/;
 function weBtoa(string) {
@@ -96,4 +96,17 @@ function weappJwtDecode(token, options) {
     }
 }
 exports.weappJwtDecode = weappJwtDecode;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"base64.js","sourceRoot":"","sources":["../../../src/utils/base64.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable */\n// weapp jwt-decode\nconst b64 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='\nconst b64re = /^(?:[A-Za-z\\d+/]{4})*?(?:[A-Za-z\\d+/]{2}(?:==)?|[A-Za-z\\d+/]{3}=?)?$/\n\n// btoa\nexport function weBtoa(string: string) {\n  string = String(string)\n  let bitmap\n  let a\n  let b\n  let c\n  let result = ''\n  let i = 0\n  const rest = string.length % 3\n\n  for (; i < string.length;) {\n    if ((a = string.charCodeAt(i++)) > 255 || (b = string.charCodeAt(i++)) > 255 || (c = string.charCodeAt(i++)) > 255) throw new TypeError('Failed to execute \\'btoa\\' on \\'Window\\': The string to be encoded contains characters outside of the Latin1 range.',)\n\n    bitmap = (a << 16) | (b << 8) | c\n    result\n      += b64.charAt((bitmap >> 18) & 63)\n      + b64.charAt((bitmap >> 12) & 63)\n      + b64.charAt((bitmap >> 6) & 63)\n      + b64.charAt(bitmap & 63)\n  }\n\n  return rest ? result.slice(0, rest - 3) + '==='.substring(rest) : result\n}\n// atob\nexport const weAtob = function (string: string) {\n  string = String(string).replace(/[\\t\\n\\f\\r ]+/g, '')\n  if (!b64re.test(string)) throw new TypeError('Failed to execute \\'atob\\' on \\'Window\\': The string to be decoded is not correctly encoded.')\n  string += '=='.slice(2 - (string.length & 3))\n  let bitmap\n  let result = ''\n  let r1\n  let r2\n  let i = 0\n  for (; i < string.length;) {\n    bitmap =      (b64.indexOf(string.charAt(i++)) << 18)\n      | (b64.indexOf(string.charAt(i++)) << 12)\n      | ((r1 = b64.indexOf(string.charAt(i++))) << 6)\n      | (r2 = b64.indexOf(string.charAt(i++)))\n\n    result\n      += r1 === 64\n        ? String.fromCharCode((bitmap >> 16) & 255)\n        : r2 === 64\n          ? String.fromCharCode((bitmap >> 16) & 255, (bitmap >> 8) & 255)\n          : String.fromCharCode((bitmap >> 16) & 255, (bitmap >> 8) & 255, bitmap & 255)\n  }\n  return result\n}\n\nfunction b64DecodeUnicode(str: string) {\n  return decodeURIComponent(weAtob(str).replace(/(.)/g, (p) => {\n    let code = p.charCodeAt(0).toString(16)\n      .toUpperCase()\n    if (code.length < 2) {\n      code = `0${code}`\n    }\n    return `%${code}`\n  }),)\n}\n\nexport function base64_url_decode(str: string) {\n  let output = str.replace(/-/g, '+').replace(/_/g, '/')\n  switch (output.length % 4) {\n    case 0:\n      break\n    case 2:\n      output += '=='\n      break\n    case 3:\n      output += '='\n      break\n    default:\n      throw new Error('Illegal base64url string!')\n  }\n\n  try {\n    return b64DecodeUnicode(output)\n  } catch (err) {\n    return weAtob(output)\n  }\n}\n\nexport function weappJwtDecode(token: string, options?: any) {\n  if (typeof token !== 'string') {\n    throw new Error('Invalid token specified')\n  }\n  options = options || {}\n  const pos = options.header === true ? 0 : 1\n  try {\n    return JSON.parse(base64_url_decode(token.split('.')[pos]))\n  } catch (e) {\n    throw new Error(`Invalid token specified: ${e}` ? (e as any).message : '')\n  }\n}\n"]}
+function weappJwtDecodeAll(token) {
+    if (typeof token !== 'string') {
+        throw new Error('Invalid token specified');
+    }
+    try {
+        var parts = token.split('.').map(function (segment, i) { return i === 2 ? segment : JSON.parse(base64_url_decode(segment)); });
+        return { claims: parts[1], header: parts[0], signature: parts[2] };
+    }
+    catch (e) {
+        throw new Error("Invalid token specified: ".concat(e) ? e.message : '');
+    }
+}
+exports.weappJwtDecodeAll = weappJwtDecodeAll;
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"base64.js","sourceRoot":"","sources":["../../../src/utils/base64.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable */\n// weapp jwt-decode\nconst b64 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='\nconst b64re = /^(?:[A-Za-z\\d+/]{4})*?(?:[A-Za-z\\d+/]{2}(?:==)?|[A-Za-z\\d+/]{3}=?)?$/\n\n// btoa\nexport function weBtoa(string: string) {\n  string = String(string)\n  let bitmap\n  let a\n  let b\n  let c\n  let result = ''\n  let i = 0\n  const rest = string.length % 3\n\n  for (; i < string.length;) {\n    if ((a = string.charCodeAt(i++)) > 255 || (b = string.charCodeAt(i++)) > 255 || (c = string.charCodeAt(i++)) > 255) throw new TypeError('Failed to execute \\'btoa\\' on \\'Window\\': The string to be encoded contains characters outside of the Latin1 range.',)\n\n    bitmap = (a << 16) | (b << 8) | c\n    result\n      += b64.charAt((bitmap >> 18) & 63)\n      + b64.charAt((bitmap >> 12) & 63)\n      + b64.charAt((bitmap >> 6) & 63)\n      + b64.charAt(bitmap & 63)\n  }\n\n  return rest ? result.slice(0, rest - 3) + '==='.substring(rest) : result\n}\n// atob\nexport const weAtob = function (string: string) {\n  string = String(string).replace(/[\\t\\n\\f\\r ]+/g, '')\n  if (!b64re.test(string)) throw new TypeError('Failed to execute \\'atob\\' on \\'Window\\': The string to be decoded is not correctly encoded.')\n  string += '=='.slice(2 - (string.length & 3))\n  let bitmap\n  let result = ''\n  let r1\n  let r2\n  let i = 0\n  for (; i < string.length;) {\n    bitmap =      (b64.indexOf(string.charAt(i++)) << 18)\n      | (b64.indexOf(string.charAt(i++)) << 12)\n      | ((r1 = b64.indexOf(string.charAt(i++))) << 6)\n      | (r2 = b64.indexOf(string.charAt(i++)))\n\n    result\n      += r1 === 64\n        ? String.fromCharCode((bitmap >> 16) & 255)\n        : r2 === 64\n          ? String.fromCharCode((bitmap >> 16) & 255, (bitmap >> 8) & 255)\n          : String.fromCharCode((bitmap >> 16) & 255, (bitmap >> 8) & 255, bitmap & 255)\n  }\n  return result\n}\n\nfunction b64DecodeUnicode(str: string) {\n  return decodeURIComponent(weAtob(str).replace(/(.)/g, (p) => {\n    let code = p.charCodeAt(0).toString(16)\n      .toUpperCase()\n    if (code.length < 2) {\n      code = `0${code}`\n    }\n    return `%${code}`\n  }),)\n}\n\nexport function base64_url_decode(str: string) {\n  let output = str.replace(/-/g, '+').replace(/_/g, '/')\n  switch (output.length % 4) {\n    case 0:\n      break\n    case 2:\n      output += '=='\n      break\n    case 3:\n      output += '='\n      break\n    default:\n      throw new Error('Illegal base64url string!')\n  }\n\n  try {\n    return b64DecodeUnicode(output)\n  } catch (err) {\n    return weAtob(output)\n  }\n}\n\nexport function weappJwtDecode(token: string, options?: any) {\n  if (typeof token !== 'string') {\n    throw new Error('Invalid token specified')\n  }\n  options = options || {}\n  const pos = options.header === true ? 0 : 1\n  try {\n    return JSON.parse(base64_url_decode(token.split('.')[pos]))\n  } catch (e) {\n    throw new Error(`Invalid token specified: ${e}` ? (e as any).message : '')\n  }\n}\n\nexport function weappJwtDecodeAll(token: string) {\n  if (typeof token !== 'string') {\n    throw new Error('Invalid token specified')\n  }\n  try {\n    const parts = token.split('.').map((segment, i) => i === 2 ? segment : JSON.parse(base64_url_decode(segment)))\n    return { claims: parts[1], header: parts[0], signature: parts[2]}\n  } catch (e) {\n    throw new Error(`Invalid token specified: ${e}` ? (e as any).message : '')\n  }\n}\n"]}

package/dist/esm/auth/apis.js

@@ -1,9 +1,10 @@
 'use strict';
-import { ApiUrls, ApiUrlsV2, ErrorType } from './consts';
+import { ApiUrls, ApiUrlsV2, AUTH_STATE_CHANGED_TYPE, ErrorType, EVENTS, OAUTH_TYPE } from './consts';
 import { OAuth2Client, defaultStorage } from '../oauth2client/oauth2client';
 import { Captcha } from '../captcha/captcha';
 import { deepClone } from '../utils';
 import MyURLSearchParams from '../utils/urlSearchParams';
+import { AuthError } from '..';
 function getEncryptUtils(isEncrypt, adapter) {
     const getUtils = () => {
         try {
@@ -54,16 +55,19 @@ export class Auth {
                 onCredentialsError: opts.onCredentialsError,
                 headers: opts.headers || {},
                 i18n: opts.i18n,
+                debug: opts.debug,
             };
             oAuth2Client = new OAuth2Client(initOptions);
         }
         if (!request) {
             const baseRequest = oAuth2Client.request.bind(oAuth2Client);
             const captcha = new Captcha({
+                env: opts.env,
                 clientId: opts.clientId,
                 request: baseRequest,
                 storage: opts.storage,
                 adapter: opts.adapter,
+                oauthInstance: this,
                 ...opts.captchaOptions,
             });
             request = captcha.request.bind(captcha);
@@ -240,6 +244,99 @@ export class Auth {
         });
         return Promise.resolve(credentials);
     }
+    async toBindIdentity(params) {
+        const credentials = params.credentials || (await this.config.credentialsClient.localCredentials.getCredentials());
+        let res;
+        try {
+            await this.bindWithProvider({
+                provider_token: params.provider_token,
+            }, credentials);
+            res = { data: { type: OAUTH_TYPE.BIND_IDENTITY, provider: params.provider }, error: null };
+        }
+        catch (error) {
+            res = { data: { type: OAUTH_TYPE.BIND_IDENTITY }, error: new AuthError(error) };
+        }
+        if (params.fireEvent) {
+            this.config.eventBus?.fire?.(EVENTS.AUTH_STATE_CHANGED, {
+                event: AUTH_STATE_CHANGED_TYPE.BIND_IDENTITY,
+                info: res,
+            });
+        }
+        return res;
+    }
+    async getInitialSession() {
+        let data = {};
+        try {
+            if (typeof window === 'undefined' || typeof document === 'undefined') {
+                return { data: null, error: null };
+            }
+            const localSearch = new URLSearchParams(location?.search);
+            const code = localSearch.get('code');
+            const state = localSearch.get('state');
+            if (!code || !state) {
+                return { data: null, error: null };
+            }
+            let cacheData = null;
+            try {
+                cacheData = JSON.parse(sessionStorage.getItem(state) || 'null');
+            }
+            catch {
+            }
+            data = { type: cacheData?.type };
+            const errorParam = localSearch.get('error');
+            const errorDescription = localSearch.get('error_description');
+            if (errorParam || errorDescription) {
+                return {
+                    data,
+                    error: new AuthError({ message: errorDescription || errorParam || 'Unknown error from OAuth provider' }),
+                };
+            }
+            const provider = cacheData?.provider || localSearch.get('provider');
+            if (!provider) {
+                return { data, error: new AuthError({ message: 'Provider is required for OAuth verification' }) };
+            }
+            const redirectUri = location.origin + location.pathname;
+            const { provider_token: providerToken } = await this.grantProviderToken({
+                provider_id: provider,
+                provider_redirect_uri: redirectUri,
+                provider_code: code,
+            });
+            let credentials;
+            let user = null;
+            let res;
+            if (cacheData.type === OAUTH_TYPE.BIND_IDENTITY) {
+                credentials = await this.config.credentialsClient.localCredentials.getCredentials();
+                res = await this.toBindIdentity({ provider, provider_token: providerToken, credentials });
+            }
+            else if (cacheData.type === OAUTH_TYPE.SIGN_IN) {
+                res = this.getParamsByVersion({ provider }, 'AUTH_SIGN_IN_WITH_PROVIDER_URL');
+                credentials = await this.config.request(res.url, {
+                    method: 'POST',
+                    body: { provider_token: providerToken },
+                });
+                try {
+                    user = await this.getUserInfo({ credentials });
+                }
+                catch (e) {
+                    console.error('get user info error', e);
+                }
+                res = { data: { ...data, session: credentials, user }, error: null };
+            }
+            localSearch.delete('code');
+            localSearch.delete('state');
+            localSearch.delete('provider');
+            this.restoreUrlState(cacheData?.search === undefined ? `?${localSearch.toString()}` : cacheData.search, cacheData?.hash || location.hash);
+            try {
+                sessionStorage.removeItem(state);
+            }
+            catch {
+            }
+            return res;
+        }
+        catch (error) {
+            return { data, error: new AuthError(error) };
+        }
+    }
     async signInCustom(params) {
         const credentials = await this.config.request(ApiUrls.AUTH_SIGN_IN_CUSTOM, {
             method: 'POST',
@@ -256,11 +353,12 @@ export class Auth {
         await this.config.credentialsClient.setCredentials(credentials);
         return Promise.resolve(credentials);
     }
-    async bindWithProvider(params) {
+    async bindWithProvider(params, credentials) {
         return this.config.request(ApiUrls.PROVIDER_BIND_URL, {
             method: 'POST',
             body: params,
             withCredentials: true,
+            getCredentials: credentials ? () => credentials : undefined,
         });
     }
     async getUserProfile(params) {
@@ -275,6 +373,7 @@ export class Auth {
         const userInfo = await this.config.request(res.url, {
             method: 'GET',
             withCredentials: true,
+            getCredentials: params.credentials ? () => params.credentials : undefined,
         });
         if (userInfo.sub) {
             userInfo.uid = userInfo.sub;
@@ -635,4 +734,16 @@ export class Auth {
             },
         });
     }
+    restoreUrlState(search, hash) {
+        if (search === undefined)
+            return;
+        try {
+            const url = new URL(window.location.href);
+            url.search = search;
+            url.hash = hash || '';
+            window.history.replaceState(null, '', url.toString());
+        }
+        catch {
+        }
+    }
 }

package/dist/esm/auth/auth-error.js

@@ -0,0 +1,9 @@
+export class AuthError extends Error {
+    constructor(error) {
+        super(error.error_description || error.message);
+        this.__isAuthError = true;
+        this.name = 'AuthError';
+        this.status = error.error;
+        this.code = error.error_code;
+    }
+}

package/dist/esm/auth/consts.js

@@ -112,3 +112,25 @@ export var ErrorType;
     ErrorType["CAPTCHA_REQUIRED"] = "captcha_required";
     ErrorType["CAPTCHA_INVALID"] = "captcha_invalid";
 })(ErrorType || (ErrorType = {}));
+export const LOGIN_STATE_CHANGED_TYPE = {
+    SIGN_OUT: 'sign_out',
+    SIGN_IN: 'sign_in',
+    CREDENTIALS_ERROR: 'credentials_error',
+};
+export const AUTH_STATE_CHANGED_TYPE = {
+    SIGNED_OUT: 'SIGNED_OUT',
+    SIGNED_IN: 'SIGNED_IN',
+    INITIAL_SESSION: 'INITIAL_SESSION',
+    PASSWORD_RECOVERY: 'PASSWORD_RECOVERY',
+    TOKEN_REFRESHED: 'TOKEN_REFRESHED',
+    USER_UPDATED: 'USER_UPDATED',
+    BIND_IDENTITY: 'BIND_IDENTITY',
+};
+export const EVENTS = {
+    LOGIN_STATE_CHANGED: 'loginStateChanged',
+    AUTH_STATE_CHANGED: 'authStateChanged',
+};
+export const OAUTH_TYPE = {
+    SIGN_IN: 'sign_in',
+    BIND_IDENTITY: 'bind_identity',
+};

package/dist/esm/captcha/captcha-dom.js

@@ -0,0 +1,129 @@
+import { CloudbaseEventEmitter } from '@cloudbase/utilities/dist/cjs/libs/events';
+import { parseCaptcha } from '@cloudbase/utilities/dist/cjs/libs/util';
+const debounce = (func, delay) => {
+    let timeoutId;
+    return (...args) => {
+        clearTimeout(timeoutId);
+        timeoutId = setTimeout(() => func.apply(null, args), delay);
+    };
+};
+const eventBus = new CloudbaseEventEmitter();
+const CAPTCHA_EVENT = {
+    CAPTCHA_DATA_CHANGE: 'captchaDataChange',
+    RESOLVE_CAPTCHA_DATA: 'resolveCaptchaData',
+};
+const CAPTCHA_STYLES = {
+    overlay: 'position:fixed;top:0;left:0;width:100%;height:100%;background:rgba(0,0,0,0.5);z-index:999',
+    modal: 'position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);width:320px;padding:20px;background:#fff;border-radius:8px;box-shadow:0 0 10px rgba(0,0,0,0.2);z-index:1000',
+    prompt: 'margin-bottom:15px',
+    captchaWrap: 'display:flex;align-items:center;justify-content:space-between;margin-bottom:15px',
+    captchaImg: 'width:100%;height:auto;border:1px solid #eee',
+    refreshBtn: 'padding:10px 8px;background:#007bff;color:#fff;border:none;border-radius:4px;cursor:pointer;flex:1;white-space:nowrap;margin-left:10px',
+    input: 'width:100%;padding:14px 16px;margin-bottom:15px;box-sizing:border-box;border:2px solid #e8ecf4;border-radius:10px;font-size:15px',
+    confirmBtn: 'width:100%;padding:10px;background:#007bff;color:#fff;border:none;border-radius:4px;cursor:pointer',
+    loading: 'background:#6c757d;cursor:not-allowed',
+};
+const genCaptchaDom = ({ oauthInstance, captchaState }) => {
+    const CAPTCHA_IMG_ID = 'captcha-image';
+    const refreshCaptcha = async () => {
+        try {
+            const result = await oauthInstance.createCaptchaData({ state: captchaState.state });
+            captchaState = { ...captchaState, captchaData: result.data, token: result.token };
+            document.getElementById(CAPTCHA_IMG_ID).src = result.data;
+        }
+        catch (error) {
+            console.error('刷新图形验证码失败', error);
+        }
+    };
+    const createElement = (tag, styles, text) => {
+        const el = document.createElement(tag);
+        if (styles)
+            el.style.cssText = styles;
+        if (text)
+            el.textContent = text;
+        return el;
+    };
+    const overlay = createElement('div', CAPTCHA_STYLES.overlay);
+    const modal = createElement('div', CAPTCHA_STYLES.modal);
+    modal.appendChild(createElement('p', CAPTCHA_STYLES.prompt, '请输入你看到的字符：'));
+    const captchaWrap = createElement('div', CAPTCHA_STYLES.captchaWrap);
+    const captchaImg = createElement('img', CAPTCHA_STYLES.captchaImg);
+    captchaImg.id = CAPTCHA_IMG_ID;
+    captchaImg.src = captchaState.captchaData;
+    captchaWrap.appendChild(captchaImg);
+    const refreshBtn = createElement('button', CAPTCHA_STYLES.refreshBtn, '刷新');
+    refreshBtn.onclick = debounce(async () => {
+        refreshBtn.textContent = '加载中...';
+        refreshBtn.disabled = true;
+        refreshBtn.style.cssText = `${CAPTCHA_STYLES.refreshBtn};${CAPTCHA_STYLES.loading}`;
+        try {
+            await refreshCaptcha();
+        }
+        finally {
+            refreshBtn.textContent = '刷新';
+            refreshBtn.disabled = false;
+            refreshBtn.style.cssText = CAPTCHA_STYLES.refreshBtn;
+        }
+    }, 500);
+    captchaWrap.appendChild(refreshBtn);
+    modal.appendChild(captchaWrap);
+    const input = createElement('input', CAPTCHA_STYLES.input);
+    input.type = 'text';
+    input.placeholder = '输入字符';
+    input.maxLength = 4;
+    modal.appendChild(input);
+    const errorMsg = createElement('div', 'color:#dc3545;font-size:12px;margin-bottom:10px;display:none;padding:8px;background:#f8d7da;border:1px solid #f5c6cb;border-radius:4px');
+    modal.appendChild(errorMsg);
+    const showError = (message) => {
+        errorMsg.textContent = message;
+        errorMsg.style.display = 'block';
+    };
+    const confirmBtn = createElement('button', CAPTCHA_STYLES.confirmBtn, '确定');
+    confirmBtn.onclick = debounce(async () => {
+        const inputValue = input.value.trim();
+        if (!inputValue) {
+            showError('请输入字符');
+            return;
+        }
+        errorMsg.style.display = 'none';
+        confirmBtn.textContent = '验证中...';
+        confirmBtn.disabled = true;
+        confirmBtn.style.cssText = `${CAPTCHA_STYLES.confirmBtn};${CAPTCHA_STYLES.loading}`;
+        try {
+            const verifyResult = await oauthInstance.verifyCaptchaData({
+                token: captchaState.token,
+                key: inputValue,
+            });
+            eventBus.fire(CAPTCHA_EVENT.RESOLVE_CAPTCHA_DATA, verifyResult);
+            console.log('图形验证码校验成功');
+            document.body.removeChild(overlay);
+            document.body.removeChild(modal);
+        }
+        catch (error) {
+            console.error('图形验证码校验失败', error);
+            const errorMessage = error.error_description || '图形验证码校验失败';
+            showError(errorMessage);
+            input.value = '';
+            input.focus();
+            await refreshCaptcha();
+        }
+        finally {
+            confirmBtn.textContent = '确定';
+            confirmBtn.disabled = false;
+            confirmBtn.style.cssText = CAPTCHA_STYLES.confirmBtn;
+        }
+    }, 500);
+    modal.appendChild(confirmBtn);
+    document.body.appendChild(overlay);
+    document.body.appendChild(modal);
+};
+export const openURIWithCallback = async (url, oauthInstance) => {
+    const { captchaData, state, token } = parseCaptcha(url);
+    genCaptchaDom({ oauthInstance, captchaState: { captchaData, state, token } });
+    return new Promise((resolve) => {
+        console.log('等待图形验证码校验结果...');
+        eventBus.on(CAPTCHA_EVENT.RESOLVE_CAPTCHA_DATA, (res) => {
+            resolve(res?.data);
+        });
+    });
+};

package/dist/esm/captcha/captcha.js

@@ -1,7 +1,7 @@
 import { ApiUrls, ErrorType } from '../auth/consts';
 import { defaultStorage } from '../oauth2client/oauth2client';
-import { isInMpWebView, isMp } from '../utils/mp';
-import MyURLSearchParams from '../utils/urlSearchParams';
+import { isMp } from '../utils/mp';
+import { openURIWithCallback } from './captcha-dom';
 export class Captcha {
     constructor(opts) {
         if (!opts.openURIWithCallback) {
@@ -11,7 +11,7 @@ export class Captcha {
             opts.storage = defaultStorage;
         }
         this.config = opts;
-        this.tokenSectionName = `captcha_${opts.clientId}`;
+        this.tokenSectionName = `captcha_${opts.clientId || opts.env}`;
     }
     isMatch() {
         return this.config?.adapter?.isMatch?.() || isMp();
@@ -42,65 +42,7 @@ export class Captcha {
         return resp;
     }
     getDefaultOpenURIWithCallback() {
-        if (!this.isMatch() && !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;
-    }
-    async defaultOpenURIWithCallback(url, opts) {
-        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:${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((resolve, reject) => {
-            iframe.onload = function () {
-                try {
-                    const windowLocation = window.location;
-                    const iframeLocation = iframe.contentWindow.location;
-                    if (iframeLocation.host + iframeLocation.pathname === windowLocation.host + windowLocation.pathname) {
-                        target.style.display = 'none';
-                        const iframeUrlParams = new MyURLSearchParams(iframeLocation.search);
-                        const captchToken = iframeUrlParams.get('captcha_token');
-                        if (captchToken) {
-                            return resolve({
-                                captcha_token: captchToken,
-                                expires_in: Number(iframeUrlParams.get('expires_in')),
-                            });
-                        }
-                        return reject({
-                            error: iframeUrlParams.get('error'),
-                            error_description: iframeUrlParams.get('error_description'),
-                        });
-                    }
-                    target.style.display = 'block';
-                }
-                catch (error) {
-                    target.style.display = 'block';
-                }
-            };
-        });
+        return (url) => openURIWithCallback(url, this.config.oauthInstance);
     }
     async getCaptchaToken(forceNewToken, state) {
         if (!forceNewToken) {
@@ -109,41 +51,16 @@ export class Captcha {
                 return captchaToken;
             }
         }
-        let captchaTokenResp;
-        if (!this.isMatch() && !isInMpWebView()) {
-            const redirect_uri = `${window.location.origin + window.location.pathname}?__captcha=on`;
-            captchaTokenResp = await this.config.request(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 {
-            const captchaDataResp = await this.config.request(ApiUrls.CAPTCHA_DATA_URL, {
-                method: 'POST',
-                body: {
-                    state,
-                    redirect_uri: '',
-                },
-                withCredentials: false,
-            });
-            captchaTokenResp = {
-                url: `${captchaDataResp.data}?state=${encodeURIComponent(state)}&token=${encodeURIComponent(captchaDataResp.token)}`,
-            };
-        }
-        const captchaToken = await this.config.openURIWithCallback(captchaTokenResp.url);
+        const captchaDataResp = await this.config.request(ApiUrls.CAPTCHA_DATA_URL, {
+            method: 'POST',
+            body: {
+                state,
+                redirect_uri: '',
+            },
+            withCredentials: false,
+        });
+        const captchaTokenUrl = `${captchaDataResp.data}?state=${encodeURIComponent(state)}&token=${encodeURIComponent(captchaDataResp.token)}`;
+        const captchaToken = await this.config.openURIWithCallback(captchaTokenUrl);
         this.saveCaptchaToken(captchaToken);
         return captchaToken.captcha_token;
     }

package/dist/esm/index.js

@@ -2,12 +2,16 @@ import { OAuth2Client } from './oauth2client/oauth2client';
 import { Auth } from './auth/apis';
 import { AUTH_API_PREFIX } from './auth/consts';
 export { Auth } from './auth/apis';
-export { AUTH_API_PREFIX } from './auth/consts';
+export { AUTH_API_PREFIX, OAUTH_TYPE } from './auth/consts';
+export { AuthError } from './auth/auth-error';
 import * as authModels_1 from './auth/models';
 export { authModels_1 as authModels };
+export { weappJwtDecodeAll } from './utils/base64';
+export { LOGIN_STATE_CHANGED_TYPE, EVENTS, AUTH_STATE_CHANGED_TYPE } from './auth/consts';
 export class CloudbaseOAuth {
     constructor(authOptions) {
-        const { apiOrigin, apiPath = AUTH_API_PREFIX, clientId, env, storage, request, baseRequest, anonymousSignInFunc, wxCloud, adapter, onCredentialsError, headers, i18n, useWxCloud } = authOptions;
+        const { apiOrigin, apiPath = AUTH_API_PREFIX, clientId, env, storage, request, baseRequest, anonymousSignInFunc, wxCloud, adapter, onCredentialsError, headers, i18n, useWxCloud, eventBus, detectSessionInUrl, debug, } = authOptions;
+        this.detectSessionInUrl = detectSessionInUrl ?? false;
         this.oauth2client = new OAuth2Client({
             apiOrigin,
             apiPath,
@@ -21,6 +25,8 @@ export class CloudbaseOAuth {
             headers: headers || {},
             i18n,
             useWxCloud,
+            eventBus,
+            debug,
         });
         this.authApi = new Auth({
             credentialsClient: this.oauth2client,
@@ -28,5 +34,15 @@ export class CloudbaseOAuth {
             request: request ? this.oauth2client.request.bind(this.oauth2client) : undefined,
             adapter,
         });
+        if (detectSessionInUrl) {
+            this.oauth2client.setGetInitialSession(this.authApi.getInitialSession.bind(this.authApi));
+        }
+    }
+    initializeSession(onUserObtained) {
+        if (!this.detectSessionInUrl) {
+            return;
+        }
+        this.oauth2client.setOnInitialSessionObtained(onUserObtained);
+        this.oauth2client.initialize();
     }
 }