@cloudbase/oauth 2.6.3-beta.0 → 2.6.5-beta.0

package/dist/esm/captcha/captcha.js

@@ -1,44 +1,8 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 import { ApiUrls, ErrorType } from '../auth/consts';
 import { defaultStorage } from '../oauth2client/oauth2client';
 import { isInMpWebView, isMp } from '../utils/mp';
-var Captcha = (function () {
-    function Captcha(opts) {
+export class Captcha {
+    constructor(opts) {
         if (!opts.openURIWithCallback) {
             opts.openURIWithCallback = this.getDefaultOpenURIWithCallback();
         }
@@ -46,240 +10,173 @@ var Captcha = (function () {
             opts.storage = defaultStorage;
         }
         this.config = opts;
-        this.tokenSectionName = "captcha_".concat(opts.clientId);
+        this.tokenSectionName = `captcha_${opts.clientId}`;
     }
-    Captcha.prototype.request = function (url, options) {
-        return __awaiter(this, void 0, void 0, function () {
-            var state, reqURL, resp, err_1;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!options) {
-                            options = {};
-                        }
-                        if (!options.method) {
-                            options.method = 'GET';
-                        }
-                        state = "".concat(options.method, ":").concat(url);
-                        reqURL = url;
-                        if (!options.withCaptcha) return [3, 2];
-                        return [4, this.appendCaptchaTokenToURL(url, state, false)];
-                    case 1:
-                        reqURL = _a.sent();
-                        _a.label = 2;
-                    case 2:
-                        _a.trys.push([2, 4, , 7]);
-                        return [4, this.config.request(reqURL, options)];
-                    case 3:
-                        resp = _a.sent();
-                        return [3, 7];
-                    case 4:
-                        err_1 = _a.sent();
-                        if (!(err_1.error === ErrorType.CAPTCHA_REQUIRED || err_1.error === ErrorType.CAPTCHA_INVALID)) return [3, 6];
-                        return [4, this.appendCaptchaTokenToURL(url, state, err_1.error === ErrorType.CAPTCHA_INVALID)];
-                    case 5:
-                        url = _a.sent();
-                        return [2, this.config.request(url, options)];
-                    case 6: return [2, Promise.reject(err_1)];
-                    case 7: return [2, resp];
-                }
-            });
-        });
-    };
-    Captcha.prototype.getDefaultOpenURIWithCallback = function () {
+    async request(url, options) {
+        if (!options) {
+            options = {};
+        }
+        if (!options.method) {
+            options.method = 'GET';
+        }
+        const state = `${options.method}:${url}`;
+        let reqURL = url;
+        if (options.withCaptcha) {
+            reqURL = await this.appendCaptchaTokenToURL(url, state, false);
+        }
+        let resp;
+        try {
+            resp = await this.config.request(reqURL, options);
+        }
+        catch (err) {
+            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(url, options);
+            }
+            return Promise.reject(err);
+        }
+        return resp;
+    }
+    getDefaultOpenURIWithCallback() {
         if (!isMp() && !isInMpWebView()) {
             if (window.location.search.indexOf('__captcha') > 0) {
                 document.body.style.display = 'none';
             }
             if (document.getElementById('captcha_panel_wrap') === null) {
-                var elementDiv_1 = document.createElement('div');
-                elementDiv_1.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_1.setAttribute('id', 'captcha_panel_wrap');
-                setTimeout(function () {
-                    document.body.appendChild(elementDiv_1);
+                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;
-    };
-    Captcha.prototype.defaultOpenURIWithCallback = function (url, opts) {
-        return __awaiter(this, void 0, void 0, function () {
-            var _a, _b, width, _c, height, matched, target, iframe;
-            return __generator(this, function (_d) {
-                _a = opts || {}, _b = _a.width, width = _b === void 0 ? '355px' : _b, _c = _a.height, height = _c === void 0 ? '355px' : _c;
-                matched = url.match(/^(data:.*)$/);
-                if (matched) {
-                    return [2, Promise.reject({
-                            error: ErrorType.UNIMPLEMENTED,
-                            error_description: 'need to impl captcha data',
-                        })];
-                }
-                target = document.getElementById('captcha_panel_wrap');
-                iframe = document.createElement('iframe');
-                target.innerHTML = '';
-                iframe.setAttribute('src', url);
-                iframe.setAttribute('id', 'review-panel-iframe');
-                iframe.style.cssText = "min-width:".concat(width, ";display:block;height:").concat(height, ";margin:0 auto;background-color: rgb(255, 255, 255);border: none;");
-                target.appendChild(iframe);
-                target.style.display = 'block';
-                return [2, new Promise(function (resolve, reject) {
-                        iframe.onload = function () {
-                            try {
-                                var windowLocation = window.location;
-                                var iframeLocation = iframe.contentWindow.location;
-                                if (iframeLocation.host + iframeLocation.pathname === windowLocation.host + windowLocation.pathname) {
-                                    target.style.display = 'none';
-                                    var iframeUrlParams = new URLSearchParams(iframeLocation.search);
-                                    var 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';
-                            }
-                        };
-                    })];
+    }
+    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',
             });
-        });
-    };
-    Captcha.prototype.getCaptchaToken = function (forceNewToken, state) {
-        return __awaiter(this, void 0, void 0, function () {
-            var captchaToken_1, captchaTokenResp, redirect_uri, captchaToken_2, captchaDataResp, captchaToken;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!!forceNewToken) return [3, 2];
-                        return [4, this.findCaptchaToken()];
-                    case 1:
-                        captchaToken_1 = _a.sent();
-                        if (captchaToken_1) {
-                            return [2, captchaToken_1];
-                        }
-                        _a.label = 2;
-                    case 2:
-                        if (!(!isMp() && !isInMpWebView())) return [3, 4];
-                        redirect_uri = "".concat(window.location.origin + window.location.pathname, "?__captcha=on");
-                        return [4, this.config.request(ApiUrls.GET_CAPTCHA_URL, {
-                                method: 'POST',
-                                body: {
-                                    client_id: this.config.clientId,
-                                    redirect_uri: redirect_uri,
-                                    state: state,
-                                },
-                                withCredentials: false,
-                            })];
-                    case 3:
-                        captchaTokenResp = _a.sent();
-                        if (captchaTokenResp.captcha_token) {
-                            captchaToken_2 = {
-                                captcha_token: captchaTokenResp.captcha_token,
-                                expires_in: captchaTokenResp.expires_in,
-                            };
-                            this.saveCaptchaToken(captchaToken_2);
-                            return [2, captchaTokenResp.captcha_token];
+        }
+        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 URLSearchParams(iframeLocation.search);
+                        const captchToken = iframeUrlParams.get('captcha_token');
+                        if (captchToken) {
+                            return resolve({
+                                captcha_token: captchToken,
+                                expires_in: Number(iframeUrlParams.get('expires_in')),
+                            });
                         }
-                        return [3, 6];
-                    case 4: return [4, this.config.request(ApiUrls.CAPTCHA_DATA_URL, {
-                            method: 'POST',
-                            body: {
-                                state: state,
-                                redirect_uri: '',
-                            },
-                            withCredentials: false,
-                        })];
-                    case 5:
-                        captchaDataResp = _a.sent();
-                        captchaTokenResp = {
-                            url: "".concat(captchaDataResp.data, "?state=").concat(encodeURIComponent(state), "&token=").concat(encodeURIComponent(captchaDataResp.token)),
-                        };
-                        _a.label = 6;
-                    case 6: return [4, this.config.openURIWithCallback(captchaTokenResp.url)];
-                    case 7:
-                        captchaToken = _a.sent();
-                        this.saveCaptchaToken(captchaToken);
-                        return [2, captchaToken.captcha_token];
+                        return reject({
+                            error: iframeUrlParams.get('error'),
+                            error_description: iframeUrlParams.get('error_description'),
+                        });
+                    }
+                    target.style.display = 'block';
                 }
-            });
-        });
-    };
-    Captcha.prototype.appendCaptchaTokenToURL = function (url, state, forceNewToken) {
-        return __awaiter(this, void 0, void 0, function () {
-            var captchaToken;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4, this.getCaptchaToken(forceNewToken, state)];
-                    case 1:
-                        captchaToken = _a.sent();
-                        if (url.indexOf('?') > 0) {
-                            url += "&captcha_token=".concat(captchaToken);
-                        }
-                        else {
-                            url += "?captcha_token=".concat(captchaToken);
-                        }
-                        return [2, url];
+                catch (error) {
+                    target.style.display = 'block';
                 }
-            });
+            };
         });
