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

package/dist/auth/index.js

@@ -1,33 +1,27 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Auth = exports.getAuth = exports.DeviceAuthorizeState = exports.VerificationUsages = exports.ErrorType = void 0;
-const consts_1 = require("./consts");
-const oauthclient_1 = require("../oauthclient");
-const captcha_1 = require("../captcha");
-const internal_1 = require("../app/internal");
-var consts_2 = require("./consts");
-Object.defineProperty(exports, "ErrorType", { enumerable: true, get: function () { return consts_2.ErrorType; } });
-Object.defineProperty(exports, "VerificationUsages", { enumerable: true, get: function () { return consts_2.VerificationUsages; } });
-Object.defineProperty(exports, "DeviceAuthorizeState", { enumerable: true, get: function () { return consts_2.DeviceAuthorizeState; } });
+'use strict';
+import { ApiUrls } from './consts';
+import { getOAuthClient, ErrorType as oauthErrorType } from '../oauthclient';
+import { getCaptcha } from '../captcha';
+import { _getComponent } from '../app/internal';
+export { ErrorType, VerificationUsages, DeviceAuthorizeState } from './consts';
 /**
  * Returns the existing `Auth` instance that is associated with the app
  */
-function getAuth(app, initOptions) {
-    return (0, internal_1._getComponent)(app, "auth", () => {
-        const credentialsClient = (0, oauthclient_1.getOAuthClient)(app, initOptions);
+export function getAuth(app, initOptions) {
+    return _getComponent(app, 'auth', () => {
+        const credentialsClient = getOAuthClient(app, initOptions);
         const baseRequest = credentialsClient.request.bind(credentialsClient);
-        const captcha = (0, captcha_1.getCaptcha)(app, { request: baseRequest });
+        const captcha = getCaptcha(app, { request: baseRequest });
         return new Auth({
             credentialsClient: credentialsClient,
             captcha: captcha,
         });
     });
 }
-exports.getAuth = getAuth;
 /**
  * Auth
  */
-class Auth {
+export class Auth {
     /**
      * constructor
      * @param {AuthOptions} opts
@@ -42,8 +36,8 @@ class Auth {
      * @return {Promise<Credentials>} A Promise<Credentials> object.
      */
     async signIn(params) {
-        const credentials = await this.request(consts_1.ApiUrls.AUTH_SIGN_IN_URL, {
-            method: "POST",
+        const credentials = await this.request(ApiUrls.AUTH_SIGN_IN_URL, {
+            method: 'POST',
             withBasicAuth: true,
             body: params,
         });
@@ -55,8 +49,8 @@ class Auth {
      * @return {Promise<Credentials>} A Promise<Credentials> object.
      */
     async signInAnonymously() {
-        const credentials = await this.request(consts_1.ApiUrls.AUTH_SIGN_IN_ANONYMOUSLY_URL, {
-            method: "POST",
+        const credentials = await this.request(ApiUrls.AUTH_SIGN_IN_ANONYMOUSLY_URL, {
+            method: 'POST',
             withBasicAuth: true,
             body: {},
         });
@@ -69,8 +63,8 @@ class Auth {
      * @return {Promise<Credentials>} A Promise<Credentials> object.
      */
     async signUp(params) {
-        const data = await this.request(consts_1.ApiUrls.AUTH_SIGN_UP_URL, {
-            method: "POST",
+        const data = await this.request(ApiUrls.AUTH_SIGN_UP_URL, {
+            method: 'POST',
             withBasicAuth: true,
             body: params,
         });
@@ -79,30 +73,36 @@ class Auth {
     }
     /**
      * Sign out.
-     * @return {Object} A Promise<void> object.
+     * @param {SignoutRequest} params A SignoutRequest Object.
+     * @return {SignoutReponse} A Promise<SignoutReponse> object.
      */
-    async signOut() {
+    async signOut(params) {
+        var resp = {};
+        if (!params) {
+            params = {};
+        }
         try {
-            await this.request(consts_1.ApiUrls.AUTH_REVOKE_URL, {
-                method: "POST",
+            resp = await this.request(ApiUrls.AUTH_SIGNOUT_URL, {
+                method: 'POST',
                 withCredentials: true,
+                body: params,
             });
         }
         catch (err) {
-            if (err.error !== oauthclient_1.ErrorType.UNAUTHENTICATED) {
-                console.log("sign_out_error", err);
+            if (err.error !== oauthErrorType.UNAUTHENTICATED) {
+                console.log('sign_out_error', err);
             }
         }
         await this.credentialsClient.setCredentials();
-        return;
+        return resp;
     }
     /**
      * Revoke All Devices
      * @return {Object} A Promise<void> object.
      */
     async revokeAllDevices() {
-        await this.request(consts_1.ApiUrls.AUTH_REVOKE_ALL_URL, {
-            method: "DELETE",
+        await this.request(ApiUrls.AUTH_REVOKE_ALL_URL, {
+            method: 'DELETE',
             withCredentials: true,
         });
     }
@@ -111,8 +111,8 @@ class Auth {
      * @return {Object} A Promise<void> object.
      */
     async revokeDevice(params) {
-        await this.request(consts_1.ApiUrls.AUTHORIZED_DEVICES_DELETE_URL + params.device_id, {
-            method: "DELETE",
+        await this.request(ApiUrls.AUTHORIZED_DEVICES_DELETE_URL + params.device_id, {
+            method: 'DELETE',
             withCredentials: true,
         });
     }
@@ -125,7 +125,7 @@ class Auth {
         let withBasicAuth = false;
         let withCredentials = false;
         // 发送短信时，如果时给当前用户发，则需要带上鉴权信息
-        if (params.target == "CUR_USER") {
+        if (params.target == 'CUR_USER') {
             withCredentials = true;
         }
         else {
@@ -137,22 +137,25 @@ class Auth {
                 withBasicAuth = true;
             }
         }
-        return this.request(consts_1.ApiUrls.VERIFICATION_URL, {
-            method: "POST",
+        return this.request(ApiUrls.VERIFICATION_URL, {
+            method: 'POST',
             withBasicAuth: withBasicAuth,
             withCredentials: withCredentials,
             body: params,
             withCaptcha: true,
         });
     }
+    async getVerification(params) {
+        return this.sendVerificationCode(params);
+    }
     /**
      *  Verify the code
      * @param {VerifyRequest} params A VerifyRequest Object.
      * @return {Promise<VerifyResponse>} A Promise<VerifyResponse> object.
      */
     async verify(params) {
-        return this.request(consts_1.ApiUrls.VERIFY_URL, {
-            method: "POST",
+        return this.request(ApiUrls.VERIFY_URL, {
+            method: 'POST',
             withBasicAuth: true,
             body: params,
         });
@@ -162,8 +165,8 @@ class Auth {
      * @param params A ResetPasswordRequest Object
      */
     async resetPassword(params) {
-        return this.request(consts_1.ApiUrls.RESET_PASSWORD_URL, {
-            method: "POST",
+        return this.request(ApiUrls.RESET_PASSWORD_URL, {
+            method: 'POST',
             withBasicAuth: true,
             body: params,
         });
@@ -176,14 +179,14 @@ class Auth {
     async genProviderRedirectUri(params) {
         const otherParams = params.other_params;
         delete params.other_params;
-        let url = `${consts_1.ApiUrls.PROVIDER_URI_URL}?${Auth.parseParamsToSearch(params)}`;
+        let url = `${ApiUrls.PROVIDER_URI_URL}?${Auth.parseParamsToSearch(params)}`;
         if (otherParams) {
             otherParams.forEach((value, key) => {
                 url += `&other_params[${key}]=${encodeURIComponent(value)}`;
             });
         }
         return this.request(url, {
-            method: "GET",
+            method: 'GET',
             withBasicAuth: true,
         });
     }
@@ -193,8 +196,8 @@ class Auth {
      * @return {Promise<GrantProviderTokenResponse>} A Promise<GrantProviderTokenResponse> object.
      */
     async grantProviderToken(params) {
-        return this.request(consts_1.ApiUrls.PROVIDER_TOKEN_URL, {
-            method: "POST",
+        return this.request(ApiUrls.PROVIDER_TOKEN_URL, {
+            method: 'POST',
             withBasicAuth: true,
             body: params,
         });
@@ -205,8 +208,8 @@ class Auth {
      * @return {Promise<PatchProviderTokenResponse>} A Promise<PatchProviderTokenResponse> object.
      */
     async patchProviderToken(params) {
-        return this.request(consts_1.ApiUrls.PROVIDER_TOKEN_URL, {
-            method: "PATCH",
+        return this.request(ApiUrls.PROVIDER_TOKEN_URL, {
+            method: 'PATCH',
             withBasicAuth: true,
             body: params,
         });
@@ -217,8 +220,8 @@ class Auth {
      * @return {Promise<Credentials>} A Promise<Credentials> object.
      */
     async signInWithProvider(params) {
-        const credentials = await this.request(consts_1.ApiUrls.AUTH_SIGN_IN_WITH_PROVIDER_URL, {
-            method: "POST",
+        const credentials = await this.request(ApiUrls.AUTH_SIGN_IN_WITH_PROVIDER_URL, {
+            method: 'POST',
             withBasicAuth: true,
             body: params,
         });
@@ -231,8 +234,8 @@ class Auth {
      * @return {Promise<void>} A Promise<void> object.
      */
     async bindWithProvider(params) {
-        return this.request(consts_1.ApiUrls.PROVIDER_BIND_URL, {
-            method: "POST",
+        return this.request(ApiUrls.PROVIDER_BIND_URL, {
+            method: 'POST',
             withBasicAuth: true,
             body: params,
             withCredentials: true,
@@ -243,8 +246,8 @@ class Auth {
      * @return {Promise<UserProfile>} A Promise<UserProfile> object.
      */
     async getUserProfile() {
-        return this.request(consts_1.ApiUrls.USER_ME_URL, {
-            method: "GET",
+        return this.request(ApiUrls.USER_ME_URL, {
+            method: 'GET',
             withCredentials: true,
         });
     }
@@ -253,8 +256,8 @@ class Auth {
      * @return {Promise<UserProfile>} A Promise<UserProfile> object.
      */
     async updateUserProfile(params) {
-        return this.request(consts_1.ApiUrls.USER_ME_URL, {
-            method: "PATCH",
+        return this.request(ApiUrls.USER_ME_URL, {
+            method: 'PATCH',
             withCredentials: true,
             body: params,
         });
@@ -269,7 +272,7 @@ class Auth {
             return true;
         }
         catch (err) {
-            if (err.error === oauthclient_1.ErrorType.UNAUTHENTICATED) {
+            if (err.error === oauthErrorType.UNAUTHENTICATED) {
                 return false;
             }
             return Promise.reject(err);
@@ -288,8 +291,8 @@ class Auth {
      * @return {Promise<Credentials>} A Promise<Credentials> object.
      */
     async transByProvider(params) {
-        return this.request(consts_1.ApiUrls.USER_TRANS_BY_PROVIDER_URL, {
-            method: "PATCH",
+        return this.request(ApiUrls.USER_TRANS_BY_PROVIDER_URL, {
+            method: 'PATCH',
             body: params,
             withCredentials: true,
         });
@@ -300,8 +303,8 @@ class Auth {
      * @return {Promise<Credentials>} A Promise<Credentials> object.
      */
     async grantToken(params) {
-        const credentials = await this.request(consts_1.ApiUrls.AUTH_TOKEN_URL, {
-            method: "POST",
+        const credentials = await this.request(ApiUrls.AUTH_TOKEN_URL, {
+            method: 'POST',
             withBasicAuth: true,
             body: params,
         });
@@ -313,8 +316,8 @@ class Auth {
      * @return {Promise<ProvidersResponse>} A Promise<UserProfileProviderList> object.
      */
     async getProviders() {
-        return this.request(consts_1.ApiUrls.PROVIDER_LIST_URL, {
-            method: "GET",
+        return this.request(ApiUrls.PROVIDER_LIST_URL, {
+            method: 'GET',
             withCredentials: true,
         });
     }
@@ -323,9 +326,9 @@ class Auth {
      * @param params CheckIfUserExistRequest
      */
     async checkIfUserExist(params) {
-        const url = `${consts_1.ApiUrls.USER_ME_URL}?${Auth.parseParamsToSearch(params)}`;
+        const url = `${ApiUrls.USER_ME_URL}?${Auth.parseParamsToSearch(params)}`;
         return this.request(url, {
-            method: "GET",
+            method: 'GET',
         });
     }
     /**
@@ -334,8 +337,8 @@ class Auth {
      * @return {Promise<void>}
      */
     async unbindProvider(params) {
-        return this.request(`${consts_1.ApiUrls.PROVIDER_UNBIND_URL}/${params.provider_id}`, {
-            method: "DELETE",
+        return this.request(`${ApiUrls.PROVIDER_UNBIND_URL}/${params.provider_id}`, {
+            method: 'DELETE',
             withCredentials: true,
         });
     }
@@ -345,8 +348,8 @@ class Auth {
      * @return {Promise<void>}
      */
     async checkPassword(params) {
-        return this.request(`${consts_1.ApiUrls.SUDO_URL}`, {
-            method: "POST",
+        return this.request(`${ApiUrls.SUDO_URL}`, {
+            method: 'POST',
             withCredentials: true,
             body: params,
         });
@@ -357,8 +360,8 @@ class Auth {
      * @return {Promise<void>}
      */
     async editContact(params) {
-        return this.request(`${consts_1.ApiUrls.EDIT_CONTACT_URL}`, {
-            method: "PATCH",
+        return this.request(`${ApiUrls.EDIT_CONTACT_URL}`, {
+            method: 'PATCH',
             withCredentials: true,
             body: params,
         });
@@ -369,8 +372,8 @@ class Auth {
      * @return {Promise<void>}
      */
     async setPassword(params) {
-        return this.request(`${consts_1.ApiUrls.AUTH_SET_PASSWORD_URL}`, {
-            method: "PATCH",
+        return this.request(`${ApiUrls.AUTH_SET_PASSWORD_URL}`, {
+            method: 'PATCH',
             withCredentials: true,
             body: params,
         });
@@ -393,8 +396,8 @@ class Auth {
      * @return {Promise<SudoResponse>}
      */
     async sudo(params) {
-        return this.request(`${consts_1.ApiUrls.SUDO_URL}`, {
-            method: "POST",
+        return this.request(`${ApiUrls.SUDO_URL}`, {
+            method: 'POST',
             withCredentials: true,
             body: params,
         });
@@ -405,9 +408,9 @@ class Auth {
      * @return {Promise<SendVerificationCodeResponse>} A Promise<SendVerificationCodeResponse> object.
      */
     async SendVerificationCodeToCurrentUser(params) {
-        params.target = "CUR_USER";
-        return this.request(consts_1.ApiUrls.VERIFICATION_URL, {
-            method: "POST",
+        params.target = 'CUR_USER';
+        return this.request(ApiUrls.VERIFICATION_URL, {
+            method: 'POST',
             body: params,
             withCredentials: true,
             withCaptcha: true,
@@ -419,8 +422,8 @@ class Auth {
      * @return {Promise<ChangeBoundProviderResponse>} A Promise<GetVerificationResponse> object.
      */
     async changeBoundProvider(params) {
-        return this.request(`${consts_1.ApiUrls.PROVIDER_LIST_URL}/${params.provider_id}/trans`, {
-            method: "POST",
+        return this.request(`${ApiUrls.PROVIDER_LIST_URL}/${params.provider_id}/trans`, {
+            method: 'POST',
             body: {
                 provider_trans_token: params.trans_token,
             },
@@ -433,8 +436,8 @@ class Auth {
      * @return {Promise<UserProfile>} A Promise<UserProfile> object.
      */
     async setUserProfile(params) {
-        return this.request(consts_1.ApiUrls.USER_PROFILE_URL, {
-            method: "PATCH",
+        return this.request(ApiUrls.USER_PROFILE_URL, {
+            method: 'PATCH',
             body: params,
             withCredentials: true,
         });
@@ -444,9 +447,9 @@ class Auth {
      * @param params
      */
     async deleteMe(params) {
-        const url = `${consts_1.ApiUrls.USER_ME_URL}?${Auth.parseParamsToSearch(params)}`;
+        const url = `${ApiUrls.USER_ME_URL}?${Auth.parseParamsToSearch(params)}`;
         return this.request(url, {
-            method: "DELETE",
+            method: 'DELETE',
             withCredentials: true,
         });
     }
@@ -465,13 +468,13 @@ class Auth {
         const customSignTicketFn = this._getCustomSignTicketFn;
         if (!customSignTicketFn) {
             return Promise.reject({
-                error: "failed_precondition",
-                error_description: "please use setCustomSignFunc to set custom sign function",
+                error: 'failed_precondition',
+                error_description: 'please use setCustomSignFunc to set custom sign function',
             });
         }
         const customTicket = await customSignTicketFn();
         return this.signInWithProvider({
-            provider_id: "custom",
+            provider_id: 'custom',
             provider_token: customTicket,
         });
     }
@@ -480,9 +483,9 @@ class Auth {
      * @param params queryUserProfile query user profile
      */
     async queryUserProfile(params) {
-        const url = `${consts_1.ApiUrls.USER_QUERY_URL}?${Auth.parseParamsToSearch(params)}`;
+        const url = `${ApiUrls.USER_QUERY_URL}?${Auth.parseParamsToSearch(params)}`;
         return this.request(url, {
-            method: "GET",
+            method: 'GET',
             withCredentials: true,
         });
     }
@@ -492,8 +495,8 @@ class Auth {
      * @constructor
      */
     async authorize(params) {
-        return this.request(consts_1.ApiUrls.AUTHORIZE_URL, {
-            method: "POST",
+        return this.request(ApiUrls.AUTHORIZE_URL, {
+            method: 'POST',
             withCredentials: true,
             body: params,
         });
@@ -503,15 +506,15 @@ class Auth {
      * @param params
      */
     async authorizeDevice(params) {
-        return this.request(consts_1.ApiUrls.AUTHORIZE_DEVICE_URL, {
-            method: "POST",
+        return this.request(ApiUrls.AUTHORIZE_DEVICE_URL, {
+            method: 'POST',
             withCredentials: true,
             body: params,
         });
     }
     async deviceAuthorize(params) {
-        return this.request(consts_1.ApiUrls.AUTHORIZE_DEVICE_CODE_URL, {
-            method: "POST",
+        return this.request(ApiUrls.AUTHORIZE_DEVICE_CODE_URL, {
+            method: 'POST',
             withBasicAuth: true,
             body: params,
         });
@@ -522,7 +525,7 @@ class Auth {
      * @constructor
      */
     async authorizeInfo(params) {
-        const url = `${consts_1.ApiUrls.AUTHORIZE_INFO_URL}?${Auth.parseParamsToSearch(params)}`;
+        const url = `${ApiUrls.AUTHORIZE_INFO_URL}?${Auth.parseParamsToSearch(params)}`;
         let withBasicAuth = true;
         let withCredentials = false;
         const hasLogin = await this.hasLoginState();
@@ -531,11 +534,42 @@ class Auth {
             withBasicAuth = false;
         }
         return this.request(url, {
-            method: "GET",
+            method: 'GET',
             withBasicAuth: withBasicAuth,
             withCredentials: withCredentials,
         });
     }
+    /**
+     * get provider sub type
+     * @returns
+     */
+    async getProviderSubType() {
+        return this.request(ApiUrls.GET_PROVIDER_TYPE, {
+            method: 'POST',
+            body: {
+                provider_id: 'weda',
+            },
+        });
+    }
+    async createCaptchaData(params) {
+        return this.request(ApiUrls.CAPTCHA_DATA_URL, {
+            method: 'POST',
+            withBasicAuth: true,
+            body: params,
+        });
+    }
+    /**
+     * 验证输入验证码
+     * @param params.token 图形验证码token
+     * @param params.key 用户输入值
+     */
+    async verifyCaptchaData(params) {
+        return this.request(ApiUrls.VERIFY_CAPTCHA_DATA_URL, {
+            method: 'POST',
+            withBasicAuth: true,
+            body: params,
+        });
+    }
     static parseParamsToSearch(params) {
         for (let key in params) {
             if (!params[key]) {
@@ -546,5 +580,3 @@ class Auth {
         return searchParams.toString();
     }
 }
-exports.Auth = Auth;
-//# sourceMappingURL=index.js.map

package/dist/auth/models.d.ts

@@ -2,7 +2,7 @@ export interface SignInRequest {
     username?: string;
     password?: string;
     verification_token?: string;
-    two_factor_password?: string;
+    provider_token?: string;
 }
 export interface SignInWithProviderRequest {
     provider_token: string;
@@ -59,6 +59,7 @@ export interface GrantProviderTokenRequest {
     provider_code?: string;
     provider_access_token?: string;
     provider_id_token?: string;
+    provider_params?: Map<string, string>;
 }
 export interface GrantProviderTokenResponse {
     provider_token: string;
@@ -84,7 +85,6 @@ export interface GenProviderRedirectUriRequest {
 }
 export interface GenProviderRedirectUriResponse {
     uri: string;
-    signout_uri?: string;
 }
 export interface BindWithProviderRequest {
     provider_token: string;
@@ -98,6 +98,7 @@ export interface UserProfileProvider {
     name?: string;
 }
 export interface UserProfile {
+    sub?: string;
     name?: string;
     picture?: string;
     username?: string;
@@ -264,6 +265,13 @@ export interface Scope {
 export interface RevokeDeviceRequest {
     device_id: string;
 }
+export interface SignoutRequest {
+    redirect_uri?: string;
+    state?: string;
+}
+export interface SignoutReponse {
+    redirect_uri?: string;
+}
 export interface AuthorizeDeviceRequest {
     client_id: string;
     user_code: string;
@@ -282,3 +290,7 @@ export interface DeviceAuthorizeResponse {
     verification_uri?: string;
     verification_uri_complete?: string;
 }
+export interface ProviderSubType {
+    id: string;
+    provider_sub_type: 'NO_AUTH_LOGIN' | '';
+}

package/dist/auth/models.js

@@ -1,4 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-``;
-//# sourceMappingURL=models.js.map
+export {};

package/dist/captcha/index.d.ts

@@ -1,8 +1,9 @@
-import { App, RequestOptions, RequestFn, Storage, OpenURIWithCallback } from "../app";
+import { App, RequestOptions, RequestFn, Storage, OpenURIWithCallback } from '../app';
 export interface CaptchaOptions {
+    clientId?: string;
     request: RequestFn;
     storage: Storage;
-    openURIWithCallback: OpenURIWithCallback;
+    openURIWithCallback?: OpenURIWithCallback;
 }
 export interface CaptchaInitOptions {
     request?: RequestFn;
@@ -22,8 +23,8 @@ export interface GetCaptchaResponse {
     url?: string;
 }
 export declare class Captcha {
-    private _config;
-    private _tokenSectionName;
+    private config;
+    private tokenSectionName;
     /**
      * constructor
      * @param {CaptchaOptions} opts
@@ -36,10 +37,10 @@ export declare class Captcha {
      */
     request<T>(url: string, options?: CaptchaRequestOptions): Promise<T>;
     /**
-     * _getCaptchaToken get captcha token
+     * getCaptchaToken 获取captchaToken
      */
-    private _getCaptchaToken;
-    private _appendCaptchaTokenToURL;
-    private _saveCaptchaToken;
-    private _findCaptchaToken;
+    private getCaptchaToken;
+    private appendCaptchaTokenToURL;
+    private saveCaptchaToken;
+    private findCaptchaToken;
 }