Browse Source

feat(auth): add email field to MinimalUser and update related functions

as
npmrun 4 days ago
parent
commit
f016638346
  1. 5
      server/service/auth/index.ts

5
server/service/auth/index.ts

@ -20,6 +20,7 @@ type AuthPayload = {
export type MinimalUser = { export type MinimalUser = {
id: number; id: number;
username: string; username: string;
email: string | null;
role: string; role: string;
nickname: string | null; nickname: string | null;
avatar: string | null; avatar: string | null;
@ -159,6 +160,7 @@ export async function loginUser(payload: AuthPayload) {
.select({ .select({
id: users.id, id: users.id,
username: users.username, username: users.username,
email: users.email,
password: users.password, password: users.password,
status: users.status, status: users.status,
role: users.role, role: users.role,
@ -188,6 +190,7 @@ export async function loginUser(payload: AuthPayload) {
user: { user: {
id: user.id, id: user.id,
username: user.username, username: user.username,
email: user.email,
role: user.role, role: user.role,
nickname: user.nickname, nickname: user.nickname,
avatar: user.avatar, avatar: user.avatar,
@ -209,6 +212,7 @@ export async function getCurrentUser(sessionId: string): Promise<MinimalUser | n
.select({ .select({
userId: users.id, userId: users.id,
username: users.username, username: users.username,
email: users.email,
role: users.role, role: users.role,
nickname: users.nickname, nickname: users.nickname,
avatar: users.avatar, avatar: users.avatar,
@ -232,6 +236,7 @@ export async function getCurrentUser(sessionId: string): Promise<MinimalUser | n
return { return {
id: row.userId, id: row.userId,
username: row.username, username: row.username,
email: row.email,
role: row.role, role: row.role,
nickname: row.nickname, nickname: row.nickname,
avatar: row.avatar, avatar: row.avatar,

Loading…
Cancel
Save