@smart100/spu-web-plugin 0.0.34 → 0.0.35

package/package.json

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

package/src/axios.ts

@@ -7,7 +7,7 @@ import type {
 import { get } from 'lodash-es'
 // import { Message } from 'element-ui'
 import { loadding } from './components/loadding'
-import { getUser, getToken } from './index'
+import login from './login'
 import core from './core'
 
 interface Response {
@@ -30,12 +30,27 @@ const createAxiosInstance = (type: 'spu' | 'normal' = 'spu', options: any) => {
 
   axiosInstance.interceptors.request.use(async (config: any) => {
     // const isShowLoading = typeof config?.isShowLoading !== 'undefined' ? config.isShowLoading : true
+    // console.error(444444)
+    // console.log(config)
+
     const isShowLoading = get(config, 'isShowLoading', true)
     isShowLoading && loadding.open()
 
     const isSendToken = get(config, 'isSendToken', true)
     if (isSendToken) {
-      const token = getToken()
+
+      // 请求接口前校验是否过期 如果过期先刷新token
+      if (config.url !== '/api/auth/refreshtoken') {
+        if (!login.checkLogin() && login.getRole() !== 'center') {
+          try {
+            await login.updateToken()
+          } catch (err) {
+            console.error(err)
+          }
+        }
+      }
+
+      const token = login.getToken()
       if (config?.headers && token) {
         config.headers.token = token
       }

package/src/index.ts

@@ -19,8 +19,6 @@ import { expandexp } from './components/expandexp'
 import { initApaasSpuTrack } from './apaasSpuTrack'
 import { initTest } from './test'
 
-
-
 // class SPUWebPlugin {
 //   static install = install
 //   static version = version
@@ -29,11 +27,12 @@ import { initTest } from './test'
 // // SPUWebPlugin.version = version
 
 
-
+// 基于部署路径查出 modulekey moduleversion
+const arr = location.pathname.split('/')
 const globalOptions: any = {
-  modulekey: 'demospu',
-  modulename: 'demospu',
-  moduleversion: 'v1.0',
+  modulename: '',
+  modulekey: arr[1] || '',
+  moduleversion: arr[2] || '',
   storageproxyprefix: '',
   router: null
 }
@@ -118,13 +117,13 @@ const SPUWebPlugin = {
 
 
 
+const updateToken = login.updateToken.bind(login)
 const getToken = login.getToken.bind(login)
 const getTokenExpires = login.getTokenExpires.bind(login)
 const getRefreshToken = login.getRefreshToken.bind(login)
 const getUser = login.getUser.bind(login)
 const checkLogin = login.checkLogin.bind(login)
 const singleLogin = login.singleLogin.bind(login)
-const startRefreshtoken = login.startRefreshtoken.bind(login)
 
 
 
@@ -167,13 +166,13 @@ export {
   setTitle,
   isInApp,
   AMapLoader,
+  singleLogin,
+  updateToken,
   getToken,
   getTokenExpires,
   getRefreshToken,
   getUser,
   checkLogin,
-  singleLogin,
-  startRefreshtoken,
   Module,
   components,
   expandexp,

package/src/login.ts

@@ -84,6 +84,7 @@ class Login {
 
   getToken () {
     return this.getData('token')
+    // return lsProxy.getItem('token') as string
   }
 
   setToken (value: string) {
@@ -108,6 +109,7 @@ class Login {
 
   getRefreshToken () {
     return this.getData('refreshtoken')
+    // return lsProxy.getItem('refreshtoken') as string
   }
 
   setRefreshToken (value: string) {
@@ -118,13 +120,25 @@ class Login {
     this.removeData('refreshtoken')
   }
 
-  private updateToken () {
+  updateToken () {
+    // 如果是产品运营中心 则不走刷新token流程
+    if (this.checkLogin() && this.getRole() === 'center') {
+      console.warn('当前登录为产品运营中心用户，不支持自动刷新token。')
+      return false
+    }
+    const token = this.getToken()
+    const refreshtoken = this.getRefreshToken()
+    const sendToken = this.checkLoginByToken(token) ? token : refreshtoken
     return axios.get('/api/auth/refreshtoken', {
       params: {
-        refreshtoken: this.getRefreshToken()
+        refreshtoken: sendToken
       },
       isShowLoadding: false,
-      isShowErrorMessage: false
+      isShowErrorMessage: false,
+      isSendToken: false,
+      headers: {
+        token: sendToken
+      }
     }).then((res: any) => {
       // console.log(res)
       const data = res?.data
@@ -139,19 +153,41 @@ class Login {
   private refreshtokenTimer: number | null = null
 
   startRefreshtoken () {
-    // 如果有登录 则过期前15秒更新token
-    // 如果没登录 每隔1分钟走token更新逻辑(如果刚开始没登录 后面才登录【不需要再在登陆后写刷新token逻辑】)
+    // 如果是产品运营中心 则不走刷新token流程
+    if (this.checkLogin() && this.getRole() === 'center') {
+      console.warn('当前登录为产品运营中心用户，不支持自动刷新token。')
+      return false
+    }
+
     this.stopRefreshtoken()
-    const time = this.checkLogin() ? (Number(this.getTokenExpires()) - Date.now() - 1000 * 15) : (1000 * 60)
-    // const time = 5000
-    if (time > 0) {
-      this.refreshtokenTimer = window.setTimeout(async () => {
-        if (this.checkLogin()) {
-          await this.updateToken()
+
+    // 如果有登录 但 refreshtoken 不是完整 token 则10秒后【需要等单点登录走完后才刷新不然会被覆盖】刷新一次取到完整 token
+    // 如果有登录 且 refreshtoken 是完整 token 如果剩余时间大于10分钟 则每隔10分钟刷一次 否则过期前15秒更新 token
+    // 如果没登录 每隔1分钟走token更新逻辑(如果刚开始没登录 后面才登录【不需要再在登陆后写刷新token逻辑】)
+    let time = 0
+    if (this.checkLogin()) {
+      const user = this.getUserByToken(this.getRefreshToken())
+      if (user?.tokenId) {
+        time = Number(this.getTokenExpires()) - Date.now() - 1000 * 15
+        // 如果剩余时间大于10分钟 则每隔10分钟刷一次
+        if (time > 600000) {
+          time = 600000
+        } else if (time < 0) {
+          time = 0
         }
-        this.startRefreshtoken()
-      }, time)
+      } else {
+        time = 10000
+      }
+    } else {
+      time = 60000
     }
+    // time = 5000
+    this.refreshtokenTimer = window.setTimeout(async () => {
+      if (this.checkLogin()) {
+        await this.updateToken()
+      }
+      this.startRefreshtoken()
+    }, time)
   }
 
   private stopRefreshtoken () {
@@ -185,11 +221,20 @@ class Login {
   }
 
   setUserByToken (token: string) {
+    const user = this.getUserByToken(token)
+    if (user) {
+      this.setUser(user)
+    } else {
+      this.removeUser()
+    }
+  }
+
+  getUserByToken (token: string) {
     const jwtInfo = this.jwtDecode(token)
     if (jwtInfo && jwtInfo.LoginUser) {
-      this.setUser(jwtInfo.LoginUser)
+      return jwtInfo.LoginUser
     } else {
-      this.removeUser()
+      return null
     }
   }
 
@@ -280,7 +325,7 @@ class Login {
   // 查询token所属登录角色
   // tenant: 普通租户登录 默认
   // center: 产品运营中心登录 单点登录时只带 token 没带 refreshtoken 和 tokenexpires
-  getLoginRole (token?: string) {
+  getRoleByToken (token?: string) {
     let loginRole: 'center' | 'tenant' = 'tenant' // center | tenant
     if (token) {
       const jwtInfo = this.jwtDecode(token)
@@ -292,19 +337,23 @@ class Login {
     return loginRole
   }
 
+  getRole () {
+    return this.getRoleByToken(this.getToken())
+  }
+
   // 检测当前用户是否登录状态
   checkLogin () {
     let haslogged = false
     const token = this.getToken()
     if (token) {
-      if (this.getLoginRole(token) === 'center') {
-        haslogged = this.checkTokenLogin(token)
+      if (this.getRole() === 'center') {
+        haslogged = this.checkLoginByToken(token)
       } else {
         const refreshtoken = this.getRefreshToken()
         const tokenexpires = this.getTokenExpires()
         const now = Date.now()
         if (token && refreshtoken && tokenexpires && Number(tokenexpires) > now) {
-          haslogged = this.checkTokenLogin(token)
+          haslogged = this.checkLoginByToken(token)
         }
       }
     }
@@ -312,7 +361,7 @@ class Login {
   }
 
   // 检测token是否过期
-  checkTokenLogin (token?: string) {
+  checkLoginByToken (token?: string) {
     let haslogged = false
     if (token) {
       const now = Date.now()
@@ -418,9 +467,9 @@ class Login {
     const envname = query.envname
     const context = query.context
 
-    if (this.checkTokenLogin(token)) {
+    if (this.checkLoginByToken(token)) {
       let isneedlogin = true // 是否需要走单点登录流程
-      const loginRole = this.getLoginRole(token)
+      const loginRole = this.getRoleByToken(token)
 
       if (loginRole === 'center') {
         // 如果本地已经登录 且 query 登录参数与本地一致 说明是刚登录没多久【token也没刷新过】 视为已经登录 不需再走单点登录流程
@@ -449,6 +498,18 @@ class Login {
         // web 端有传 app没传 需要做兼容
         context && lsProxy.setItem('context', decodeURIComponent(context))
 
+        // 单点登录写入 token 之后 换取完整的 refreshtoken
+        try {
+          if (this.checkLogin()) {
+            const user = this.getUserByToken(this.getRefreshToken())
+            if (!user?.tokenId) {
+              this.updateToken()
+            }
+          }
+        } catch (err) {
+          console.error(err)
+        }
+
         // 这里兼容报错
         await this.getAndSetTenant()
         await this.getAndSetUserInfo()