@cloudbase/oauth 0.1.1-alpha.6 → 0.1.1-alpha.8

package/packages/oauth/dist/esm/utils/mp.d.ts

@@ -0,0 +1 @@
+export declare function isMp(): boolean;

package/packages/oauth/dist/esm/utils/mp.js

@@ -0,0 +1,37 @@
+export function isMp() {
+    var wx = globalThis.wx;
+    if (typeof wx === 'undefined') {
+        return false;
+    }
+    if (globalThis.Page === undefined) {
+        return false;
+    }
+    if (!wx.getSystemInfoSync) {
+        return false;
+    }
+    if (!wx.getStorageSync) {
+        return false;
+    }
+    if (!wx.setStorageSync) {
+        return false;
+    }
+    if (!wx.connectSocket) {
+        return false;
+    }
+    if (!wx.request) {
+        return false;
+    }
+    try {
+        if (!wx.getSystemInfoSync()) {
+            return false;
+        }
+        if (wx.getSystemInfoSync().AppPlatform === 'qq') {
+            return false;
+        }
+    }
+    catch (e) {
+        return false;
+    }
+    return true;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdXRpbHMvbXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSxVQUFVLElBQUk7SUFDVixJQUFBLEVBQUUsR0FBSyxVQUFpQixHQUF0QixDQUFzQjtJQUNoQyxJQUFJLE9BQU8sRUFBRSxLQUFLLFdBQVcsRUFBRTtRQUM3QixPQUFPLEtBQUssQ0FBQTtLQUNiO0lBQ0QsSUFBSyxVQUFrQixDQUFDLElBQUksS0FBSyxTQUFTLEVBQUU7UUFDMUMsT0FBTyxLQUFLLENBQUE7S0FDYjtJQUNELElBQUksQ0FBQyxFQUFFLENBQUMsaUJBQWlCLEVBQUU7UUFDekIsT0FBTyxLQUFLLENBQUE7S0FDYjtJQUNELElBQUksQ0FBQyxFQUFFLENBQUMsY0FBYyxFQUFFO1FBQ3RCLE9BQU8sS0FBSyxDQUFBO0tBQ2I7SUFDRCxJQUFJLENBQUMsRUFBRSxDQUFDLGNBQWMsRUFBRTtRQUN0QixPQUFPLEtBQUssQ0FBQTtLQUNiO0lBQ0QsSUFBSSxDQUFDLEVBQUUsQ0FBQyxhQUFhLEVBQUU7UUFDckIsT0FBTyxLQUFLLENBQUE7S0FDYjtJQUNELElBQUksQ0FBQyxFQUFFLENBQUMsT0FBTyxFQUFFO1FBQ2YsT0FBTyxLQUFLLENBQUE7S0FDYjtJQUVELElBQUk7UUFDRixJQUFJLENBQUMsRUFBRSxDQUFDLGlCQUFpQixFQUFFLEVBQUU7WUFDM0IsT0FBTyxLQUFLLENBQUE7U0FDYjtRQUVELElBQUksRUFBRSxDQUFDLGlCQUFpQixFQUFFLENBQUMsV0FBVyxLQUFLLElBQUksRUFBRTtZQUMvQyxPQUFPLEtBQUssQ0FBQTtTQUNiO0tBQ0Y7SUFBQyxPQUFPLENBQUMsRUFBRTtRQUNWLE9BQU8sS0FBSyxDQUFBO0tBQ2I7SUFFRCxPQUFPLElBQUksQ0FBQTtBQUNiLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgZnVuY3Rpb24gaXNNcCgpIHtcbiAgY29uc3QgeyB3eCB9ID0gZ2xvYmFsVGhpcyBhcyBhbnlcbiAgaWYgKHR5cGVvZiB3eCA9PT0gJ3VuZGVmaW5lZCcpIHtcbiAgICByZXR1cm4gZmFsc2VcbiAgfVxuICBpZiAoKGdsb2JhbFRoaXMgYXMgYW55KS5QYWdlID09PSB1bmRlZmluZWQpIHtcbiAgICByZXR1cm4gZmFsc2VcbiAgfVxuICBpZiAoIXd4LmdldFN5c3RlbUluZm9TeW5jKSB7XG4gICAgcmV0dXJuIGZhbHNlXG4gIH1cbiAgaWYgKCF3eC5nZXRTdG9yYWdlU3luYykge1xuICAgIHJldHVybiBmYWxzZVxuICB9XG4gIGlmICghd3guc2V0U3RvcmFnZVN5bmMpIHtcbiAgICByZXR1cm4gZmFsc2VcbiAgfVxuICBpZiAoIXd4LmNvbm5lY3RTb2NrZXQpIHtcbiAgICByZXR1cm4gZmFsc2VcbiAgfVxuICBpZiAoIXd4LnJlcXVlc3QpIHtcbiAgICByZXR1cm4gZmFsc2VcbiAgfVxuXG4gIHRyeSB7XG4gICAgaWYgKCF3eC5nZXRTeXN0ZW1JbmZvU3luYygpKSB7XG4gICAgICByZXR1cm4gZmFsc2VcbiAgICB9XG5cbiAgICBpZiAod3guZ2V0U3lzdGVtSW5mb1N5bmMoKS5BcHBQbGF0Zm9ybSA9PT0gJ3FxJykge1xuICAgICAgcmV0dXJuIGZhbHNlXG4gICAgfVxuICB9IGNhdGNoIChlKSB7XG4gICAgcmV0dXJuIGZhbHNlXG4gIH1cblxuICByZXR1cm4gdHJ1ZVxufVxuIl19

package/packages/src/dist/oauth/src/index.d.ts

@@ -0,0 +1 @@
+export * from '@cloudbase/oauth';

package/packages/src/dist/src/index.d.ts

@@ -0,0 +1,9 @@
+import cloudbase from '@cloudbase/app';
+import { ICloudbase } from '@cloudbase/types';
+declare global {
+    interface Window {
+        cloudbase: ICloudbase;
+    }
+}
+export = cloudbase;
+export default cloudbase;

package/src/app/index.ts

@@ -1,83 +1,74 @@
-import {defaultRequest, RequestFn as requestFn, RequestOptions as requestOptions} from "./request";
-import {OpenURIWithCallback as openURIWithCallback, defaultOpenURIWithCallback} from "./openuri";
-import {DefaultStorage, Storage as storage} from "./storage";
+import { defaultRequest, RequestFn as requestFn, RequestOptions as requestOptions } from './request';
+import { OpenURIWithCallback as openURIWithCallback, defaultOpenURIWithCallback } from './openuri';
+import { DefaultStorage, Storage as storage } from './storage';
 
 export interface Options {
-    env: string,
-    region?: string,
-    apiOrigin?: string;
-    clientId?: string;
-    clientSecret?: string;
-    custom?: any;
+  env: string;
+  region?: string;
+  apiOrigin?: string;
+  clientId?: string;
+  clientSecret?: string;
+  custom?: any;
 
-    // plugins can set platform functions
-    request?: requestFn;
-    storage?: storage;
-    openURIWithCallback?: openURIWithCallback;
+  // plugins can set platform functions
+  request?: requestFn;
+  baseRequest?: requestFn;
+  storage?: storage;
+  openURIWithCallback?: openURIWithCallback;
 }
 
-export function initializeApp(
-    options: Options,
-): App {
-    return new AppImpl(options);
+export function initializeApp(options: Options): App {
+  return new AppImpl(options);
 }
 
 export interface App {
-    readonly options: Options;
+  readonly options: Options;
 }
 
 export class AppImpl implements App {
-    private readonly _options: Options;
-    private readonly _container = new Map<string, any>();
+  private readonly _options: Options;
+  private readonly _container = new Map<string, any>();
 
-    constructor(options: Options) {
-        if (!options.region) {
-            options.region = 'ap-shanghai'
-        }
-        if (!options.apiOrigin) {
-            options.apiOrigin = `https://${options.env}.${options.region}.tcb-api.tencentcloudapi.com`
-        }
-        let storageEnv = options.env
-        if (!options.clientId) {
-            options.clientId = ''
-        } else {
-            storageEnv = options.clientId
-        }
-        if (!options.storage) {
-            options.storage = new DefaultStorage({env: storageEnv});
-        }
-        if (!options.openURIWithCallback) {
-            options.openURIWithCallback = defaultOpenURIWithCallback;
-        }
-        let baseRequest = options.request
-        if (!baseRequest) {
-            baseRequest = defaultRequest
-        }
-        const apiOrigin = options.apiOrigin
-        options.request = async <T>(
-            url: string,
-            options?: RequestOptions,
-        ): Promise<T> => {
-            if (url.startsWith('/')) {
-                url = apiOrigin + url;
-            }
-            return baseRequest<T>(url, options)
-        }
-        this._options = options;
+  constructor(options: Options) {
+    if (!options.region) {
+      options.region = 'ap-shanghai';
     }
-
-    get options(): Options {
-        return this._options;
+    if (!options.apiOrigin) {
+      options.apiOrigin = `https://${options.env}.${options.region}.tcb-api.tencentcloudapi.com`;
     }
-
-    get container(): Map<string, any> {
-        return this._container;
+    let storageEnv = options.env;
+    if (!options.clientId) {
+      options.clientId = '';
+    } else {
+      storageEnv = options.clientId;
     }
-}
+    if (!options.storage) {
+      options.storage = new DefaultStorage({ env: storageEnv });
+    }
+    if (!options.openURIWithCallback) {
+      options.openURIWithCallback = defaultOpenURIWithCallback;
+    }
+    let baseRequest: requestFn = options.baseRequest || options.request || defaultRequest;
+    const apiOrigin = options.apiOrigin;
+    options.request = async <T>(url: string, options?: RequestOptions): Promise<T> => {
+      if (url.startsWith('/')) {
+        url = apiOrigin + url;
+      }
+      return baseRequest<T>(url, options);
+    };
+    this._options = options;
+  }
 
+  get options(): Options {
+    return this._options;
+  }
 
-export type RequestFn = requestFn
-export type RequestOptions = requestOptions
-export type OpenURIWithCallback = openURIWithCallback
-export type Storage = storage
+  get container(): Map<string, any> {
+    return this._container;
+  }
+}
 
+export type RequestFn = requestFn;
+export type RequestOptions = requestOptions;
+export type OpenURIWithCallback = openURIWithCallback;
+export type Storage = storage;

package/src/app/openuri.ts

@@ -1,8 +1,8 @@
 export type OpenURIWithCallback = (url: string, opts?: OpenURIOptions) => Promise<{ [key: string]: string }>;
 
 export interface OpenURIOptions {
-    width: string;
-    height: string;
+  width: string;
+  height: string;
 }
 
 /**
@@ -17,98 +17,105 @@ export interface OpenURIOptions {
     }, false);
  *
  */
-export const defaultOpenURIWithCallback: OpenURIWithCallback = (url: string, opts?: OpenURIOptions): Promise<{ [key: string]: string }> => {
-    let iframeTag = '__iframe';
-    if (window.location.search.indexOf(iframeTag) > 0) {
-        document.body.style.display = 'none';
-    }
-    if (!opts) {
-        opts = {
-            width: '355px',
-            height: '355px'
-        }
-    }
-    if (document.getElementById('_iframe_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', '_iframe_panel_wrap');
-        document.body.appendChild(elementDiv);
-    }
-    const target = document.getElementById('_iframe_panel_wrap'),
-        iframe = document.createElement('iframe')
-    target.innerHTML = '';
-    const openURL = new URL(url);
-    const redirectUri = openURL.searchParams.get('redirect_uri')
-    if (redirectUri) {
-        const redirectUrl = new URL(redirectUri);
-        redirectUrl.searchParams.append(iframeTag, "on")
-        openURL.searchParams.set('redirect_uri', redirectUrl.href)
-        url = openURL.href
-    }
-    iframe.setAttribute('src', url)
-    iframe.setAttribute('id', '_iframe_panel_wrap_iframe')
-    iframe.style.cssText = `min-width:${opts.width};display:block;height:${opts.height};margin:0 auto;background-color: rgb(255, 255, 255);border: none;`;
-    target.appendChild(iframe);
-    target.style.display = 'block';
+export const defaultOpenURIWithCallback: OpenURIWithCallback = (
+  url: string,
+  opts?: OpenURIOptions,
+): Promise<{ [key: string]: string }> => {
+  let iframeTag = '__iframe';
+  if (window.location.search.indexOf(iframeTag) > 0) {
+    document.body.style.display = 'none';
+  }
+  if (!opts) {
+    opts = {
+      width: '355px',
+      height: '355px',
+    };
+  }
+  if (document.getElementById('_iframe_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', '_iframe_panel_wrap');
+    document.body.appendChild(elementDiv);
+  }
+  const target = document.getElementById('_iframe_panel_wrap'),
+    iframe = document.createElement('iframe');
+  target.innerHTML = '';
+  const openURL = new URL(url);
+  let search = openURL.search.substring(1);
+  let contactSign = '?';
+  if (openURL.hash.indexOf('=') > 0) {
+    search = openURL.hash.substring(1);
+    contactSign = '#';
+  }
+  const searchParams = new URLSearchParams(search);
+  const redirectUri = searchParams.get('redirect_uri');
+  if (redirectUri) {
+    const redirectUrl = new URL(redirectUri);
+    redirectUrl.searchParams.append(iframeTag, 'on');
+    searchParams.set('redirect_uri', redirectUrl.href);
+    url = openURL.origin + openURL.pathname + contactSign + searchParams.toString();
+  }
+  iframe.setAttribute('src', url);
+  iframe.setAttribute('id', '_iframe_panel_wrap_iframe');
+  iframe.style.cssText = `min-width:${opts.width};display:block;height:${opts.height};margin:0 auto;background-color: rgb(255, 255, 255);border: none;`;
+  target.appendChild(iframe);
+  target.style.display = 'block';
 
-    let callBack = new Callback()
-    // handle callback from iframe post message
-    window.addEventListener('message', e => {
-        if (e.origin == openURL.origin && callBack.callFunc) {
-            if (!(typeof e.data === "string")) {
-                return;
-            }
-            target.style.display = 'none';
-            const data = JSON.parse(e.data);
-            try {
-                callBack.callFunc(data)
-            } catch (e) {
-            }
+  let callBack = new Callback();
+  // handle callback from iframe post message
+  window.addEventListener(
+    'message',
+    (e) => {
+      if (e.origin == openURL.origin && callBack.callFunc) {
+        if (!(typeof e.data === 'string')) {
+          return;
         }
-    }, false);
-    return new Promise<{ [key: string]: string }>((resolve, reject) => {
-        callBack.callFunc = data => {
-            if (data.error) {
-                return reject(data)
-            }
-            return resolve(data)
+        target.style.display = 'none';
+        const data = JSON.parse(e.data);
+        try {
+          callBack.callFunc(data);
+        } catch (e) {}
+      }
+    },
+    false,
+  );
+  return new Promise<{ [key: string]: string }>((resolve, reject) => {
+    callBack.callFunc = (data) => {
+      if (data.error) {
+        return reject(data);
+      }
+      return resolve(data);
+    };
+    // handle callback from iframe redirect uri
+    iframe.onload = () => {
+      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 data: { [key: string]: string } = {};
+          iframeUrlParams.forEach((v, k) => {
+            data[k] = v;
+          });
+          if (data.error) {
+            return reject({
+              error: iframeUrlParams.get('error'),
+              error_description: iframeUrlParams.get('error_description'),
+            });
+          }
+          return resolve(data);
+        } else {
+          target.style.display = 'block';
         }
-        // handle callback from iframe redirect uri
-        iframe.onload = () => {
-            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 data: { [key: string]: string } = {};
-                    iframeUrlParams.forEach((v, k) => {
-                        data[k] = v;
-                    })
-                    if (data.error) {
-                        return reject({
-                            error: iframeUrlParams.get('error'),
-                            error_description: iframeUrlParams.get('error_description')
-                        })
-                    }
-                    return resolve(data)
-                } else {
-                    target.style.display = 'block';
-                }
-            } catch (error) {
-                target.style.display = 'block';
-            }
-        };
-    })
-}
-
+      } catch (error) {
+        target.style.display = 'block';
+      }
+    };
+  });
+};
 
 class Callback {
-    public callFunc: (data?: { [key: string]: string }) => void;
-}
+  public callFunc: (data?: { [key: string]: string }) => void;
+}

package/src/app/request.ts

@@ -1,66 +1,68 @@
 export interface RequestOptions {
-    body?: any | null;
-    headers?: any | null;
-    method?: string;
+  body?: any | null;
+  headers?: any | null;
+  method?: string;
 
-    [key: string]: any;
+  [key: string]: any;
 }
 
 export enum ErrorType {
-    UNREACHABLE = 'unreachable'
+  UNREACHABLE = 'unreachable',
 }
 
 export type RequestFn = <T>(url: string, options?: RequestOptions) => Promise<T>;
 
 /** An Error For all concern **/
 export interface ResponseError {
-    error: string;
-    error_description?: string;
-    error_uri?: string;
-    details?: any;
-    request_id?: string;
+  error: string;
+  error_description?: string;
+  error_uri?: string;
+  details?: any;
+  request_id?: string;
 }
 
-export const defaultRequest: RequestFn = async <T>(
-    url: string,
-    options?: RequestOptions,
-): Promise<T> => {
-    let result: T;
-    let responseError: ResponseError;
-    // Objects must be copied to prevent modification of data such as body.
-    const copyOptions = Object.assign({}, options);
-    if (!copyOptions.method) {
-        copyOptions.method = 'GET';
-    }
-    if (copyOptions.body && typeof copyOptions.body !== 'string') {
-        copyOptions.body = JSON.stringify(copyOptions.body, (key, value) => {
-            if (value && value !== '') {
-                return value
-            }
-        })
-    }
-    const requestId = copyOptions.headers['x-request-id'] as string;
-    try {
-        const responseResult: Response = await fetch(url, copyOptions);
-        const jsonResponse = await responseResult.json();
-        if (jsonResponse.error || responseResult.status >= 400) {
-            responseError = jsonResponse as ResponseError;
-            responseError.error_uri = new URL(url).pathname;
-            responseError.request_id = requestId;
-        } else {
-            result = jsonResponse as T;
+export const defaultRequest: RequestFn = async <T>(url: string, options?: RequestOptions): Promise<T> => {
+  let result: T;
+  let responseError: ResponseError;
+  // Objects must be copied to prevent modification of data such as body.
+  const copyOptions = Object.assign({}, options);
+  if (!copyOptions.method) {
+    copyOptions.method = 'GET';
+  }
+  if (copyOptions.body && typeof copyOptions.body !== 'string') {
+    copyOptions.body = JSON.stringify(copyOptions.body, (key, value) => {
+      if (value) {
+        if (value instanceof Map) {
+          return Object.fromEntries(value.entries());
+        } else if (value !== '') {
+          return value;
         }
-    } catch (error : any) {
-        responseError = {
-            error: ErrorType.UNREACHABLE,
-            error_description: error.message,
-            error_uri: new URL(url).pathname,
-            request_id: requestId,
-        };
-    }
-    if (responseError) {
-        throw responseError;
+      }
+    });
+  }
+  const requestId = copyOptions.headers['x-request-id'] as string;
+  try {
+    copyOptions.credentials = 'include';
+    const responseResult: Response = await fetch(url, copyOptions);
+    const jsonResponse = await responseResult.json();
+    if (jsonResponse.error || responseResult.status >= 400) {
+      responseError = jsonResponse as ResponseError;
+      responseError.error_uri = new URL(url).pathname;
+      responseError.request_id = requestId;
     } else {
-        return result as T;
+      result = jsonResponse as T;
     }
-};
+  } catch (error: any) {
+    responseError = {
+      error: ErrorType.UNREACHABLE,
+      error_description: error.message,
+      error_uri: new URL(url).pathname,
+      request_id: requestId,
+    };
+  }
+  if (responseError) {
+    throw responseError;
+  } else {
+    return result as T;
+  }
+};