Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/lib/auth-cookies.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export function setAuthCookies(res: Response, tokens: { refresh: string; access:
httpOnly: true,
secure: isProduction,
sameSite: isProduction ? "strict" : "lax",
path: "/",
maxAge: accessMaxAge,
});
}
Expand Down
6 changes: 5 additions & 1 deletion src/lib/auth-token-generator.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
import {generateAccessToken, generateRefreshToken} from "./jwt";
import {prisma} from "../config/db";
import {env} from "../utils/environment-variables";
import ms from "ms";

export async function generateAuthToken({id, email}: { id: number; email: string; }) {
const access_token = generateAccessToken({id: id, email: email});
const refresh_token = generateRefreshToken({id: id});
const refreshExpiryMs = ms(env.JWT_REFRESH_EXPIRES_IN as ms.StringValue);

await prisma.refreshToken.create({
data: {
userId: id,
token: refresh_token,
expiresAt: new Date(Date.now() + 7 * 24 * 3600 * 1000),
expiresAt: new Date(Date.now() + refreshExpiryMs),
},
});
return {
Expand Down
6 changes: 5 additions & 1 deletion src/services/auth/LoginService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import {
TwoFactorChallengeError
} from "../../lib/errors";
import {LoginRequestDTO} from "../../dtos/command/LoginRequestDTO";
import {env} from "../../utils/environment-variables";
import ms from "ms";

export class LoginService {
async login(dto: LoginRequestDTO) {
Expand Down Expand Up @@ -55,12 +57,14 @@ export class LoginService {
id: user.id,
});

const refreshExpiryMs = ms(env.JWT_REFRESH_EXPIRES_IN as ms.StringValue);

try {
await prisma.refreshToken.create({
data: {
userId: user.id,
token: refresh_token,
expiresAt: new Date(Date.now() + 7 * 24 * 3600 * 1000),
expiresAt: new Date(Date.now() + refreshExpiryMs),
},
});
} catch (error) {
Expand Down
5 changes: 4 additions & 1 deletion src/services/auth/RefreshTokenService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {generateAccessToken, generateRefreshToken} from "../../lib/jwt";
import {env} from "../../utils/environment-variables";
import {AppError, InvalidRefreshTokenError} from "../../lib/errors";
import {redis} from "../../config/redis";
import ms from "ms";

export class RefreshTokenService {
async refresh(refreshToken: string) {
Expand Down Expand Up @@ -46,6 +47,8 @@ export class RefreshTokenService {
email: user.email,
});

const refreshExpiryMs = ms(env.JWT_REFRESH_EXPIRES_IN as ms.StringValue);

try {
await prisma.$transaction([
prisma.refreshToken.update({
Expand All @@ -56,7 +59,7 @@ export class RefreshTokenService {
data: {
userId: stored.userId,
token: newRefresh,
expiresAt: new Date(Date.now() + 7 * 24 * 3600 * 1000),
expiresAt: new Date(Date.now() + refreshExpiryMs),
},
}),
]);
Expand Down