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