@cloudbase/app 1.4.1 → 2.0.0-alpha.0

package/src/index.ts

@@ -11,6 +11,7 @@ import { initCache, getCacheByEnvId, getLocalCache } from './libs/cache';
 import { ICloudbaseRequest } from '@cloudbase/types/request';
 import { initRequest, getRequestByEnvId } from './libs/request';
 import { getSdkName, setSdkVersion, setEndPoint, setRegionLevelEndpoint, setSdkName } from './constants/common';
+export { getBaseEndPoint } from './constants/common'
 const { useAdapters, useDefaultAdapter, RUNTIME } = adapters;
 const { ERRORS, COMMUNITY_SITE_URL } = constants;
 const { printWarn } = utils;
@@ -33,12 +34,15 @@ const extensionMap: KV<ICloudbaseExtension> = {};
 
 class Cloudbase implements ICloudbase {
   public authInstance: ICloudbaseAuth;
+  public oauthInstance: any;
   public requestClient: any;
+  public oauthClient: any
   private _config: ICloudbaseConfig;
 
   constructor(config?: ICloudbaseConfig) {
     this._config = config ? config : this._config;
     this.authInstance = null;
+    this.oauthInstance = null
   }
 
   get config() {
@@ -119,14 +123,14 @@ class Cloudbase implements ICloudbase {
     // 修正timeout取值
     this._config.timeout = this._formatTimeout(this._config.timeout);
     // 初始化cache和request
-    const { env, persistence, debug, timeout, appSecret, appSign } = this._config;
+    const { env, persistence, debug, timeout, appSecret, appSign, oauthClient } = this._config;
     initCache({ env, persistence, debug, platformInfo: this.platform });
-    initRequest({ env, region: config.region || '', timeout, appSecret, appSign });
 
     if (config.region) {
       setRegionLevelEndpoint(env, config.region || '')
     }
     const app = new Cloudbase(this._config);
+    initRequest({ env, region: config.region || '', timeout, appSecret, appSign, oauthClient, _fromApp: app });
     app.requestClient = this.requestClient;
     return app;
   }

package/src/libs/cache.ts

@@ -2,12 +2,13 @@ import { KV } from "@cloudbase/types";
 import { cache } from "@cloudbase/utilities";
 import { ICloudbaseCache, ICacheConfig } from "@cloudbase/types/cache";
 
-const KEY_ACCESS_TOKEN = 'access_token';
-const KEY_ACCESS_TOKEN_EXPIRE = 'access_token_expire';
-const KEY_REFRESH_TOKEN = 'refresh_token';
-const KEY_ANONYMOUS_UUID = 'anonymous_uuid';
-const KEY_LOGIN_TYPE = 'login_type';
 const USER_INFO_KEY = 'user_info';
+// const KEY_ACCESS_TOKEN = 'access_token';
+// const KEY_ACCESS_TOKEN_EXPIRE = 'access_token_expire';
+// const KEY_REFRESH_TOKEN = 'refresh_token';
+// const KEY_ANONYMOUS_UUID = 'anonymous_uuid';
+// const KEY_LOGIN_TYPE = 'login_type';
+// const DEVICE_INFO = 'device_id';
 
 const { CloudbaseCache } = cache;
 
@@ -15,30 +16,31 @@ const cacheMap: KV<ICloudbaseCache> = {};
 // 本地存储
 const localCacheMap: KV<ICloudbaseCache> = {};
 
-export function initCache(config: ICacheConfig&{env:string}) {
-  const { env,persistence,platformInfo } = config;
+export function initCache(config: ICacheConfig & { env: string }) {
+  const { env, persistence, platformInfo } = config;
 
-  const accessTokenKey       = `${KEY_ACCESS_TOKEN}_${env}`;
-  const accessTokenExpireKey = `${KEY_ACCESS_TOKEN_EXPIRE}_${env}`;
-  const refreshTokenKey      = `${KEY_REFRESH_TOKEN}_${env}`;
-  const anonymousUuidKey     = `${KEY_ANONYMOUS_UUID}_${env}`;
-  const loginTypeKey         = `${KEY_LOGIN_TYPE}_${env}`;
-  const userInfoKey          = `${USER_INFO_KEY}_${env}`;
+  // const accessTokenKey = `${KEY_ACCESS_TOKEN}_${env}`;
+  // const accessTokenExpireKey = `${KEY_ACCESS_TOKEN_EXPIRE}_${env}`;
+  // const refreshTokenKey      = `${KEY_REFRESH_TOKEN}_${env}`;
+  // const anonymousUuidKey     = `${KEY_ANONYMOUS_UUID}_${env}`;
+  // const loginTypeKey         = `${KEY_LOGIN_TYPE}_${env}`;
+  const userInfoKey = `${USER_INFO_KEY}_${env}`;
+  // const deviceIdKey = `${DEVICE_INFO}`; // 非环境级别
 
   const keys = {
-    accessTokenKey,
-    accessTokenExpireKey,
-    refreshTokenKey,
-    anonymousUuidKey,
-    loginTypeKey,
-    userInfoKey
+    userInfoKey,
+    // accessTokenKey,
+    // accessTokenExpireKey,
+    // refreshTokenKey,
+    // anonymousUuidKey,
+    // loginTypeKey,
+    // deviceIdKey
   };
   // 若指定env已存在cache则尝试更新persistence
-  cacheMap[env]?cacheMap[env].updatePersistence(persistence):(cacheMap[env] = new CloudbaseCache({
+  cacheMap[env] ? cacheMap[env].updatePersistence(persistence) : (cacheMap[env] = new CloudbaseCache({
     ...config,
     keys,
     platformInfo,
-    alwaysLocalKeys: ['anonymousUuidKey']
   }));
   localCacheMap[env] = localCacheMap[env] || new CloudbaseCache({
     ...config,

package/src/libs/request.ts

@@ -1,8 +1,8 @@
 import {
   DATA_VERSION,
-  LOGINTYPE,
   getSdkVersion,
-  getEndPoint
+  getEndPoint,
+  getBaseEndPoint
 } from '../constants/common';
 import {
   IRequestOptions,
@@ -15,15 +15,15 @@ import { utils, adapters, constants } from '@cloudbase/utilities';
 import { KV } from '@cloudbase/types';
 import { IGetAccessTokenResult, ICloudbaseRequestConfig, IAppendedRequestInfo, IRequestBeforeHook } from '@cloudbase/types/request';
 import { ICloudbaseCache } from '@cloudbase/types/cache';
-import { cloudbase } from '..';
-import { getCacheByEnvId, getLocalCache } from './cache';
-import { EVENTS } from '../constants/events';
+import { getLocalCache } from './cache';
 import { Platform } from './adapter';
-
 const { ERRORS } = constants;
 const { genSeqId, isFormData, formatUrl, createSign } = utils;
 const { RUNTIME } = adapters;
 
+// import FingerprintJS from '@fingerprintjs/fingerprintjs'
+// const fpPromise = FingerprintJS.load()
+
 // 下面几种 action 不需要 access token
 const ACTIONS_WITHOUT_ACCESSTOKEN = [
   'auth.getJwt',
@@ -85,8 +85,6 @@ export interface ICloudbaseRequest {
   post: (options: IRequestOptions) => Promise<ResponseObject>;
   upload: (options: IUploadRequestOptions) => Promise<ResponseObject>;
   download: (options: IRequestOptions) => Promise<ResponseObject>;
-  refreshAccessToken: () => Promise<IGetAccessTokenResult>;
-  getAccessToken: () => Promise<IGetAccessTokenResult>;
   request: (action: string, params: KV<any>, options?: KV<any>) => Promise<ResponseObject>;
   send: (action: string, data: KV<any>) => Promise<any>;
 }
@@ -101,7 +99,6 @@ export class CloudbaseRequest implements ICloudbaseRequest {
   _reqClass: SDKRequestInterface;
   // 请求失败是否抛出Error
   private _throwWhenRequestFail = false;
-  private _cache: ICloudbaseCache;
   // 持久化本地存储
   private _localCache: ICloudbaseCache;
   /**
@@ -109,6 +106,7 @@ export class CloudbaseRequest implements ICloudbaseRequest {
    * @param config
    */
   constructor(config: ICloudbaseRequestConfig & { throw?: boolean }) {
+
     this.config = config;
     // eslint-disable-next-line
     this._reqClass = new Platform.adapter.reqClass(<IRequestConfig>{
@@ -117,12 +115,12 @@ export class CloudbaseRequest implements ICloudbaseRequest {
       restrictedMethods: ['post']
     });
     this._throwWhenRequestFail = config.throw || false;
-    this._cache = getCacheByEnvId(this.config.env);
     this._localCache = getLocalCache(this.config.env);
     bindHooks(this._reqClass, 'post', [beforeEach]);
     bindHooks(this._reqClass, 'upload', [beforeEach]);
     bindHooks(this._reqClass, 'download', [beforeEach]);
   }
+
   public async post(options: IRequestOptions): Promise<ResponseObject> {
     const res = await this._reqClass.post(options);
     return res;
@@ -136,61 +134,20 @@ export class CloudbaseRequest implements ICloudbaseRequest {
     return res;
   }
 
-  public async refreshAccessToken(): Promise<IGetAccessTokenResult> {
-    // 可能会同时调用多次刷新access token，这里把它们合并成一个
-    if (!this._refreshAccessTokenPromise) {
-      // 没有正在刷新，那么正常执行刷新逻辑
-      this._refreshAccessTokenPromise = this._refreshAccessToken();
-    }
-
-    let result;
-    let err;
-    try {
-      result = await this._refreshAccessTokenPromise;
-    } catch (e) {
-      err = e;
-    }
-    this._refreshAccessTokenPromise = null;
-    this._shouldRefreshAccessTokenHook = null;
-    if (err) {
-      throw err;
-    }
-    return result;
+  public getBaseEndPoint() {
+    return getBaseEndPoint()
   }
 
-  // 获取access token
-  public async getAccessToken(): Promise<IGetAccessTokenResult> {
-    const { accessTokenKey, accessTokenExpireKey, refreshTokenKey } = this._cache.keys;
-    const refreshToken = await this._cache.getStoreAsync(refreshTokenKey);
-    if (!refreshToken) {
-      // 不该出现的状态：有 access token 却没有 refresh token
-      throw new Error(JSON.stringify({
-        code: ERRORS.OPERATION_FAIL,
-        msg: 'refresh token is not exist, your local data might be messed up, please retry after clear localStorage or sessionStorage'
-      }));
-    }
-    // 如果没有access token或者过期，那么刷新
-    const accessToken = await this._cache.getStoreAsync(accessTokenKey);
-    const accessTokenExpire = Number(await this._cache.getStoreAsync(accessTokenExpireKey));
-
-    // 调用钩子函数
-    let shouldRefreshAccessToken = true;
-    if (this._shouldRefreshAccessTokenHook && !(await this._shouldRefreshAccessTokenHook(accessToken, accessTokenExpire))) {
-      shouldRefreshAccessToken = false;
-    }
-
-    if ((!accessToken || !accessTokenExpire || accessTokenExpire < Date.now()) && shouldRefreshAccessToken) {
-      // 返回新的access tolen
-      return await this.refreshAccessToken();
-    } else {
-      // 返回本地的access token
-      return {
-        accessToken,
-        accessTokenExpire
-      };
+  public async getOauthAccessTokenV2(oauthClient: any): Promise<IGetAccessTokenResult> {
+    const validAccessToken = await oauthClient.getAccessToken()
+    const credentials = await oauthClient._getCredentials()
+    return {
+      accessToken: validAccessToken,
+      accessTokenExpire: new Date(credentials.expires_at).getTime()
     }
   }
 
+
   /* eslint-disable complexity */
   public async request(action: string, params: KV<any>, options?: KV<any>): Promise<ResponseObject> {
     const tcbTraceKey = `x-tcb-trace_${this.config.env}`;
@@ -204,15 +161,10 @@ export class CloudbaseRequest implements ICloudbaseRequest {
       ...params
     };
 
-
     if (ACTIONS_WITHOUT_ACCESSTOKEN.indexOf(action) === -1) {
-      const { refreshTokenKey } = this._cache.keys;
-
-      // 若有 refreshToken 则任务有登录态 刷 accessToken
-      const refreshToken = await this._cache.getStoreAsync(refreshTokenKey);
-      if (refreshToken) {
-        tmpObj.access_token = (await this.getAccessToken()).accessToken;
-      }
+      const app = this.config._fromApp
+      const oauthClient = app.oauthInstance.oauth2client
+      tmpObj.access_token = (await this.getOauthAccessTokenV2(oauthClient)).accessToken
     }
 
     // 拼body和content-type
@@ -308,11 +260,6 @@ export class CloudbaseRequest implements ICloudbaseRequest {
 
   public async send(action: string, data: KV<any> = {}): Promise<any> {
     let response = await this.request(action, data, { onUploadProgress: data.onUploadProgress });
-    if (response.data.code === 'ACCESS_TOKEN_EXPIRED' && ACTIONS_WITHOUT_ACCESSTOKEN.indexOf(action) === -1) {
-      // access_token过期，重新获取
-      await this.refreshAccessToken();
-      response = await this.request(action, data, { onUploadProgress: data.onUploadProgress });
-    }
 
     if (response.data.code && this._throwWhenRequestFail) {
       throw new Error(JSON.stringify({
@@ -323,86 +270,6 @@ export class CloudbaseRequest implements ICloudbaseRequest {
 
     return response.data;
   }
-
-  // 调用接口刷新access token，并且返回
-  private async _refreshAccessToken(retryNum = 1): Promise<IGetAccessTokenResult> {
-    const { accessTokenKey, accessTokenExpireKey, refreshTokenKey, loginTypeKey, anonymousUuidKey } = this._cache.keys;
-    await this._cache.removeStoreAsync(accessTokenKey);
-    await this._cache.removeStoreAsync(accessTokenExpireKey);
-
-    let refreshToken = await this._cache.getStoreAsync(refreshTokenKey);
-    if (!refreshToken) {
-      throw new Error(JSON.stringify({
-        code: ERRORS.INVALID_OPERATION,
-        msg: 'not login'
-      }));
-    }
-    const params: KV<string> = {
-      refresh_token: refreshToken
-    };
-    const response = await this.request('auth.fetchAccessTokenWithRefreshToken', params);
-    if (response.data.code) {
-      const { code } = response.data;
-      if (code === 'SIGN_PARAM_INVALID' || code === 'REFRESH_TOKEN_EXPIRED' || code === 'INVALID_REFRESH_TOKEN') {
-        // 这里处理以下逻辑：
-        // 匿名登录时，如果刷新access token报错refresh token过期，此时应该：
-        // 1. 再用 uuid 拿一次新的refresh token
-        // 2. 拿新的refresh token换access token
-        const isAnonymous = await this._cache.getStoreAsync(loginTypeKey) === LOGINTYPE.ANONYMOUS;
-        if (isAnonymous && code === 'INVALID_REFRESH_TOKEN') {
-          // 获取新的 refresh token
-          const anonymous_uuid = await this._cache.getStoreAsync(anonymousUuidKey);
-          // 此处cache为基类property
-          const refresh_token = await this._cache.getStoreAsync(refreshTokenKey);
-          const res = await this.send('auth.signInAnonymously', {
-            anonymous_uuid,
-            refresh_token
-          });
-          this._setRefreshToken(res.refresh_token);
-          if (retryNum >= 1) {
-            return this._refreshAccessToken(--retryNum);
-          } else {
-            throw new Error(
-              JSON.stringify({
-                code: ERRORS.OPERATION_FAIL,
-                message: '重试获取 refresh token 失败'
-              })
-            )
-          }
-        }
-        cloudbase.fire(EVENTS.LOGIN_STATE_EXPIRED);
-        await this._cache.removeStoreAsync(refreshTokenKey);
-      }
-      throw new Error(JSON.stringify({
-        code: ERRORS.NETWORK_ERROR,
-        msg: `refresh access_token failed：${response.data.code}`
-      }));
-    }
-    if (response.data.access_token) {
-      cloudbase.fire(EVENTS.ACCESS_TOKEN_REFRESHD);
-      await this._cache.setStoreAsync(accessTokenKey, response.data.access_token);
-      // 本地时间可能没有同步
-      await this._cache.setStoreAsync(accessTokenExpireKey, response.data.access_token_expire + Date.now());
-      return {
-        accessToken: response.data.access_token,
-        accessTokenExpire: response.data.access_token_expire
-      };
-    }
-    // 匿名登录refresh_token过期情况下返回refresh_token
-    // 此场景下使用新的refresh_token获取access_token
-    if (response.data.refresh_token) {
-      await this._cache.removeStoreAsync(refreshTokenKey);
-      await this._cache.setStoreAsync(refreshTokenKey, response.data.refresh_token);
-      await this._refreshAccessToken();
-    }
-  }
-  private async _setRefreshToken(refreshToken: string) {
-    const { accessTokenKey, accessTokenExpireKey, refreshTokenKey } = this._cache.keys;
-    // refresh token设置前，先清掉 access token
-    await this._cache.removeStoreAsync(accessTokenKey);
-    await this._cache.removeStoreAsync(accessTokenExpireKey);
-    await this._cache.setStoreAsync(refreshTokenKey, refreshToken);
-  }
 }
 
 const requestMap: KV<CloudbaseRequest> = {};

package/dist/cjs/constants/events.d.ts

@@ -1,7 +0,0 @@
-export declare const EVENTS: {
-    LOGIN_STATE_CHANGED: string;
-    LOGIN_STATE_EXPIRED: string;
-    LOGIN_TYPE_CHANGED: string;
-    ANONYMOUS_CONVERTED: string;
-    ACCESS_TOKEN_REFRESHD: string;
-};

package/dist/cjs/constants/events.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EVENTS = void 0;
-exports.EVENTS = {
-    LOGIN_STATE_CHANGED: 'loginStateChanged',
-    LOGIN_STATE_EXPIRED: 'loginStateExpire',
-    LOGIN_TYPE_CHANGED: 'loginTypeChanged',
-    ANONYMOUS_CONVERTED: 'anonymousConverted',
-    ACCESS_TOKEN_REFRESHD: 'refreshAccessToken'
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXZlbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbnN0YW50cy9ldmVudHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQWEsUUFBQSxNQUFNLEdBQUc7SUFDcEIsbUJBQW1CLEVBQUksbUJBQW1CO0lBQzFDLG1CQUFtQixFQUFJLGtCQUFrQjtJQUN6QyxrQkFBa0IsRUFBSyxrQkFBa0I7SUFDekMsbUJBQW1CLEVBQUksb0JBQW9CO0lBQzNDLHFCQUFxQixFQUFFLG9CQUFvQjtDQUM1QyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGNvbnN0IEVWRU5UUyA9IHtcbiAgTE9HSU5fU1RBVEVfQ0hBTkdFRCAgOiAnbG9naW5TdGF0ZUNoYW5nZWQnLFxuICBMT0dJTl9TVEFURV9FWFBJUkVEICA6ICdsb2dpblN0YXRlRXhwaXJlJyxcbiAgTE9HSU5fVFlQRV9DSEFOR0VEICAgOiAnbG9naW5UeXBlQ2hhbmdlZCcsXG4gIEFOT05ZTU9VU19DT05WRVJURUQgIDogJ2Fub255bW91c0NvbnZlcnRlZCcsIC8v5Yy/5ZCN6LSm5oi36KKr6L2s5q2j5ZCO6Kem5Y+RXG4gIEFDQ0VTU19UT0tFTl9SRUZSRVNIRDogJ3JlZnJlc2hBY2Nlc3NUb2tlbidcbn07XG4iXX0=

package/dist/esm/constants/events.d.ts

@@ -1,7 +0,0 @@
-export declare const EVENTS: {
-    LOGIN_STATE_CHANGED: string;
-    LOGIN_STATE_EXPIRED: string;
-    LOGIN_TYPE_CHANGED: string;
-    ANONYMOUS_CONVERTED: string;
-    ACCESS_TOKEN_REFRESHD: string;
-};

package/dist/esm/constants/events.js

@@ -1,8 +0,0 @@
-export var EVENTS = {
-    LOGIN_STATE_CHANGED: 'loginStateChanged',
-    LOGIN_STATE_EXPIRED: 'loginStateExpire',
-    LOGIN_TYPE_CHANGED: 'loginTypeChanged',
-    ANONYMOUS_CONVERTED: 'anonymousConverted',
-    ACCESS_TOKEN_REFRESHD: 'refreshAccessToken'
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXZlbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbnN0YW50cy9ldmVudHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSxDQUFDLElBQU0sTUFBTSxHQUFHO0lBQ3BCLG1CQUFtQixFQUFJLG1CQUFtQjtJQUMxQyxtQkFBbUIsRUFBSSxrQkFBa0I7SUFDekMsa0JBQWtCLEVBQUssa0JBQWtCO0lBQ3pDLG1CQUFtQixFQUFJLG9CQUFvQjtJQUMzQyxxQkFBcUIsRUFBRSxvQkFBb0I7Q0FDNUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBjb25zdCBFVkVOVFMgPSB7XG4gIExPR0lOX1NUQVRFX0NIQU5HRUQgIDogJ2xvZ2luU3RhdGVDaGFuZ2VkJyxcbiAgTE9HSU5fU1RBVEVfRVhQSVJFRCAgOiAnbG9naW5TdGF0ZUV4cGlyZScsXG4gIExPR0lOX1RZUEVfQ0hBTkdFRCAgIDogJ2xvZ2luVHlwZUNoYW5nZWQnLFxuICBBTk9OWU1PVVNfQ09OVkVSVEVEICA6ICdhbm9ueW1vdXNDb252ZXJ0ZWQnLCAvL+WMv+WQjei0puaIt+iiq+i9rOato+WQjuinpuWPkVxuICBBQ0NFU1NfVE9LRU5fUkVGUkVTSEQ6ICdyZWZyZXNoQWNjZXNzVG9rZW4nXG59O1xuIl19

package/src/constants/events.ts

@@ -1,7 +0,0 @@
-export const EVENTS = {
-  LOGIN_STATE_CHANGED  : 'loginStateChanged',
-  LOGIN_STATE_EXPIRED  : 'loginStateExpire',
-  LOGIN_TYPE_CHANGED   : 'loginTypeChanged',
-  ANONYMOUS_CONVERTED  : 'anonymousConverted', //匿名账户被转正后触发
-  ACCESS_TOKEN_REFRESHD: 'refreshAccessToken'
-};