@cloudbase/auth 1.7.3-alpha.0 → 1.8.1

package/src/providers/weixinAuthProvider.ts

@@ -2,7 +2,7 @@ import { AuthProvider } from './base';
 import { ICloudbaseAuthConfig } from '@cloudbase/types/auth';
 import { ICloudbaseCache } from '@cloudbase/types/cache';
 import { ICloudbaseRequest } from '@cloudbase/types/request';
-import { constants, adapters,utils, helpers } from '@cloudbase/utilities/';
+import { constants, adapters, utils, helpers } from '@cloudbase/utilities/';
 import { eventBus, EVENTS, LoginState } from '..';
 import { LOGINTYPE } from '../constants';
 
@@ -15,9 +15,9 @@ export class WeixinAuthProvider extends AuthProvider {
   private readonly _scope: string;
   private readonly _state: string;
   private readonly _appid: string;
-  private readonly _runtime:string;
+  private readonly _runtime: string;
 
-  constructor(config: ICloudbaseAuthConfig&{cache:ICloudbaseCache,request:ICloudbaseRequest,runtime:string}, appid: string, scope: string, state?: string) {
+  constructor(config: ICloudbaseAuthConfig&{cache: ICloudbaseCache, request: ICloudbaseRequest, runtime: string}, appid: string, scope: string, state?: string) {
     super(config);
 
     this._runtime = config.runtime;
@@ -25,17 +25,17 @@ export class WeixinAuthProvider extends AuthProvider {
     this._scope = scope;
     this._state = state || 'weixin';
   }
-  
-  public async signIn(){
-    return printWarn(ERRORS.OPERATION_FAIL,'API signIn has been deprecated, please use signInWithRedirect insteed');
+
+  public async signIn() {
+    return printWarn(ERRORS.OPERATION_FAIL, 'API signIn has been deprecated, please use signInWithRedirect insteed');
   }
   @catchErrorsDecorator({
     title: '跳转微信公众号授权失败',
     messages: [
       '请确认以下各项：',
       '  1 - 调用 auth().weixinAuthProvider().signInWithRedirect() 的语法或参数是否正确',
-      `如果问题依然存在，建议到官方问答社区提问或寻找帮助：${COMMUNITY_SITE_URL}`
-    ]
+      `如果问题依然存在，建议到官方问答社区提问或寻找帮助：${COMMUNITY_SITE_URL}`,
+    ],
   })
   public async signInWithRedirect() {
     return this._redirect();
@@ -47,15 +47,15 @@ export class WeixinAuthProvider extends AuthProvider {
       '  1 - 调用 auth().weixinAuthProvider().getRedirectResult() 的语法或参数是否正确',
       '  2 - 当前环境是否开通了微信公众号登录授权',
       '  3 - 微信公众号的 AppId 与 AppSecret 配置是否正确',
-      `如果问题依然存在，建议到官方问答社区提问或寻找帮助：${COMMUNITY_SITE_URL}`
-    ]
+      `如果问题依然存在，建议到官方问答社区提问或寻找帮助：${COMMUNITY_SITE_URL}`,
+    ],
   })
-  public async getRedirectResult(options:{ withUnionId?: boolean; syncUserInfo?: boolean }) {
+  public async getRedirectResult(options: { withUnionId?: boolean; syncUserInfo?: boolean }) {
     const code = getWeixinCode();
     if (!code) {
       return null;
     }
-    return this._signInWithCode(code,options);
+    return this._signInWithCode(code, options);
   }
   @catchErrorsDecorator({
     title: '获取微信重定向绑定结果',
@@ -64,8 +64,8 @@ export class WeixinAuthProvider extends AuthProvider {
       '  1 - 调用 auth().weixinAuthProvider().getLinkRedirectResult() 的语法或参数是否正确',
       '  2 - 当前环境是否开通了微信公众号登录授权',
       '  3 - 微信公众号的 AppId 与 AppSecret 配置是否正确',
-      `如果问题依然存在，建议到官方问答社区提问或寻找帮助：${COMMUNITY_SITE_URL}`
-    ]
+      `如果问题依然存在，建议到官方问答社区提问或寻找帮助：${COMMUNITY_SITE_URL}`,
+    ],
   })
   async getLinkRedirectResult(options: { withUnionId?: boolean } = {}) {
     const { withUnionId = false } = options;
@@ -74,7 +74,7 @@ export class WeixinAuthProvider extends AuthProvider {
       return null;
     }
     const { _appid: appid } = this;
-    const loginType = (scope => {
+    const loginType = ((scope) => {
       switch (scope) {
         case 'snsapi_login':
           return 'WECHAT-OPEN';
@@ -83,14 +83,14 @@ export class WeixinAuthProvider extends AuthProvider {
       }
     })(this._scope);
     const hybridMiniapp = this._runtime === RUNTIME.WX_MP ? '1' : '0';
-    return this._request.send('auth.linkWithWeixinCode', { 
-      payload: { 
-        appid, 
-        loginType, 
-        code, 
-        hybridMiniapp, 
-        withUnionId
-      }
+    return this._request.send('auth.linkWithWeixinCode', {
+      payload: {
+        appid,
+        loginType,
+        code,
+        hybridMiniapp,
+        withUnionId,
+      },
     });
   }
 
@@ -103,17 +103,17 @@ export class WeixinAuthProvider extends AuthProvider {
     if (this._scope === 'snsapi_login') {
       host = '//open.weixin.qq.com/connect/qrconnect';
     }
-    try{
+    try {
       location.href = `${host}?appid=${this._appid}&redirect_uri=${currUrl}&response_type=code&scope=${this._scope}&state=${this._state}#wechat_redirect`;
-    }catch(e){
-      throw new Error(`[${getSdkName()}][${ERRORS.UNKOWN_ERROR}]${e}`)
+    } catch (e) {
+      throw new Error(`[${getSdkName()}][${ERRORS.UNKOWN_ERROR}]${e}`);
     }
   }
 
-  private async _signInWithCode(code:string,options) {
+  private async _signInWithCode(code: string, options) {
     const { accessTokenKey, accessTokenExpireKey, refreshTokenKey } = this._cache.keys;
     // 有code，用code换refresh token
-    const loginType = (scope => {
+    const loginType = ((scope) => {
       switch (scope) {
         case 'snsapi_login':
           return 'WECHAT-OPEN';
@@ -122,7 +122,7 @@ export class WeixinAuthProvider extends AuthProvider {
       }
     })(this._scope);
 
-    const refreshTokenRes = await this._getRefreshTokenByWXCode(this._appid, loginType, code,options);
+    const refreshTokenRes = await this._getRefreshTokenByWXCode(this._appid, loginType, code, options);
     const { refreshToken } = refreshTokenRes;
 
     // 本地存下
@@ -135,25 +135,25 @@ export class WeixinAuthProvider extends AuthProvider {
     }
     eventBus.fire(EVENTS.LOGIN_STATE_CHANGED);
     // 抛出登录类型更改事件
-    eventBus.fire(EVENTS.LOGIN_TYPE_CHANGED, { 
+    eventBus.fire(EVENTS.LOGIN_TYPE_CHANGED, {
       env: this._config.env,
-      loginType: LOGINTYPE.WECHAT, 
-      persistence: this._config.persistence 
+      loginType: LOGINTYPE.WECHAT,
+      persistence: this._config.persistence,
     });
     await this.refreshUserInfo();
     const loginState = new LoginState({
       envId: this._config.env,
       cache: this._cache,
-      request: this._request
+      request: this._request,
     });
     await loginState.checkLocalStateAsync();
-    
+
     return loginState;
   }
 
   private async _getRefreshTokenByWXCode(
-    appid: string, 
-    loginType: string, 
+    appid: string,
+    loginType: string,
     code: string,
     options: any = {}
   ): Promise<{ refreshToken: string; accessToken: string; accessTokenExpire: number }> {
@@ -163,15 +163,15 @@ export class WeixinAuthProvider extends AuthProvider {
 
     const action = 'auth.signIn';
     const hybridMiniapp = this._runtime === RUNTIME.WX_MP ? '1' : '0';
-    return this._request.send(action, { 
-      appid, 
-      loginType, 
+    return this._request.send(action, {
+      appid,
+      loginType,
       hybridMiniapp,
       syncUserInfo,
       loginCredential: code,
       withUnionId,
-      createUser
-    }).then(res => {
+      createUser,
+    }).then((res) => {
       if (res.code) {
         throw new Error(`[${getSdkName()}][${ERRORS.OPERATION_FAIL}] failed login via wechat: ${res.code}`);
       }
@@ -179,15 +179,14 @@ export class WeixinAuthProvider extends AuthProvider {
         return {
           refreshToken: res.refresh_token,
           accessToken: res.access_token,
-          accessTokenExpire: res.access_token_expire
+          accessTokenExpire: res.access_token_expire,
         };
-      } else {
-        throw new Error(`[${getSdkName()}][${ERRORS.OPERATION_FAIL}] action:getJwt not return refreshToken`);
       }
+      throw new Error(`[${getSdkName()}][${ERRORS.OPERATION_FAIL}] action:getJwt not return refreshToken`);
     });
   }
 }
 
-function getWeixinCode () {
+function getWeixinCode() {
   return getQuery('code') || getHash('code');
-};
+}

package/tsconfig.esm.json

@@ -1,26 +1,9 @@
 {
-  "compileOnSave": true,
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "allowSyntheticDefaultImports": true,
-    "declaration": true,
-    "esModuleInterop": true,
-    "experimentalDecorators": true,
-    "emitDecoratorMetadata": true,
     "module": "es6",
-    "noFallthroughCasesInSwitch": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
     "outDir": "dist/esm",
     "rootDir": "src",
-    "pretty": true,
-    "removeComments": true,
-    "inlineSourceMap": true,
-    "inlineSources": true,
-    "skipLibCheck": true,
-    "strictBindCallApply": true,
-    "target": "es5",
-    "moduleResolution": "node",
-    "lib": ["es2015", "dom"]
   },
   "include": [
     "src/**/*.ts",
@@ -30,4 +13,4 @@
     "node_modules",
     "dist"
   ]
-}
+}

package/tsconfig.json

@@ -1,26 +1,9 @@
 {
-  "compileOnSave": true,
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "allowSyntheticDefaultImports": true,
-    "declaration": true,
-    "esModuleInterop": true,
-    "experimentalDecorators": true,
-    "emitDecoratorMetadata": true,
     "module": "commonjs",
-    "noFallthroughCasesInSwitch": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
     "outDir": "dist/cjs",
     "rootDir": "src",
-    "pretty": true,
-    "removeComments": true,
-    "inlineSourceMap": true,
-    "inlineSources": true,
-    "skipLibCheck": true,
-    "strictBindCallApply": true,
-    "target": "es5",
-    "moduleResolution": "node",
-    "lib": ["es2015", "dom"]
   },
   "include": [
     "src/**/*.ts",
@@ -30,4 +13,4 @@
     "node_modules",
     "dist"
   ]
-}
+}

package/.eslintrc

@@ -1,30 +0,0 @@
-{
-    "extends": [
-        "eslint-config-alloy/typescript"
-    ],
-    "rules": {
-        "indent": [
-            "error",
-            2,
-            {
-                "SwitchCase": 1,
-                "flatTernaryExpressions": true
-            }
-        ],
-        "guard-for-in": 0,
-        "no-param-reassign": 0,
-        "no-undefined": 0,
-        "@typescript-eslint/explicit-member-accessibility": 0,
-        "@typescript-eslint/no-loss-of-precision": 0,
-        "@typescript-eslint/no-invalid-this": 0,
-        "@typescript-eslint/no-duplicate-imports": 0,
-        "@typescript-eslint/member-ordering": 0
-    },
-    "parserOptions": {
-        "ecmaVersion": 6,
-        "sourceType": "module",
-        "ecmaFeatures": {
-            "modules": true
-        }
-    }
-}

package/dist/cjs/common.d.ts

@@ -1,8 +0,0 @@
-import { ICloudbase } from '@cloudbase/types';
-export declare const checkFromAuthV2: (_fromApp: ICloudbase) => Promise<{
-    authType: string;
-    instance: any;
-} | {
-    authType?: undefined;
-    instance?: undefined;
-}>;

package/dist/cjs/common.js

@@ -1,64 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkFromAuthV2 = void 0;
-exports.checkFromAuthV2 = function (_fromApp) { return __awaiter(void 0, void 0, void 0, function () {
-    var oauthInstance, oauthLogin, _a;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
-            case 0:
-                oauthInstance = _fromApp.oauthInstance || _fromApp.oauth();
-                _a = oauthInstance;
-                if (!_a) return [3, 2];
-                return [4, oauthInstance.hasLoginState()];
-            case 1:
-                _a = (_b.sent());
-                _b.label = 2;
-            case 2:
-                oauthLogin = _a;
-                if (oauthLogin) {
-                    return [2, {
-                            authType: 'oauth',
-                            instance: oauthInstance
-                        }];
-                }
-                return [2, {}];
-        }
-    });
-}); };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tbW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbW1vbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFYSxRQUFBLGVBQWUsR0FBRyxVQUFPLFFBQW9COzs7OztnQkFFbEQsYUFBYSxHQUFHLFFBQVEsQ0FBQyxhQUFhLElBQUssUUFBZ0IsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtnQkFRdEQsS0FBQSxhQUFhLENBQUE7eUJBQWIsY0FBYTtnQkFBSSxXQUFNLGFBQWEsQ0FBQyxhQUFhLEVBQUUsRUFBQTs7c0JBQW5DLFNBQW1DOzs7Z0JBQWpFLFVBQVUsS0FBdUQ7Z0JBQ3ZFLElBQUksVUFBVSxFQUFFO29CQUNkLFdBQU87NEJBQ0wsUUFBUSxFQUFFLE9BQU87NEJBQ2pCLFFBQVEsRUFBRSxhQUFhO3lCQUN4QixFQUFBO2lCQUNGO2dCQUNELFdBQU8sRUFBRSxFQUFBOzs7S0FDVixDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSUNsb3VkYmFzZSB9IGZyb20gJ0BjbG91ZGJhc2UvdHlwZXMnO1xuXG5leHBvcnQgY29uc3QgY2hlY2tGcm9tQXV0aFYyID0gYXN5bmMgKF9mcm9tQXBwOiBJQ2xvdWRiYXNlKSA9PiB7XG4gIC8vIGNvbnN0IGF1dGhJbnN0YW5jZSA9IF9mcm9tQXBwLmF1dGhJbnN0YW5jZVxuICBjb25zdCBvYXV0aEluc3RhbmNlID0gX2Zyb21BcHAub2F1dGhJbnN0YW5jZSB8fCAoX2Zyb21BcHAgYXMgYW55KS5vYXV0aCgpXG4gIC8vIGNvbnN0IGF1dGhMb2dpbiA9IGF1dGhJbnN0YW5jZSAmJiBhd2FpdCBhdXRoSW5zdGFuY2UuZ2V0TG9naW5TdGF0ZSgpXG4gIC8vIGlmIChhdXRoTG9naW4pIHtcbiAgLy8gICByZXR1cm4ge1xuICAvLyAgICAgYXV0aFR5cGU6ICdhdXRoJyxcbiAgLy8gICAgIGluc3RhbmNlOiBhdXRoSW5zdGFuY2VcbiAgLy8gICB9XG4gIC8vIH1cbiAgY29uc3Qgb2F1dGhMb2dpbiA9IG9hdXRoSW5zdGFuY2UgJiYgYXdhaXQgb2F1dGhJbnN0YW5jZS5oYXNMb2dpblN0YXRlKClcbiAgaWYgKG9hdXRoTG9naW4pIHtcbiAgICByZXR1cm4ge1xuICAgICAgYXV0aFR5cGU6ICdvYXV0aCcsXG4gICAgICBpbnN0YW5jZTogb2F1dGhJbnN0YW5jZVxuICAgIH1cbiAgfVxuICByZXR1cm4ge31cbn0iXX0=

package/dist/cjs/providers/oauth2AuthProvider.d.ts

@@ -1,61 +0,0 @@
-import { AuthProvider } from './base';
-import { ICloudbaseAuthConfig } from '@cloudbase/types/auth';
-import { ICloudbaseCache } from '@cloudbase/types/cache';
-import { ICloudbaseRequest } from '@cloudbase/types/request';
-import { LoginState } from '..';
-interface IPrividerCallbackInfo {
-    href: string;
-    state: string;
-    token_type: string;
-    code?: string;
-    access_token?: string;
-    id_token?: string;
-    expires_in: number;
-    scope: string;
-    authuser: string;
-    prompt: string;
-}
-export interface IOAuth2AuthProviderOptions {
-    providerId?: string;
-    clientId?: string;
-    responseType?: string;
-    scope?: string;
-    redirectUri?: string;
-    syncProfile?: boolean;
-    forceDisableSignUp?: boolean;
-}
-export interface ISignInWithPopupOptions {
-    popup?: {
-        target?: string;
-        features?: string;
-    };
-}
-export declare class OAuth2AuthProvider extends AuthProvider {
-    private providerId;
-    private clientId;
-    private responseType;
-    private scope;
-    private redirectUri;
-    private syncProfile;
-    private forceDisableSignUp;
-    private popupWindowUrl;
-    private popupWindowRef;
-    constructor(config: ICloudbaseAuthConfig & {
-        cache: ICloudbaseCache;
-        request: ICloudbaseRequest;
-        runtime: string;
-    }, options?: IOAuth2AuthProviderOptions);
-    signIn(): Promise<void>;
-    signInWithPopup(options?: ISignInWithPopupOptions): Promise<void>;
-    signInWithModal(elemId: string): Promise<void>;
-    private jumpToProviderPage;
-    private recvMessageFromPopup;
-    continueSignIn(callbackInfo?: IPrividerCallbackInfo): Promise<LoginState>;
-    private getAuthPrividerCallbackInfoFromUrl;
-    private fetchProviderRedirectURI;
-    private fetchProviderToken;
-    private signInWithProvider;
-    refreshUserInfo(): Promise<any>;
-    private fetch;
-}
-export {};