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

package/.prettierrc.js

@@ -0,0 +1,41 @@
+module.exports = {
+  // 一行最多 120 字符
+  printWidth: 120,
+  // 使用 2 个空格缩进
+  tabWidth: 2,
+  // 不使用缩进符，而使用空格
+  useTabs: false,
+  // 行尾需要有分号
+  semi: true,
+  // 使用单引号
+  singleQuote: true,
+  // 对象的 key 仅在必要时用引号
+  quoteProps: "as-needed",
+  // jsx 不使用单引号，而使用双引号
+  jsxSingleQuote: false,
+  // 末尾需要有逗号
+  trailingComma: "all",
+  // 大括号内的首尾需要空格
+  bracketSpacing: true,
+  // jsx 标签的反尖括号需要换行
+  jsxBracketSameLine: false,
+  // 箭头函数，只有一个参数的时候，也需要括号
+  arrowParens: "always",
+  // 每个文件格式化的范围是文件的全部内容
+  rangeStart: 0,
+  rangeEnd: Infinity,
+  // 不需要写文件开头的 @prettier
+  requirePragma: false,
+  // 不需要自动在文件开头插入 @prettier
+  insertPragma: false,
+  // 使用默认的折行标准
+  proseWrap: "preserve",
+  // 根据显示样式决定 html 要不要折行
+  htmlWhitespaceSensitivity: "css",
+  // vue 文件中的 script 和 style 内不用缩进
+  vueIndentScriptAndStyle: false,
+  // 换行符使用 lf
+  endOfLine: "lf",
+  // 格式化内嵌代码
+  embeddedLanguageFormatting: "auto",
+};

package/dist/app/index.d.ts

