Skip to content

chore: provide latest user session #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lebalz merged 1 commit into from
Sep 1, 2026
Merged

chore: provide latest user session #59

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 38 additions & 9 deletions src/models/User.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import prisma from '../prisma.js';
import { HTTP403Error, HTTP404Error } from '../utils/errors/Errors.js';
import { createDataExtractor } from '../helpers/dataExtractor.js';
import _ from 'es-toolkit/compat';
import { Session } from 'better-auth';
const getData = createDataExtractor<Prisma.UserUncheckedUpdateInput>(['firstName', 'lastName']);

export enum Role {
Expand Down Expand Up @@ -33,10 +34,15 @@ export const whereStudentGroupAccess = (userId: string, isAdmin?: boolean) => ({
}
});

export type ApiUser = DbUser & { authProviders?: string[] };
export type ApiUser = DbUser & { authProviders?: string[]; sessions: Omit<Session, 'token' | 'userId'>[] };

export const prepareUser = (
user: (DbUser & { accounts: { providerId: string }[] }) | null | undefined,
const prepareSession = (session: Session): Omit<Session, 'token' | 'userId'> => {
const { token, userId, ...rest } = session;
return rest;
};

const prepareUser = (
user: (DbUser & { accounts: { providerId: string }[]; sessions: Session[] }) | null | undefined,
includeAuthProvidersFor?: string
): ApiUser | null => {
if (!user) {
Expand All @@ -45,12 +51,17 @@ export const prepareUser = (
if (!includeAuthProvidersFor || user.id === includeAuthProvidersFor) {
(user as unknown as ApiUser).authProviders = (user.accounts || []).map((a) => a.providerId);
}
if (user.sessions && user.sessions.length > 0) {
(user as unknown as ApiUser).sessions = user.sessions.map(prepareSession);
} else {
(user as unknown as ApiUser).sessions = [];
}
delete (user as any).accounts;
return user;
};

const prepareUsers = (
users: (DbUser & { accounts: { providerId: string }[] })[] | null | undefined
users: (DbUser & { accounts: { providerId: string }[]; sessions: Session[] })[] | null | undefined
): ApiUser[] => {
return users?.filter((u) => !!u).map((u) => prepareUser(u)!) || [];
};
Expand All @@ -59,7 +70,13 @@ function User(db: PrismaClient['user']) {
return Object.assign(db, {
async findModel(id: string): Promise<ApiUser | null> {
return db
.findUnique({ where: { id }, include: { accounts: { select: { providerId: true } } } })
.findUnique({
where: { id },
include: {
accounts: { select: { providerId: true } },
sessions: { take: 1, orderBy: { createdAt: 'desc' } }
}
})
.then(prepareUser);
},

Expand All @@ -81,7 +98,10 @@ function User(db: PrismaClient['user']) {
.update({
where: { id: id },
data: sanitized,
include: { accounts: { select: { providerId: true } } }
include: {
accounts: { select: { providerId: true } },
sessions: { take: 1, orderBy: { createdAt: 'desc' } }
}
})
.then((u) => prepareUser(u)!);
},
Expand All @@ -94,13 +114,19 @@ function User(db: PrismaClient['user']) {
*/
return db
.findMany({
include: { accounts: { select: { providerId: true } } }
include: {
accounts: { select: { providerId: true } },
sessions: { take: 1, orderBy: { createdAt: 'desc' } }
}
})
.then(prepareUsers);
}
const users = await db.findMany({
where: { OR: [{ id: actor.id }, whereStudentGroupAccess(actor.id)] },
include: { accounts: { select: { providerId: true } } },
include: {
accounts: { select: { providerId: true } },
sessions: { take: 1, orderBy: { createdAt: 'desc' } }
},
distinct: ['id']
});
return users.filter((u) => !!u).map((u) => prepareUser(u, actor.id)!);
Expand Down Expand Up @@ -133,7 +159,10 @@ function User(db: PrismaClient['user']) {
.update({
where: { id: userId },
data: { role: role },
include: { accounts: { select: { providerId: true } } }
include: {
accounts: { select: { providerId: true } },
sessions: { take: 1, orderBy: { createdAt: 'desc' } }
}
})
.then((u) => prepareUser(u)!);
}
Expand Down