-    };
-    Captcha.prototype.saveCaptchaToken = function (token) {
-        return __awaiter(this, void 0, void 0, function () {
-            var tokenStr;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        token.expires_at = new Date(Date.now() + (token.expires_in - 10) * 1000);
-                        tokenStr = JSON.stringify(token);
-                        return [4, this.config.storage.setItem(this.tokenSectionName, tokenStr)];
-                    case 1:
-                        _a.sent();
-                        return [2];
-                }
+    }
+    async getCaptchaToken(forceNewToken, state) {
+        if (!forceNewToken) {
+            const captchaToken = await this.findCaptchaToken();
+            if (captchaToken) {
+                return captchaToken;
+            }
+        }
+        let captchaTokenResp;
+        if (!isMp() && !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,
             });
-        });
-    };
-    Captcha.prototype.findCaptchaToken = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var tokenStr, captchaToken, isExpired, error_1;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4, this.config.storage.getItem(this.tokenSectionName)];
-                    case 1:
-                        tokenStr = _a.sent();
-                        if (!(tokenStr !== undefined && tokenStr !== null)) return [3, 5];
-                        _a.label = 2;
-                    case 2:
-                        _a.trys.push([2, 3, , 5]);
-                        captchaToken = JSON.parse(tokenStr);
-                        if (captchaToken === null || captchaToken === void 0 ? void 0 : captchaToken.expires_at) {
-                            captchaToken.expires_at = new Date(captchaToken.expires_at);
-                        }
-                        isExpired = captchaToken.expires_at < new Date();
-                        if (isExpired) {
-                            return [2, null];
-                        }
-                        return [2, captchaToken.captcha_token];
-                    case 3:
-                        error_1 = _a.sent();
-                        return [4, this.config.storage.removeItem(this.tokenSectionName)];
-                    case 4:
-                        _a.sent();
-                        return [2, null];
-                    case 5: return [2, null];
-                }
+            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,
             });
