fix(login): fix res
This commit is contained in:
@@ -144,6 +144,7 @@ export default function AppLayout({
|
|||||||
process.env.NEXT_PUBLIC_OUTPUT_TYPE === "standalone" &&
|
process.env.NEXT_PUBLIC_OUTPUT_TYPE === "standalone" &&
|
||||||
(await deleteCookie())
|
(await deleteCookie())
|
||||||
router.push("/login")
|
router.push("/login")
|
||||||
|
window.location.reload()
|
||||||
}
|
}
|
||||||
const matches = useMediaQuery("(min-width: 48em)")
|
const matches = useMediaQuery("(min-width: 48em)")
|
||||||
|
|
||||||
|
|||||||
@@ -187,12 +187,12 @@ export default function LoginPage({ useUserStore }: { useUserStore: any }) {
|
|||||||
setError(null)
|
setError(null)
|
||||||
|
|
||||||
try {
|
try {
|
||||||
let isAdmin = values.username === "admin"
|
// let isAdmin = values.username === "admin"
|
||||||
let phone = values.username.startsWith("+86")
|
// let phone = values.username.startsWith("+86")
|
||||||
? values.username
|
// ? values.username
|
||||||
: `+86${values.username}`
|
// : `+86${values.username}`
|
||||||
const params = {
|
const params = {
|
||||||
account: isAdmin ? values.username : phone,
|
account: values.username,
|
||||||
password: values.password,
|
password: values.password,
|
||||||
tenant: TENANT,
|
tenant: TENANT,
|
||||||
platform: PLATFORM,
|
platform: PLATFORM,
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import { ResultData } from "@/api/typing"
|
|
||||||
import { Login } from "@/components/login/api/types"
|
import { Login } from "@/components/login/api/types"
|
||||||
import redis from "@/components/login/libs/redis"
|
import redis from "@/components/login/libs/redis"
|
||||||
import { encrypt, generateKeyFromEnv } from "@/components/login/libs/session"
|
import { encrypt, generateKeyFromEnv } from "@/components/login/libs/session"
|
||||||
@@ -55,7 +54,7 @@ export const handleLoginData = async (props: {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export const handleRefreshToken = async (props: {
|
export const handleRefreshToken = async (props: {
|
||||||
data: ResultData<Login.ResRefreshKey>
|
data: Login.ResLabelLogin
|
||||||
userData: any
|
userData: any
|
||||||
}) => {
|
}) => {
|
||||||
const { userData, data } = props
|
const { userData, data } = props
|
||||||
@@ -64,21 +63,18 @@ export const handleRefreshToken = async (props: {
|
|||||||
JSON.parse(redisKey),
|
JSON.parse(redisKey),
|
||||||
JSON.stringify({
|
JSON.stringify({
|
||||||
...rest,
|
...rest,
|
||||||
access_token: data?.message?.access,
|
user_name: data?.name,
|
||||||
refresh_token: data?.message?.refresh,
|
access_token: data.token,
|
||||||
|
refresh_token: data.refresh_token,
|
||||||
}),
|
}),
|
||||||
"EX",
|
"EX",
|
||||||
172800
|
172800
|
||||||
)
|
)
|
||||||
return {
|
return {
|
||||||
...data,
|
...data,
|
||||||
message: {
|
token: "",
|
||||||
...data.message,
|
access_token: "",
|
||||||
// access_token: "",
|
refresh_token: "",
|
||||||
// refresh_token: "",
|
|
||||||
access: "",
|
|
||||||
refresh: "",
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user