@cloudbase/oauth 0.0.3-alpha.0 → 1.0.0-alpha.0

package/src/captcha/captcha.ts

@@ -1,217 +1,217 @@
-import {SimpleStorage, RequestFunction} from '../oauth2client/interface';
-import {AuthClientRequestOptions} from "../oauth2client/models";
-import {defaultStorage} from "../oauth2client/oauth2client";
+import { SimpleStorage, RequestFunction } from '../oauth2client/interface';
+import { AuthClientRequestOptions } from "../oauth2client/models";
+import { defaultStorage } from "../oauth2client/oauth2client";
 
 export interface CaptchaOptions {
-    clientId: string
-    request: RequestFunction;
-    storage: SimpleStorage;
-    // 打开网页并通过URL回调获取 CaptchaToken，针对不通的平台，该函数可以自定义实现, 默认集成浏览器端认证
-    openURIWithCallback?: OpenURIWithCallbackFuction;
+  clientId: string
+  request: RequestFunction;
+  storage: SimpleStorage;
+  // 打开网页并通过URL回调获取 CaptchaToken，针对不通的平台，该函数可以自定义实现, 默认集成浏览器端认证
+  openURIWithCallback?: OpenURIWithCallbackFuction;
 }
 
 type OpenURIWithCallbackFuction = (url: string) => Promise<CaptchaToken>;
 
 export interface CaptchaToken {
-    captcha_token: string
-    expires_in: number
-    expires_at?: Date | null;
+  captcha_token: string
+  expires_in: number
+  expires_at?: Date | null;
 }
 
 export interface CaptchaRequestOptions extends AuthClientRequestOptions {
-    withCaptcha?: boolean;
+  withCaptcha?: boolean;
 }
 
 export interface GetCaptchaResponse {
-    captcha_token?: string
-    expires_in?: number
-    url?: string
+  captcha_token?: string
+  expires_in?: number
+  url?: string
 }
 
 const GET_CAPTCHA_URL = '/auth/v1/captcha/init'
 
 export class Captcha {
-    private _config: CaptchaOptions;
-    private _tokenSectionName: string;
+  private _config: CaptchaOptions;
+  private _tokenSectionName: string;
 
-    /**
-     * constructor
-     * @param {CaptchaOptions} opts
-     */
-    constructor(opts: CaptchaOptions) {
-        if (!opts.openURIWithCallback) {
-            opts.openURIWithCallback = this._getDefaultOpenURIWithCallback()
-        }
-        if (!opts.storage) {
-            opts.storage = defaultStorage
-        }
-        this._config = opts
-        this._tokenSectionName = 'captcha_' + opts.clientId
+  /**
+   * constructor
+   * @param {CaptchaOptions} opts
+   */
+  constructor(opts: CaptchaOptions) {
+    if (!opts.openURIWithCallback) {
+      opts.openURIWithCallback = this._getDefaultOpenURIWithCallback()
     }
-
-    /**
-     * request http like simple fetch api, exp:request('/v1/user/me', {withCredentials:true})
-     * @param {string} url
-     * @param {AuthClientRequestOptions} options
-     */
-    public async request<T>(
-        url: string,
-        options?: CaptchaRequestOptions,
-    ): Promise<T> {
-        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);
-        }
-        try {
-            return 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')
-                return this._config.request<T>(url, options)
-            } else {
-                return Promise.reject(err)
-            }
-        }
+    if (!opts.storage) {
+      opts.storage = defaultStorage
     }
+    this._config = opts
+    this._tokenSectionName = 'captcha_' + opts.clientId
+  }
 
-    private _getDefaultOpenURIWithCallback(): OpenURIWithCallbackFuction {
-        if (window.location.search.indexOf('__captcha') > 0) {
-            document.body.style.display = 'none';
-        }
-        if (document.getElementById('captcha_panel_wrap') === null) {
-            var 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');
-            document.body.appendChild(elementDiv);
-        }
-        return this._defaultOpenURIWithCallback
+  /**
+   * request http like simple fetch api, exp:request('/v1/user/me', {withCredentials:true})
+   * @param {string} url
+   * @param {AuthClientRequestOptions} options
+   */
+  public async request<T>(
+    url: string,
+    options?: CaptchaRequestOptions,
+  ): Promise<T> {
+    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);
     }
+    try {
+      return 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')
+        return this._config.request<T>(url, options)
+      } else {
+        return Promise.reject(err)
+      }
+    }
+  }
 
