@cloudbase/oauth 0.1.1-alpha.1 → 0.1.1-alpha.10

package/src/app/openuri.ts

@@ -1,8 +1,11 @@
+import { ErrorType } from '../auth/consts';
+
 export type OpenURIWithCallback = (url: string, opts?: OpenURIOptions) => Promise<{ [key: string]: string }>;
 
 export interface OpenURIOptions {
-    width: string;
-    height: string;
+  width: string;
+  height: string;
+  request?: any;
 }
 
 /**
@@ -17,95 +20,109 @@ 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';
+  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`,
+    });
+  }
+
+  if (window.location.search.indexOf(iframeTag) > 0) {
+    document.body.style.display = 'none';
+  }
+  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:${width};display:block;height:${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) {
-            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) {
-        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;
+  }
+};

package/src/auth/consts.ts

@@ -1,74 +1,79 @@
 export enum ApiUrls {
-    AUTH_SIGN_IN_URL = '/auth/v1/signin',
-    AUTH_SIGN_IN_ANONYMOUSLY_URL = '/auth/v1/signin/anonymously',
-    AUTH_SIGN_IN_WITH_PROVIDER_URL = '/auth/v1/signin/with/provider',
-    AUTH_SIGN_UP_URL = '/auth/v1/signup',
-    AUTH_TOKEN_URL = '/auth/v1/token',
-    AUTH_REVOKE_URL = '/auth/v1/revoke',
-    PROVIDER_BIND_URL = '/auth/v1/user/provider/bind',
-    PROVIDER_TOKEN_URL = '/auth/v1/provider/token',
-    PROVIDER_URI_URL = '/auth/v1/provider/uri',
-    USER_ME_URL = '/auth/v1/user/me',
-    RESET_PASSWORD_URL = '/auth/v1/reset',
-    USER_QUERY_URL = '/auth/v1/user/query',
-    USER_PROFILE_URL = '/auth/v1/user/profile',
-    USER_TRANS_BY_PROVIDER_URL = '/auth/v1/user/trans/by/provider',
-    VERIFICATION_URL = '/auth/v1/verification',
-    VERIFY_URL = '/auth/v1/verification/verify',
-    PROVIDER_LIST_URL = '/auth/v1/user/provider',
-    PROVIDER_UNBIND_URL = '/auth/v1/user/provider',
-    SUDO_URL = '/auth/v1/user/sudo',
-    EDIT_CONTACT_URL = '/auth/v1/user/contact',
-    AUTH_SET_PASSWORD_URL = '/auth/v1/user/password',
-    CHECK_IF_USER_EXIST_URL = '/auth/v1/checkIfUserExist',
-    AUTHORIZE_URL = '/auth/v1/user/authorize',
-    AUTHORIZE_DEVICE_URL = '/auth/v1/user/device/authorize',
-    AUTHORIZE_DEVICE_CODE_URL = '/auth/v1/device/code',
-    AUTHORIZE_INFO_URL = '/auth/v1/user/authorize/info',
-    AUTHORIZED_URL = '/auth/v1/user/authorized',
-    AUTHORIZED_DELETE_URL = '/auth/v1/user/authorized/',
-    AUTHORIZED_DEVICES_URL = '/auth/v1/user/authorized/devices',
-    AUTHORIZED_DEVICES_DELETE_URL = '/auth/v1/user/authorized/devices/',
-    AUTH_REVOKE_ALL_URL = '/auth/v1/user/revoke/all',
+  AUTH_SIGN_IN_URL = '/auth/v1/signin',
+  AUTH_SIGN_IN_ANONYMOUSLY_URL = '/auth/v1/signin/anonymously',
+  AUTH_SIGN_IN_WITH_PROVIDER_URL = '/auth/v1/signin/with/provider',
+  AUTH_SIGN_UP_URL = '/auth/v1/signup',
+  AUTH_TOKEN_URL = '/auth/v1/token',
+  AUTH_REVOKE_URL = '/auth/v1/revoke',
+  AUTH_SIGNOUT_URL = '/auth/v1/user/signout',
+  PROVIDER_BIND_URL = '/auth/v1/user/provider/bind',
+  PROVIDER_TOKEN_URL = '/auth/v1/provider/token',
+  PROVIDER_URI_URL = '/auth/v1/provider/uri',
+  USER_ME_URL = '/auth/v1/user/me',
+  RESET_PASSWORD_URL = '/auth/v1/reset',
+  USER_QUERY_URL = '/auth/v1/user/query',
+  USER_PROFILE_URL = '/auth/v1/user/profile',
+  USER_TRANS_BY_PROVIDER_URL = '/auth/v1/user/trans/by/provider',
+  VERIFICATION_URL = '/auth/v1/verification',
+  VERIFY_URL = '/auth/v1/verification/verify',
+  CAPTCHA_DATA_URL = '/auth/v1/captcha/data',
+  VERIFY_CAPTCHA_DATA_URL = '/auth/v1/captcha/data/verify',
+  GET_CAPTCHA_URL = '/auth/v1/captcha/init',
+  PROVIDER_LIST_URL = '/auth/v1/user/provider',
+  PROVIDER_UNBIND_URL = '/auth/v1/user/provider',
+  SUDO_URL = '/auth/v1/user/sudo',
+  EDIT_CONTACT_URL = '/auth/v1/user/contact',
+  AUTH_SET_PASSWORD_URL = '/auth/v1/user/password',
+  CHECK_IF_USER_EXIST_URL = '/auth/v1/checkIfUserExist',
+  AUTHORIZE_URL = '/auth/v1/user/authorize',
+  AUTHORIZE_DEVICE_URL = '/auth/v1/user/device/authorize',
+  AUTHORIZE_DEVICE_CODE_URL = '/auth/v1/device/code',
+  AUTHORIZE_INFO_URL = '/auth/v1/user/authorize/info',
+  AUTHORIZED_URL = '/auth/v1/user/authorized',
+  AUTHORIZED_DELETE_URL = '/auth/v1/user/authorized/',
+  AUTHORIZED_DEVICES_URL = '/auth/v1/user/authorized/devices',
+  AUTHORIZED_DEVICES_DELETE_URL = '/auth/v1/user/authorized/devices/',
+  AUTH_REVOKE_ALL_URL = '/auth/v1/user/revoke/all',
+  GET_PROVIDER_TYPE = '/auth/v1/mgr/provider/providerSubType',
 }
 
 export enum VerificationUsages {
-    REGISTER = 'REGISTER',
-    SIGN_IN = 'SIGN_IN',
-    PASSWORD_RESET = 'PASSWORD_RESET',
-    EMAIL_ADDRESS_CHANGE = 'EMAIL_ADDRESS_CHANGE',
-    PHONE_NUMBER_CHANGE = 'PHONE_NUMBER_CHANGE',
+  REGISTER = 'REGISTER',
+  SIGN_IN = 'SIGN_IN',
+  PASSWORD_RESET = 'PASSWORD_RESET',
+  EMAIL_ADDRESS_CHANGE = 'EMAIL_ADDRESS_CHANGE',
+  PHONE_NUMBER_CHANGE = 'PHONE_NUMBER_CHANGE',
 }
 
 export enum ErrorType {
-    INVALID_ARGUMENT = 'invalid_argument',
-    DEADLINE_EXCEEDED = 'deadline_exceeded',
-    NOT_FOUND = 'not_found',
-    ALREADY_EXISTS = 'already_exists',
-    PERMISSION_DENIED = 'permission_denied',
-    ABORTED = 'aborted',
-    OUT_OF_RANGE = 'out_of_range',
-    UNIMPLEMENTED = 'unimplemented',
-    INTERNAL = 'internal',
-    UNAVAILABLE = 'unavailable',
-    DATA_LOSS = 'data_loss',
-    // CommonError
-    CAPTCHA_REQUIRED = 'captcha_required',
-    CAPTCHA_INVALID = 'captcha_invalid',
-    INVALID_PASSWORD = 'invalid_password',
-    PASSWORD_NOT_SET = 'password_not_set',
-    INVALID_STATUS = 'invalid_status',
-    USER_PENDING = 'user_pending',
-    USER_BLOCKED = 'user_blocked',
+  INVALID_ARGUMENT = 'invalid_argument',
+  DEADLINE_EXCEEDED = 'deadline_exceeded',
+  NOT_FOUND = 'not_found',
+  ALREADY_EXISTS = 'already_exists',
+  PERMISSION_DENIED = 'permission_denied',
+  ABORTED = 'aborted',
+  OUT_OF_RANGE = 'out_of_range',
+  UNIMPLEMENTED = 'unimplemented',
+  INTERNAL = 'internal',
+  UNAVAILABLE = 'unavailable',
+  DATA_LOSS = 'data_loss',
+  // CommonError
+  CAPTCHA_REQUIRED = 'captcha_required',
+  CAPTCHA_INVALID = 'captcha_invalid',
+  INVALID_PASSWORD = 'invalid_password',
+  PASSWORD_NOT_SET = 'password_not_set',
+  INVALID_STATUS = 'invalid_status',
+  USER_PENDING = 'user_pending',
+  USER_BLOCKED = 'user_blocked',
 }
 
 export enum DeviceAuthorizeState {
-    // 完成
-    ACCOMPLISHED = 'ACCOMPLISHED',
-    // 等待连接
-   WAITING_CONNECT = 'WAITING_CONNECT',
-   // 等待用户点击同意界面
-   WAITING_CONSENT = 'WAITING_CONSENT',
-   // 用户拒绝授权
-   ACCESS_DENIED = 'ACCESS_DENIED',
-}
+  // 完成
+  ACCOMPLISHED = 'ACCOMPLISHED',
+  // 等待连接
+  WAITING_CONNECT = 'WAITING_CONNECT',
+  // 等待用户点击同意界面
+  WAITING_CONSENT = 'WAITING_CONSENT',
+  // 用户拒绝授权
+  ACCESS_DENIED = 'ACCESS_DENIED',
+}