@smart100/spu-web-plugin 0.0.24 → 0.0.26

package/src/login.ts

@@ -1,8 +1,7 @@
 import { cloneDeep } from 'lodash-es'
 import jwtDecode from 'jwt-decode'
-import { axios } from './axios'
-import tenantInfo from './tenantInfo'
-import { lsProxy } from './storageProxy'
+import { lsProxy, axios } from './index'
+import cloudServ from './cloudServ'
 // import { functionCheck } from './utils'
 
 
@@ -45,11 +44,19 @@ class Login {
 
   async getEnvname (): Promise<string> {
     let envname = ''
-    // web 查 envname
+
+    // web 查 context 的 envname
     let context: any = lsProxy.getItem('context')
     context && (context = JSON.parse(context))
-    if (context?.envname) {
-      envname = context.envname
+    const contextEnvname = context?.envname || ''
+
+    // 链接有些spu可能会传 envname
+    const queryEnvname = this.getQueryEnvname()
+
+    if (contextEnvname) {
+      envname = contextEnvname
+    } else if (queryEnvname) {
+      envname = queryEnvname
     } else if (window?.aPaaS?.getWebInitParams && window?.Native?.setNavigationBarReturnButton) {
       // 手机端 查 envname
       // 只有手机端有 setNavigationBarReturnButton 方法
@@ -59,9 +66,22 @@ class Login {
         })
       })
     }
+
     return envname
   }
 
+  setQueryEnvname (value: string) {
+    this.setData('envname', value)
+  }
+
+  getQueryEnvname () {
+    return this.getData('envname') || ''
+  }
+
+  removeQueryEnvname () {
+    this.removeData('envname')
+  }
+
   getToken () {
     return this.getData('token')
   }
@@ -190,15 +210,112 @@ class Login {
     }
   }
 
