yuang-framework-ui-common 1.0.41 → 1.0.42

package/lib/utils/ssoUtils.ts

@@ -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.41",
+  "version": "1.0.42",
   "private": false,
   "type": "module",
   "scripts": {

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

@@ -24,20 +24,41 @@
       setSsoAccessToken(res.data.data);
       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>