-        });
-    };
-    return Captcha;
-}());
-export { Captcha };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"captcha.js","sourceRoot":"","sources":["../../../src/captcha/captcha.ts"],"names":[],"mappings":"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","sourcesContent":["import { ApiUrls, ErrorType } from '../auth/consts'\nimport { SimpleStorage, RequestFunction } from '../oauth2client/interface'\nimport { AuthClientRequestOptions } from '../oauth2client/models'\nimport { defaultStorage } from '../oauth2client/oauth2client'\nimport { isInMpWebView, isMp } from '../utils/mp'\n\nexport interface CaptchaOptions {\n  clientId: string\n  request: RequestFunction\n  storage: SimpleStorage\n  // 打开网页并通过URL回调获取 CaptchaToken，针对不通的平台，该函数可以自定义实现, 默认集成浏览器端认证\n  openURIWithCallback?: OpenURIWithCallbackFuction\n}\n\ntype OpenURIWithCallbackFuction = (url: string) => Promise<CaptchaToken>\n\nexport interface CaptchaToken {\n  captcha_token: string\n  expires_in: number\n  expires_at?: Date | null\n}\n\nexport interface CaptchaRequestOptions extends AuthClientRequestOptions {\n  withCaptcha?: boolean\n}\n\nexport interface GetCaptchaResponse {\n  captcha_token?: string\n  expires_in?: number\n  url?: string\n}\n\nexport class Captcha {\n  private config: CaptchaOptions\n  private tokenSectionName: string\n\n  /**\n   * constructor\n   * @param {CaptchaOptions} opts\n   */\n  constructor(opts: CaptchaOptions) {\n    if (!opts.openURIWithCallback) {\n      opts.openURIWithCallback = this.getDefaultOpenURIWithCallback()\n    }\n    if (!opts.storage) {\n      opts.storage = defaultStorage\n    }\n\n    this.config = opts\n    this.tokenSectionName = `captcha_${opts.clientId}`\n  }\n\n  /**\n   * request http like simple fetch api, exp:request('/v1/user/me', {withCredentials:true})\n   * @param {string} url\n   * @param {AuthClientRequestOptions} options\n   */\n  public async request<T>(url: string, options?: CaptchaRequestOptions): Promise<T> {\n    if (!options) {\n      options = {}\n    }\n    if (!options.method) {\n      options.method = 'GET'\n    }\n    const state = `${options.method}:${url}`\n    let reqURL = url\n    if (options.withCaptcha) {\n      reqURL = await this.appendCaptchaTokenToURL(url, state, false)\n    }\n\n    let resp: T\n    try {\n      resp = await this.config.request<T>(reqURL, options)\n    } catch (err) {\n      if (err.error === ErrorType.CAPTCHA_REQUIRED || err.error === ErrorType.CAPTCHA_INVALID) {\n        url = await this.appendCaptchaTokenToURL(url, state, err.error === ErrorType.CAPTCHA_INVALID)\n        return this.config.request<T>(url, options)\n      }\n      return Promise.reject(err)\n    }\n    return resp\n  }\n\n  private getDefaultOpenURIWithCallback(): OpenURIWithCallbackFuction {\n    if (!isMp() && !isInMpWebView()) {\n      if (window.location.search.indexOf('__captcha') > 0) {\n        document.body.style.display = 'none'\n      }\n      if (document.getElementById('captcha_panel_wrap') === null) {\n        const elementDiv = document.createElement('div')\n        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;'\n        elementDiv.setAttribute('id', 'captcha_panel_wrap')\n        setTimeout(() => {\n          document.body.appendChild(elementDiv)\n        }, 0)\n      }\n    }\n    return this.defaultOpenURIWithCallback\n  }\n\n  /**\n   * 默认通过浏览器打开网页并获取回调\n   */\n  private async defaultOpenURIWithCallback(\n    url: string,\n    opts?: { width?: string; height?: string },\n  ): Promise<CaptchaToken> {\n    const { width = '355px', height = '355px' } = opts || {}\n\n    const matched = url.match(/^(data:.*)$/)\n    if (matched) {\n      return Promise.reject({\n        error: ErrorType.UNIMPLEMENTED,\n        error_description: 'need to impl captcha data',\n      })\n    }\n\n    const target = document.getElementById('captcha_panel_wrap')\n    const iframe = document.createElement('iframe')\n    target.innerHTML = ''\n\n    iframe.setAttribute('src', url)\n    iframe.setAttribute('id', 'review-panel-iframe')\n    iframe.style.cssText = `min-width:${width};display:block;height:${height};margin:0 auto;background-color: rgb(255, 255, 255);border: none;`\n    target.appendChild(iframe)\n    target.style.display = 'block'\n    return new Promise<CaptchaToken>((resolve, reject) => {\n      iframe.onload = function () {\n        try {\n          const windowLocation = window.location\n          const iframeLocation = iframe.contentWindow.location\n          if (iframeLocation.host + iframeLocation.pathname === windowLocation.host + windowLocation.pathname) {\n            target.style.display = 'none'\n            const iframeUrlParams = new URLSearchParams(iframeLocation.search)\n            const captchToken = iframeUrlParams.get('captcha_token')\n            if (captchToken) {\n              return resolve({\n                captcha_token: captchToken,\n                expires_in: Number(iframeUrlParams.get('expires_in')),\n              })\n            }\n            return reject({\n              error: iframeUrlParams.get('error'),\n              error_description: iframeUrlParams.get('error_description'),\n            })\n          }\n          target.style.display = 'block'\n        } catch (error) {\n          target.style.display = 'block'\n        }\n      }\n    })\n  }\n  /**\n   * getCaptchaToken 获取captchaToken\n   */\n  private async getCaptchaToken(forceNewToken: boolean, state: string): Promise<string> {\n    if (!forceNewToken) {\n      // 如果本地存在，则直接返回\n      const captchaToken = await this.findCaptchaToken()\n      if (captchaToken) {\n        return captchaToken\n      }\n    }\n    let captchaTokenResp: {\n      url?: string\n      captcha_token?: string\n      expires_in?: number\n    }\n    if (!isMp() && !isInMpWebView()) {\n      const redirect_uri = `${window.location.origin + window.location.pathname}?__captcha=on`\n      captchaTokenResp = await this.config.request<GetCaptchaResponse>(ApiUrls.GET_CAPTCHA_URL, {\n        method: 'POST',\n        body: {\n          client_id: this.config.clientId,\n          redirect_uri,\n          state,\n        },\n        withCredentials: false,\n      })\n      if (captchaTokenResp.captcha_token) {\n        const captchaToken = {\n          captcha_token: captchaTokenResp.captcha_token,\n          expires_in: captchaTokenResp.expires_in,\n        }\n        this.saveCaptchaToken(captchaToken)\n        return captchaTokenResp.captcha_token\n      }\n    } else {\n      /**\n       * https://iwiki.woa.com/p/4010699417\n       */\n      const captchaDataResp = await this.config.request<{\n        data: string\n        type: 'image'\n        token: string\n        expires_in: number\n      }>(ApiUrls.CAPTCHA_DATA_URL, {\n        method: 'POST',\n        body: {\n          state,\n          redirect_uri: '',\n        },\n        withCredentials: false,\n      })\n      captchaTokenResp = {\n        url: `${captchaDataResp.data}?state=${encodeURIComponent(state)}&token=${encodeURIComponent(captchaDataResp.token,)}`,\n      }\n    }\n    const captchaToken = await this.config.openURIWithCallback(captchaTokenResp.url)\n    this.saveCaptchaToken(captchaToken)\n    return captchaToken.captcha_token\n  }\n\n  private async appendCaptchaTokenToURL(url: string, state: string, forceNewToken: boolean): Promise<string> {\n    const captchaToken = await this.getCaptchaToken(forceNewToken, state)\n    if (url.indexOf('?') > 0) {\n      url += `&captcha_token=${captchaToken}`\n    } else {\n      url += `?captcha_token=${captchaToken}`\n    }\n    return url\n  }\n\n  private async saveCaptchaToken(token: CaptchaToken) {\n    token.expires_at = new Date(Date.now() + (token.expires_in - 10) * 1000)\n    const tokenStr: string = JSON.stringify(token)\n    await this.config.storage.setItem(this.tokenSectionName, tokenStr)\n  }\n\n  private async findCaptchaToken(): Promise<string> {\n    const tokenStr: string = await this.config.storage.getItem(this.tokenSectionName)\n    if (tokenStr !== undefined && tokenStr !== null) {\n      try {\n        const captchaToken = JSON.parse(tokenStr)\n        if (captchaToken?.expires_at) {\n          captchaToken.expires_at = new Date(captchaToken.expires_at)\n        }\n        const isExpired = captchaToken.expires_at < new Date()\n        if (isExpired) {\n          return null\n        }\n        return captchaToken.captcha_token\n      } catch (error) {\n        await this.config.storage.removeItem(this.tokenSectionName)\n        return null\n      }\n    }\n    return null\n  }\n}\n"]}
+            captchaTokenResp = {
+                url: `${captchaDataResp.data}?state=${encodeURIComponent(state)}&token=${encodeURIComponent(captchaDataResp.token)}`,
+            };
+        }
+        const captchaToken = await this.config.openURIWithCallback(captchaTokenResp.url);
+        this.saveCaptchaToken(captchaToken);
+        return captchaToken.captcha_token;
+    }
+    async appendCaptchaTokenToURL(url, state, forceNewToken) {
+        const captchaToken = await this.getCaptchaToken(forceNewToken, state);
+        if (url.indexOf('?') > 0) {
+            url += `&captcha_token=${captchaToken}`;
+        }
+        else {
+            url += `?captcha_token=${captchaToken}`;
+        }
+        return url;
+    }
+    async saveCaptchaToken(token) {
+        token.expires_at = new Date(Date.now() + (token.expires_in - 10) * 1000);
+        const tokenStr = JSON.stringify(token);
+        await this.config.storage.setItem(this.tokenSectionName, tokenStr);
+    }
+    async findCaptchaToken() {
+        const tokenStr = await this.config.storage.getItem(this.tokenSectionName);
+        if (tokenStr !== undefined && tokenStr !== null) {
+            try {
+                const captchaToken = JSON.parse(tokenStr);
+                if (captchaToken?.expires_at) {
+                    captchaToken.expires_at = new Date(captchaToken.expires_at);
+                }
+                const isExpired = captchaToken.expires_at < new Date();
+                if (isExpired) {
+                    return null;
+                }
+                return captchaToken.captcha_token;
+            }
+            catch (error) {
+                await this.config.storage.removeItem(this.tokenSectionName);
+                return null;
+            }
+        }
+        return null;
+    }
+}

