yuang-framework-ui-common 1.0.44 → 1.0.45

package/lib/utils/ssoUtils.ts

@@ -33,17 +33,17 @@ const getSsoLogoutUrl = (ssoRedirectUrl = '') => {
 }
 
 /**
- * 获取sso登录路由路径
+ * 获取sso认证路由路径
  * @param ssoRedirectRoutePath
  */
-const getSsoLoginRoutePath = (ssoRedirectRoutePath = '') => {
-    let ssoLoginRoutePath = '/sso/login/index';
+const getSsoAuthRoutePath = (ssoRedirectRoutePath = '') => {
+    let ssoAuthRoutePath = '/sso/auth/index';
     if (!ssoRedirectRoutePath) {
-        ssoLoginRoutePath += `?ssoRedirectRoutePath=${encodeURIComponent('/sso/login/login-success')}`;
+        ssoAuthRoutePath += `?ssoRedirectRoutePath=${encodeURIComponent('/sso/auth/auth-success')}`;
     } else {
-        ssoLoginRoutePath += `?ssoRedirectRoutePath=${encodeURIComponent(ssoRedirectRoutePath)}`;
+        ssoAuthRoutePath += `?ssoRedirectRoutePath=${encodeURIComponent(ssoRedirectRoutePath)}`;
     }
-    return ssoLoginRoutePath;
+    return ssoAuthRoutePath;
 }
 
 /**
@@ -160,7 +160,7 @@ const logoutSso = () => {
 export {
     getSsoLoginUrl,
     getSsoLogoutUrl,
-    getSsoLoginRoutePath,
+    getSsoAuthRoutePath,
 
     getSsoEncrypt,
     getSsoEncryptList,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yuang-framework-ui-common",
-  "version": "1.0.44",
+  "version": "1.0.45",
   "private": false,
   "type": "module",
   "scripts": {

package/src/router/index.ts

@@ -1,7 +1,7 @@
 import {createRouter, createWebHistory} from 'vue-router'
 import {getExceptionRoutes} from '../../lib/utils/vueRouterUtils'
 
-import { getSsoAccessToken, getSsoLoginRoutePath } from '../../lib/utils/ssoUtils';
+import { getSsoAccessToken, getSsoAuthRoutePath } from '../../lib/utils/ssoUtils';
 
 
 const router = createRouter({
@@ -53,7 +53,7 @@ const router = createRouter({
 router.beforeEach(async (to) => {
     if (!getSsoAccessToken()) {
         if (!to.meta?.isAnonymous) {
-            return getSsoLoginRoutePath(to.fullPath);
+            return getSsoAuthRoutePath(to.fullPath);
         }
         return;
     }

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

@@ -7,7 +7,7 @@
   import { useRouter } from 'vue-router';
 
   import { getSsoLoginUrl, setSsoAccessToken } from '../../../../lib/utils/ssoUtils';
-  import { removeUrlParameter } from '../../../../lib/utils/urlUtils';
+  import { removeParameter } from '../../../../lib/utils/urlUtils';
 
   const router = useRouter();
 
@@ -25,7 +25,7 @@
       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');
+      ssoRedirectRoutePath = removeParameter('ssoAuthCode', ssoRedirectRoutePath) || '';
       router.push(ssoRedirectRoutePath);
     });
   });