xinyin025/ChatGPT-Next-Web
1
0
Fork 0
mirror of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git synced 2025-11-17 14:33:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

优化登录逻辑,待添加设置密码页面

Browse Source
This commit is contained in:
sijinhui
2024-05-24 17:40:35 +08:00
parent 402d6b9664
commit db8be98230
11 changed files with 428 additions and 457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/auth.ts
View File

@@ -8,7 +8,6 @@ import { User } from "@prisma/client";
import { isEmail, isName } from "@/lib/auth_list";
import {createTransport} from "nodemailer";
import { comparePassword, hashPassword } from "@/lib/utils";
import {getCurStartEnd} from "@/app/utils/custom";
const SECURE_COOKIES:boolean = !!process.env.SECURE_COOKIES;
@@ -158,6 +157,8 @@ export const authOptions: NextAuthOptions = {
id: token?.sub,
// @ts-expect-error
username: token?.user?.username || token?.user?.gh_username,
// @ts-expect-error
hasPassword: !!token?.user?.password,
};
// console.log('555555555,', session, token)
return session;

11
lib/auth_client.ts
View File

@@ -1,16 +1,21 @@
import {isName} from "@/lib/auth_list";
import { isName } from "@/lib/auth_list";
import { CUS_JWT } from "@/lib/auth_type";
export async function VerifiedUser(session: CUS_JWT |null) {
export async function VerifiedUser(session: CUS_JWT | null) {
const userId = session?.sub
const name = session?.email || session?.name
return !!(name && isName(name) && userId);
}
export async function VerifiedAdminUser(session: CUS_JWT |null) {
export async function VerifiedAdminUser(session: CUS_JWT | null) {
// console.log('-------', session, session?.user?.isAdmin)
return !!session?.user?.isAdmin;
// const name = session?.email || session?.name
// return !!(name && ADMIN_LIST.includes(name));
}
export function VerifiedNeedSetPassword(path: string, session: CUS_JWT | null,) {
const need_set_pwd = !session?.user?.password
return path === "/login/set-password" && need_set_pwd;
}