@cloudbase/app 1.4.1 → 2.0.0-alpha.0

package/dist/esm/libs/cache.js

@@ -10,33 +10,18 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { cache } from "@cloudbase/utilities";
-var KEY_ACCESS_TOKEN = 'access_token';
-var KEY_ACCESS_TOKEN_EXPIRE = 'access_token_expire';
-var KEY_REFRESH_TOKEN = 'refresh_token';
-var KEY_ANONYMOUS_UUID = 'anonymous_uuid';
-var KEY_LOGIN_TYPE = 'login_type';
 var USER_INFO_KEY = 'user_info';
 var CloudbaseCache = cache.CloudbaseCache;
 var cacheMap = {};
 var localCacheMap = {};
 export function initCache(config) {
     var env = config.env, persistence = config.persistence, platformInfo = config.platformInfo;
-    var accessTokenKey = KEY_ACCESS_TOKEN + "_" + env;
-    var accessTokenExpireKey = KEY_ACCESS_TOKEN_EXPIRE + "_" + env;
-    var refreshTokenKey = KEY_REFRESH_TOKEN + "_" + env;
-    var anonymousUuidKey = KEY_ANONYMOUS_UUID + "_" + env;
-    var loginTypeKey = KEY_LOGIN_TYPE + "_" + env;
     var userInfoKey = USER_INFO_KEY + "_" + env;
     var keys = {
-        accessTokenKey: accessTokenKey,
-        accessTokenExpireKey: accessTokenExpireKey,
-        refreshTokenKey: refreshTokenKey,
-        anonymousUuidKey: anonymousUuidKey,
-        loginTypeKey: loginTypeKey,
-        userInfoKey: userInfoKey
+        userInfoKey: userInfoKey,
     };
     cacheMap[env] ? cacheMap[env].updatePersistence(persistence) : (cacheMap[env] = new CloudbaseCache(__assign(__assign({}, config), { keys: keys,
-        platformInfo: platformInfo, alwaysLocalKeys: ['anonymousUuidKey'] })));
+        platformInfo: platformInfo })));
     localCacheMap[env] = localCacheMap[env] || new CloudbaseCache(__assign(__assign({}, config), { keys: keys,
         platformInfo: platformInfo, persistence: 'local' }));
 }
