yuang-framework-ui-common 1.0.95 → 1.0.96

package/lib/utils/ssoUtils.ts

@@ -5,7 +5,8 @@ import { isFullUrl } from './urlUtils';
 import { getLocalStorageItem, setLocalStorageItem, removeLocalStorageItem } from './storageUtils';
 import { application } from '../config/applicationConfig';
 import { getIsDebug } from '../utils/htmlUtils';
-
+import { http} from '../config/httpConfig';
+import { removeParameter } from '../utils/urlUtils';
 
 /**
  * 获取sso登录地址
@@ -78,25 +79,71 @@ const getSsoLogoutUrl = (ssoRedirectUrl = '') => {
     }
     return ssoLogoutUrl;
 }
+//
+// /**
+//  * 获取sso认证路由路径
+//  * @param ssoRedirectRoutePath
+//  */
+// const getSsoAuthRoutePath = (ssoRedirectRoutePath = '') => {
+//     if(getIsDebug()) {
+//         debugger;
+//     }
+//     let ssoAuthRoutePath = '/sso/client/sso-auth/index';
+//     if (!ssoRedirectRoutePath) {
+//         ssoAuthRoutePath += `?ssoRedirectRoutePath=${encodeURIComponent('/sso/client/sso-auth/auth-success')}`;
+//     } else {
+//         ssoAuthRoutePath += `?ssoRedirectRoutePath=${encodeURIComponent(ssoRedirectRoutePath)}`;
+//     }
+//     if(getIsDebug()) {
+//         console.log('ssoAuthRoutePath', ssoAuthRoutePath);
+//     }
+//     return ssoAuthRoutePath;
+// }
 
 /**
- * 获取sso认证路由路径
- * @param ssoRedirectRoutePath
+ * 处理路由守卫sso认证
+ * @param to
+ * @param from
  */