-    /**
-     * 默认通过浏览器打开网页并获取回调
-     */
-    private async _defaultOpenURIWithCallback(url: string): Promise<CaptchaToken> {
-        const 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:355px;display:block;height:355px;margin:0 auto;background-color: rgb(255, 255, 255);border: none;';
-        target.appendChild(iframe);
-        target.style.display = 'block';
-        return new Promise<CaptchaToken>((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';
-                        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 reject({
-                            error: iframeUrlParams.get('error'),
-                            error_description: iframeUrlParams.get('error_description')
-                        })
-                    } else {
-                        target.style.display = 'block';
-                    }
-                } catch (error) {
-                    target.style.display = 'block';
-                }
-            };
-        })
+  private _getDefaultOpenURIWithCallback(): OpenURIWithCallbackFuction {
+    if (window.location.search.indexOf('__captcha') > 0) {
+      document.body.style.display = 'none';
     }
-    /**
-     * _getCaptchaToken 获取captchaToken
-     */
-    private async _getCaptchaToken(forceNewToken: boolean, state: string): Promise<string> {
-        if (!forceNewToken) {
-            // 如果本地存在，则直接返回
-            const captchaToken = await this._findCaptchaToken()
-            if (captchaToken) {
-                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: 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
-        }
-        const captchaToken = await this._config.openURIWithCallback(captchaTokenResp.url)
-        this._saveCaptchaToken(captchaToken)
-        return captchaToken.captcha_token
+    if (document.getElementById('captcha_panel_wrap') === null) {
+      var 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');
+      document.body.appendChild(elementDiv);
     }
+    return this._defaultOpenURIWithCallback
+  }
 
-    private async _appendCaptchaTokenToURL(url: string, state: string, forceNewToken: boolean): Promise<string> {
-        const captchaToken = await this._getCaptchaToken(forceNewToken, state);
-        if (url.indexOf("?") > 0) {
-            url += "&captcha_token=" + captchaToken
-        } else {
-            url += "?captcha_token=" + captchaToken
+  /**
+   * 默认通过浏览器打开网页并获取回调
+   */
+  private async _defaultOpenURIWithCallback(url: string): Promise<CaptchaToken> {
+    const 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:355px;display:block;height:355px;margin:0 auto;background-color: rgb(255, 255, 255);border: none;';
+    target.appendChild(iframe);
+    target.style.display = 'block';
+    return new Promise<CaptchaToken>((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';
+            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 reject({
+              error: iframeUrlParams.get('error'),
+              error_description: iframeUrlParams.get('error_description')
+            })
+          } else {
+            target.style.display = 'block';
+          }
+        } catch (error) {
+          target.style.display = 'block';
         }
-        return url
+      };
+    })
+  }
+  /**
+   * _getCaptchaToken 获取captchaToken
+   */
+  private async _getCaptchaToken(forceNewToken: boolean, state: string): Promise<string> {
+    if (!forceNewToken) {
+      // 如果本地存在，则直接返回
+      const captchaToken = await this._findCaptchaToken()
+      if (captchaToken) {
+        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: 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
     }
+    const captchaToken = await this._config.openURIWithCallback(captchaTokenResp.url)
+    this._saveCaptchaToken(captchaToken)
+    return captchaToken.captcha_token
+  }
 
-    private async _saveCaptchaToken(token: CaptchaToken) {
-        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 _appendCaptchaTokenToURL(url: string, state: string, forceNewToken: boolean): Promise<string> {
+    const captchaToken = await this._getCaptchaToken(forceNewToken, state);
+    if (url.indexOf("?") > 0) {
+      url += "&captcha_token=" + captchaToken
+    } else {
+      url += "?captcha_token=" + captchaToken
     }
+    return url
+  }
 
-    private async _findCaptchaToken(): Promise<string> {
-        const tokenStr: string = await this._config.storage.getItem(
-            this._tokenSectionName,
-        );
-        if (tokenStr !== undefined && tokenStr !== null) {
-            try {
-                const captchaToken = JSON.parse(tokenStr);
-                if (captchaToken && 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
-            }
+  private async _saveCaptchaToken(token: CaptchaToken) {
+    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,
+    );
+    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/src/index.ts

@@ -1,4 +1,6 @@
-export {Syntax, ErrorType} from './oauth2client/consts';
+export { Syntax, ErrorType } from './oauth2client/consts';
+
+import { OAuth2Client } from './oauth2client/oauth2client'
 
 export {
   defaultStorage,
@@ -9,8 +11,9 @@ export {
   OAuth2Client,
 } from './oauth2client/oauth2client';
 
-export {AuthClient, SimpleStorage} from './oauth2client/interface';
+export { AuthClient, SimpleStorage } from './oauth2client/interface';
 
+// import { Credentials } from './oauth2client/models'
 export {
   Credentials,
   ResponseError,
@@ -18,7 +21,29 @@ export {
   AuthClientRequestOptions,
 } from './oauth2client/models';
 
-export {AuthOptions, Auth} from './auth/apis';
+import { AuthOptions, Auth } from './auth/apis'
+
+export { AuthOptions, Auth } from './auth/apis';
 
 import * as authModels from './auth/models';
-export {authModels};
+export { authModels };
+
+
+export class CloudbaseOAuth {
+  public oauth2client: OAuth2Client
+  public authApi: Auth
+
+  constructor(authOptions: AuthOptions) {
+    const { apiOrigin, clientId } = authOptions
+    this.oauth2client = new OAuth2Client({
+      apiOrigin,
+      clientId
+    })
+
+    this.authApi = new Auth({
+      credentialsClient: this.oauth2client,
+      ...authOptions
+    })
+  }
+}
+

package/src/oauth2client/interface.ts

@@ -1,4 +1,4 @@
-import {Credentials, AuthClientRequestOptions} from './models';
+import { Credentials, AuthClientRequestOptions } from './models';
 
 /**
  * the interface for the Oauth2Client
@@ -25,20 +25,33 @@ export abstract class AuthClient {
   abstract getAccessToken(): Promise<string>;
 }
 
-export type RequestFunction = <T>(url: string,options?: AuthClientRequestOptions) => Promise<T>;
+export type RequestFunction = <T>(url: string, options?: AuthClientRequestOptions) => Promise<T>;
 
 /** An interface of the Simple  Web Storage API  */
 export interface SimpleStorage {
   /**
    * value = storage[key]
    */
-  getItem(key: string): Promise<string | null>;
+  getItem: (key: string) => Promise<string | null>;
   /**
    * delete storage[key]
    */
-  removeItem(key: string): Promise<void>;
+  removeItem: (key: string) => Promise<void>;
   /**
    * storage[key] = value
    */
-  setItem(key: string, value: string): Promise<void>;
+  setItem: (key: string, value: string) => Promise<void>;
+
+  /**
+   * value = storage[key]
+   */
+  getItemSync: (key: string) => string | null;
+  /**
+   * delete storage[key]
+   */
+  removeItemSync: (key: string) => void;
+  /**
+   * storage[key] = value
+   */
+  setItemSync: (key: string, value: string) => void;
 }