yuang-framework-ui-common 1.0.82 → 1.0.84

package/lib/config/httpConfig.ts

@@ -86,7 +86,8 @@ http.interceptors.response.use(async (res: any) => {
             }
             return http.request(res.config);
         } else if (res?.data?.statusCode === 500815001) {
-            showErrorMessage(res?.data?.message || messageMap.requestError);
+            // 会提示消息：未登录或已超时，但是马上跳转到登录页面，体验不好，所以去掉提示消息
+            // showErrorMessage(res?.data?.message || messageMap.requestError);
             clearSsoAccessToken();
             window.location.href = getSsoLoginUrl() || '';
             return Promise.reject(new Error(res?.data?.message));

package/lib/utils/ssoUtils.ts

@@ -6,6 +6,10 @@ import { getLocalStorageItem, setLocalStorageItem, removeLocalStorageItem } from
 import { application } from '../config/applicationConfig';
 
 
+/**
+ * 获取sso登录地址
+ * @param ssoRedirectUrl
+ */
 const getSsoLoginUrl = (ssoRedirectUrl = '') => {
     let gatewayServerBaseUrl = application.gatewayServerBaseUrl;
     if (!gatewayServerBaseUrl) {
@@ -23,6 +27,31 @@ const getSsoLoginUrl = (ssoRedirectUrl = '') => {
     return ssoLoginUrl;
 }
 
+/**
+ * 获取sso认证地址
+ * @param ssoRedirectUrl
+ */
+const getSsoAuthUrl = (ssoRedirectUrl = '') => {
+    let gatewayServerBaseUrl = application.gatewayServerBaseUrl;
+    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)}`;
+    } else {
+        ssoAuthUrl += `?ssoRedirectUrl=${encodeURIComponent(ssoRedirectUrl)}`;
+    }
+    return ssoAuthUrl;
+}
+
+/**
+ * 获取sso注销地址
+ * @param ssoRedirectUrl
+ */
 const getSsoLogoutUrl = (ssoRedirectUrl = '') => {
     let gatewayServerBaseUrl = application.gatewayServerBaseUrl;
     if (!gatewayServerBaseUrl) {
@@ -169,6 +198,7 @@ const logoutSso = () => {
 
 export {
     getSsoLoginUrl,
+    getSsoAuthUrl,
     getSsoLogoutUrl,
     getSsoAuthRoutePath,
 

package/package.json

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

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

@@ -7,7 +7,7 @@
   import { useRouter } from 'vue-router';
 
   import { application } from '../../../../lib/config/applicationConfig';
-  import { getSsoLoginUrl, setSsoAccessToken } from '../../../../lib/utils/ssoUtils';
+  import { getSsoAuthUrl, setSsoAccessToken } from '../../../../lib/utils/ssoUtils';
   import { removeParameter } from '../../../../lib/utils/urlUtils';
   import { http } from '../../../../lib/config/httpConfig';
 
@@ -18,7 +18,7 @@
   onMounted(() => {
     const ssoAuthCode = router.currentRoute.value.query.ssoAuthCode;
     if (!ssoAuthCode) {
-      window.location.href = getSsoLoginUrl(window.location.href) || '';
+      window.location.href = getSsoAuthUrl(window.location.href) || '';
       // 这里一定要return，不return还是会继续执行下面的代码
       return;
     }