@@ -46,4 +31,4 @@ export function getCacheByEnvId(env) {
 export function getLocalCache(env) {
     return localCacheMap[env];
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FjaGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbGlicy9jYWNoZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7OztBQUNBLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUc3QyxJQUFNLGdCQUFnQixHQUFHLGNBQWMsQ0FBQztBQUN4QyxJQUFNLHVCQUF1QixHQUFHLHFCQUFxQixDQUFDO0FBQ3RELElBQU0saUJBQWlCLEdBQUcsZUFBZSxDQUFDO0FBQzFDLElBQU0sa0JBQWtCLEdBQUcsZ0JBQWdCLENBQUM7QUFDNUMsSUFBTSxjQUFjLEdBQUcsWUFBWSxDQUFDO0FBQ3BDLElBQU0sYUFBYSxHQUFHLFdBQVcsQ0FBQztBQUUxQixJQUFBLGNBQWMsR0FBSyxLQUFLLGVBQVYsQ0FBVztBQUVqQyxJQUFNLFFBQVEsR0FBd0IsRUFBRSxDQUFDO0FBRXpDLElBQU0sYUFBYSxHQUF3QixFQUFFLENBQUM7QUFFOUMsTUFBTSxVQUFVLFNBQVMsQ0FBQyxNQUFpQztJQUNqRCxJQUFBLEdBQUcsR0FBOEIsTUFBTSxJQUFwQyxFQUFDLFdBQVcsR0FBa0IsTUFBTSxZQUF4QixFQUFDLFlBQVksR0FBSyxNQUFNLGFBQVgsQ0FBWTtJQUVoRCxJQUFNLGNBQWMsR0FBWSxnQkFBZ0IsU0FBSSxHQUFLLENBQUM7SUFDMUQsSUFBTSxvQkFBb0IsR0FBTSx1QkFBdUIsU0FBSSxHQUFLLENBQUM7SUFDakUsSUFBTSxlQUFlLEdBQVcsaUJBQWlCLFNBQUksR0FBSyxDQUFDO0lBQzNELElBQU0sZ0JBQWdCLEdBQVUsa0JBQWtCLFNBQUksR0FBSyxDQUFDO0lBQzVELElBQU0sWUFBWSxHQUFjLGNBQWMsU0FBSSxHQUFLLENBQUM7SUFDeEQsSUFBTSxXQUFXLEdBQWUsYUFBYSxTQUFJLEdBQUssQ0FBQztJQUV2RCxJQUFNLElBQUksR0FBRztRQUNYLGNBQWMsZ0JBQUE7UUFDZCxvQkFBb0Isc0JBQUE7UUFDcEIsZUFBZSxpQkFBQTtRQUNmLGdCQUFnQixrQkFBQTtRQUNoQixZQUFZLGNBQUE7UUFDWixXQUFXLGFBQUE7S0FDWixDQUFDO0lBRUYsUUFBUSxDQUFDLEdBQUcsQ0FBQyxDQUFBLENBQUMsQ0FBQSxRQUFRLENBQUMsR0FBRyxDQUFDLENBQUMsaUJBQWlCLENBQUMsV0FBVyxDQUFDLENBQUEsQ0FBQyxDQUFBLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxHQUFHLElBQUksY0FBYyx1QkFDekYsTUFBTSxLQUNULElBQUksTUFBQTtRQUNKLFlBQVksY0FBQSxFQUNaLGVBQWUsRUFBRSxDQUFDLGtCQUFrQixDQUFDLElBQ3JDLENBQUMsQ0FBQztJQUNKLGFBQWEsQ0FBQyxHQUFHLENBQUMsR0FBRyxhQUFhLENBQUMsR0FBRyxDQUFDLElBQUksSUFBSSxjQUFjLHVCQUN4RCxNQUFNLEtBQ1QsSUFBSSxNQUFBO1FBQ0osWUFBWSxjQUFBLEVBQ1osV0FBVyxFQUFFLE9BQU8sSUFDcEIsQ0FBQztBQUNMLENBQUM7QUFFRCxNQUFNLFVBQVUsZUFBZSxDQUFDLEdBQVc7SUFDekMsT0FBTyxRQUFRLENBQUMsR0FBRyxDQUFDLENBQUM7QUFDdkIsQ0FBQztBQUVELE1BQU0sVUFBVSxhQUFhLENBQUMsR0FBVztJQUN2QyxPQUFPLGFBQWEsQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUM1QixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgS1YgfSBmcm9tIFwiQGNsb3VkYmFzZS90eXBlc1wiO1xuaW1wb3J0IHsgY2FjaGUgfSBmcm9tIFwiQGNsb3VkYmFzZS91dGlsaXRpZXNcIjtcbmltcG9ydCB7IElDbG91ZGJhc2VDYWNoZSwgSUNhY2hlQ29uZmlnIH0gZnJvbSBcIkBjbG91ZGJhc2UvdHlwZXMvY2FjaGVcIjtcblxuY29uc3QgS0VZX0FDQ0VTU19UT0tFTiA9ICdhY2Nlc3NfdG9rZW4nO1xuY29uc3QgS0VZX0FDQ0VTU19UT0tFTl9FWFBJUkUgPSAnYWNjZXNzX3Rva2VuX2V4cGlyZSc7XG5jb25zdCBLRVlfUkVGUkVTSF9UT0tFTiA9ICdyZWZyZXNoX3Rva2VuJztcbmNvbnN0IEtFWV9BTk9OWU1PVVNfVVVJRCA9ICdhbm9ueW1vdXNfdXVpZCc7XG5jb25zdCBLRVlfTE9HSU5fVFlQRSA9ICdsb2dpbl90eXBlJztcbmNvbnN0IFVTRVJfSU5GT19LRVkgPSAndXNlcl9pbmZvJztcblxuY29uc3QgeyBDbG91ZGJhc2VDYWNoZSB9ID0gY2FjaGU7XG5cbmNvbnN0IGNhY2hlTWFwOiBLVjxJQ2xvdWRiYXNlQ2FjaGU+ID0ge307XG4vLyDmnKzlnLDlrZjlgqhcbmNvbnN0IGxvY2FsQ2FjaGVNYXA6IEtWPElDbG91ZGJhc2VDYWNoZT4gPSB7fTtcblxuZXhwb3J0IGZ1bmN0aW9uIGluaXRDYWNoZShjb25maWc6IElDYWNoZUNvbmZpZyZ7ZW52OnN0cmluZ30pIHtcbiAgY29uc3QgeyBlbnYscGVyc2lzdGVuY2UscGxhdGZvcm1JbmZvIH0gPSBjb25maWc7XG5cbiAgY29uc3QgYWNjZXNzVG9rZW5LZXkgICAgICAgPSBgJHtLRVlfQUNDRVNTX1RPS0VOfV8ke2Vudn1gO1xuICBjb25zdCBhY2Nlc3NUb2tlbkV4cGlyZUtleSA9IGAke0tFWV9BQ0NFU1NfVE9LRU5fRVhQSVJFfV8ke2Vudn1gO1xuICBjb25zdCByZWZyZXNoVG9rZW5LZXkgICAgICA9IGAke0tFWV9SRUZSRVNIX1RPS0VOfV8ke2Vudn1gO1xuICBjb25zdCBhbm9ueW1vdXNVdWlkS2V5ICAgICA9IGAke0tFWV9BTk9OWU1PVVNfVVVJRH1fJHtlbnZ9YDtcbiAgY29uc3QgbG9naW5UeXBlS2V5ICAgICAgICAgPSBgJHtLRVlfTE9HSU5fVFlQRX1fJHtlbnZ9YDtcbiAgY29uc3QgdXNlckluZm9LZXkgICAgICAgICAgPSBgJHtVU0VSX0lORk9fS0VZfV8ke2Vudn1gO1xuXG4gIGNvbnN0IGtleXMgPSB7XG4gICAgYWNjZXNzVG9rZW5LZXksXG4gICAgYWNjZXNzVG9rZW5FeHBpcmVLZXksXG4gICAgcmVmcmVzaFRva2VuS2V5LFxuICAgIGFub255bW91c1V1aWRLZXksXG4gICAgbG9naW5UeXBlS2V5LFxuICAgIHVzZXJJbmZvS2V5XG4gIH07XG4gIC8vIOiLpeaMh+WummVuduW3suWtmOWcqGNhY2hl5YiZ5bCd6K+V5pu05pawcGVyc2lzdGVuY2VcbiAgY2FjaGVNYXBbZW52XT9jYWNoZU1hcFtlbnZdLnVwZGF0ZVBlcnNpc3RlbmNlKHBlcnNpc3RlbmNlKTooY2FjaGVNYXBbZW52XSA9IG5ldyBDbG91ZGJhc2VDYWNoZSh7XG4gICAgLi4uY29uZmlnLFxuICAgIGtleXMsXG4gICAgcGxhdGZvcm1JbmZvLFxuICAgIGFsd2F5c0xvY2FsS2V5czogWydhbm9ueW1vdXNVdWlkS2V5J11cbiAgfSkpO1xuICBsb2NhbENhY2hlTWFwW2Vudl0gPSBsb2NhbENhY2hlTWFwW2Vudl0gfHwgbmV3IENsb3VkYmFzZUNhY2hlKHtcbiAgICAuLi5jb25maWcsXG4gICAga2V5cyxcbiAgICBwbGF0Zm9ybUluZm8sXG4gICAgcGVyc2lzdGVuY2U6ICdsb2NhbCdcbiAgfSk7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBnZXRDYWNoZUJ5RW52SWQoZW52OiBzdHJpbmcpOiBJQ2xvdWRiYXNlQ2FjaGUge1xuICByZXR1cm4gY2FjaGVNYXBbZW52XTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGdldExvY2FsQ2FjaGUoZW52OiBzdHJpbmcpOiBJQ2xvdWRiYXNlQ2FjaGUge1xuICByZXR1cm4gbG9jYWxDYWNoZU1hcFtlbnZdO1xufVxuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FjaGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbGlicy9jYWNoZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7OztBQUNBLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUc3QyxJQUFNLGFBQWEsR0FBRyxXQUFXLENBQUM7QUFRMUIsSUFBQSxjQUFjLEdBQUssS0FBSyxlQUFWLENBQVc7QUFFakMsSUFBTSxRQUFRLEdBQXdCLEVBQUUsQ0FBQztBQUV6QyxJQUFNLGFBQWEsR0FBd0IsRUFBRSxDQUFDO0FBRTlDLE1BQU0sVUFBVSxTQUFTLENBQUMsTUFBc0M7SUFDdEQsSUFBQSxHQUFHLEdBQWdDLE1BQU0sSUFBdEMsRUFBRSxXQUFXLEdBQW1CLE1BQU0sWUFBekIsRUFBRSxZQUFZLEdBQUssTUFBTSxhQUFYLENBQVk7SUFPbEQsSUFBTSxXQUFXLEdBQU0sYUFBYSxTQUFJLEdBQUssQ0FBQztJQUc5QyxJQUFNLElBQUksR0FBRztRQUNYLFdBQVcsYUFBQTtLQU9aLENBQUM7SUFFRixRQUFRLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FBQyxpQkFBaUIsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLEdBQUcsSUFBSSxjQUFjLHVCQUM3RixNQUFNLEtBQ1QsSUFBSSxNQUFBO1FBQ0osWUFBWSxjQUFBLElBQ1osQ0FBQyxDQUFDO0lBQ0osYUFBYSxDQUFDLEdBQUcsQ0FBQyxHQUFHLGFBQWEsQ0FBQyxHQUFHLENBQUMsSUFBSSxJQUFJLGNBQWMsdUJBQ3hELE1BQU0sS0FDVCxJQUFJLE1BQUE7UUFDSixZQUFZLGNBQUEsRUFDWixXQUFXLEVBQUUsT0FBTyxJQUNwQixDQUFDO0FBQ0wsQ0FBQztBQUVELE1BQU0sVUFBVSxlQUFlLENBQUMsR0FBVztJQUN6QyxPQUFPLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUN2QixDQUFDO0FBRUQsTUFBTSxVQUFVLGFBQWEsQ0FBQyxHQUFXO0lBQ3ZDLE9BQU8sYUFBYSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0FBQzVCLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBLViB9IGZyb20gXCJAY2xvdWRiYXNlL3R5cGVzXCI7XG5pbXBvcnQgeyBjYWNoZSB9IGZyb20gXCJAY2xvdWRiYXNlL3V0aWxpdGllc1wiO1xuaW1wb3J0IHsgSUNsb3VkYmFzZUNhY2hlLCBJQ2FjaGVDb25maWcgfSBmcm9tIFwiQGNsb3VkYmFzZS90eXBlcy9jYWNoZVwiO1xuXG5jb25zdCBVU0VSX0lORk9fS0VZID0gJ3VzZXJfaW5mbyc7XG4vLyBjb25zdCBLRVlfQUNDRVNTX1RPS0VOID0gJ2FjY2Vzc190b2tlbic7XG4vLyBjb25zdCBLRVlfQUNDRVNTX1RPS0VOX0VYUElSRSA9ICdhY2Nlc3NfdG9rZW5fZXhwaXJlJztcbi8vIGNvbnN0IEtFWV9SRUZSRVNIX1RPS0VOID0gJ3JlZnJlc2hfdG9rZW4nO1xuLy8gY29uc3QgS0VZX0FOT05ZTU9VU19VVUlEID0gJ2Fub255bW91c191dWlkJztcbi8vIGNvbnN0IEtFWV9MT0dJTl9UWVBFID0gJ2xvZ2luX3R5cGUnO1xuLy8gY29uc3QgREVWSUNFX0lORk8gPSAnZGV2aWNlX2lkJztcblxuY29uc3QgeyBDbG91ZGJhc2VDYWNoZSB9ID0gY2FjaGU7XG5cbmNvbnN0IGNhY2hlTWFwOiBLVjxJQ2xvdWRiYXNlQ2FjaGU+ID0ge307XG4vLyDmnKzlnLDlrZjlgqhcbmNvbnN0IGxvY2FsQ2FjaGVNYXA6IEtWPElDbG91ZGJhc2VDYWNoZT4gPSB7fTtcblxuZXhwb3J0IGZ1bmN0aW9uIGluaXRDYWNoZShjb25maWc6IElDYWNoZUNvbmZpZyAmIHsgZW52OiBzdHJpbmcgfSkge1xuICBjb25zdCB7IGVudiwgcGVyc2lzdGVuY2UsIHBsYXRmb3JtSW5mbyB9ID0gY29uZmlnO1xuXG4gIC8vIGNvbnN0IGFjY2Vzc1Rva2VuS2V5ID0gYCR7S0VZX0FDQ0VTU19UT0tFTn1fJHtlbnZ9YDtcbiAgLy8gY29uc3QgYWNjZXNzVG9rZW5FeHBpcmVLZXkgPSBgJHtLRVlfQUNDRVNTX1RPS0VOX0VYUElSRX1fJHtlbnZ9YDtcbiAgLy8gY29uc3QgcmVmcmVzaFRva2VuS2V5ICAgICAgPSBgJHtLRVlfUkVGUkVTSF9UT0tFTn1fJHtlbnZ9YDtcbiAgLy8gY29uc3QgYW5vbnltb3VzVXVpZEtleSAgICAgPSBgJHtLRVlfQU5PTllNT1VTX1VVSUR9XyR7ZW52fWA7XG4gIC8vIGNvbnN0IGxvZ2luVHlwZUtleSAgICAgICAgID0gYCR7S0VZX0xPR0lOX1RZUEV9XyR7ZW52fWA7XG4gIGNvbnN0IHVzZXJJbmZvS2V5ID0gYCR7VVNFUl9JTkZPX0tFWX1fJHtlbnZ9YDtcbiAgLy8gY29uc3QgZGV2aWNlSWRLZXkgPSBgJHtERVZJQ0VfSU5GT31gOyAvLyDpnZ7njq/looPnuqfliKtcblxuICBjb25zdCBrZXlzID0ge1xuICAgIHVzZXJJbmZvS2V5LFxuICAgIC8vIGFjY2Vzc1Rva2VuS2V5LFxuICAgIC8vIGFjY2Vzc1Rva2VuRXhwaXJlS2V5LFxuICAgIC8vIHJlZnJlc2hUb2tlbktleSxcbiAgICAvLyBhbm9ueW1vdXNVdWlkS2V5LFxuICAgIC8vIGxvZ2luVHlwZUtleSxcbiAgICAvLyBkZXZpY2VJZEtleVxuICB9O1xuICAvLyDoi6XmjIflrpplbnblt7LlrZjlnKhjYWNoZeWImeWwneivleabtOaWsHBlcnNpc3RlbmNlXG4gIGNhY2hlTWFwW2Vudl0gPyBjYWNoZU1hcFtlbnZdLnVwZGF0ZVBlcnNpc3RlbmNlKHBlcnNpc3RlbmNlKSA6IChjYWNoZU1hcFtlbnZdID0gbmV3IENsb3VkYmFzZUNhY2hlKHtcbiAgICAuLi5jb25maWcsXG4gICAga2V5cyxcbiAgICBwbGF0Zm9ybUluZm8sXG4gIH0pKTtcbiAgbG9jYWxDYWNoZU1hcFtlbnZdID0gbG9jYWxDYWNoZU1hcFtlbnZdIHx8IG5ldyBDbG91ZGJhc2VDYWNoZSh7XG4gICAgLi4uY29uZmlnLFxuICAgIGtleXMsXG4gICAgcGxhdGZvcm1JbmZvLFxuICAgIHBlcnNpc3RlbmNlOiAnbG9jYWwnXG4gIH0pO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gZ2V0Q2FjaGVCeUVudklkKGVudjogc3RyaW5nKTogSUNsb3VkYmFzZUNhY2hlIHtcbiAgcmV0dXJuIGNhY2hlTWFwW2Vudl07XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBnZXRMb2NhbENhY2hlKGVudjogc3RyaW5nKTogSUNsb3VkYmFzZUNhY2hlIHtcbiAgcmV0dXJuIGxvY2FsQ2FjaGVNYXBbZW52XTtcbn1cbiJdfQ==

package/dist/esm/libs/request.d.ts

@@ -5,8 +5,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>;
 }
@@ -16,7 +14,6 @@ export declare class CloudbaseRequest implements ICloudbaseRequest {
     _refreshAccessTokenPromise: Promise<IGetAccessTokenResult> | null;
     _reqClass: SDKRequestInterface;
     private _throwWhenRequestFail;
-    private _cache;
     private _localCache;
     constructor(config: ICloudbaseRequestConfig & {
         throw?: boolean;
@@ -24,12 +21,10 @@ export declare class CloudbaseRequest implements ICloudbaseRequest {
     post(options: IRequestOptions): Promise<ResponseObject>;
     upload(options: IUploadRequestOptions): Promise<ResponseObject>;
     download(options: IRequestOptions): Promise<ResponseObject>;
-    refreshAccessToken(): Promise<IGetAccessTokenResult>;
-    getAccessToken(): Promise<IGetAccessTokenResult>;
+    getBaseEndPoint(): string;
+    getOauthAccessTokenV2(oauthClient: any): Promise<IGetAccessTokenResult>;
     request(action: string, params: KV<any>, options?: KV<any>): Promise<ResponseObject>;
     send(action: string, data?: KV<any>): Promise<any>;
-    private _refreshAccessToken;
-    private _setRefreshToken;
 }
 export declare function initRequest(config: ICloudbaseRequestConfig): void;
 export declare function getRequestByEnvId(env: string): CloudbaseRequest;

package/dist/esm/libs/request.js

@@ -45,11 +45,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-import { DATA_VERSION, LOGINTYPE, getSdkVersion, getEndPoint } from '../constants/common';
+import { DATA_VERSION, getSdkVersion, getEndPoint, getBaseEndPoint } from '../constants/common';
 import { utils, adapters, constants } from '@cloudbase/utilities';
-import { cloudbase } from '..';
-import { getCacheByEnvId, getLocalCache } from './cache';
-import { EVENTS } from '../constants/events';
+import { getLocalCache } from './cache';
 import { Platform } from './adapter';
 var ERRORS = constants.ERRORS;
 var genSeqId = utils.genSeqId, isFormData = utils.isFormData, formatUrl = utils.formatUrl, createSign = utils.createSign;
@@ -113,7 +111,6 @@ var CloudbaseRequest = (function () {
             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]);
@@ -158,103 +155,46 @@ var CloudbaseRequest = (function () {
             });
         });
     };
-    CloudbaseRequest.prototype.refreshAccessToken = function () {
+    CloudbaseRequest.prototype.getBaseEndPoint = function () {
+        return getBaseEndPoint();
+    };
+    CloudbaseRequest.prototype.getOauthAccessTokenV2 = function (oauthClient) {
         return __awaiter(this, void 0, void 0, function () {
-            var result, err, e_1;
+            var validAccessToken, credentials;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        if (!this._refreshAccessTokenPromise) {
-                            this._refreshAccessTokenPromise = this._refreshAccessToken();
-                        }
-                        _a.label = 1;
+                    case 0: return [4, oauthClient.getAccessToken()];
                     case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        return [4, this._refreshAccessTokenPromise];
+                        validAccessToken = _a.sent();
+                        return [4, oauthClient._getCredentials()];
                     case 2:
-                        result = _a.sent();
-                        return [3, 4];
-                    case 3:
-                        e_1 = _a.sent();
-                        err = e_1;
-                        return [3, 4];
-                    case 4:
-                        this._refreshAccessTokenPromise = null;
-                        this._shouldRefreshAccessTokenHook = null;
-                        if (err) {
-                            throw err;
-                        }
-                        return [2, result];
-                }
-            });
-        });
-    };
-    CloudbaseRequest.prototype.getAccessToken = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var _a, accessTokenKey, accessTokenExpireKey, refreshTokenKey, refreshToken, accessToken, accessTokenExpire, _b, shouldRefreshAccessToken, _c;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
-                    case 0:
-                        _a = this._cache.keys, accessTokenKey = _a.accessTokenKey, accessTokenExpireKey = _a.accessTokenExpireKey, refreshTokenKey = _a.refreshTokenKey;
-                        return [4, this._cache.getStoreAsync(refreshTokenKey)];
-                    case 1:
-                        refreshToken = _d.sent();
-                        if (!refreshToken) {
-                            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'
-                            }));
-                        }
-                        return [4, this._cache.getStoreAsync(accessTokenKey)];
-                    case 2:
-                        accessToken = _d.sent();
-                        _b = Number;
-                        return [4, this._cache.getStoreAsync(accessTokenExpireKey)];
-                    case 3:
-                        accessTokenExpire = _b.apply(void 0, [_d.sent()]);
-                        shouldRefreshAccessToken = true;
-                        _c = this._shouldRefreshAccessTokenHook;
-                        if (!_c) return [3, 5];
-                        return [4, this._shouldRefreshAccessTokenHook(accessToken, accessTokenExpire)];
-                    case 4:
-                        _c = !(_d.sent());
-                        _d.label = 5;
-                    case 5:
-                        if (_c) {
-                            shouldRefreshAccessToken = false;
-                        }
-                        if (!((!accessToken || !accessTokenExpire || accessTokenExpire < Date.now()) && shouldRefreshAccessToken)) return [3, 7];
-                        return [4, this.refreshAccessToken()];
-                    case 6: return [2, _d.sent()];
-                    case 7: return [2, {
-                            accessToken: accessToken,
-                            accessTokenExpire: accessTokenExpire
-                        }];
+                        credentials = _a.sent();
+                        return [2, {
+                                accessToken: validAccessToken,
+                                accessTokenExpire: new Date(credentials.expires_at).getTime()
+                            }];
                 }
             });
         });
     };
     CloudbaseRequest.prototype.request = function (action, params, options) {
         return __awaiter(this, void 0, void 0, function () {
-            var tcbTraceKey, contentType, tmpObj, refreshTokenKey, refreshToken, _a, payload, key, key, opts, traceHeader, _b, appSign, appSecret, timestamp, appAccessKey, appAccessKeyId, sign, parse, inQuery, search, formatQuery, _c, BASE_URL, PROTOCOL, newUrl, res, resTraceHeader;
+            var tcbTraceKey, contentType, tmpObj, app, oauthClient, _a, payload, key, key, opts, traceHeader, _b, appSign, appSecret, timestamp, appAccessKey, appAccessKeyId, sign, parse, inQuery, search, formatQuery, _c, BASE_URL, PROTOCOL, newUrl, res, resTraceHeader;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
                         tcbTraceKey = "x-tcb-trace_" + this.config.env;
                         contentType = 'application/x-www-form-urlencoded';
                         tmpObj = __assign({ action: action, dataVersion: DATA_VERSION, env: this.config.env }, params);
-                        if (!(ACTIONS_WITHOUT_ACCESSTOKEN.indexOf(action) === -1)) return [3, 3];
-                        refreshTokenKey = this._cache.keys.refreshTokenKey;
-                        return [4, this._cache.getStoreAsync(refreshTokenKey)];
-                    case 1:
-                        refreshToken = _d.sent();
-                        if (!refreshToken) return [3, 3];
+                        if (!(ACTIONS_WITHOUT_ACCESSTOKEN.indexOf(action) === -1)) return [3, 2];
+                        app = this.config._fromApp;
+                        oauthClient = app.oauthInstance.oauth2client;
                         _a = tmpObj;
-                        return [4, this.getAccessToken()];
-                    case 2:
+                        return [4, this.getOauthAccessTokenV2(oauthClient)];
+                    case 1:
                         _a.access_token = (_d.sent()).accessToken;
-                        _d.label = 3;
-                    case 3:
+                        _d.label = 2;
+                    case 2:
                         if (action === 'storage.uploadFile') {
                             payload = new FormData();
                             for (key in payload) {
@@ -312,7 +252,7 @@ var CloudbaseRequest = (function () {
                             newUrl += search;
                         }
                         return [4, this.post(__assign({ url: newUrl, data: payload }, opts))];
-                    case 4:
+                    case 3:
                         res = _d.sent();
                         resTraceHeader = res.header && res.header['x-tcb-trace'];
                         if (resTraceHeader) {
@@ -335,15 +275,6 @@ var CloudbaseRequest = (function () {
                     case 0: return [4, this.request(action, data, { onUploadProgress: data.onUploadProgress })];
                     case 1:
                         response = _a.sent();
-                        if (!(response.data.code === 'ACCESS_TOKEN_EXPIRED' && ACTIONS_WITHOUT_ACCESSTOKEN.indexOf(action) === -1)) return [3, 4];
-                        return [4, this.refreshAccessToken()];
-                    case 2:
-                        _a.sent();
-                        return [4, this.request(action, data, { onUploadProgress: data.onUploadProgress })];
-                    case 3:
-                        response = _a.sent();
-                        _a.label = 4;
-                    case 4:
                         if (response.data.code && this._throwWhenRequestFail) {
                             throw new Error(JSON.stringify({
                                 code: ERRORS.OPERATION_FAIL,
@@ -355,126 +286,6 @@ var CloudbaseRequest = (function () {
             });
         });
     };
-    CloudbaseRequest.prototype._refreshAccessToken = function (retryNum) {
-        if (retryNum === void 0) { retryNum = 1; }
-        return __awaiter(this, void 0, void 0, function () {
-            var _a, accessTokenKey, accessTokenExpireKey, refreshTokenKey, loginTypeKey, anonymousUuidKey, refreshToken, params, response, code, isAnonymous, anonymous_uuid, refresh_token, res;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        _a = this._cache.keys, accessTokenKey = _a.accessTokenKey, accessTokenExpireKey = _a.accessTokenExpireKey, refreshTokenKey = _a.refreshTokenKey, loginTypeKey = _a.loginTypeKey, anonymousUuidKey = _a.anonymousUuidKey;
-                        return [4, this._cache.removeStoreAsync(accessTokenKey)];
-                    case 1:
-                        _b.sent();
-                        return [4, this._cache.removeStoreAsync(accessTokenExpireKey)];
-                    case 2:
-                        _b.sent();
-                        return [4, this._cache.getStoreAsync(refreshTokenKey)];
-                    case 3:
-                        refreshToken = _b.sent();
-                        if (!refreshToken) {
-                            throw new Error(JSON.stringify({
-                                code: ERRORS.INVALID_OPERATION,
-                                msg: 'not login'
-                            }));
-                        }
-                        params = {
-                            refresh_token: refreshToken
-                        };
-                        return [4, this.request('auth.fetchAccessTokenWithRefreshToken', params)];
-                    case 4:
-                        response = _b.sent();
-                        if (!response.data.code) return [3, 12];
-                        code = response.data.code;
-                        if (!(code === 'SIGN_PARAM_INVALID' || code === 'REFRESH_TOKEN_EXPIRED' || code === 'INVALID_REFRESH_TOKEN')) return [3, 11];
-                        return [4, this._cache.getStoreAsync(loginTypeKey)];
-                    case 5:
-                        isAnonymous = (_b.sent()) === LOGINTYPE.ANONYMOUS;
-                        if (!(isAnonymous && code === 'INVALID_REFRESH_TOKEN')) return [3, 9];
-                        return [4, this._cache.getStoreAsync(anonymousUuidKey)];
-                    case 6:
-                        anonymous_uuid = _b.sent();
-                        return [4, this._cache.getStoreAsync(refreshTokenKey)];
-                    case 7:
-                        refresh_token = _b.sent();
-                        return [4, this.send('auth.signInAnonymously', {
-                                anonymous_uuid: anonymous_uuid,
-                                refresh_token: refresh_token
-                            })];
-                    case 8:
-                        res = _b.sent();
-                        this._setRefreshToken(res.refresh_token);
-                        if (retryNum >= 1) {
-                            return [2, this._refreshAccessToken(--retryNum)];
-                        }
-                        else {
-                            throw new Error(JSON.stringify({
-                                code: ERRORS.OPERATION_FAIL,
-                                message: '重试获取 refresh token 失败'
-                            }));
-                        }
-                        _b.label = 9;
-                    case 9:
-                        cloudbase.fire(EVENTS.LOGIN_STATE_EXPIRED);
-                        return [4, this._cache.removeStoreAsync(refreshTokenKey)];
-                    case 10:
-                        _b.sent();
-                        _b.label = 11;
-                    case 11: throw new Error(JSON.stringify({
-                        code: ERRORS.NETWORK_ERROR,
-                        msg: "refresh access_token failed\uFF1A" + response.data.code
-                    }));
-                    case 12:
-                        if (!response.data.access_token) return [3, 15];
-                        cloudbase.fire(EVENTS.ACCESS_TOKEN_REFRESHD);
-                        return [4, this._cache.setStoreAsync(accessTokenKey, response.data.access_token)];
-                    case 13:
-                        _b.sent();
-                        return [4, this._cache.setStoreAsync(accessTokenExpireKey, response.data.access_token_expire + Date.now())];
-                    case 14:
-                        _b.sent();
-                        return [2, {
-                                accessToken: response.data.access_token,
-                                accessTokenExpire: response.data.access_token_expire
-                            }];
-                    case 15:
-                        if (!response.data.refresh_token) return [3, 19];
-                        return [4, this._cache.removeStoreAsync(refreshTokenKey)];
-                    case 16:
-                        _b.sent();
-                        return [4, this._cache.setStoreAsync(refreshTokenKey, response.data.refresh_token)];
-                    case 17:
-                        _b.sent();
-                        return [4, this._refreshAccessToken()];
-                    case 18:
-                        _b.sent();
-                        _b.label = 19;
-                    case 19: return [2];
-                }
-            });
-        });
-    };
-    CloudbaseRequest.prototype._setRefreshToken = function (refreshToken) {
-        return __awaiter(this, void 0, void 0, function () {
-            var _a, accessTokenKey, accessTokenExpireKey, refreshTokenKey;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        _a = this._cache.keys, accessTokenKey = _a.accessTokenKey, accessTokenExpireKey = _a.accessTokenExpireKey, refreshTokenKey = _a.refreshTokenKey;
-                        return [4, this._cache.removeStoreAsync(accessTokenKey)];
-                    case 1:
-                        _b.sent();
-                        return [4, this._cache.removeStoreAsync(accessTokenExpireKey)];
-                    case 2:
-                        _b.sent();
-                        return [4, this._cache.setStoreAsync(refreshTokenKey, refreshToken)];
-                    case 3:
-                        _b.sent();
-                        return [2];
-                }
-            });
-        });
-    };
     return CloudbaseRequest;
 }());
 export { CloudbaseRequest };
@@ -485,4 +296,4 @@ export function initRequest(config) {
 export function getRequestByEnvId(env) {
     return requestMap[env];
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../src/libs/request.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  DATA_VERSION,\n  LOGINTYPE,\n  getSdkVersion,\n  getEndPoint\n} from '../constants/common';\nimport {\n  IRequestOptions,\n  SDKRequestInterface,\n  ResponseObject,\n  IUploadRequestOptions,\n  IRequestConfig\n} from '@cloudbase/adapter-interface';\nimport { utils, adapters, constants } from '@cloudbase/utilities';\nimport { KV } from '@cloudbase/types';\nimport { IGetAccessTokenResult, ICloudbaseRequestConfig, IAppendedRequestInfo, IRequestBeforeHook } from '@cloudbase/types/request';\nimport { ICloudbaseCache } from '@cloudbase/types/cache';\nimport { cloudbase } from '..';\nimport { getCacheByEnvId, getLocalCache } from './cache';\nimport { EVENTS } from '../constants/events';\nimport { Platform } from './adapter';\n\nconst { ERRORS } = constants;\nconst { genSeqId, isFormData, formatUrl, createSign } = utils;\nconst { RUNTIME } = adapters;\n\n// 下面几种 action 不需要 access token\nconst ACTIONS_WITHOUT_ACCESSTOKEN = [\n  'auth.getJwt',\n  'auth.logout',\n  'auth.signInWithTicket',\n  'auth.signInAnonymously',\n  'auth.signIn',\n  'auth.fetchAccessTokenWithRefreshToken',\n  'auth.signUpWithEmailAndPassword',\n  'auth.activateEndUserMail',\n  'auth.sendPasswordResetEmail',\n  'auth.resetPasswordWithToken',\n  'auth.isUsernameRegistered'\n];\n\nfunction bindHooks(instance: SDKRequestInterface, name: string, hooks: IRequestBeforeHook[]) {\n  const originMethod = instance[name];\n  instance[name] = function (options: IRequestOptions) {\n    const data = {};\n    const headers = {};\n    hooks.forEach(hook => {\n      const { data: appendedData, headers: appendedHeaders } = hook.call(instance, options);\n      Object.assign(data, appendedData);\n      Object.assign(headers, appendedHeaders);\n    });\n    const originData = options.data;\n    originData && (() => {\n      if (isFormData(originData)) {\n        for (const key in data) {\n          (originData as FormData).append(key, data[key]);\n        }\n        return;\n      }\n      options.data = {\n        ...originData,\n        ...data\n      };\n    })();\n    options.headers = {\n      ...(options.headers || {}),\n      ...headers\n    };\n    return (originMethod as Function).call(instance, options);\n  };\n}\nfunction beforeEach(): IAppendedRequestInfo {\n  const seqId = genSeqId();\n  return {\n    data: {\n      seqId\n    },\n    headers: {\n      'X-SDK-Version': `@cloudbase/js-sdk/${getSdkVersion()}`,\n      'x-seqid': seqId\n    }\n  };\n}\nexport interface ICloudbaseRequest {\n  post: (options: IRequestOptions) => Promise<ResponseObject>;\n  upload: (options: IUploadRequestOptions) => Promise<ResponseObject>;\n  download: (options: IRequestOptions) => Promise<ResponseObject>;\n  refreshAccessToken: () => Promise<IGetAccessTokenResult>;\n  getAccessToken: () => Promise<IGetAccessTokenResult>;\n  request: (action: string, params: KV<any>, options?: KV<any>) => Promise<ResponseObject>;\n  send: (action: string, data: KV<any>) => Promise<any>;\n}\n\n/**\n * @class CloudbaseRequest\n */\nexport class CloudbaseRequest implements ICloudbaseRequest {\n  config: ICloudbaseRequestConfig;\n  _shouldRefreshAccessTokenHook: Function\n  _refreshAccessTokenPromise: Promise<IGetAccessTokenResult> | null\n  _reqClass: SDKRequestInterface;\n  // 请求失败是否抛出Error\n  private _throwWhenRequestFail = false;\n  private _cache: ICloudbaseCache;\n  // 持久化本地存储\n  private _localCache: ICloudbaseCache;\n  /**\n   * 初始化\n   * @param config\n   */\n  constructor(config: ICloudbaseRequestConfig & { throw?: boolean }) {\n    this.config = config;\n    // eslint-disable-next-line\n    this._reqClass = new Platform.adapter.reqClass(<IRequestConfig>{\n      timeout: this.config.timeout,\n      timeoutMsg: `[@cloudbase/js-sdk] 请求在${this.config.timeout / 1000}s内未完成，已中断`,\n      restrictedMethods: ['post']\n    });\n    this._throwWhenRequestFail = config.throw || false;\n    this._cache = getCacheByEnvId(this.config.env);\n    this._localCache = getLocalCache(this.config.env);\n    bindHooks(this._reqClass, 'post', [beforeEach]);\n    bindHooks(this._reqClass, 'upload', [beforeEach]);\n    bindHooks(this._reqClass, 'download', [beforeEach]);\n  }\n  public async post(options: IRequestOptions): Promise<ResponseObject> {\n    const res = await this._reqClass.post(options);\n    return res;\n  }\n  public async upload(options: IUploadRequestOptions): Promise<ResponseObject> {\n    const res = await this._reqClass.upload(options);\n    return res;\n  }\n  public async download(options: IRequestOptions): Promise<ResponseObject> {\n    const res = await this._reqClass.download(options);\n    return res;\n  }\n\n  public async refreshAccessToken(): Promise<IGetAccessTokenResult> {\n    // 可能会同时调用多次刷新access token，这里把它们合并成一个\n    if (!this._refreshAccessTokenPromise) {\n      // 没有正在刷新，那么正常执行刷新逻辑\n      this._refreshAccessTokenPromise = this._refreshAccessToken();\n    }\n\n    let result;\n    let err;\n    try {\n      result = await this._refreshAccessTokenPromise;\n    } catch (e) {\n      err = e;\n    }\n    this._refreshAccessTokenPromise = null;\n    this._shouldRefreshAccessTokenHook = null;\n    if (err) {\n      throw err;\n    }\n    return result;\n  }\n\n  // 获取access token\n  public async getAccessToken(): Promise<IGetAccessTokenResult> {\n    const { accessTokenKey, accessTokenExpireKey, refreshTokenKey } = this._cache.keys;\n    const refreshToken = await this._cache.getStoreAsync(refreshTokenKey);\n    if (!refreshToken) {\n      // 不该出现的状态：有 access token 却没有 refresh token\n      throw new Error(JSON.stringify({\n        code: ERRORS.OPERATION_FAIL,\n        msg: 'refresh token is not exist, your local data might be messed up, please retry after clear localStorage or sessionStorage'\n      }));\n    }\n    // 如果没有access token或者过期，那么刷新\n    const accessToken = await this._cache.getStoreAsync(accessTokenKey);\n    const accessTokenExpire = Number(await this._cache.getStoreAsync(accessTokenExpireKey));\n\n    // 调用钩子函数\n    let shouldRefreshAccessToken = true;\n    if (this._shouldRefreshAccessTokenHook && !(await this._shouldRefreshAccessTokenHook(accessToken, accessTokenExpire))) {\n      shouldRefreshAccessToken = false;\n    }\n\n    if ((!accessToken || !accessTokenExpire || accessTokenExpire < Date.now()) && shouldRefreshAccessToken) {\n      // 返回新的access tolen\n      return await this.refreshAccessToken();\n    } else {\n      // 返回本地的access token\n      return {\n        accessToken,\n        accessTokenExpire\n      };\n    }\n  }\n\n  /* eslint-disable complexity */\n  public async request(action: string, params: KV<any>, options?: KV<any>): Promise<ResponseObject> {\n    const tcbTraceKey = `x-tcb-trace_${this.config.env}`;\n    let contentType = 'application/x-www-form-urlencoded';\n    // const webDeviceId = await getTcbFingerprintId();\n    const tmpObj: KV<any> = {\n      action,\n      // webDeviceId,\n      dataVersion: DATA_VERSION,\n      env: this.config.env,\n      ...params\n    };\n\n\n    if (ACTIONS_WITHOUT_ACCESSTOKEN.indexOf(action) === -1) {\n      const { refreshTokenKey } = this._cache.keys;\n\n      // 若有 refreshToken 则任务有登录态 刷 accessToken\n      const refreshToken = await this._cache.getStoreAsync(refreshTokenKey);\n      if (refreshToken) {\n        tmpObj.access_token = (await this.getAccessToken()).accessToken;\n      }\n    }\n\n    // 拼body和content-type\n    let payload;\n    if (action === 'storage.uploadFile') {\n      payload = new FormData();\n      for (let key in payload) {\n        if (payload.hasOwnProperty(key) && payload[key] !== undefined) {\n          payload.append(key, tmpObj[key]);\n        }\n      }\n      contentType = 'multipart/form-data';\n    } else {\n      contentType = 'application/json;charset=UTF-8';\n      payload = {};\n      for (let key in tmpObj) {\n        if (tmpObj[key] !== undefined) {\n          payload[key] = tmpObj[key];\n        }\n      }\n    }\n    let opts: any = {\n      headers: {\n        'content-type': contentType\n      }\n    };\n    if (options?.['onUploadProgress']) {\n      opts.onUploadProgress = options['onUploadProgress'];\n    }\n\n    if (this.config.region) {\n      opts.headers['X-TCB-Region'] = this.config.region;\n    }\n\n    const traceHeader = this._localCache.getStore(tcbTraceKey);\n    if (traceHeader) {\n      opts.headers['X-TCB-Trace'] = traceHeader;\n    }\n    // 非web平台使用凭证检验有效性\n    if (Platform.runtime !== RUNTIME.WEB) {\n      const { appSign, appSecret } = this.config;\n      const timestamp = Date.now();\n      const { appAccessKey, appAccessKeyId } = appSecret;\n      const sign = createSign({\n        data: {}, // 校验签名流程实际未用到，可设空\n        timestamp,\n        appAccessKeyId,\n        appSign\n      }, appAccessKey);\n\n      opts.headers['X-TCB-App-Source'] = `timestamp=${timestamp};appAccessKeyId=${appAccessKeyId};appSign=${appSign};sign=${sign}`;\n    }\n\n    // 发出请求\n    // 新的 url 需要携带 env 参数进行 CORS 校验\n    // 请求链接支持添加动态 query 参数，方便用户调试定位请求\n    const { parse, inQuery, search } = params;\n    let formatQuery: Record<string, any> = {\n      env: this.config.env\n    };\n    // 尝试解析响应数据为 JSON\n    parse && (formatQuery.parse = true);\n    inQuery && (formatQuery = {\n      ...inQuery,\n      ...formatQuery\n    });\n    const { BASE_URL, PROTOCOL } = getEndPoint();\n    // 生成请求 url\n    let newUrl = formatUrl(PROTOCOL, BASE_URL, formatQuery);\n\n    if (search) {\n      newUrl += search;\n    }\n\n    const res: ResponseObject = await this.post({\n      url: newUrl,\n      data: payload,\n      ...opts\n    });\n\n    // 保存 trace header\n    const resTraceHeader = res.header && res.header['x-tcb-trace'];\n    if (resTraceHeader) {\n      this._localCache.setStore(tcbTraceKey, resTraceHeader);\n    }\n\n    if ((Number(res.status) !== 200 && Number(res.statusCode) !== 200) || !res.data) {\n      throw new Error('network request error');\n    }\n\n    return res;\n  }\n\n  public async send(action: string, data: KV<any> = {}): Promise<any> {\n    let response = await this.request(action, data, { onUploadProgress: data.onUploadProgress });\n    if (response.data.code === 'ACCESS_TOKEN_EXPIRED' && ACTIONS_WITHOUT_ACCESSTOKEN.indexOf(action) === -1) {\n      // access_token过期，重新获取\n      await this.refreshAccessToken();\n      response = await this.request(action, data, { onUploadProgress: data.onUploadProgress });\n    }\n\n    if (response.data.code && this._throwWhenRequestFail) {\n      throw new Error(JSON.stringify({\n        code: ERRORS.OPERATION_FAIL,\n        msg: `[${response.data.code}] ${response.data.message}`\n      }));\n    }\n\n    return response.data;\n  }\n\n  // 调用接口刷新access token，并且返回\n  private async _refreshAccessToken(retryNum = 1): Promise<IGetAccessTokenResult> {\n    const { accessTokenKey, accessTokenExpireKey, refreshTokenKey, loginTypeKey, anonymousUuidKey } = this._cache.keys;\n    await this._cache.removeStoreAsync(accessTokenKey);\n    await this._cache.removeStoreAsync(accessTokenExpireKey);\n\n    let refreshToken = await this._cache.getStoreAsync(refreshTokenKey);\n    if (!refreshToken) {\n      throw new Error(JSON.stringify({\n        code: ERRORS.INVALID_OPERATION,\n        msg: 'not login'\n      }));\n    }\n    const params: KV<string> = {\n      refresh_token: refreshToken\n    };\n    const response = await this.request('auth.fetchAccessTokenWithRefreshToken', params);\n    if (response.data.code) {\n      const { code } = response.data;\n      if (code === 'SIGN_PARAM_INVALID' || code === 'REFRESH_TOKEN_EXPIRED' || code === 'INVALID_REFRESH_TOKEN') {\n        // 这里处理以下逻辑：\n        // 匿名登录时，如果刷新access token报错refresh token过期，此时应该：\n        // 1. 再用 uuid 拿一次新的refresh token\n        // 2. 拿新的refresh token换access token\n        const isAnonymous = await this._cache.getStoreAsync(loginTypeKey) === LOGINTYPE.ANONYMOUS;\n        if (isAnonymous && code === 'INVALID_REFRESH_TOKEN') {\n          // 获取新的 refresh token\n          const anonymous_uuid = await this._cache.getStoreAsync(anonymousUuidKey);\n          // 此处cache为基类property\n          const refresh_token = await this._cache.getStoreAsync(refreshTokenKey);\n          const res = await this.send('auth.signInAnonymously', {\n            anonymous_uuid,\n            refresh_token\n          });\n          this._setRefreshToken(res.refresh_token);\n          if (retryNum >= 1) {\n            return this._refreshAccessToken(--retryNum);\n          } else {\n            throw new Error(\n              JSON.stringify({\n                code: ERRORS.OPERATION_FAIL,\n                message: '重试获取 refresh token 失败'\n              })\n            )\n          }\n        }\n        cloudbase.fire(EVENTS.LOGIN_STATE_EXPIRED);\n        await this._cache.removeStoreAsync(refreshTokenKey);\n      }\n      throw new Error(JSON.stringify({\n        code: ERRORS.NETWORK_ERROR,\n        msg: `refresh access_token failed：${response.data.code}`\n      }));\n    }\n    if (response.data.access_token) {\n      cloudbase.fire(EVENTS.ACCESS_TOKEN_REFRESHD);\n      await this._cache.setStoreAsync(accessTokenKey, response.data.access_token);\n      // 本地时间可能没有同步\n      await this._cache.setStoreAsync(accessTokenExpireKey, response.data.access_token_expire + Date.now());\n      return {\n        accessToken: response.data.access_token,\n        accessTokenExpire: response.data.access_token_expire\n      };\n    }\n    // 匿名登录refresh_token过期情况下返回refresh_token\n    // 此场景下使用新的refresh_token获取access_token\n    if (response.data.refresh_token) {\n      await this._cache.removeStoreAsync(refreshTokenKey);\n      await this._cache.setStoreAsync(refreshTokenKey, response.data.refresh_token);\n      await this._refreshAccessToken();\n    }\n  }\n  private async _setRefreshToken(refreshToken: string) {\n    const { accessTokenKey, accessTokenExpireKey, refreshTokenKey } = this._cache.keys;\n    // refresh token设置前，先清掉 access token\n    await this._cache.removeStoreAsync(accessTokenKey);\n    await this._cache.removeStoreAsync(accessTokenExpireKey);\n    await this._cache.setStoreAsync(refreshTokenKey, refreshToken);\n  }\n}\n\nconst requestMap: KV<CloudbaseRequest> = {};\n\nexport function initRequest(config: ICloudbaseRequestConfig) {\n  requestMap[config.env] = new CloudbaseRequest({\n    ...config,\n    throw: true\n  });\n}\n\nexport function getRequestByEnvId(env: string): CloudbaseRequest {\n  return requestMap[env];\n}"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../src/libs/request.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  DATA_VERSION,\n  getSdkVersion,\n  getEndPoint,\n  getBaseEndPoint\n} from '../constants/common';\nimport {\n  IRequestOptions,\n  SDKRequestInterface,\n  ResponseObject,\n  IUploadRequestOptions,\n  IRequestConfig\n} from '@cloudbase/adapter-interface';\nimport { utils, adapters, constants } from '@cloudbase/utilities';\nimport { KV } from '@cloudbase/types';\nimport { IGetAccessTokenResult, ICloudbaseRequestConfig, IAppendedRequestInfo, IRequestBeforeHook } from '@cloudbase/types/request';\nimport { ICloudbaseCache } from '@cloudbase/types/cache';\nimport { getLocalCache } from './cache';\nimport { Platform } from './adapter';\nconst { ERRORS } = constants;\nconst { genSeqId, isFormData, formatUrl, createSign } = utils;\nconst { RUNTIME } = adapters;\n\n// import FingerprintJS from '@fingerprintjs/fingerprintjs'\n// const fpPromise = FingerprintJS.load()\n\n// 下面几种 action 不需要 access token\nconst ACTIONS_WITHOUT_ACCESSTOKEN = [\n  'auth.getJwt',\n  'auth.logout',\n  'auth.signInWithTicket',\n  'auth.signInAnonymously',\n  'auth.signIn',\n  'auth.fetchAccessTokenWithRefreshToken',\n  'auth.signUpWithEmailAndPassword',\n  'auth.activateEndUserMail',\n  'auth.sendPasswordResetEmail',\n  'auth.resetPasswordWithToken',\n  'auth.isUsernameRegistered'\n];\n\nfunction bindHooks(instance: SDKRequestInterface, name: string, hooks: IRequestBeforeHook[]) {\n  const originMethod = instance[name];\n  instance[name] = function (options: IRequestOptions) {\n    const data = {};\n    const headers = {};\n    hooks.forEach(hook => {\n      const { data: appendedData, headers: appendedHeaders } = hook.call(instance, options);\n      Object.assign(data, appendedData);\n      Object.assign(headers, appendedHeaders);\n    });\n    const originData = options.data;\n    originData && (() => {\n      if (isFormData(originData)) {\n        for (const key in data) {\n          (originData as FormData).append(key, data[key]);\n        }\n        return;\n      }\n      options.data = {\n        ...originData,\n        ...data\n      };\n    })();\n    options.headers = {\n      ...(options.headers || {}),\n      ...headers\n    };\n    return (originMethod as Function).call(instance, options);\n  };\n}\nfunction beforeEach(): IAppendedRequestInfo {\n  const seqId = genSeqId();\n  return {\n    data: {\n      seqId\n    },\n    headers: {\n      'X-SDK-Version': `@cloudbase/js-sdk/${getSdkVersion()}`,\n      'x-seqid': seqId\n    }\n  };\n}\nexport interface ICloudbaseRequest {\n  post: (options: IRequestOptions) => Promise<ResponseObject>;\n  upload: (options: IUploadRequestOptions) => Promise<ResponseObject>;\n  download: (options: IRequestOptions) => Promise<ResponseObject>;\n  request: (action: string, params: KV<any>, options?: KV<any>) => Promise<ResponseObject>;\n  send: (action: string, data: KV<any>) => Promise<any>;\n}\n\n/**\n * @class CloudbaseRequest\n */\nexport class CloudbaseRequest implements ICloudbaseRequest {\n  config: ICloudbaseRequestConfig;\n  _shouldRefreshAccessTokenHook: Function\n  _refreshAccessTokenPromise: Promise<IGetAccessTokenResult> | null\n  _reqClass: SDKRequestInterface;\n  // 请求失败是否抛出Error\n  private _throwWhenRequestFail = false;\n  // 持久化本地存储\n  private _localCache: ICloudbaseCache;\n  /**\n   * 初始化\n   * @param config\n   */\n  constructor(config: ICloudbaseRequestConfig & { throw?: boolean }) {\n\n    this.config = config;\n    // eslint-disable-next-line\n    this._reqClass = new Platform.adapter.reqClass(<IRequestConfig>{\n      timeout: this.config.timeout,\n      timeoutMsg: `[@cloudbase/js-sdk] 请求在${this.config.timeout / 1000}s内未完成，已中断`,\n      restrictedMethods: ['post']\n    });\n    this._throwWhenRequestFail = config.throw || false;\n    this._localCache = getLocalCache(this.config.env);\n    bindHooks(this._reqClass, 'post', [beforeEach]);\n    bindHooks(this._reqClass, 'upload', [beforeEach]);\n    bindHooks(this._reqClass, 'download', [beforeEach]);\n  }\n\n  public async post(options: IRequestOptions): Promise<ResponseObject> {\n    const res = await this._reqClass.post(options);\n    return res;\n  }\n  public async upload(options: IUploadRequestOptions): Promise<ResponseObject> {\n    const res = await this._reqClass.upload(options);\n    return res;\n  }\n  public async download(options: IRequestOptions): Promise<ResponseObject> {\n    const res = await this._reqClass.download(options);\n    return res;\n  }\n\n  public getBaseEndPoint() {\n    return getBaseEndPoint()\n  }\n\n  public async getOauthAccessTokenV2(oauthClient: any): Promise<IGetAccessTokenResult> {\n    const validAccessToken = await oauthClient.getAccessToken()\n    const credentials = await oauthClient._getCredentials()\n    return {\n      accessToken: validAccessToken,\n      accessTokenExpire: new Date(credentials.expires_at).getTime()\n    }\n  }\n\n\n  /* eslint-disable complexity */\n  public async request(action: string, params: KV<any>, options?: KV<any>): Promise<ResponseObject> {\n    const tcbTraceKey = `x-tcb-trace_${this.config.env}`;\n    let contentType = 'application/x-www-form-urlencoded';\n    // const webDeviceId = await getTcbFingerprintId();\n    const tmpObj: KV<any> = {\n      action,\n      // webDeviceId,\n      dataVersion: DATA_VERSION,\n      env: this.config.env,\n      ...params\n    };\n\n    if (ACTIONS_WITHOUT_ACCESSTOKEN.indexOf(action) === -1) {\n      const app = this.config._fromApp\n      const oauthClient = app.oauthInstance.oauth2client\n      tmpObj.access_token = (await this.getOauthAccessTokenV2(oauthClient)).accessToken\n    }\n\n    // 拼body和content-type\n    let payload;\n    if (action === 'storage.uploadFile') {\n      payload = new FormData();\n      for (let key in payload) {\n        if (payload.hasOwnProperty(key) && payload[key] !== undefined) {\n          payload.append(key, tmpObj[key]);\n        }\n      }\n      contentType = 'multipart/form-data';\n    } else {\n      contentType = 'application/json;charset=UTF-8';\n      payload = {};\n      for (let key in tmpObj) {\n        if (tmpObj[key] !== undefined) {\n          payload[key] = tmpObj[key];\n        }\n      }\n    }\n    let opts: any = {\n      headers: {\n        'content-type': contentType\n      }\n    };\n    if (options?.['onUploadProgress']) {\n      opts.onUploadProgress = options['onUploadProgress'];\n    }\n\n    if (this.config.region) {\n      opts.headers['X-TCB-Region'] = this.config.region;\n    }\n\n    const traceHeader = this._localCache.getStore(tcbTraceKey);\n    if (traceHeader) {\n      opts.headers['X-TCB-Trace'] = traceHeader;\n    }\n    // 非web平台使用凭证检验有效性\n    if (Platform.runtime !== RUNTIME.WEB) {\n      const { appSign, appSecret } = this.config;\n      const timestamp = Date.now();\n      const { appAccessKey, appAccessKeyId } = appSecret;\n      const sign = createSign({\n        data: {}, // 校验签名流程实际未用到，可设空\n        timestamp,\n        appAccessKeyId,\n        appSign\n      }, appAccessKey);\n\n      opts.headers['X-TCB-App-Source'] = `timestamp=${timestamp};appAccessKeyId=${appAccessKeyId};appSign=${appSign};sign=${sign}`;\n    }\n\n    // 发出请求\n    // 新的 url 需要携带 env 参数进行 CORS 校验\n    // 请求链接支持添加动态 query 参数，方便用户调试定位请求\n    const { parse, inQuery, search } = params;\n    let formatQuery: Record<string, any> = {\n      env: this.config.env\n    };\n    // 尝试解析响应数据为 JSON\n    parse && (formatQuery.parse = true);\n    inQuery && (formatQuery = {\n      ...inQuery,\n      ...formatQuery\n    });\n    const { BASE_URL, PROTOCOL } = getEndPoint();\n    // 生成请求 url\n    let newUrl = formatUrl(PROTOCOL, BASE_URL, formatQuery);\n\n    if (search) {\n      newUrl += search;\n    }\n\n    const res: ResponseObject = await this.post({\n      url: newUrl,\n      data: payload,\n      ...opts\n    });\n\n    // 保存 trace header\n    const resTraceHeader = res.header && res.header['x-tcb-trace'];\n    if (resTraceHeader) {\n      this._localCache.setStore(tcbTraceKey, resTraceHeader);\n    }\n\n    if ((Number(res.status) !== 200 && Number(res.statusCode) !== 200) || !res.data) {\n      throw new Error('network request error');\n    }\n\n    return res;\n  }\n\n  public async send(action: string, data: KV<any> = {}): Promise<any> {\n    let response = await this.request(action, data, { onUploadProgress: data.onUploadProgress });\n\n    if (response.data.code && this._throwWhenRequestFail) {\n      throw new Error(JSON.stringify({\n        code: ERRORS.OPERATION_FAIL,\n        msg: `[${response.data.code}] ${response.data.message}`\n      }));\n    }\n\n    return response.data;\n  }\n}\n\nconst requestMap: KV<CloudbaseRequest> = {};\n\nexport function initRequest(config: ICloudbaseRequestConfig) {\n  requestMap[config.env] = new CloudbaseRequest({\n    ...config,\n    throw: true\n  });\n}\n\nexport function getRequestByEnvId(env: string): CloudbaseRequest {\n  return requestMap[env];\n}"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/app",
-  "version": "1.4.1",
+  "version": "2.0.0-alpha.0",
   "description": "cloudbase javascript sdk core",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -28,11 +28,13 @@
   "license": "ISC",
   "dependencies": {
     "@cloudbase/adapter-interface": "^0.4.0",
-    "@cloudbase/types": "^1.1.3-alpha.0",
-    "@cloudbase/utilities": "^1.3.4",
-    "cloudbase-adapter-wx_mp": "0.2.0"
+    "@cloudbase/types": "^2.0.0-alpha.0",
+    "@cloudbase/utilities": "^2.0.0-alpha.0",
+    "cloudbase-adapter-wx_mp": "0.2.0",
+    "uuid": "^8.3.2"
   },
   "devDependencies": {
+    "@types/uuid": "^8.3.1",
     "@typescript-eslint/eslint-plugin": "^2.30.0",
     "@typescript-eslint/parser": "^2.30.0",
     "eslint": "^6.8.0",
@@ -51,5 +53,5 @@
       "eslint --fix"
     ]
   },
-  "gitHead": "ab207863756e06d702ad17554e67a3c6242ce4b6"
+  "gitHead": "9ab9ea4322a548cd981d5fe747b6dee911272a6d"
 }

package/src/constants/common.ts

@@ -8,49 +8,63 @@ const { setSdkName: setUtilitiesSdkName, setProtocol: setUtilitiesProtocol } = c
 let sdk_version = '';
 let sdk_name = '@cloudbase/js-sdk';
 
-export function setSdkVersion(version:string){
+export function setSdkVersion(version: string) {
   sdk_version = version;
 }
-export function getSdkVersion(){
+export function getSdkVersion() {
   return sdk_version;
 }
-export function setSdkName(name:string){
+export function setSdkName(name: string) {
   sdk_name = name;
   setUtilitiesSdkName(name);
 }
-export function getSdkName(){
+export function getSdkName() {
   return sdk_name;
 }
 export const DATA_VERSION = '2020-01-10';
 /**
  * request
  */
-let PROTOCOL = typeof location !== 'undefined' && location.protocol === 'http:' 
-  ? 'http:' 
+let PROTOCOL = typeof location !== 'undefined' && location.protocol === 'http:'
+  ? 'http:'
   : 'https:';
 let BASE_URL = typeof process !== 'undefined' && process.env.NODE_ENV === 'e2e' && process.env.END_POINT === 'pre'
   ? '//tcb-pre.tencentcloudapi.com/web'
   : '//tcb-api.tencentcloudapi.com/web';
-export function setEndPoint(url:string,protocol?:'http'|'https'){
+export function setEndPoint(url: string, protocol?: 'http' | 'https') {
   BASE_URL = url;
-  if(protocol){
+  if (protocol) {
     PROTOCOL = protocol;
     setUtilitiesProtocol(protocol);
   }
 }
-export function setRegionLevelEndpoint(env:string,region:string,protocol?:'http'|'https') {
+export function setRegionLevelEndpoint(env: string, region: string, protocol?: 'http' | 'https') {
   const endpoiont = region
     ? `//${env}.${region}.tcb-api.tencentcloudapi.com/web`
     : `//${env}.ap-shanghai.tcb-api.tencentcloudapi.com/web`
   setEndPoint(endpoiont, protocol)
 }
-export function getEndPoint(){
+export function getEndPoint() {
   return { BASE_URL, PROTOCOL };
 }
 
+
+export function getBaseEndPoint() {
+  const { PROTOCOL, BASE_URL } = getEndPoint()
+  const webEndpoint = `${PROTOCOL}${BASE_URL}`
+  return `${new URL(webEndpoint).origin}`
+}
+
 export enum LOGINTYPE {
+  NULL = 'NULL',
   ANONYMOUS = 'ANONYMOUS',
   WECHAT = 'WECHAT',
+  WECHAT_PUBLIC = 'WECHAT-PUBLIC',
+  WECHAT_OPEN = 'WECHAT-OPEN',
   CUSTOM = 'CUSTOM',
-  NULL = 'NULL' // 保留字，代表未登录
-}
+  EMAIL = 'EMAIL',
+  USERNAME = 'USERNAME',
+  PHONE = 'PHONE'
+}
+
+export const OAUTH2_LOGINTYPE_PREFIX = 'OAUTH2'