From 72610ab1948bf57e0073a0dd377ab84393459ca0 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 18 六月 2024 18:44:27 +0800
Subject: [PATCH] update 优化 三方登录不同域名获取不到租户id问题
---
src/layout/components/SocialCallback/index.vue | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/layout/components/SocialCallback/index.vue b/src/layout/components/SocialCallback/index.vue
index faf7d50..dcc10a6 100644
--- a/src/layout/components/SocialCallback/index.vue
+++ b/src/layout/components/SocialCallback/index.vue
@@ -4,14 +4,11 @@
<script setup lang="ts">
import { login, callback } from '@/api/login';
-import { setToken } from '@/utils/auth';
-import Cookies from 'js-cookie';
-import { getToken } from '@/utils/auth';
+import { setToken, getToken } from '@/utils/auth';
import { LoginData } from '@/api/types';
const route = useRoute();
const loading = ref(true);
-
/**
* 鎺ユ敹Route浼犻�掔殑鍙傛暟
@@ -20,21 +17,30 @@
const code = route.query.code as string;
const state = route.query.state as string;
const source = route.query.source as string;
-const tenantId = Cookies.get("tenantId") ? Cookies.get("tenantId") as string : '000000';
-
+const tenantId = route.query.tenantId as string ? route.query.tenantId as string : '000000';
const processResponse = async (res: any) => {
if (res.code !== 200) {
throw new Error(res.msg);
}
- setToken(res.data.access_token);
+ if (res.data !== null && res.data.access_token !== null) {
+ setToken(res.data.access_token);
+ }
ElMessage.success(res.msg);
- location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
+ setTimeout(() => {
+ if (res.data !== null && res.data.domain !== null) {
+ location.href = res.data.domain + import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
+ } else {
+ location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
+ }
+ }, 2000);
};
const handleError = (error: any) => {
ElMessage.error(error.message);
- location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
+ setTimeout(() => {
+ location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
+ }, 2000);
};
const callbackByCode = async (data: LoginData) => {
--
Gitblit v1.9.3