-  // 检测用户是否登录状态
+  // // 产品运营中心token
+  // {
+  //   "LoginUser": {
+  //     "appId": "100",
+  //     "tenantCode": "1656652",
+  //     "productCode": "100000000000000000",
+  //     "productVersionCode": null,
+  //     "clientTypeCode": null,
+  //     "userCode": "6",
+  //     "accountCode": "6",
+  //     "username": "庄焕滨",
+  //     "tokenId": "bd69b4a4-5376-47cd-91c3-f1e1576440e5",
+  //     "appCodes": null,
+  //     "appCode": null,
+  //     "platRoleCodes": ["1637696814759153664"],
+  //     "metamodeltype": 2,
+  //     "orgCode": "1751852081616130048",
+  //     "centerRole": true
+  //   },
+  //   "TwoFactorAuthCode": "6f56da978dffe31a3b03a56c446f9467",
+  //   "exp": 1751694745
+  // }
+
+  // // 租户token
+  // {
+  //   "exp": 1720161305,
+  //   "LoginUser": {
+  //     "accountInfoCode": "1803686723986010112",
+  //     "accountCode": "1803686724107644928",
+  //     "tenantCode": "3000911",
+  //     "productCode": "100000000000000000",
+  //     "productVersionCode": "30000000000000911",
+  //     "clientTypeCode": 1,
+  //     "tokenId": "8614059e-69a5-4e1e-a948-f2ef680d0dd5",
+  //     "orgCode": "1803686397149065216",
+  //     "userInfoId": "1806591894588108800",
+  //     "userInfoName": "woOUQJEAAAn4r5-7jffaxad6yotbEZ5A",
+  //     "positionCode": "1803686397304254473",
+  //     "positionName": "系统管理员-勿删",
+  //     "memberCode": "1806591894659411968",
+  //     "refPositionCode": "1300728614534385664",
+  //     "categoryCode": "",
+  //     "orgStructTypeId": "1",
+  //     "userName": null,
+  //     "userName1": "woOUQJEAAAn4r5-7jffaxad6yotbEZ5A",
+  //     "userName2": null,
+  //     "userName3": null,
+  //     "tenantName": "智慧100-企微版-V9.1.1开发租户",
+  //     "appCode": "sales",
+  //     "appCodes": [
+  //       "promotion",
+  //       "distribution",
+  //       "sales"
+  //     ],
+  //     "subPdCodes": [
+  //       "sfa",
+  //       "dms",
+  //       "pmm",
+  //       "tpm",
+  //       "ai"
+  //     ],
+  //     "codepath": "1.1803686395634921472.1803686397149065216.",
+  //     "isleaforg": "true",
+  //     "metamodeltype": 1,
+  //     "isSmsLogin": false
+  //   }
+  // }
+  // 查询token所属登录角色
+  // tenant: 普通租户登录 默认
+  // center: 产品运营中心登录 单点登录时只带 token 没带 refreshtoken 和 tokenexpires
+  getLoginRole (token?: string) {
+    let loginRole: 'center' | 'tenant' = 'tenant' // center | tenant
+    if (token) {
+      const jwtInfo = this.jwtDecode(token)
+      if (jwtInfo?.LoginUser?.centerRole || jwtInfo?.LoginUser?.appId === '100') {
+        // 产品运营中心登录
+        loginRole = 'center'
+      }
+    }
+    return loginRole
+  }
+
+  // 检测当前用户是否登录状态
   checkLogin () {
     let haslogged = false
     const token = this.getToken()
-    const refreshtoken = this.getRefreshToken()
-    const tokenexpires = this.getTokenExpires()
-    const now = Date.now()
-    if (token && refreshtoken && tokenexpires && Number(tokenexpires) > now) {
-      // 优化成用 jwt 解析token 获取过期时间 不需要请求接口
+    if (token) {
+      if (this.getLoginRole(token) === 'center') {
+        haslogged = this.checkTokenLogin(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)
+        }
+      }
+    }
+    return haslogged
+  }
+
+  // 检测token是否过期
+  checkTokenLogin (token?: string) {
+    let haslogged = false
+    if (token) {
+      const now = Date.now()
       const jwtInfo = this.jwtDecode(token)
       if (jwtInfo?.exp) {
         haslogged = Number(jwtInfo.exp + '000') > now
@@ -210,26 +327,11 @@ class Login {
   }
 
   // 接口请求回来的 userInfo 有 functioncodes 以便做权限校验
+  // 有可能是中心角色请求失败 兼容不报错
   async getAndSetUserInfo () {
-    // return axios.post('/api/teapi/rolepermission/account/getaccountinfo', {
-    //   positionid: this.getUser('positioncode'),
-    //   deviceinfo: '',
-    //   sysversion: '',
-    //   clientversion: ''
-    // }).then((res: any) => {
-    //   // console.log(res)
-    //   // debugger
-    //   if (res.code === 200 && res.data) {
-    //     this.setUser(res.data)
-    //   }
-    // }).catch((err: Error) => {
-    //   console.error(22)
-    //   console.error(err)
-    // })
-
     try {
-      const accountinfo: null | any = await axios.post('/api/teapi/rolepermission/account/getaccountinfo', {
-        positionid: this.getUser('positioncode'),
+      const accountinfo = await axios.post('/api/teapi/rolepermission/account/getaccountinfo', {
+        positionid: this.getUser('positioncode') || '',
         deviceinfo: '',
         sysversion: '',
         clientversion: ''
@@ -245,57 +347,135 @@ class Login {
       }
     } catch (e) {
       console.error(e)
+      console.warn('获取用户信息失败，当前您登录的帐号可能为非标准租户帐号。')
+    }
+  }
+
+  formatTenant (tenant: ITenantInfo) {
+    if (!tenant) {
+      return null
+    }
+    const cloundTagMap = ['storage', 'storage-1d', 'storage-1y', 'storage-3m']
+    const result: NormalizedCloudServ = {}
+    for (const keyItem of cloundTagMap) {
+      const cloudServ = tenant.cloudserv[keyItem as StorageEnum]
+      if (cloudServ) {
+        result[keyItem as StorageEnum] = {
+          cloudserv_storage_provider: cloudServ.provider,
+          cloudserv_storage_storagebucket: cloudServ.storagebucket,
+          cloudserv_storage_storageendpoint: cloudServ.storageendpoint,
+          cloudserv_storage_storageurl: cloudServ.storageurl,
+          cloudserv_storage_accesskeyid: cloudServ.accesskeyid,
+          cloudserv_storage_region: cloudServ.region
+        }
+      }
+    }
+    if (Object.keys(result).length === 0) {
+      return null
+    }
+    return result
+  }
+
+  async getAndSetTenant (tenantcode?: string) {
+    try {
+      const tenantsRes: null | ITenantInfo[] = await axios.get('/api/auth/tenantlist', {}).then((res: any) => {
+        return res?.data?.tenants
+      })
+
+      let tenant: ITenantInfo | null = null
+      if (tenantsRes?.length) {
+        if (!tenantcode) {
+          tenant = tenantsRes[0]
+        } else {
+          tenant = tenantsRes.find((item) => item.code === tenantcode) || null
+        }
+      }
+
+      if (!tenant) {
+        lsProxy.removeItem('tenant')
+        cloudServ.remove()
+      } else {
+        lsProxy.setItem('tenant', JSON.stringify(tenant))
+        const normalizedTenant = this.formatTenant(tenant)
+        if (normalizedTenant) {
+          cloudServ.set(normalizedTenant)
+        }
+      }
+    } catch (e) {
+      console.error(e)
+      console.warn('获取租户信息失败，当前您登录的帐号可能为非标准租户帐号。')
     }
   }
 
   // 单点登录
   async singleLogin (query: IAny) {
-    // 自动登录
     query = cloneDeep(query)
-    const token = query.token
-    // 之所以不强制校验 refreshtoken tokenexpires 是因为安装卸载配置页面有可能放在产品运营中心 没有这两字段
-    if (token) {
-      this.setToken(token)
-      this.setUserByToken(token) // 解析token为用户信息存入
 
-      const refreshtoken = query.refreshtoken
-      const tokenexpires = query.tokenexpires
-      if (refreshtoken) {
-        this.setRefreshToken(refreshtoken)
-      } else {
-        this.removeRefreshToken()
-      }
-      if (tokenexpires) {
-        this.setTokenExpires(tokenexpires)
+    let flag = false // 是否登录成功
+    const token = query.token
+    const refreshtoken = query.refreshtoken
+    const tokenexpires = query.tokenexpires
+    const envname = query.envname
+    const context = query.context
+
+    if (this.checkTokenLogin(token)) {
+      let isneedlogin = true // 是否需要走单点登录流程
+      const loginRole = this.getLoginRole(token)
+
+      if (loginRole === 'center') {
+        // 如果本地已经登录 且 query 登录参数与本地一致 说明是刚登录没多久【token也没刷新过】 视为已经登录 不需再走单点登录流程
+        // 之所以不强制校验 refreshtoken tokenexpires 是因为安装卸载配置页面有可能放在产品运营中心 没有这两字段
+        if (this.checkLogin() && token === this.getToken()) {
+          isneedlogin = false
+          flag = true
+        }
       } else {
-        this.removeTokenExpires()
+        // 如果本地已经登录 且 query 登录参数与本地一致 说明是刚登录没多久【token也没刷新过】 视为已经登录 不需再走单点登录流程
+        if (this.checkLogin() && token === this.getToken() && refreshtoken === this.getRefreshToken() && tokenexpires === this.getTokenExpires()) {
+          isneedlogin = false
+          flag = true
+        }
       }
 
-      // context 上下文字段 产品运营中心安装 卸载 配置 和 产品配置中心业务配置 页面需要用到
-      let context = query.context
-      if (context) {
-        context = decodeURIComponent(context)
-        lsProxy.setItem('context', context)
-        delete query.context
-      }
+      if (isneedlogin) {
+        this.setToken(token)
+        this.setUserByToken(token) // 解析token为用户信息存入
+
+        refreshtoken ? this.setRefreshToken(refreshtoken) : this.removeRefreshToken()
+        tokenexpires ? this.setTokenExpires(tokenexpires) : this.removeTokenExpires()
+        envname ? this.setQueryEnvname(envname) : this.removeQueryEnvname()
 
-      await tenantInfo.getAndSave()
-      await this.getAndSetUserInfo()
+        // context 上下文字段 产品运营中心安装 卸载 配置 和 产品配置中心业务配置 页面需要用到
+        // web 端有传 app没传 需要做兼容
+        context && lsProxy.setItem('context', decodeURIComponent(context))
 
-      // const ischeck = functionCheck('1429379220684842752')
-      // console.log(ischeck)
+        // 这里兼容报错
+        await this.getAndSetTenant()
+        await this.getAndSetUserInfo()
+
+        flag = true
+      }
     } else {
-      console.error('query 中没有 token，无法单点登录。')
+      flag = false
+      console.error('没传 token 或所传 token 已过期，无法单点登录。')
     }
+
     // 单点登录后 无论是否成功 都需要删除 query 中相关参数
-    delete query.token
-    delete query.refreshtoken
-    delete query.tokenexpires
+    token && delete query.token
+    refreshtoken && delete query.refreshtoken
+    tokenexpires && delete query.tokenexpires
+    envname && delete query.envname
+    context && delete query.context
+
     // debugger
+
     return {
+      flag,
       query
     }
   }
 }
 
-export default new Login()
+const login = new Login()
+
+export default login

package/src/oss/downloadService.ts

@@ -1,14 +1,14 @@
-import CloudServ from '../cloudServ'
-import { initServToken } from './servtoken'
 import OSS from '../package/ali-oss/aliyun-oss-sdk.apaas.min.js'
 // import * as OSS from '../package/ali-oss/aliyun-oss-sdk.apaas.min.js'
 // const OSS = require('../package/ali-oss/aliyun-oss-sdk.apaas.min.js')
 import ObsClient from '../package/huaweicloud-obs/esdk-obs-browserjs.3.22.3.min.js'
 // import * as ObsClient from '../package/huaweicloud-obs/esdk-obs-browserjs.3.22.3.min.js'
 // const ObsClient = require('../package/huaweicloud-obs/esdk-obs-browserjs.3.22.3.min.js')
+
 import dayjs from 'dayjs'
-import login from '../login'
-import { axios } from '../axios'
+import CloudServ from '../cloudServ'
+import { initServToken } from './servtoken'
+import { axios, getUser } from '../index'
 // import { get } from 'lodash-es'
 // import qs from 'qs'
 
@@ -108,7 +108,7 @@ const getUrl = async ({
 
   const isAliYun = CloudServ.isAliyun(storagetype)
   const isHuawei = CloudServ.isHuawei(storagetype)
-  const tenantCode = login.getUser('tenantcode')
+  const tenantCode = getUser('tenantcode')
 
   if (!filename) {
     filename = source

package/src/oss/servtoken.ts

@@ -1,5 +1,5 @@
 // import { noBaseRequest } from '@/service/http'
-import { axios } from '../axios'
+import { axios } from '../index'
 
 export type ServToken = {
   accesskeyid: string

package/src/oss/uploadService.ts

@@ -1,15 +1,16 @@
-import CloudServ from '../cloudServ'
-import { initServToken } from './servtoken'
-import { v4 as uuidv4 } from 'uuid'
 import OSS from '../package/ali-oss/aliyun-oss-sdk.apaas.min.js'
 // const OSS = require('../package/ali-oss/aliyun-oss-sdk.apaas.min.js')
 import ObsClient from '../package/huaweicloud-obs/esdk-obs-browserjs.3.22.3.min.js'
 // const ObsClient = require('../package/huaweicloud-obs/esdk-obs-browserjs.3.22.3.min.js')
+
+import { v4 as uuidv4 } from 'uuid'
 import dayjs from 'dayjs'
 import co from 'co'
-import login from '../login'
-import { obsMultiUpload } from './multiUpload'
 
+import { getUser } from '../index'
+import CloudServ from '../cloudServ'
+import { initServToken } from './servtoken'
+import { obsMultiUpload } from './multiUpload'
 
 
 interface IUpload {
@@ -37,7 +38,7 @@ const upload = async ({
 
   const isAliYun = CloudServ.isAliyun(storagetype)
   const isHuawei = CloudServ.isHuawei(storagetype)
-  const tenantCode = login.getUser('tenantcode')
+  const tenantCode = getUser('tenantcode')
   const suffix = '.' + file.name.substring(file.name.lastIndexOf('.') + 1)
   source = source ? source : (uuidv4() + suffix)
   datetime = datetime ? datetime : Date.now()