yuang-framework-ui-common 1.0.44 → 1.0.46

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?ssoRedirectRoutePath=${encodeURIComponent(fullPath)}`);
+            router.push(`/sso/auth/index?ssoRedirectRoutePath=${encodeURIComponent(fullPath)}`);
             return;
         } else if (res?.data?.statusCode === 500815003) {
             showErrorMessage(res?.data?.message || messageMap.requestError);

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.46",
   "private": false,
   "type": "module",
   "scripts": {

package/src/router/index.ts

@@ -1,17 +1,17 @@
 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({
     history: createWebHistory(import.meta.env.BASE_URL),
     routes: [
         {
-            path: '/sso/login/index',
-            component: () => import('@/views/sso/login/index.vue'),
+            path: '/sso/auth/index',
+            component: () => import('@/views/sso/auth/index.vue'),
             meta: {
-                title: '登录',
+                title: '认证',
                 isAnonymous: true
             }
         },
@@ -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 → auth}/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <!--  <div>登录中...</div>-->
+    <div>认证中...</div>
 </template>
 
 <script setup lang="ts">
@@ -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();
 
@@ -24,8 +24,8 @@
     proxy.$http.get('/sso-api/client/sso-auth/getSsoAccessToken', { params: { ssoAuthCode: ssoAuthCode } }).then((res: any) => {
       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 = (ssoRedirectRoutePath && decodeURIComponent(ssoRedirectRoutePath)) || ('/sso/auth/auth-success' as any);
+      ssoRedirectRoutePath = removeParameter('ssoAuthCode', ssoRedirectRoutePath) || '';
       router.push(ssoRedirectRoutePath);
     });
   });