-const getSsoAuthRoutePath = (ssoRedirectRoutePath = '') => {
-    if(getIsDebug()) {
-        debugger;
-    }
-    let ssoAuthRoutePath = '/sso/client/sso-auth/index';
-    if (!ssoRedirectRoutePath) {
-        ssoAuthRoutePath += `?ssoRedirectRoutePath=${encodeURIComponent('/sso/client/sso-auth/auth-success')}`;
-    } else {
-        ssoAuthRoutePath += `?ssoRedirectRoutePath=${encodeURIComponent(ssoRedirectRoutePath)}`;
-    }
-    if(getIsDebug()) {
-        console.log('ssoAuthRoutePath', ssoAuthRoutePath);
-    }
-    return ssoAuthRoutePath;
+const handleRouterGuardSsoAuth = (to : any, from : any) => {
+    from;
+    return new Promise((resolve, reject) => {
+        // 已登录，直接放行
+        if (getSsoAccessToken()) {
+            return resolve({result: true});
+        }
+        // 免登录路由，直接放行
+        if (to.meta?.isSsoClientExcluded) {
+            return resolve({result: true});
+        }
+        // 无认证码，跳转到 SSO 授权页（window.location 跳转后 return false 终止路由）
+        const ssoAuthCode = to.query.ssoAuthCode;
+        if (!ssoAuthCode) {
+            window.location.href = getSsoAuthUrl(window.location.href) || '';
+            // 这里一定要return，不return还是会继续执行下面的代码
+            return resolve({result: false});
+        }
+        try {
+            // 有认证码，请求获取 AccessToken（try/catch 捕获所有异常）
+            http.get(`/sso-api/client/sso-auth/getSsoAccessToken`, { params: { ssoAuthCode } }).then(res =>{
+                setSsoAccessToken(res.data.data);
+                // 处理重定向路径
+                let ssoRedirectRoutePath = to.query.ssoRedirectRoutePath as string;
+                ssoRedirectRoutePath = (ssoRedirectRoutePath && decodeURIComponent(ssoRedirectRoutePath)) || '/sso/client/sso-login/sso-login-success';
+                ssoRedirectRoutePath = removeParameter('ssoAuthCode', ssoRedirectRoutePath);
+                // 无权限页重定向为登录成功页，避免切换账号误解
+                if (ssoRedirectRoutePath === '/sso/client/sso-login/sso-login-no-privilege') {
+                    ssoRedirectRoutePath = '/sso/client/sso-login/sso-login-success';
+                }
+                // 返回重定向路径
+                return resolve({result: false, path: ssoRedirectRoutePath});
+            });
+        } catch (error) {
+            console.error('SSO 获取 AccessToken 失败：', error);
+            // 失败后跳转到登录页（可根据业务调整为无权限页）
+            return reject({result: false, path:'/sso/client/sso-login/index'});
+        }
+    });
 }
 
 /**
@@ -216,7 +263,8 @@ export {
     getSsoLoginUrl,
     getSsoAuthUrl,
     getSsoLogoutUrl,
-    getSsoAuthRoutePath,
+    // getSsoAuthRoutePath,
+    handleRouterGuardSsoAuth,
 
     getSsoEncrypt,
     getSsoEncryptList,

package/package.json

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

package/src/router/index.ts

@@ -1,20 +1,12 @@
 import {createRouter, createWebHistory} from 'vue-router'
 import {getExceptionRoutes} from '../../lib/utils/routerUtils'
 
-import { getSsoAccessToken, getSsoAuthRoutePath } from '../../lib/utils/ssoUtils';
+import { getSsoAccessToken, getSsoAuthRoutePath, handleSsoRouterGuardAuth } from '../../lib/utils/ssoUtils';
 
 
 const router = createRouter({
     history: createWebHistory(import.meta.env.BASE_URL),
     routes: [
-        {
-            path: '/sso/client/sso-auth/index',
-            component: () => import('@/views/sso/client/sso-auth/index.vue'),
-            meta: {
-                title: '认证',
-                isSsoClientExcluded: true
-            }
-        },
         {
             path: '/sso/client/sso-auth/auth-success',
             component: () => import('@/views/sso/client/sso-auth/auth-success.vue'),
@@ -70,21 +62,15 @@ const router = createRouter({
             path: '/example/table/index',
             component: () => import('@/views/example/table/index.vue')
         },
-
         ...getExceptionRoutes()
     ]
 })
 
 
 /* 路由守卫 */
-router.beforeEach(async (to) => {
-    if (!getSsoAccessToken()) {
-        if (!to.meta?.isSsoClientExcluded) {
-            return getSsoAuthRoutePath(to.fullPath);
-        }
-        return;
-    }
-    return;
+router.beforeEach(async (to, from) => {
+    let ssoAuthResult = await handleRouterGuardSsoAuth(to, from);
+    return ssoAuthResult.result;
 });
 
 

package/src/views/sso/client/sso-auth/index.vue

@@ -1,35 +0,0 @@
-<template>
-    <div>认证中...</div>
-</template>
-
-<script setup lang="ts">
-  import { getCurrentInstance, onMounted } from 'vue';
-  import { useRouter } from 'vue-router';
-
-  import { getSsoAuthUrl, setSsoAccessToken } from '../../../../lib/utils/ssoUtils';
-  import { removeParameter } from '../../../../lib/utils/urlUtils';
-  import { http } from '../../../../lib/config/httpConfig';
-
-  const router = useRouter();
-
-  const { proxy } = getCurrentInstance() as any;
-
-  onMounted(() => {
-    const ssoAuthCode = router.currentRoute.value.query.ssoAuthCode;
-    if (!ssoAuthCode) {
-      window.location.href = getSsoAuthUrl(window.location.href) || '';
-      // 这里一定要return，不return还是会继续执行下面的代码
-      return;
-    }
-
-    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/client/sso-auth/auth-success' as any);
-      ssoRedirectRoutePath = removeParameter('ssoAuthCode', ssoRedirectRoutePath) || '';
-      router.push(ssoRedirectRoutePath);
-    });
-  });
-</script>
-
-<style scoped></style>