yuang-framework-ui-common 1.0.96 → 1.0.98

package/lib/utils/ssoUtils.ts

@@ -1,7 +1,6 @@
 import Cookies from 'js-cookie'
 import { getAesRandomKey, aesEncrypt } from './aesUtils';
 import { rsaEncrypt } from './rsaUtils';
-import { isFullUrl } from './urlUtils';
 import { getLocalStorageItem, setLocalStorageItem, removeLocalStorageItem } from './storageUtils';
 import { application } from '../config/applicationConfig';
 import { getIsDebug } from '../utils/htmlUtils';
@@ -20,9 +19,6 @@ const getSsoLoginUrl = (ssoRedirectUrl = '') => {
     if (!gatewayServerBaseUrl) {
         throw new Error('参数[gatewayServerBaseUrl]为空');
     }
-    if (!isFullUrl(gatewayServerBaseUrl)) {
-        throw new Error('参数[gatewayServerBaseUrl]必须是完整路径');
-    }
     let ssoLoginUrl = `${gatewayServerBaseUrl}/sso-api/server/sso/login`;
     if (!ssoRedirectUrl) {
         ssoLoginUrl += `?ssoRedirectUrl=${encodeURIComponent(window.location.href)}`;
@@ -44,9 +40,6 @@ const getSsoAuthUrl = (ssoRedirectUrl = '') => {
     if (!gatewayServerBaseUrl) {
         throw new Error('参数[gatewayServerBaseUrl]为空');
     }
-    if (!isFullUrl(gatewayServerBaseUrl)) {
-        throw new Error('参数[gatewayServerBaseUrl]必须是完整路径');
-    }
     let ssoAuthUrl = `${gatewayServerBaseUrl}/sso-api/server/sso/auth`;
     if (!ssoRedirectUrl) {
         ssoAuthUrl += `?ssoRedirectUrl=${encodeURIComponent(window.location.href)}`;
@@ -68,9 +61,6 @@ const getSsoLogoutUrl = (ssoRedirectUrl = '') => {
     if (!gatewayServerBaseUrl) {
         throw new Error('参数[gatewayServerBaseUrl]为空');
     }
-    if (!isFullUrl(gatewayServerBaseUrl)) {
-        throw new Error('参数[gatewayServerBaseUrl]必须是完整路径');
-    }
     let ssoLogoutUrl = `${gatewayServerBaseUrl}/sso-api/server/sso/logout`;
     if (!ssoRedirectUrl) {
         ssoLogoutUrl += `?ssoRedirectUrl=${encodeURIComponent(window.location.href)}`;
@@ -79,33 +69,13 @@ 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认证
+ * 处理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 +94,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);
@@ -263,8 +227,7 @@ export {
     getSsoLoginUrl,
     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.98",
   "private": false,
   "type": "module",
   "scripts": {

package/src/router/index.ts

@@ -1,19 +1,12 @@
 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({
     history: createWebHistory(import.meta.env.BASE_URL),
     routes: [
-        {
-            path: '/sso/client/sso-auth/auth-success',
-            component: () => import('@/views/sso/client/sso-auth/auth-success.vue'),
-            meta: {
-                title: '认证成功',
-            }
-        },
         {
             path: '/gateway/gateway-config',
             component: () => import('@/views/gateway/gateway-config.vue')
@@ -69,7 +62,7 @@ const router = createRouter({
 
 /* 路由守卫 */
 router.beforeEach(async (to, from) => {
-    let ssoAuthResult = await handleRouterGuardSsoAuth(to, from);
+    let ssoAuthResult = await handleSsoAuth(to, from);
     return ssoAuthResult.result;
 });
 

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

@@ -1,46 +0,0 @@
-<template>
-  <h1>认证成功！ {{ ssoData?.ssoTokenUser?.account }}</h1>
-
-  <h3 @click="getSsoTokenUser">获取ssoTokenUser</h3>
-  <h3 @click="getSsoIdentity">获取SsoIdentity</h3>
-
-  <a @click="logout">注销登录</a>
-</template>
-
-<script setup lang="ts">
-  import { onMounted, reactive } from 'vue';
-  import { ElMessage } from 'element-plus/es';
-
-  import { getSsoAccessToken, logoutSso } from '../../../../lib/utils/ssoUtils';
-  import { http } from '../../../../lib/config/httpConfig';
-
-  let ssoData = reactive({
-    ssoTokenUser: {},
-    ssoIdentity: {}
-  });
-  onMounted(() => {
-    let ssoAccessToken = getSsoAccessToken();
-    console.log('ssoAccessToken', ssoAccessToken);
-    getSsoTokenUser();
-  });
-  const getSsoTokenUser = () => {
-    http.get(`/sso-api/client/sso-user/getSsoTokenUser`).then((res: any) => {
-      ssoData.ssoTokenUser = res.data.data;
-      console.log('ssoTokenUser', ssoData.ssoTokenUser);
-      ElMessage.success('获取成功');
-    });
-  };
-  const getSsoIdentity = () => {
-    http.get(`/sso-api/client/sso-user/getSsoIdentity`).then((res: any) => {
-      ssoData.ssoIdentity = res.data.data;
-      console.log('ssoIdentity', ssoData.ssoIdentity);
-      ElMessage.success('获取成功');
-    });
-  };
-
-  const logout = () => {
-    logoutSso();
-  };
-</script>
-
-<style scoped></style>