yuang-framework-ui-common 1.0.40 → 1.0.42

package/lib/config/httpConfig.ts

@@ -78,7 +78,7 @@ http.interceptors.response.use(async (res: any) => {
             return axios.request(res.config);
         } else if (res?.data?.statusCode === 500815006) {
             const fullPath = router.currentRoute.value.fullPath;
-            router.push(`/sso/login/index?redirectRoutePath=${encodeURIComponent(fullPath)}`);
+            router.push(`/sso/login/index?ssoRedirectRoutePath=${encodeURIComponent(fullPath)}`);
             return;
         } else if (res?.data?.statusCode === 500815003) {
             showErrorMessage(res?.data?.message || messageMap.requestError);

package/lib/utils/objectUtils.ts

@@ -1,3 +1,4 @@
+import safeStringify from 'safe-stringify';
 
 /**
  * 浅度克隆对象
@@ -15,7 +16,9 @@ const shallowClone = (obj) => {
  * @returns {{}|*}
  */
 const deepClone = (obj) => {
-    let result;
+/*
+  约到允许依赖就没法了，报错：Maximum call stack size exceeded
+  let result;
     const type = typeOf(obj);
     if (type === 'Object') result = {};
     else if (type === 'Array') result = [];
@@ -26,6 +29,11 @@ const deepClone = (obj) => {
         else result[key] = obj[key];
     });
     return result;
+    */
+    if(!obj){
+        return null;
+    }
+    return JSON.parse(safeStringify(obj));
 }
 /**
  * 获取变量类型

package/lib/utils/ssoUtils.ts

@@ -1,47 +1,47 @@
 import Cookies from 'js-cookie'
-import {getAesRandomKey, aesEncrypt} from './aesUtils';
-import {rsaEncrypt} from './rsaUtils';
-import {getLocalStorageItem, setLocalStorageItem, removeLocalStorageItem} from './storageUtils';
+import { getAesRandomKey, aesEncrypt } from './aesUtils';
+import { rsaEncrypt } from './rsaUtils';
+import { getLocalStorageItem, setLocalStorageItem, removeLocalStorageItem } from './storageUtils';
 
 
-const getSsoLoginUrl = (redirectUrl = '') => {
+const getSsoLoginUrl = (ssoRedirectUrl = '') => {
     let apiFullBaseUrl = (window as any).$config?.apiFullBaseUrl;
-    if(!apiFullBaseUrl) {
+    if (!apiFullBaseUrl) {
         throw new Error('参数[apiFullBaseUrl]为空');
     }
     let ssoLoginUrl = `${apiFullBaseUrl}/sso-api/server/sso/login`;
-    if (!redirectUrl) {
-        ssoLoginUrl += `?redirectUrl=${encodeURIComponent(window.location.href)}`;
+    if (!ssoRedirectUrl) {
+        ssoLoginUrl += `?ssoRedirectUrl=${encodeURIComponent(window.location.href)}`;
     } else {
-        ssoLoginUrl += `?redirectUrl=${encodeURIComponent(redirectUrl)}`;
+        ssoLoginUrl += `?ssoRedirectUrl=${encodeURIComponent(ssoRedirectUrl)}`;
     }
     return ssoLoginUrl;
 }
 
-const getSsoLogoutUrl = (redirectUrl = '') => {
+const getSsoLogoutUrl = (ssoRedirectUrl = '') => {
     let apiFullBaseUrl = (window as any).$config?.apiFullBaseUrl;
-    if(!apiFullBaseUrl) {
+    if (!apiFullBaseUrl) {
         throw new Error('参数[apiFullBaseUrl]为空');
     }
     let ssoLogoutUrl = `${apiFullBaseUrl}/sso-api/server/sso/logout`;
-    if (!redirectUrl) {
-        ssoLogoutUrl += `?redirectUrl=${encodeURIComponent(window.location.href)}`;
-    } else if (redirectUrl) {
-        ssoLogoutUrl += `?redirectUrl=${encodeURIComponent(redirectUrl)}`;
+    if (!ssoRedirectUrl) {
+        ssoLogoutUrl += `?ssoRedirectUrl=${encodeURIComponent(window.location.href)}`;
+    } else if (ssoRedirectUrl) {
+        ssoLogoutUrl += `?ssoRedirectUrl=${encodeURIComponent(ssoRedirectUrl)}`;
     }
     return ssoLogoutUrl;
 }
 
 /**
  * 获取sso登录路由路径
- * @param redirectRoutePath
+ * @param ssoRedirectRoutePath
  */
-const getSsoLoginRoutePath = (redirectRoutePath = '') => {
+const getSsoLoginRoutePath = (ssoRedirectRoutePath = '') => {
     let ssoLoginRoutePath = '/sso/login/index';
-    if (!redirectRoutePath) {
-        ssoLoginRoutePath += `?redirectRoutePath=${encodeURIComponent('/sso/login/login-success')}`;
+    if (!ssoRedirectRoutePath) {
+        ssoLoginRoutePath += `?ssoRedirectRoutePath=${encodeURIComponent('/sso/login/login-success')}`;
     } else {
-        ssoLoginRoutePath += `?redirectRoutePath=${encodeURIComponent(redirectRoutePath)}`;
+        ssoLoginRoutePath += `?ssoRedirectRoutePath=${encodeURIComponent(ssoRedirectRoutePath)}`;
     }
     return ssoLoginRoutePath;
 }
@@ -59,7 +59,7 @@ const getSsoEncrypt = (password = '') => {
     // 使用AES16位的密钥将请求报文加密（使用的是加密前的aes密钥）
     const encryptPassword = aesEncrypt(aesKey, password);
 
-    return {encryptPassword, rsaAesKey};
+    return { encryptPassword, rsaAesKey };
 }
 
 /**
@@ -78,7 +78,7 @@ const getSsoEncryptList = (passwordList = []) => {
         encryptPasswordList[i] = aesEncrypt(aesKey, passwordList[i]);
     }
 
-    return {encryptPasswordList, rsaAesKey};
+    return { encryptPasswordList, rsaAesKey };
 }
 
 
@@ -99,16 +99,16 @@ const getSsoAccessToken = () => {
 
 
 const setSsoAccessToken = (param: any) => {
-    if(!param.ssoAccessToken) {
+    if (!param.ssoAccessToken) {
         throw new Error('参数[ssoAccessToken]为空');
     }
-    if(!param.ssoExpiresIn) {
+    if (!param.ssoExpiresIn) {
         throw new Error('参数[ssoExpiresIn]为空');
     }
-    if(!param.ssoRefreshToken) {
+    if (!param.ssoRefreshToken) {
         throw new Error('参数[ssoRefreshToken]为空');
     }
-    if(!param.ssoRefreshExpiresIn) {
+    if (!param.ssoRefreshExpiresIn) {
         throw new Error('参数[ssoRefreshExpiresIn]为空');
     }
     Cookies.set(ssoAccessTokenCookieKey, param.ssoAccessToken);
@@ -119,6 +119,30 @@ const setSsoAccessToken = (param: any) => {
 }
 
 
+
+const getSsoCookieAccessToken = () => {
+    let ssoAccessToken = Cookies.get(ssoAccessTokenCookieKey);
+    return ssoAccessToken;
+}
+
+
+const setSsoCookieAccessToken = (param: any) => {
+    if (!param.ssoAccessToken) {
+        throw new Error('参数[ssoAccessToken]为空');
+    }
+    if (!param.ssoExpiresIn) {
+        throw new Error('参数[ssoExpiresIn]为空');
+    }
+    if (!param.ssoRefreshToken) {
+        throw new Error('参数[ssoRefreshToken]为空');
+    }
+    if (!param.ssoRefreshExpiresIn) {
+        throw new Error('参数[ssoRefreshExpiresIn]为空');
+    }
+    Cookies.set(ssoAccessTokenCookieKey, param.ssoAccessToken);
+}
+
+
 const clearSsoAccessToken = () => {
     Cookies.remove(ssoAccessTokenCookieKey);
 
@@ -144,6 +168,9 @@ export {
     getSsoAccessToken,
     setSsoAccessToken,
 
+    getSsoCookieAccessToken,
+    setSsoCookieAccessToken,
+
     clearSsoAccessToken,
 
     logoutSso,

package/lib/utils/urlUtils.ts

@@ -0,0 +1,33 @@
+
+/**
+ * 删除url中的指定参数
+ * @param url
+ * @param parameter
+ * @return {string}
+ */
+const removeUrlParameter = (url, parameter) => {
+    if (!url) {
+        return console.error('参数[url]为空');
+    }
+    if (!parameter) {
+        return console.error('参数[parameter]为空');
+    }
+    let urlObj;
+    let isFullUrl = url.startsWith('http');
+    if (isFullUrl) {
+        urlObj = new URL(url);
+    } else {
+        urlObj = new URL(url, window.location.origin);
+    }
+    urlObj.searchParams.delete(parameter);
+    let result = urlObj.pathname + urlObj.search;
+    if (url.includes('#')) {
+        result += '#' + url.split('#')[1];
+    }
+    if (isFullUrl) {
+        result = urlObj.origin + result;
+    }
+    return result;
+};
+
+export { removeUrlParameter };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yuang-framework-ui-common",
-  "version": "1.0.40",
+  "version": "1.0.42",
   "private": false,
   "type": "module",
   "scripts": {
@@ -35,6 +35,7 @@
     "lodash": "^4.17.21",
     "moment": "^2.30.1",
     "pinia": "^2.1.7",
+    "safe-stringify": "^1.1.1",
     "vant": "^4.9.8",
     "vue": "^3.4.29",
     "vue-router": "^4.3.3"

package/src/shims-vue.d.ts

@@ -8,3 +8,6 @@ declare module '*.vue' {
   const component: DefineComponent<{}, {}, any>;
   export default component;
 }
+
+
+declare module 'js-cookie';

package/src/views/sso/login/index.vue

@@ -13,31 +13,52 @@
   const { proxy } = getCurrentInstance() as any;
 
   onMounted(() => {
-    const code = router.currentRoute.value.query.code;
-    if (!code) {
+    const ssoAuthCode = router.currentRoute.value.query.ssoAuthCode;
+    if (!ssoAuthCode) {
       window.location.href = getSsoLoginUrl(window.location.href) || '';
       // 这里一定要return，不return还是会继续执行下面的代码
       return;
     }
 
-    proxy.$http.get('/sso-api/client/sso-auth/getSsoAccessToken', { params: { code: code } }).then((res: any) => {
+    proxy.$http.get('/sso-api/client/sso-auth/getSsoAccessToken', { params: { ssoAuthCode: ssoAuthCode } }).then((res: any) => {
       setSsoAccessToken(res.data.data);
-      let redirectRoutePath = router.currentRoute.value.query.redirectRoutePath as string;
-      redirectRoutePath = (redirectRoutePath && decodeURIComponent(redirectRoutePath)) || ('/sso/login/login-success' as any);
-      router.push(redirectRoutePath);
+      let ssoRedirectRoutePath = router.currentRoute.value.query.ssoRedirectRoutePath as string;
+      ssoRedirectRoutePath = (ssoRedirectRoutePath && decodeURIComponent(ssoRedirectRoutePath)) || ('/sso/login/login-success' as any);
+      ssoRedirectRoutePath = removeUrlParameter(ssoRedirectRoutePath, 'ssoAuthCode');
+      router.push(ssoRedirectRoutePath);
     });
   });
 
-  const removeParameter = (url: string, parameter: string) => {
-    // 使用正则表达式匹配参数
-    const regex = new RegExp('[?&]' + parameter + '=[^&]*&?');
-    const newUrl = url.replace(regex, (match, offset, string) => {
-      offset;
-      string;
-      return match.includes('&') ? '&' : '';
-    });
-    return newUrl;
-  }
+  /**
+   * 删除url中的指定参数
+   * @param url
+   * @param parameter
+   * @return {string}
+   */
+   const removeUrlParameter = (url, parameter) => {
+    if (!url) {
+      return console.error('参数[url]为空');
+    }
+    if (!parameter) {
+      return console.error('参数[parameter]为空');
+    }
+    let urlObj;
+    let isFullUrl = url.startsWith('http');
+    if (isFullUrl) {
+      urlObj = new URL(url);
+    } else {
+      urlObj = new URL(url, window.location.origin);
+    }
+    urlObj.searchParams.delete(parameter);
+    let result = urlObj.pathname + urlObj.search;
+    if (url.includes('#')) {
+      result += '#' + url.split('#')[1];
+    }
+    if (isFullUrl) {
+      result = urlObj.origin + result;
+    }
+    return result;
+  };
 </script>
 
 <style scoped></style>