添加登录内容,尚未完善,先创建分支
This commit is contained in:
+21
-3
@@ -67,16 +67,34 @@ export async function getUserSession(request: Request) {
|
||||
const session = await getSession(request);
|
||||
const isAuthenticated = session.get("isAuthenticated") === true;
|
||||
const userRole = session.get("userRole") || 'common' as UserRole;
|
||||
const accessToken = session.get("accessToken");
|
||||
const refreshToken = session.get("refreshToken");
|
||||
const tokenIssuedAt = session.get("tokenIssuedAt");
|
||||
const tokenExpiresIn = session.get("tokenExpiresIn");
|
||||
const userInfo = session.get("userInfo");
|
||||
|
||||
// 检查token是否过期
|
||||
let isTokenExpired = false;
|
||||
if (accessToken && tokenIssuedAt && tokenExpiresIn) {
|
||||
const now = Date.now();
|
||||
const expiresAt = tokenIssuedAt + (tokenExpiresIn * 1000);
|
||||
isTokenExpired = now >= expiresAt;
|
||||
}
|
||||
|
||||
// console.log("获取会话状态:",
|
||||
// // "Cookie:", request.headers.get("Cookie"),
|
||||
// "是否认证:", isAuthenticated,
|
||||
// "用户角色:", userRole
|
||||
// "用户角色:", userRole,
|
||||
// "Token过期:", isTokenExpired
|
||||
// );
|
||||
|
||||
return {
|
||||
isAuthenticated,
|
||||
userRole
|
||||
isAuthenticated: isAuthenticated && !isTokenExpired,
|
||||
userRole,
|
||||
accessToken,
|
||||
refreshToken,
|
||||
userInfo,
|
||||
isTokenExpired
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user