yuang-framework-ui-common 1.0.96 → 1.0.97

package/lib/utils/ssoUtils.ts

@@ -101,11 +101,11 @@ const getSsoLogoutUrl = (ssoRedirectUrl = '') => {
 // }
 
 /**
- * 处理路由守卫sso认证
+ * 处理sso认证
  * @param to
  * @param from
  */
-const handleRouterGuardSsoAuth = (to : any, from : any) => {
+const handleSsoAuth = (to : any, from : any) => {
     from;
     return new Promise((resolve, reject) => {
         // 已登录，直接放行
@@ -124,19 +124,13 @@ const handleRouterGuardSsoAuth = (to : any, from : any) => {
             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';
-                }
+                let fullPath = to.fullPath;
+                 fullPath = removeParameter('ssoAuthCode', fullPath);
                 // 返回重定向路径
-                return resolve({result: false, path: ssoRedirectRoutePath});
+                return resolve({result: true, path: fullPath });
             });
         } catch (error) {
             console.error('SSO 获取 AccessToken 失败：', error);
@@ -264,7 +258,7 @@ export {
     getSsoAuthUrl,
     getSsoLogoutUrl,
     // getSsoAuthRoutePath,
-    handleRouterGuardSsoAuth,
+    handleSsoAuth,
 
     getSsoEncrypt,
     getSsoEncryptList,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yuang-framework-ui-common",
-  "version": "1.0.96",
+  "version": "1.0.97",
   "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/routerUtils'
 
-import { getSsoAccessToken, getSsoAuthRoutePath, handleSsoRouterGuardAuth } from '../../lib/utils/ssoUtils';
+import { handleSsoAuth } from '../../lib/utils/ssoUtils';
 
 
 const router = createRouter({
@@ -69,7 +69,7 @@ const router = createRouter({
 
 /* 路由守卫 */
 router.beforeEach(async (to, from) => {
-    let ssoAuthResult = await handleRouterGuardSsoAuth(to, from);
+    let ssoAuthResult = await handleSsoAuth(to, from);
     return ssoAuthResult.result;
 });