perf(share page): 优化分享页面的携带token影响当前用户在IOT平台操作

@@ -4,8 +4,8 @@ import type { AxiosTransform, CreateAxiosOptions } from '@/utils/external/http/a
 import { useGlobSetting } from '@/hooks/external/setting';
 import { RequestEnum, ContentTypeEnum } from '@/enums/external/httpEnum';
 import { isString } from '@/utils/external/is';
-import { getJwtToken } from '@/utils/external/auth';
-import { setObjToUrlParams, deepMerge } from '@/utils/external'; 
+import { getJwtToken, getShareJwtToken } from '@/utils/external/auth';
+import { setObjToUrlParams, deepMerge } from '@/utils/external';
 import { formatRequestDate, joinTimestamp } from '@/utils/external/http/axios/helper';
 import { VAxios } from '@/utils/external/http/axios/Axios';
 import { checkStatus } from './checkStatus';
@@ -84,15 +84,25 @@ const transform: AxiosTransform = {
    */
   requestInterceptors: (config, options) => {
     // 请求之前处理config
-    const token = getJwtToken();
-    if (token && (config as Recordable)?.requestOptions?.withToken !== false) {
-      // jwt token
-      config.headers!['X-Authorization'] = options.authenticationScheme
-        ? `${options.authenticationScheme} ${token}`
-        : token as string;
+    const { requestOptions } = config;
+    const { withShareToken } = requestOptions || {};
+    const { requestOptions: { withToken } = {} } = options;
+    if (withToken !== false) {
+      const shareToken = getShareJwtToken();
+      if (withShareToken && shareToken) {
+        config.headers!['X-Authorization'] = options.authenticationScheme
+          ? `${options.authenticationScheme} ${shareToken}`
+          : shareToken;
+      } else {
+        const token = getJwtToken();
+        if (token) {
+          config.headers!['X-Authorization'] = options.authenticationScheme
+            ? `${options.authenticationScheme} ${token}`
+            : token;
+        }
+      }
     }
-
-    return config;
+    return config
   },
 
   /**
@@ -114,7 +124,7 @@ const transform: AxiosTransform = {
       ? response?.data?.message || response?.data?.msg
       : response?.data;
 
-    const flag =  checkStatus(error?.response?.status, msg, errorMessageMode);
+    const flag = checkStatus(error?.response?.status, msg, errorMessageMode);
     return Promise.reject(response?.data);
   },
 };
@@ -158,7 +168,7 @@ function createAxios(opt?: Partial<CreateAxiosOptions>) {
           // 忽略重复请求
           ignoreCancelToken: true,
           // 是否携带token
-          withToken: false
+          withToken: true
         },
       },
       opt || {}

 import { RequestBodyEnum, RequestParams } from "@/enums/httpEnum"
 import { ExtraRequestConfigType } from "@/store/external/modules/extraComponentInfo.d"
 import { RequestConfigType } from "@/store/modules/chartEditStore/chartEditStore.d"
+import { isShareMode } from "@/views/share/hook"
 import { customHttp } from "./http"
 
 export enum ParamsType {
@@ -103,7 +104,7 @@ export const customRequest = async (request: RequestConfigType) => {
   }
 
   const body = transformBodyValue(Body, requestParamsBodyType)
-
+  
   return customHttp.request<any>({
     url: requestUrl,
     baseURL: getOriginUrl(requestOriginUrl!),
@@ -113,6 +114,7 @@ export const customRequest = async (request: RequestConfigType) => {
     headers: extraValue(Header)
   }, {
     joinPrefix: false,
-    apiUrl: ''
+    apiUrl: '',
+    withShareToken: isShareMode()
   })
 }

 import { ViewTypeEnum } from "@/enums/external/viewEnum"
 import { defHttp } from "@/utils/external/http/axios"
+import { isShareMode } from "@/views/share/hook"
 
 enum Api {
   TOKEN = '/auth/login/public',
@@ -17,7 +18,7 @@ export const getPublicToken = (publicId: string) => {
   return defHttp.post<Record<'token' | 'refreshToken', string>>({
     url: Api.TOKEN,
     data: { publicId }
-  }, { joinPrefix: false })
+  }, { joinPrefix: false, withShareToken: isShareMode() })
 }
 
 /**
@@ -27,7 +28,7 @@ export const getPublicToken = (publicId: string) => {
 export const checkSharePageNeedAccessToken = (id: string) => {
   return defHttp.get<{ data: boolean }>({
     url: `${Api.CHECK}/${ViewTypeEnum.LARGE_SCREEN}/${id}`
-  })
+  }, { withShareToken: isShareMode() })
 }
 
 /**
@@ -39,5 +40,5 @@ export const getShareContentData = (options: Record<'id' | 'accessCredentials',
   return defHttp.get<{ data: any }>({
     url: `${Api.SHARE_CONTENT}/${ViewTypeEnum.LARGE_SCREEN}/share_data/${options.id}`,
     params: accessCredentials ? { accessCredentials } : {}
-  })
+  }, { withShareToken: isShareMode() })
 }

@@ -5,6 +5,10 @@ export const JWT_TOKEN_KEY = 'JWT_TOKEN';
 
 export const REFRESH_TOKEN_KEY = 'REFRESH_TOKEN';
 
+export const SHARE_JWT_TOKEN_KEY = 'SHARE_JWT_TOKEN';
+
+export const SHARE_REFRESH_TOKEN_KEY = 'SHARE_REFRESH_TOKEN';
+
 export const LOCALE_KEY = 'LOCALE__';
 
 // user info key

@@ -3,10 +3,11 @@ import { CreateComponentType } from "@/packages/index.d";
 import { useSocketStore } from "@/store/external/modules/socketStore";
 import { SocketReceiveMessageType } from "@/store/external/modules/socketStore.d";
 import { useChartEditStore } from "@/store/modules/chartEditStore/chartEditStore";
-import { getJwtToken } from "@/utils/external/auth";
+import { getJwtToken, getShareJwtToken } from "@/utils/external/auth";
 import { useWebSocket, WebSocketResult } from "@vueuse/core";
 import { onMounted, unref } from "vue";
 import { ExtraRequestConfigType } from "@/store/external/modules/extraComponentInfo.d";
+import { isShareMode } from "@/views/share/hook";
 
 
 interface SocketConnectionPoolType {
@@ -39,7 +40,7 @@ const getSocketInstance = (request: ExtraRequestConfigType) => {
   if (~index) {
     return socketConnectionPool[index].ws
   }
-  const token = getJwtToken()
+  const token = isShareMode() ? getShareJwtToken() :  getJwtToken()
   const socketUrl = `${getOriginUrl(requestOriginUrl || '')}${requestUrl}?token=${token}`
 
   const instance = useWebSocket(socketUrl, {

@@ -3,7 +3,7 @@ import type { ErrorMessageMode } from '/#/external/axios';
 import { defineStore } from 'pinia';
 import { pinia as store } from '@/store';
 import { RoleEnum } from '@/enums/external/roleEnum';
-import { JWT_TOKEN_KEY, REFRESH_TOKEN_KEY, ROLES_KEY, USER_INFO_KEY } from '@/enums/external/cacheEnum';
+import { JWT_TOKEN_KEY, REFRESH_TOKEN_KEY, ROLES_KEY, SHARE_JWT_TOKEN_KEY, SHARE_REFRESH_TOKEN_KEY, USER_INFO_KEY } from '@/enums/external/cacheEnum';
 import { getAuthCache, getJwtToken, getRefreshToken, setAuthCache } from '@/utils/external/auth';
 import {
   LoginParams,
@@ -29,6 +29,8 @@ interface UserState {
   lastUpdateTime: number;
   jwtToken?: string;
   refreshToken?: string;
+  shareJwtToken?: string;
+  shareRefreshToken?: string;
   outTarget?: string;
 }
 
@@ -47,6 +49,8 @@ export const useUserStore = defineStore({
     jwtToken: getJwtToken() as string || undefined,
     //refresh Token
     refreshToken: getRefreshToken() as string || undefined,
+    shareJwtToken: undefined,
+    shareRefreshToken: undefined,
     // roleList
     roleList: [],
     // Whether the login expired
@@ -96,6 +100,12 @@ export const useUserStore = defineStore({
       setAuthCache(JWT_TOKEN_KEY, jwtToken);
       setAuthCache(REFRESH_TOKEN_KEY, refreshToken);
     },
+    storeShareToken(jwtToken: string, refreshToken: string) {
+      this.shareJwtToken = jwtToken;
+      this.shareRefreshToken = refreshToken;
+      setAuthCache(SHARE_JWT_TOKEN_KEY, jwtToken);
+      setAuthCache(SHARE_REFRESH_TOKEN_KEY, refreshToken);
+    },
     setToken(info: string | undefined) {
       this.jwtToken = info;
       setAuthCache(JWT_TOKEN_KEY, info);
@@ -152,14 +162,6 @@ export const useUserStore = defineStore({
       }
       return userInfo;
     },
-    async smsCodelogin(
-      params: SmsLoginParams & {
-        goHome?: boolean;
-        mode?: ErrorMessageMode;
-      }
-    ) {
-
-    },
     async getMyUserInfoAction() {
       const userInfo = await getMyInfo();
       this.setUserInfo(userInfo);
@@ -193,6 +195,20 @@ export const useUserStore = defineStore({
     },
 
     /**
+     * @description 刷新分享页面的token
+     */
+    async doShareRefresh() {
+      try {
+        const req = { refreshToken: this.shareRefreshToken } as RefreshTokenParams
+        const { token, refreshToken } = await doRefreshToken(req)
+        this.storeShareToken(token, refreshToken)
+      } catch (error) {
+        window.location.reload()
+        throw error
+      }
+    },
+
+    /**
      * @description: Confirm before logging out
      */
     confirmLoginOut() {

 import { Persistent, BasicKeys } from '@/utils/external/cache/persistent';
-import { CacheTypeEnum } from '@/enums/external/cacheEnum';
+import { CacheTypeEnum, SHARE_JWT_TOKEN_KEY, SHARE_REFRESH_TOKEN_KEY } from '@/enums/external/cacheEnum';
 import projectSetting from '@/settings/external/projectSetting';
 import { JWT_TOKEN_KEY, REFRESH_TOKEN_KEY } from '@/enums/external/cacheEnum';
 
@@ -20,9 +20,17 @@ export function clearAuthCache(immediate = true) {
   const fn = isLocal ? Persistent.clearLocal : Persistent.clearSession;
   return fn(immediate);
 }
-export function getJwtToken() {
+export function getJwtToken(): string {
   return getAuthCache(JWT_TOKEN_KEY);
 }
-export function getRefreshToken() {
+export function getRefreshToken(): string {
   return getAuthCache(REFRESH_TOKEN_KEY);
 }
+
+export function getShareJwtToken(): string {
+  return getAuthCache(SHARE_JWT_TOKEN_KEY);
+}
+export function getShareRefreshToken(): string {
+  return getAuthCache(SHARE_REFRESH_TOKEN_KEY);
+}
+

@@ -17,9 +17,11 @@ import {
   APP_SESSION_CACHE_KEY,
   MULTIPLE_TABS_KEY,
   MENU_LIST,
+  SHARE_JWT_TOKEN_KEY,
+  SHARE_REFRESH_TOKEN_KEY,
 } from '@/enums/external/cacheEnum';
 import { DEFAULT_CACHE_TIME } from '@/settings/external/encryptionSetting';
-import { toRaw } from 'vue'; 
+import { toRaw } from 'vue';
 import omit from 'lodash/omit';
 import pick from 'lodash/pick';
 
@@ -34,6 +36,8 @@ interface BasicStore {
   [PROJ_CFG_KEY]: ProjectConfig;
   [MULTIPLE_TABS_KEY]: RouteLocationNormalized[];
   [MENU_LIST]: any[];
+  [SHARE_JWT_TOKEN_KEY]: string
+  [SHARE_REFRESH_TOKEN_KEY]: string
 }
 
 type LocalStore = BasicStore;

-import type { AxiosRequestConfig, AxiosInstance, AxiosResponse, AxiosError } from 'axios';
-import type { CreateAxiosOptions } from './axiosTransform';
+import type { AxiosInstance, AxiosResponse, AxiosError } from 'axios';
+import type { AxiosRequestConfig, CreateAxiosOptions } from './axiosTransform';
 import axios from 'axios';
 import qs from 'qs';
 import { AxiosCanceler } from './axiosCancel';
@@ -115,13 +115,21 @@ export class VAxios {
     this.axiosInstance.interceptors.request.use(async (config: AxiosRequestConfig) => {
       // If cancel repeat request is turned on, then cancel repeat request is prohibited
       const userStore = useUserStore();
-      if (userStore && userStore.jwtToken) {
+      // if (userStore && (userStore.jwtToken || userStore.shareJwtToken)) {
+      if (userStore) {
         try {
-          const res = jwt_decode(userStore.jwtToken) as JwtModel;
-          const currentTime = (new Date().getTime() + (config.timeout || 0)) / 1000;
-          if (currentTime >= res.exp && this.isNeedTokenURL(config.url!)) {
-            await this.refreshTokenBeforeReq(userStore.doRefresh);
+          const { requestOptions = {} } = config
+          const { withShareToken, withToken } = requestOptions
+          const token = withShareToken && withToken ? userStore.shareJwtToken : userStore.jwtToken
+          const doRefresh = withShareToken && withToken ? userStore.doShareRefresh : userStore.doRefresh
+          if (token) {
+            const res = jwt_decode(token) as JwtModel;
+            const currentTime = (new Date().getTime() + (config.timeout || 0)) / 1000;
+            if (currentTime >= res.exp && this.isNeedTokenURL(config.url!)) {
+              await this.refreshTokenBeforeReq(doRefresh);
+            }
           }
+
         } catch (error) {
           userStore.logout();
         }

 /**
  * Data processing class, can be configured according to the project
  */
-import type { AxiosRequestConfig, AxiosResponse } from 'axios';
+import type { AxiosRequestConfig as OriginAxiosRequestConfig, AxiosResponse } from 'axios';
 import type { RequestOptions, Result } from '/#/external/axios';
 
 export interface CreateAxiosOptions extends AxiosRequestConfig {
@@ -11,6 +11,8 @@ export interface CreateAxiosOptions extends AxiosRequestConfig {
   requestOptions?: RequestOptions;
 }
 
+export type AxiosRequestConfig = OriginAxiosRequestConfig & {requestOptions?: RequestOptions}
+
 export abstract class AxiosTransform {
   /**
    * @description: Process configuration before request

@@ -9,7 +9,7 @@ import { checkStatus } from './checkStatus';
 import { useGlobSetting } from '@/hooks/external/setting';
 import { RequestEnum, ContentTypeEnum } from '@/enums/external/httpEnum';
 import { isString } from '@/utils/external/is';
-import { getJwtToken } from '@/utils/external/auth';
+import { getJwtToken, getShareJwtToken } from '@/utils/external/auth';
 import { setObjToUrlParams, deepMerge } from '@/utils/external';
 import { joinTimestamp, formatRequestDate } from './helper';
 import { PageEnum } from '@/enums/external/pageEnum';
@@ -89,14 +89,25 @@ const transform: AxiosTransform = {
    */
   requestInterceptors: (config, options) => {
     // 请求之前处理config
-    const token = getJwtToken();
-    if (token && (config as Recordable)?.requestOptions?.withToken !== false) {
-      // jwt token
-      config.headers!['X-Authorization'] = options.authenticationScheme
-        ? `${options.authenticationScheme} ${token}`
-        : token as string;
+    const { requestOptions } = config;
+    const { withShareToken } = requestOptions || {};
+    const { requestOptions: { withToken } = {} } = options;
+    if (withToken !== false) {
+      const shareToken = getShareJwtToken();
+      if (withShareToken && shareToken) {
+        config.headers!['X-Authorization'] = options.authenticationScheme
+          ? `${options.authenticationScheme} ${shareToken}`
+          : shareToken;
+      } else {
+        const token = getJwtToken();
+        if (token) {
+          config.headers!['X-Authorization'] = options.authenticationScheme
+            ? `${options.authenticationScheme} ${token}`
+            : token;
+        }
+      }
     }
-    return config;
+    return config
   },
 
   /**

+export const isShareMode = () => {
+  const sharePageReg = /^\/share\/[^/]+\/[^/]+\/[^/]+$/;
+  const { hash } = location;
+  return sharePageReg.test(hash.substring(1));
+};

@@ -42,7 +42,7 @@ const getToken = async () => {
   const { params } = ROUTE
   const { publicId } = params as Record<'id' | 'publicId', string>
   const { token, refreshToken } = await getPublicToken(publicId)
-  userStore.storeToken(token, refreshToken)
+  userStore.storeShareToken(token, refreshToken)
 }
 
 const checkNeedAccessToken = async () => {

@@ -20,7 +20,8 @@
     ],
     "typeRoots": [
       "./node_modules/@types/",
-      "./types"
+      "./types",
+      "./types/external"
     ],
     "paths": {
       "@/*": [

@@ -21,6 +21,8 @@ export interface RequestOptions {
   ignoreCancelToken?: boolean;
   // Whether to send token in header
   withToken?: boolean;
+  // Carry and share token 携带分享的访问令牌
+  withShareToken?: boolean
 }
 
 export interface Result<T = any> {