@smart100/spu-web-plugin 0.0.34 → 0.0.36

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()

package/src/nativeApi.ts

@@ -0,0 +1,60 @@
+import { globalOptions, axios, getUser, Module } from './index'
+import { get, cloneDeep } from 'lodash-es'
+import login from './login'
+import { getIndextagSync } from './apaasSpuTrack'
+import core from './core'
+
+class NativeApi {
+  // 已经注入api的或者不同域的就不再注入
+  checkIsCanInject (iframe: any) {
+    try {
+      return !iframe?.contentWindow?.Module || !!iframe?.contentWindow?.Module
+    } catch (err) {
+      console.error(err)
+      console.error(`SPU 容器无法注入 Native-API，url： ${iframe.src}。`)
+      return false
+    }
+  }
+
+  injectApi (iframe: any, options: any) {
+    const modulekey = options.modulekey
+    // const modulekey = 'demospu'
+
+    const Module = {
+      spuContainerType: '',
+      getContextSync () {
+        return core.getContextSync(modulekey)
+      },
+      getIndextagSync: getIndextagSync,
+      checkPermission: core.checkPermission.bind(core),
+      linkToPage: window?.Module?.linkToPage,
+      linkToModule: window?.Module?.linkToModule,
+      apiRequest: window?.Module?.apiRequest
+    }
+
+    const Native = {
+      // exitPage: window?.Native?.exitPage,
+      getLocation: window?.Native?.getLocation,
+      getSystemInfoSync: window?.Native?.getSystemInfoSync
+    }
+
+    const aPaaS = {
+      getUserInfoSync: login.getUser.bind(login),
+      getToken: window?.aPaaS?.getToken
+    }
+
+    iframe.contentWindow.Module = Module
+    iframe.contentWindow.Native = Native
+    iframe.contentWindow.aPaaS = aPaaS
+  }
+
+  inject (iframe: any, options: any) {
+    if (this.checkIsCanInject(iframe) && options?.modulekey) {
+      this.injectApi(iframe, options)
+    }
+  }
+}
+
+const nativeApi = new NativeApi()
+
+export default nativeApi