update 优化 全局移除cookie使用 避免安全问题
This commit is contained in:
parent
1690563ef0
commit
e906b8ad0a
@ -4,9 +4,7 @@
|
|||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { login, callback } from '@/api/login';
|
import { login, callback } from '@/api/login';
|
||||||
import { setToken } from '@/utils/auth';
|
import { setToken, getToken } from '@/utils/auth';
|
||||||
import Cookies from 'js-cookie';
|
|
||||||
import { getToken } from '@/utils/auth';
|
|
||||||
import { LoginData } from '@/api/types';
|
import { LoginData } from '@/api/types';
|
||||||
|
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
@ -20,7 +18,7 @@ const loading = ref(true);
|
|||||||
const code = route.query.code as string;
|
const code = route.query.code as string;
|
||||||
const state = route.query.state as string;
|
const state = route.query.state as string;
|
||||||
const source = route.query.source as string;
|
const source = route.query.source as string;
|
||||||
const tenantId = Cookies.get("tenantId") ? Cookies.get("tenantId") as string : '000000';
|
const tenantId = localStorage.getItem("tenantId") ? localStorage.getItem("tenantId") as string : '000000';
|
||||||
|
|
||||||
|
|
||||||
const processResponse = async (res: any) => {
|
const processResponse = async (res: any) => {
|
||||||
|
@ -61,7 +61,6 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { getCodeImg, getTenantList } from '@/api/login';
|
import { getCodeImg, getTenantList } from '@/api/login';
|
||||||
import { authBinding } from '@/api/system/social/auth';
|
import { authBinding } from '@/api/system/social/auth';
|
||||||
import Cookies from 'js-cookie';
|
|
||||||
import { useUserStore } from '@/store/modules/user';
|
import { useUserStore } from '@/store/modules/user';
|
||||||
import { LoginData, TenantVO } from '@/api/types';
|
import { LoginData, TenantVO } from '@/api/types';
|
||||||
import { to } from 'await-to-js';
|
import { to } from 'await-to-js';
|
||||||
@ -105,18 +104,18 @@ const handleLogin = () => {
|
|||||||
loginRef.value?.validate(async (valid: boolean, fields: any) => {
|
loginRef.value?.validate(async (valid: boolean, fields: any) => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
loading.value = true;
|
loading.value = true;
|
||||||
// 勾选了需要记住密码设置在 cookie 中设置记住用户名和密码
|
// 勾选了需要记住密码设置在 localStorage 中设置记住用户名和密码
|
||||||
if (loginForm.value.rememberMe) {
|
if (loginForm.value.rememberMe) {
|
||||||
Cookies.set("tenantId", String(loginForm.value.tenantId), { expires: 30 });
|
localStorage.setItem("tenantId", String(loginForm.value.tenantId));
|
||||||
Cookies.set('username', String(loginForm.value.username), { expires: 30 });
|
localStorage.setItem('username', String(loginForm.value.username));
|
||||||
Cookies.set('password', String(loginForm.value.password), { expires: 30 });
|
localStorage.setItem('password', String(loginForm.value.password));
|
||||||
Cookies.set('rememberMe', String(loginForm.value.rememberMe), { expires: 30 });
|
localStorage.setItem('rememberMe', String(loginForm.value.rememberMe));
|
||||||
} else {
|
} else {
|
||||||
// 否则移除
|
// 否则移除
|
||||||
Cookies.remove("tenantId");
|
localStorage.removeItem("tenantId");
|
||||||
Cookies.remove('username');
|
localStorage.removeItem('username');
|
||||||
Cookies.remove('password');
|
localStorage.removeItem('password');
|
||||||
Cookies.remove('rememberMe');
|
localStorage.removeItem('rememberMe');
|
||||||
}
|
}
|
||||||
// 调用action的登录方法
|
// 调用action的登录方法
|
||||||
const [err] = await to(userStore.login(loginForm.value));
|
const [err] = await to(userStore.login(loginForm.value));
|
||||||
@ -148,11 +147,11 @@ const getCode = async () => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const getCookie = () => {
|
const getLoginData = () => {
|
||||||
const tenantId = Cookies.get("tenantId");
|
const tenantId = localStorage.getItem("tenantId");
|
||||||
const username = Cookies.get('username');
|
const username = localStorage.getItem('username');
|
||||||
const password = Cookies.get('password');
|
const password = localStorage.getItem('password');
|
||||||
const rememberMe = Cookies.get('rememberMe');
|
const rememberMe = localStorage.getItem('rememberMe');
|
||||||
loginForm.value = {
|
loginForm.value = {
|
||||||
tenantId: tenantId === undefined ? String(loginForm.value.tenantId) : tenantId,
|
tenantId: tenantId === undefined ? String(loginForm.value.tenantId) : tenantId,
|
||||||
username: username === undefined ? String(loginForm.value.username) : username,
|
username: username === undefined ? String(loginForm.value.username) : username,
|
||||||
@ -178,7 +177,7 @@ const initTenantList = async () => {
|
|||||||
|
|
||||||
//检测租户选择框的变化
|
//检测租户选择框的变化
|
||||||
watch(() => loginForm.value.tenantId, () => {
|
watch(() => loginForm.value.tenantId, () => {
|
||||||
Cookies.set("tenantId", String(loginForm.value.tenantId), { expires: 30 })
|
localStorage.setItem("tenantId", String(loginForm.value.tenantId))
|
||||||
});
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -201,7 +200,7 @@ const doSocialLogin = (type: string) => {
|
|||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
getCode();
|
getCode();
|
||||||
initTenantList();
|
initTenantList();
|
||||||
getCookie();
|
getLoginData();
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user