@smart100/spu-web-plugin 1.0.18 → 1.0.19

package/dist/index.d.ts

@@ -80,6 +80,7 @@ interface IUploadService {
 //   modulename: string
 //   moduleversion: string
 //   storageproxyprefix?: string
+//   isfixapptokenexpired?: boolean
 //   router?: any
 // }
 
@@ -104,7 +105,11 @@ export const getLocation: (isuseiplocation?: boolean) => Promise<{
   [propName: string]: any
 } | null>
 export const getDistance: (p1: [number, number], p2: [number, number]) => Promise<any>
-export const getAddress: (location: { longitude: string; latitude: string; [propName: string]: any }) => Promise<string>
+export const getAddress: (location: {
+  longitude: string
+  latitude: string
+  [propName: string]: any
+}) => Promise<string>
 export const spuAxios: any
 export const apaasAxios: any
 export const axios: any

package/dist/spu-web-plugin.mjs

@@ -1,4 +1,4 @@
-var version = "1.0.18";
+var version = "1.0.19";
 
 /** Detect free variable `global` from Node.js. */
 var freeGlobal$2 = typeof global == 'object' && global && global.Object === Object && global;
@@ -16603,12 +16603,9 @@ var getSPUContainerToken = function getSPUContainerToken() {
     if ((_window$aPaaS = window.aPaaS) !== null && _window$aPaaS !== void 0 && _window$aPaaS.getToken) {
       window.aPaaS.getToken(function (res) {
         console.log('window.aPaaS.getToken success', res);
-        // 安卓返回 token tokenExpires refreshToken
-        // ios返回 token tokenexpires refreshtoken
-        // 改好按安卓
         var token = res === null || res === void 0 ? void 0 : res.token;
-        var tokenexpires = (res === null || res === void 0 ? void 0 : res.tokenExpires) || (res === null || res === void 0 ? void 0 : res.tokenexpires);
-        var refreshtoken = (res === null || res === void 0 ? void 0 : res.refreshToken) || (res === null || res === void 0 ? void 0 : res.refreshtoken);
+        var tokenexpires = res === null || res === void 0 ? void 0 : res.tokenExpires;
+        var refreshtoken = res === null || res === void 0 ? void 0 : res.refreshToken;
         if (token && tokenexpires && refreshtoken) {
           resolve({
             token: token,
@@ -16677,7 +16674,7 @@ var fixLoginQuery = /*#__PURE__*/function () {
 // 监听 App 切换到前台 判断token是否过期 如果过期就调用获取tokne方法更新token
 var fixAppTokenExpired = function fixAppTokenExpired() {
   var _window$Native;
-  if ((_window$Native = window.Native) !== null && _window$Native !== void 0 && _window$Native.onHostEnterForceground) {
+  if (globalOptions.isfixapptokenexpired && (_window$Native = window.Native) !== null && _window$Native !== void 0 && _window$Native.onHostEnterForceground) {
     console.log('listen App enter forceground');
     window.Native.onHostEnterForceground( /*#__PURE__*/_asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee3() {
       var loginState, tokenData;
@@ -16742,10 +16739,16 @@ function _singleLogin() {
             // web 端有传 app没传 需要做兼容
             context && lsProxy.setItem('context', decodeURIComponent(context));
           };
-          _context7.next = 3;
+          query = cloneDeep$1(query);
+          if (!globalOptions.isfixapptokenexpired) {
+            _context7.next = 6;
+            break;
+          }
+          _context7.next = 5;
           return fixLoginQuery(query);
-        case 3:
+        case 5:
           query = _context7.sent;
+        case 6:
           flag = false; // 是否登录成功
           token = query.token;
           refreshtoken = query.refreshtoken;
@@ -16753,7 +16756,7 @@ function _singleLogin() {
           envname = query.envname;
           context = query.context;
           if (!checkLoginByToken(token)) {
-            _context7.next = 62;
+            _context7.next = 64;
             break;
           }
           isneedlogin = true; // 是否需要走单点登录流程
@@ -16775,104 +16778,104 @@ function _singleLogin() {
           // isneedlogin = true
           // debugger
           if (!isneedlogin) {
-            _context7.next = 60;
+            _context7.next = 62;
             break;
           }
           setBaseInfo();
           // 单点登录写入 token 之后
           // 1、如果 refreshtoken 不完整 则换取完整的 refreshtoken
-          _context7.prev = 16;
+          _context7.prev = 18;
           if (!checkLogin()) {
-            _context7.next = 23;
+            _context7.next = 25;
             break;
           }
           refreshTokenUser = getUserByToken(getRefreshToken());
           tokenUser = getUserByToken(getToken());
           if (!(!(refreshTokenUser !== null && refreshTokenUser !== void 0 && refreshTokenUser.tokenId) && tokenUser !== null && tokenUser !== void 0 && tokenUser.tokenId)) {
-            _context7.next = 23;
+            _context7.next = 25;
             break;
           }
-          _context7.next = 23;
+          _context7.next = 25;
           return updateToken();
-        case 23:
-          _context7.next = 28;
-          break;
         case 25:
-          _context7.prev = 25;
-          _context7.t0 = _context7["catch"](16);
+          _context7.next = 30;
+          break;
+        case 27:
+          _context7.prev = 27;
+          _context7.t0 = _context7["catch"](18);
           console.error(_context7.t0);
-        case 28:
+        case 30:
           // 2、重新计算刷新 token 时间 因为刚开始进入就 startRefreshtoken 检测到没有 token 会过10秒才执行刷新 token 操作
           startRefreshtoken();
           // 获取环境信息和租户配置信息
-          _context7.next = 31;
+          _context7.next = 33;
           return getEnvname();
-        case 31:
+        case 33:
           nowEnvname = _context7.sent;
           if (!nowEnvname) {
-            _context7.next = 52;
+            _context7.next = 54;
             break;
           }
-          _context7.next = 35;
+          _context7.next = 37;
           return requestEnvdata(nowEnvname);
-        case 35:
+        case 37:
           envData = _context7.sent;
           if (!envData) {
-            _context7.next = 48;
+            _context7.next = 50;
             break;
           }
           saveEnvdata(envData);
           if (!envData.tenantcode) {
-            _context7.next = 44;
+            _context7.next = 46;
             break;
           }
           setTecode(envData.tenantcode);
           // 租户配置
-          _context7.next = 42;
+          _context7.next = 44;
           return tenantSetting.requestAndSetTenantSetting(envData.tenantcode);
-        case 42:
-          _context7.next = 46;
-          break;
         case 44:
+          _context7.next = 48;
+          break;
+        case 46:
           tenantSetting.removeTenantSetting();
           removeTecode();
-        case 46:
-          _context7.next = 50;
-          break;
         case 48:
+          _context7.next = 52;
+          break;
+        case 50:
           removeEnvdata();
           removeTecode();
-        case 50:
-          _context7.next = 54;
-          break;
         case 52:
+          _context7.next = 56;
+          break;
+        case 54:
           removeEnvdata();
           removeTecode();
-        case 54:
-          _context7.next = 56;
-          return getAndSetTenant();
         case 56:
           _context7.next = 58;
-          return getAndSetUserInfo();
+          return getAndSetTenant();
         case 58:
+          _context7.next = 60;
+          return getAndSetUserInfo();
+        case 60:
           // 单点登录后 获取 web 开发者模式 如果是则设置 isdebugger
           urlquery.dealWebDebugger();
           flag = true;
-        case 60:
-          _context7.next = 65;
-          break;
         case 62:
+          _context7.next = 67;
+          break;
+        case 64:
           flag = false;
           setBaseInfo(); // 传递的token过期依然写入 如果不写入的话 有可能之前的token本来没过期 页面依然可用
           console.error('单点登录失败，请检查链接所传 token/refreshtoken/tokenexpires 是否非法或过期。');
-        case 65:
+        case 67:
           if (!flag) {
-            _context7.next = 68;
+            _context7.next = 70;
             break;
           }
-          _context7.next = 68;
+          _context7.next = 70;
           return core$1.initGetData();
-        case 68:
+        case 70:
           if (flag) {
             // 单点登录成功 需要删除 query 中相关参数
             token && delete query.token;
@@ -16885,11 +16888,11 @@ function _singleLogin() {
             flag: flag,
             query: query
           });
-        case 70:
+        case 72:
         case "end":
           return _context7.stop();
       }
-    }, _callee7, null, [[16, 25]]);
+    }, _callee7, null, [[18, 27]]);
   }));
   return _singleLogin.apply(this, arguments);
 }
@@ -70312,6 +70315,7 @@ var getDefaultGlobalOptions = function getDefaultGlobalOptions() {
     modulekey: arr[1] || '',
     moduleversion: arr[2] || '',
     storageproxyprefix: '',
+    isfixapptokenexpired: false,
     singleLoginCallback: null,
     router: null
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smart100/spu-web-plugin",
-  "version": "1.0.18",
+  "version": "1.0.19",
   "description": "",
   "scripts": {
     "dev": "npm run build:types && rollup -c -w",

package/src/index.ts

@@ -53,6 +53,7 @@ const getDefaultGlobalOptions = () => {
     modulekey: arr[1] || '',
     moduleversion: arr[2] || '',
     storageproxyprefix: '',
+    isfixapptokenexpired: false, // 是否修复apptoken过期问题 目前版本暂时不默认修复 等门户引擎验证通过之后 再改成默认修复
     singleLoginCallback: null,
     router: null
   }

package/src/login.ts

@@ -17,6 +17,7 @@ import {
   removeTecode
 } from './envService'
 import { tenantSetting } from './tenantSetting'
+import { globalOptions } from './index'
 
 type JwtResult = {
   LoginUser: IAny
@@ -457,13 +458,9 @@ const getSPUContainerToken = (): Promise<any> => {
     if (window.aPaaS?.getToken) {
       window.aPaaS.getToken((res: any) => {
         console.log('window.aPaaS.getToken success', res)
-        // 安卓返回 token tokenExpires refreshToken
-        // ios返回 token tokenexpires refreshtoken
-        // 改好按安卓
-
         const token = res?.token
-        const tokenexpires = res?.tokenExpires || res?.tokenexpires
-        const refreshtoken = res?.refreshToken || res?.refreshtoken
+        const tokenexpires = res?.tokenExpires
+        const refreshtoken = res?.refreshToken
 
         if (token && tokenexpires && refreshtoken) {
           resolve({
@@ -508,7 +505,7 @@ const fixLoginQuery = async (query: IAny) => {
 // 修复 App 切到后台时间过长导致 token 过期
 // 监听 App 切换到前台 判断token是否过期 如果过期就调用获取tokne方法更新token
 const fixAppTokenExpired = () => {
-  if (window.Native?.onHostEnterForceground) {
+  if (globalOptions.isfixapptokenexpired && window.Native?.onHostEnterForceground) {
     console.log('listen App enter forceground')
     window.Native.onHostEnterForceground(async () => {
       console.log('App enter forceground')
@@ -533,7 +530,10 @@ const fixAppTokenExpired = () => {
 
 // 单点登录
 async function singleLogin(query: IAny) {
-  query = await fixLoginQuery(query)
+  query = cloneDeep(query)
+  if (globalOptions.isfixapptokenexpired) {
+    query = await fixLoginQuery(query)
+  }
 
   let flag = false // 是否登录成功
   const token = query.token
@@ -658,7 +658,9 @@ async function singleLogin(query: IAny) {
 
 function installAuth(options: any) {
   startRefreshtoken()
+
   fixAppTokenExpired()
+
   if (options.router) {
     options.router.beforeEach(async (to: any, from: any, next: any) => {
       // console.log(from)

package/src/types/index.d.ts

@@ -80,6 +80,7 @@ interface IUploadService {
 //   modulename: string
 //   moduleversion: string
 //   storageproxyprefix?: string
+//   isfixapptokenexpired?: boolean
 //   router?: any
 // }
 
@@ -104,7 +105,11 @@ export const getLocation: (isuseiplocation?: boolean) => Promise<{
   [propName: string]: any
 } | null>
 export const getDistance: (p1: [number, number], p2: [number, number]) => Promise<any>
-export const getAddress: (location: { longitude: string; latitude: string; [propName: string]: any }) => Promise<string>
+export const getAddress: (location: {
+  longitude: string
+  latitude: string
+  [propName: string]: any
+}) => Promise<string>
 export const spuAxios: any
 export const apaasAxios: any
 export const axios: any