package/dist/esm/index.d.ts

@@ -1,13 +1,10 @@
 import { OAuth2Client } from './oauth2client/oauth2client';
 import { AuthOptions, Auth } from './auth/apis';
-import * as authModels from './auth/models';
-export { Syntax, ErrorType } from './oauth2client/consts';
-export { defaultStorage, defaultRequest, ToResponseErrorOptions, toResponseError, generateRequestId, OAuth2Client, } from './oauth2client/oauth2client';
-export { AuthClient, SimpleStorage } from './oauth2client/interface';
-export { Credentials, ResponseError, OAuth2ClientOptions, AuthClientRequestOptions, } from './oauth2client/models';
-export { AuthOptions, Auth } from './auth/apis';
-export { authModels };
-export { ApiUrls } from './auth/consts';
+export { Auth } from './auth/apis';
+export * as authModels from './auth/models';
+export type { ProviderProfile } from './auth/models';
+export type { Credentials, OAuth2ClientOptions, ResponseError, AuthClientRequestOptions } from './oauth2client/models';
+export type { AuthOptions } from './auth/apis';
 export declare class CloudbaseOAuth {
     oauth2client: OAuth2Client;
     authApi: Auth;

package/dist/esm/index.js

@@ -1,38 +1,24 @@
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 import { OAuth2Client } from './oauth2client/oauth2client';
 import { Auth } from './auth/apis';
-import * as authModels from './auth/models';
-export { Syntax, ErrorType } from './oauth2client/consts';
-export { defaultStorage, defaultRequest, toResponseError, generateRequestId, OAuth2Client, } from './oauth2client/oauth2client';
-export { AuthClient } from './oauth2client/interface';
 export { Auth } from './auth/apis';
-export { authModels };
-export { ApiUrls } from './auth/consts';
-var CloudbaseOAuth = (function () {
-    function CloudbaseOAuth(authOptions) {
-        var apiOrigin = authOptions.apiOrigin, clientId = authOptions.clientId, env = authOptions.env, storage = authOptions.storage, request = authOptions.request, baseRequest = authOptions.baseRequest, anonymousSignInFunc = authOptions.anonymousSignInFunc, wxCloud = authOptions.wxCloud;
+import * as authModels_1 from './auth/models';
+export { authModels_1 as authModels };
+export class CloudbaseOAuth {
+    constructor(authOptions) {
+        const { apiOrigin, clientId, env, storage, request, baseRequest, anonymousSignInFunc, wxCloud } = authOptions;
         this.oauth2client = new OAuth2Client({
-            apiOrigin: apiOrigin,
-            clientId: clientId,
-            env: env,
-            storage: storage,
+            apiOrigin,
+            clientId,
+            env,
+            storage,
             baseRequest: baseRequest || request,
-            anonymousSignInFunc: anonymousSignInFunc,
-            wxCloud: wxCloud,
+            anonymousSignInFunc,
+            wxCloud,
+        });
+        this.authApi = new Auth({
+            credentialsClient: this.oauth2client,
+            ...authOptions,
+            request: request ? this.oauth2client.request.bind(this.oauth2client) : undefined,
         });
-        this.authApi = new Auth(__assign(__assign({ credentialsClient: this.oauth2client }, authOptions), { request: request ? this.oauth2client.request.bind(this.oauth2client) : undefined }));
     }
-    return CloudbaseOAuth;
-}());
-export { CloudbaseOAuth };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUE7QUFFMUQsT0FBTyxFQUFlLElBQUksRUFBRSxNQUFNLGFBQWEsQ0FBQTtBQUUvQyxPQUFPLEtBQUssVUFBVSxNQUFNLGVBQWUsQ0FBQTtBQUUzQyxPQUFPLEVBQUUsTUFBTSxFQUFFLFNBQVMsRUFBRSxNQUFNLHVCQUF1QixDQUFBO0FBRXpELE9BQU8sRUFDTCxjQUFjLEVBQ2QsY0FBYyxFQUVkLGVBQWUsRUFDZixpQkFBaUIsRUFDakIsWUFBWSxHQUNiLE1BQU0sNkJBQTZCLENBQUE7QUFFcEMsT0FBTyxFQUFFLFVBQVUsRUFBaUIsTUFBTSwwQkFBMEIsQ0FBQTtBQVNwRSxPQUFPLEVBQWUsSUFBSSxFQUFFLE1BQU0sYUFBYSxDQUFBO0FBQy9DLE9BQU8sRUFBRSxVQUFVLEVBQUUsQ0FBQTtBQUNyQixPQUFPLEVBQUcsT0FBTyxFQUFFLE1BQU0sZUFBZSxDQUFBO0FBR3hDO0lBSUUsd0JBQVksV0FBd0I7UUFDMUIsSUFBQSxTQUFTLEdBQWlGLFdBQVcsVUFBNUYsRUFBRSxRQUFRLEdBQXVFLFdBQVcsU0FBbEYsRUFBRSxHQUFHLEdBQWtFLFdBQVcsSUFBN0UsRUFBRSxPQUFPLEdBQXlELFdBQVcsUUFBcEUsRUFBRSxPQUFPLEdBQWdELFdBQVcsUUFBM0QsRUFBRSxXQUFXLEdBQW1DLFdBQVcsWUFBOUMsRUFBRSxtQkFBbUIsR0FBYyxXQUFXLG9CQUF6QixFQUFFLE9BQU8sR0FBSyxXQUFXLFFBQWhCLENBQWdCO1FBQzdHLElBQUksQ0FBQyxZQUFZLEdBQUcsSUFBSSxZQUFZLENBQUM7WUFDbkMsU0FBUyxXQUFBO1lBQ1QsUUFBUSxVQUFBO1lBQ1IsR0FBRyxLQUFBO1lBQ0gsT0FBTyxTQUFBO1lBQ1AsV0FBVyxFQUFFLFdBQVcsSUFBSSxPQUFPO1lBQ25DLG1CQUFtQixxQkFBQTtZQUNuQixPQUFPLFNBQUE7U0FDUixDQUFDLENBQUE7UUFFRixJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksSUFBSSxxQkFDckIsaUJBQWlCLEVBQUUsSUFBSSxDQUFDLFlBQVksSUFDakMsV0FBVyxLQUVkLE9BQU8sRUFBRSxPQUFPLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVMsSUFDaEYsQ0FBQTtJQUNKLENBQUM7SUFDSCxxQkFBQztBQUFELENBQUMsQUF2QkQsSUF1QkMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBPQXV0aDJDbGllbnQgfSBmcm9tICcuL29hdXRoMmNsaWVudC9vYXV0aDJjbGllbnQnXG5cbmltcG9ydCB7IEF1dGhPcHRpb25zLCBBdXRoIH0gZnJvbSAnLi9hdXRoL2FwaXMnXG5cbmltcG9ydCAqIGFzIGF1dGhNb2RlbHMgZnJvbSAnLi9hdXRoL21vZGVscydcblxuZXhwb3J0IHsgU3ludGF4LCBFcnJvclR5cGUgfSBmcm9tICcuL29hdXRoMmNsaWVudC9jb25zdHMnXG5cbmV4cG9ydCB7XG4gIGRlZmF1bHRTdG9yYWdlLFxuICBkZWZhdWx0UmVxdWVzdCxcbiAgVG9SZXNwb25zZUVycm9yT3B0aW9ucyxcbiAgdG9SZXNwb25zZUVycm9yLFxuICBnZW5lcmF0ZVJlcXVlc3RJZCxcbiAgT0F1dGgyQ2xpZW50LFxufSBmcm9tICcuL29hdXRoMmNsaWVudC9vYXV0aDJjbGllbnQnXG5cbmV4cG9ydCB7IEF1dGhDbGllbnQsIFNpbXBsZVN0b3JhZ2UgfSBmcm9tICcuL29hdXRoMmNsaWVudC9pbnRlcmZhY2UnXG5cbmV4cG9ydCB7XG4gIENyZWRlbnRpYWxzLFxuICBSZXNwb25zZUVycm9yLFxuICBPQXV0aDJDbGllbnRPcHRpb25zLFxuICBBdXRoQ2xpZW50UmVxdWVzdE9wdGlvbnMsXG59IGZyb20gJy4vb2F1dGgyY2xpZW50L21vZGVscydcblxuZXhwb3J0IHsgQXV0aE9wdGlvbnMsIEF1dGggfSBmcm9tICcuL2F1dGgvYXBpcydcbmV4cG9ydCB7IGF1dGhNb2RlbHMgfVxuZXhwb3J0IHsgIEFwaVVybHMgfSBmcm9tICcuL2F1dGgvY29uc3RzJ1xuXG5cbmV4cG9ydCBjbGFzcyBDbG91ZGJhc2VPQXV0aCB7XG4gIHB1YmxpYyBvYXV0aDJjbGllbnQ6IE9BdXRoMkNsaWVudFxuICBwdWJsaWMgYXV0aEFwaTogQXV0aFxuXG4gIGNvbnN0cnVjdG9yKGF1dGhPcHRpb25zOiBBdXRoT3B0aW9ucykge1xuICAgIGNvbnN0IHsgYXBpT3JpZ2luLCBjbGllbnRJZCwgZW52LCBzdG9yYWdlLCByZXF1ZXN0LCBiYXNlUmVxdWVzdCwgYW5vbnltb3VzU2lnbkluRnVuYywgd3hDbG91ZCB9ID0gYXV0aE9wdGlvbnNcbiAgICB0aGlzLm9hdXRoMmNsaWVudCA9IG5ldyBPQXV0aDJDbGllbnQoe1xuICAgICAgYXBpT3JpZ2luLFxuICAgICAgY2xpZW50SWQsXG4gICAgICBlbnYsXG4gICAgICBzdG9yYWdlLFxuICAgICAgYmFzZVJlcXVlc3Q6IGJhc2VSZXF1ZXN0IHx8IHJlcXVlc3QsXG4gICAgICBhbm9ueW1vdXNTaWduSW5GdW5jLFxuICAgICAgd3hDbG91ZCxcbiAgICB9KVxuXG4gICAgdGhpcy5hdXRoQXBpID0gbmV3IEF1dGgoe1xuICAgICAgY3JlZGVudGlhbHNDbGllbnQ6IHRoaXMub2F1dGgyY2xpZW50LFxuICAgICAgLi4uYXV0aE9wdGlvbnMsXG4gICAgICAvLyDlhbzlrrnogIHpgLvovpHvvIzmnInlgLzkvKDlhaXliJnkuI3otbBBdXRo5YaF55qE6aqM6K+B56CB6K+35rGC6YC76L6RXG4gICAgICByZXF1ZXN0OiByZXF1ZXN0ID8gdGhpcy5vYXV0aDJjbGllbnQucmVxdWVzdC5iaW5kKHRoaXMub2F1dGgyY2xpZW50KSA6IHVuZGVmaW5lZCxcbiAgICB9KVxuICB9XG59XG5cbiJdfQ==
+}

package/dist/esm/oauth2client/consts.d.ts

@@ -1,3 +1,4 @@
+export { ErrorType } from '../auth/consts';
 export declare enum Syntax {
     CLIENT_ID = "client_id",
     CLIENT_SECRET = "client_secret",
@@ -17,51 +18,3 @@ export declare enum Syntax {
     PASSWORD = "password",
     REFRESH_TOKEN = "refresh_token"
 }
-export declare enum ErrorType {
-    UNREACHABLE = "unreachable",
-    LOCAL = "local",
-    CANCELLED = "cancelled",
-    UNKNOWN = "unknown",
-    INVALID_ARGUMENT = "invalid_argument",
-    DEADLINE_EXCEEDED = "deadline_exceeded",
-    NOT_FOUND = "not_found",
-    ALREADY_EXISTS = "already_exists",
-    PERMISSION_DENIED = "permission_denied",
-    UNAUTHENTICATED = "unauthenticated",
-    RESOURCE_EXHAUSTED = "resource_exhausted",
-    FAILED_PRECONDITION = "failed_precondition",
-    ABORTED = "aborted",
-    OUT_OF_RANGE = "out_of_range",
-    UNIMPLEMENTED = "unimplemented",
-    INTERNAL = "internal",
-    UNAVAILABLE = "unavailable",
-    DATA_LOSS = "data_loss",
-    CAPTCHA_REQUIRED = "captcha_required",
-    CAPTCHA_INVALID = "captcha_invalid",
-    INVALID_PASSWORD = "invalid_password",
-    INVALID_STATUS = "invalid_status",
-    USER_PENDING = "user_pending",
-    USER_BLOCKED = "user_blocked",
-    INVALID_VERIFICATION_CODE = "invalid_verification_code",
-    TWO_FACTOR_REQUIRED = "two_factor_required",
-    INVALID_TWO_FACTOR = "invalid_two_factor",
-    INVALID_TWO_FACTOR_RECOVERY = "invalid_two_factor_recovery",
-    UNDER_REVIEW = "under_review",
-    INVALID_REQUEST = "invalid_request",
-    UNAUTHORIZED_CLIENT = "unauthorized_client",
-    ACCESS_DENIED = "access_denied",
-    UNSUPPORTED_RESPONSE_TYPE = "unsupported_response_type",
-    INVALID_SCOPE = "invalid_scope",
-    INVALID_GRANT = "invalid_grant",
-    SERVER_ERROR = "server_error",
-    TEMPORARILY_UNAVAILABLE = "temporarily_unavailable",
-    INTERACTION_REQUIRED = "interaction_required",
-    LOGIN_REQUIRED = "login_required",
-    ACCOUNT_SELECTION_REQUIRED = "account_selection_required",
-    CONSENT_REQUIRED = "consent_required",
-    INVALID_REQUEST_URI = "invalid_request_uri",
-    INVALID_REQUEST_OBJECT = "invalid_request_object",
-    REQUEST_NOT_SUPPORTED = "request_not_supported",
-    REQUEST_URI_NOT_SUPPORTED = "request_uri_not_supported",
-    REGISTRATION_NOT_SUPPORTED = "registration_not_supported"
-}