@@ -1,6 +1,6 @@
-import { RequestFn as requestFn, RequestOptions as requestOptions } from "./request";
-import { OpenURIWithCallback as openURIWithCallback } from "./openuri";
-import { Storage as storage } from "./storage";
+import { RequestFn as requestFn, RequestOptions as requestOptions } from './request';
+import { OpenURIWithCallback as openURIWithCallback } from './openuri';
+import { Storage as storage } from './storage';
 export interface Options {
     env: string;
     region?: string;
@@ -9,8 +9,11 @@ export interface Options {
     clientSecret?: string;
     custom?: any;
     request?: requestFn;
+    baseRequest?: requestFn;
     storage?: storage;
-    openURIWithCallback?: openURIWithCallback;
+    captchaOptions?: {
+        openURIWithCallback?: openURIWithCallback;
+    };
 }
 export declare function initializeApp(options: Options): App;
 export interface App {
@@ -23,7 +26,7 @@ export declare class AppImpl implements App {
     get options(): Options;
     get container(): Map<string, any>;
 }
-export declare type RequestFn = requestFn;
-export declare type RequestOptions = requestOptions;
-export declare type OpenURIWithCallback = openURIWithCallback;
-export declare type Storage = storage;
+export type RequestFn = requestFn;
+export type RequestOptions = requestOptions;
+export type OpenURIWithCallback = openURIWithCallback;
+export type Storage = storage;

package/dist/app/index.js

@@ -27,10 +27,14 @@ class AppImpl {
         if (!options.storage) {
             options.storage = new storage_1.DefaultStorage({ env: storageEnv });
         }
-        if (!options.openURIWithCallback) {
-            options.openURIWithCallback = openuri_1.defaultOpenURIWithCallback;
+        if (!options.captchaOptions) {
+            options.captchaOptions = {};
         }
-        let baseRequest = options.request;
+        if (!options.captchaOptions.openURIWithCallback) {
+            // 兼容之前的传参方式，options.openURIWithCallback
+            options.captchaOptions.openURIWithCallback = options.openURIWithCallback || openuri_1.defaultOpenURIWithCallback;
+        }
+        let baseRequest = options.baseRequest || options.request || request_1.defaultRequest;
         if (!baseRequest) {
             baseRequest = request_1.defaultRequest;
         }
@@ -51,4 +55,3 @@ class AppImpl {
     }
 }
 exports.AppImpl = AppImpl;
-//# sourceMappingURL=index.js.map

package/dist/app/internal.js

@@ -22,4 +22,3 @@ function _getComponent(app, name, creator) {
     return component;
 }
 exports._getComponent = _getComponent;
-//# sourceMappingURL=internal.js.map

package/dist/app/openuri.d.ts

@@ -1,9 +1,10 @@
-export declare type OpenURIWithCallback = (url: string, opts?: OpenURIOptions) => Promise<{
+export type OpenURIWithCallback = (url: string, opts?: OpenURIOptions) => Promise<{
     [key: string]: string;
 }>;
 export interface OpenURIOptions {
     width: string;
     height: string;
+    request?: any;
 }
 /**
  * default use iframe to open url can return callback

package/dist/app/openuri.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultOpenURIWithCallback = void 0;
+const consts_1 = require("../auth/consts");
 /**
  * default use iframe to open url can return callback
  * for example : open https://example.com/callback?rediret_uri=http://127.0.0.1:8080/
@@ -15,15 +16,17 @@ exports.defaultOpenURIWithCallback = void 0;
  */
 const defaultOpenURIWithCallback = (url, opts) => {
     let iframeTag = '__iframe';
+    const { width = '355px', height = '355px' } = opts || {};
+    const matched = url.match(/^(data:.*)$/);
+    if (matched) {
+        return Promise.reject({
+            error: consts_1.ErrorType.UNIMPLEMENTED,
+            error_description: `need to impl captcha data`,
+        });
+    }
     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 =
@@ -34,33 +37,42 @@ const defaultOpenURIWithCallback = (url, opts) => {
     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');
+    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");
-        openURL.searchParams.set('redirect_uri', redirectUrl.href);
-        url = openURL.href;
+        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;`;
+    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 => {
+    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) {
-            }
+            catch (e) { }
         }
     }, false);
     return new Promise((resolve, reject) => {
-        callBack.callFunc = data => {
+        callBack.callFunc = (data) => {
             if (data.error) {
                 return reject(data);
             }
@@ -71,10 +83,7 @@ const defaultOpenURIWithCallback = (url, opts) => {
             try {
                 var windowLocation = window.location;
                 var iframeLocation = iframe.contentWindow.location;
-                if (iframeLocation.host +
-                    iframeLocation.pathname ===
-                    windowLocation.host +
-                        windowLocation.pathname) {
+                if (iframeLocation.host + iframeLocation.pathname === windowLocation.host + windowLocation.pathname) {
                     target.style.display = 'none';
                     const iframeUrlParams = new URLSearchParams(iframeLocation.search);
                     const data = {};
@@ -84,7 +93,7 @@ const defaultOpenURIWithCallback = (url, opts) => {
                     if (data.error) {
                         return reject({
                             error: iframeUrlParams.get('error'),
-                            error_description: iframeUrlParams.get('error_description')
+                            error_description: iframeUrlParams.get('error_description'),
                         });
                     }
                     return resolve(data);
@@ -102,4 +111,3 @@ const defaultOpenURIWithCallback = (url, opts) => {
 exports.defaultOpenURIWithCallback = defaultOpenURIWithCallback;
 class Callback {
 }
-//# sourceMappingURL=openuri.js.map

package/dist/app/request.d.ts

@@ -7,7 +7,7 @@ export interface RequestOptions {
 export declare enum ErrorType {
     UNREACHABLE = "unreachable"
 }
-export declare type RequestFn = <T>(url: string, options?: RequestOptions) => Promise<T>;
+export type RequestFn = <T>(url: string, options?: RequestOptions) => Promise<T>;
 /** An Error For all concern **/
 export interface ResponseError {
     error: string;

package/dist/app/request.js

@@ -15,13 +15,19 @@ const defaultRequest = async (url, options) => {
     }
     if (copyOptions.body && typeof copyOptions.body !== 'string') {
         copyOptions.body = JSON.stringify(copyOptions.body, (key, value) => {
-            if (value && value !== '') {
-                return value;
+            if (value) {
+                if (value instanceof Map) {
+                    return Object.fromEntries(value.entries());
+                }
+                else if (value !== '') {
+                    return value;
+                }
             }
         });
     }
     const requestId = copyOptions.headers['x-request-id'];
     try {
+        copyOptions.credentials = 'include';
         const responseResult = await fetch(url, copyOptions);
         const jsonResponse = await responseResult.json();
         if (jsonResponse.error || responseResult.status >= 400) {
@@ -49,4 +55,3 @@ const defaultRequest = async (url, options) => {
     }
 };
 exports.defaultRequest = defaultRequest;
-//# sourceMappingURL=request.js.map

package/dist/app/storage.js

@@ -32,4 +32,3 @@ class DefaultStorage {
     }
 }
 exports.DefaultStorage = DefaultStorage;
-//# sourceMappingURL=storage.js.map

package/dist/auth/consts.d.ts

@@ -5,6 +5,7 @@ export declare enum ApiUrls {
     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",
@@ -15,6 +16,9 @@ export declare enum ApiUrls {
     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",
@@ -29,7 +33,8 @@ export declare enum ApiUrls {
     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_REVOKE_ALL_URL = "/auth/v1/user/revoke/all",
+    GET_PROVIDER_TYPE = "/auth/v1/mgr/provider/providerSubType"
 }
 export declare enum VerificationUsages {
     REGISTER = "REGISTER",

package/dist/auth/consts.js

@@ -9,6 +9,7 @@ var ApiUrls;
     ApiUrls["AUTH_SIGN_UP_URL"] = "/auth/v1/signup";
     ApiUrls["AUTH_TOKEN_URL"] = "/auth/v1/token";
     ApiUrls["AUTH_REVOKE_URL"] = "/auth/v1/revoke";
+    ApiUrls["AUTH_SIGNOUT_URL"] = "/auth/v1/user/signout";
     ApiUrls["PROVIDER_BIND_URL"] = "/auth/v1/user/provider/bind";
     ApiUrls["PROVIDER_TOKEN_URL"] = "/auth/v1/provider/token";
     ApiUrls["PROVIDER_URI_URL"] = "/auth/v1/provider/uri";
@@ -19,6 +20,9 @@ var ApiUrls;
     ApiUrls["USER_TRANS_BY_PROVIDER_URL"] = "/auth/v1/user/trans/by/provider";
     ApiUrls["VERIFICATION_URL"] = "/auth/v1/verification";
     ApiUrls["VERIFY_URL"] = "/auth/v1/verification/verify";
+    ApiUrls["CAPTCHA_DATA_URL"] = "/auth/v1/captcha/data";
+    ApiUrls["VERIFY_CAPTCHA_DATA_URL"] = "/auth/v1/captcha/data/verify";
+    ApiUrls["GET_CAPTCHA_URL"] = "/auth/v1/captcha/init";
     ApiUrls["PROVIDER_LIST_URL"] = "/auth/v1/user/provider";
     ApiUrls["PROVIDER_UNBIND_URL"] = "/auth/v1/user/provider";
     ApiUrls["SUDO_URL"] = "/auth/v1/user/sudo";
@@ -34,6 +38,7 @@ var ApiUrls;
     ApiUrls["AUTHORIZED_DEVICES_URL"] = "/auth/v1/user/authorized/devices";
     ApiUrls["AUTHORIZED_DEVICES_DELETE_URL"] = "/auth/v1/user/authorized/devices/";
     ApiUrls["AUTH_REVOKE_ALL_URL"] = "/auth/v1/user/revoke/all";
+    ApiUrls["GET_PROVIDER_TYPE"] = "/auth/v1/mgr/provider/providerSubType";
 })(ApiUrls = exports.ApiUrls || (exports.ApiUrls = {}));
 var VerificationUsages;
 (function (VerificationUsages) {
@@ -76,4 +81,3 @@ var DeviceAuthorizeState;
     // 用户拒绝授权
     DeviceAuthorizeState["ACCESS_DENIED"] = "ACCESS_DENIED";
 })(DeviceAuthorizeState = exports.DeviceAuthorizeState || (exports.DeviceAuthorizeState = {}));
-//# sourceMappingURL=consts.js.map

package/dist/auth/index.d.ts

@@ -1,9 +1,9 @@
-import { UserProfile, SignInRequest, SignUpRequest, VerifyRequest, VerifyResponse, GenProviderRedirectUriRequest, GenProviderRedirectUriResponse, GrantProviderTokenRequest, GrantProviderTokenResponse, PatchProviderTokenRequest, PatchProviderTokenResponse, SignInWithProviderRequest, BindWithProviderRequest, TransByProviderRequest, GrantTokenRequest, UnbindProviderRequest, CheckPasswordRequest, SetPasswordRequest, ChangeBoundProviderRequest, ChangeBoundProviderResponse, QueryUserProfileRequest, UpdatePasswordRequest, SudoRequest, SudoResponse, QueryUserProfileResponse, EditContactRequest, CheckIfUserExistResponse, CheckIfUserExistRequest, SendVerificationCodeRequest, SendVerificationCodeResponse, ResetPasswordRequest, AuthorizeRequest, AuthorizeResponse, AuthorizeInfoRequest, AuthorizeInfoResponse, RevokeDeviceRequest, WithSudoRequest, AuthorizeDeviceRequest, DeviceAuthorizeRequest, DeviceAuthorizeResponse, ProvidersResponse } from "./models";
-import { Credentials, AuthClient } from "../oauthclient";
-import { Captcha } from "../captcha";
-import { App, RequestFn as appRequestFn } from "../app";
-export { ErrorType, VerificationUsages, DeviceAuthorizeState } from "./consts";
-export { ResponseError } from "../oauthclient";
+import { UserProfile, SignInRequest, SignUpRequest, VerifyRequest, VerifyResponse, GenProviderRedirectUriRequest, GenProviderRedirectUriResponse, GrantProviderTokenRequest, GrantProviderTokenResponse, PatchProviderTokenRequest, PatchProviderTokenResponse, SignInWithProviderRequest, BindWithProviderRequest, TransByProviderRequest, GrantTokenRequest, UnbindProviderRequest, CheckPasswordRequest, SetPasswordRequest, ChangeBoundProviderRequest, ChangeBoundProviderResponse, QueryUserProfileRequest, UpdatePasswordRequest, SudoRequest, SudoResponse, QueryUserProfileResponse, EditContactRequest, CheckIfUserExistResponse, CheckIfUserExistRequest, SendVerificationCodeRequest, SendVerificationCodeResponse, ResetPasswordRequest, AuthorizeRequest, AuthorizeResponse, AuthorizeInfoRequest, AuthorizeInfoResponse, RevokeDeviceRequest, WithSudoRequest, AuthorizeDeviceRequest, DeviceAuthorizeRequest, DeviceAuthorizeResponse, ProvidersResponse, SignoutRequest, SignoutReponse, ProviderSubType } from './models';
+import { Credentials, AuthClient } from '../oauthclient';
+import { Captcha } from '../captcha';
+import { App, RequestFn as appRequestFn } from '../app';
+export { ErrorType, VerificationUsages, DeviceAuthorizeState } from './consts';
+export { ResponseError } from '../oauthclient';
 export interface AuthOptions {
     credentialsClient: AuthClient;
     captcha: Captcha;
@@ -12,7 +12,7 @@ export interface AuthOptions {
  * Returns the existing `Auth` instance that is associated with the app
  */
 export declare function getAuth(app: App, initOptions?: any): Auth;
-export declare type GetCustomSignTicketFn = () => Promise<string>;
+export type GetCustomSignTicketFn = () => Promise<string>;
 /**
  * Auth
  */
@@ -44,9 +44,10 @@ export declare class Auth {
     signUp(params: SignUpRequest): Promise<Credentials>;
     /**
      * Sign out.
-     * @return {Object} A Promise<void> object.
+     * @param {SignoutRequest} params A SignoutRequest Object.
+     * @return {SignoutReponse} A Promise<SignoutReponse> object.
      */
-    signOut(): Promise<void>;
+    signOut(params?: SignoutRequest): Promise<SignoutReponse>;
     /**
      * Revoke All Devices
      * @return {Object} A Promise<void> object.
@@ -63,6 +64,7 @@ export declare class Auth {
      * @return {Promise<SendVerificationCodeResponse>} A Promise<GetVerificationResponse> object.
      */
     sendVerificationCode(params: SendVerificationCodeRequest): Promise<SendVerificationCodeResponse>;
+    getVerification(params: SendVerificationCodeRequest): Promise<SendVerificationCodeResponse>;
     /**
      *  Verify the code
      * @param {VerifyRequest} params A VerifyRequest Object.
@@ -238,5 +240,29 @@ export declare class Auth {
      * @constructor
      */
     authorizeInfo(params: AuthorizeInfoRequest): Promise<AuthorizeInfoResponse>;
+    /**
+     * get provider sub type
+     * @returns
+     */
+    getProviderSubType(): Promise<ProviderSubType>;
+    createCaptchaData(params: {
+        state: string;
+        redirect_uri?: string;
+    }): Promise<{
+        captcha_token: string;
+        expires_in: number;
+    }>;
+    /**
+     * 验证输入验证码
+     * @param params.token 图形验证码token
+     * @param params.key 用户输入值
+     */
+    verifyCaptchaData(params: {
+        token: string;
+        key: string;
+    }): Promise<{
+        captcha_token: string;
+        expires_in: number;
+    }>;
     private static parseParamsToSearch;
 }