Restore refresh token functionality for seamless session renewal

## Summary
Restores refresh token functionality that was lost during a previous refactor.
This enables seamless session renewal without forcing users to re-login when
their access token expires.

## Server changes
- Add refresh token configuration to settingsService (7d TTL by default)
- Add issueRefreshToken method to userService
- Update login/register/resetPassword to return refreshToken
- Add refreshAuthToken method to userService for token refresh
- Add refreshAuthToken controller method
- Add POST /auth/refresh route
- Update verifyJWT middleware to return 403 for expired tokens (triggers refresh)
  and 401 for invalid tokens (triggers logout)

## Client changes
- Store refreshToken in Redux auth state
- Clear refreshToken on logout
- Add setAuthToken action for updating token after refresh
- Update NetworkService to handle 403 responses:
  - Call /auth/refresh endpoint to get new token
  - Retry failed request with new token
  - Queue concurrent requests during refresh
  - Redirect to login if refresh fails
This commit is contained in:
gorkem-bwl committed 2026-01-15 22:28:07 -05:00
1 parent b5caabed20
commit a87ca648dc
7 files changed
+178 -14

No files matched your search

+33 -5
View File
@@ -36,11 +36,11 @@ class AuthController {
req.body.email = req.body.email?.toLowerCase();
}
await registrationBodyValidation.validateAsync(req.body);
const { user, token } = await this.userService.registerUser(req.body, req.file);
const { user, token, refreshToken } = await this.userService.registerUser(req.body, req.file);
res.status(200).json({
success: true,
msg: "User registered successfully",
data: { user, token },
data: { user, token, refreshToken },
});
} catch (error) {
next(error);
@@ -53,7 +53,7 @@ class AuthController {
req.body.email = req.body.email?.toLowerCase();
}
await loginValidation.validateAsync(req.body);
const { user, token } = await this.userService.loginUser(req.body.email, req.body.password);
const { user, token, refreshToken } = await this.userService.loginUser(req.body.email, req.body.password);
return res.status(200).json({
success: true,
@@ -61,6 +61,7 @@ class AuthController {
data: {
user,
token,
refreshToken,
},
});
} catch (error) {
@@ -128,11 +129,38 @@ class AuthController {
resetPassword = async (req: Request, res: Response, next: NextFunction) => {
try {
await newPasswordValidation.validateAsync(req.body);
const { user, token } = await this.userService.resetPassword(req.body.password, req.body.recoveryToken);
const { user, token, refreshToken } = await this.userService.resetPassword(req.body.password, req.body.recoveryToken);
return res.status(200).json({
success: true,
msg: "Password has been reset successfully",
data: { user, token },
data: { user, token, refreshToken },
});
} catch (error) {
next(error);
}
};
refreshAuthToken = async (req: Request, res: Response, next: NextFunction) => {
try {
const authToken = req.headers.authorization?.split(" ")[1];
const refreshToken = req.headers["x-refresh-token"] as string;
if (!authToken || !refreshToken) {
return res.status(400).json({
success: false,
msg: "Auth token and refresh token are required",
});
}
const { user, token, refreshToken: newRefreshToken } = await this.userService.refreshAuthToken(
authToken,
refreshToken
);
return res.status(200).json({
success: true,
msg: "Token refreshed successfully",
data: { user, token, refreshToken: newRefreshToken },
});
} catch (error) {
next(error);
+3 -1
View File
@@ -41,7 +41,9 @@ const verifyJWT = (req, res, next) => {
if (err) {
const errorMessage = err.name === "TokenExpiredError" ? stringService.expiredAuthToken : stringService.invalidAuthToken;
err.details = { msg: errorMessage };
err.status = 401;
// Return 403 for expired tokens to trigger client refresh flow
// Return 401 for invalid tokens to trigger logout
err.status = err.name === "TokenExpiredError" ? 403 : 401;
err.service = SERVICE_NAME;
err.method = "verifyJWT";
next(err);
+1
View File
@@ -15,6 +15,7 @@ class AuthRoutes {
initRoutes() {
this.router.post("/register", upload.single("profileImage"), this.authController.registerUser);
this.router.post("/login", this.authController.loginUser);
this.router.post("/refresh", this.authController.refreshAuthToken);
this.router.post("/recovery/request", this.authController.requestRecovery);
this.router.post("/recovery/validate", this.authController.validateRecovery);
+49 -3
View File
@@ -62,6 +62,17 @@ class UserService {
return this.jwt.sign(payloadData, tokenSecret, { expiresIn: tokenTTL });
};
issueRefreshToken = (payload: any, appSettings: any) => {
const refreshTokenTTL = appSettings?.refreshTokenTTL ?? "7d";
const refreshTokenSecret = appSettings?.refreshTokenSecret ?? appSettings?.jwtSecret;
const payloadData = { ...payload };
// Remove sensitive data from refresh token payload
delete payloadData.password;
delete payloadData.profileImage;
delete payloadData.avatarImage;
return this.jwt.sign(payloadData, refreshTokenSecret, { expiresIn: refreshTokenTTL });
};
registerUser = async (user: any, file: any) => {
// Create a new user
// If superAdmin exists, a token should be attached to all further register requests
@@ -92,6 +103,7 @@ class UserService {
const appSettings = await this.settingsService.getSettings();
const token = this.issueToken(userForToken, appSettings);
const refreshToken = this.issueRefreshToken(userForToken, appSettings);
try {
const html = await this.emailService.buildEmail("welcomeEmailTemplate", {
@@ -114,7 +126,7 @@ class UserService {
});
}
return { user: newUser, token };
return { user: newUser, token, refreshToken };
};
loginUser = async (email: string, password: string) => {
@@ -134,9 +146,10 @@ class UserService {
// Happy path, return token
const appSettings = await this.settingsService.getSettings();
const token = this.issueToken(userWithoutPassword, appSettings);
const refreshToken = this.issueRefreshToken(userWithoutPassword, appSettings);
// reset avatar image
userWithoutPassword.avatarImage = user.avatarImage;
return { user: userWithoutPassword, token };
return { user: userWithoutPassword, token, refreshToken };
};
editUser = async (updates: any, file: any, currentUser: any) => {
@@ -191,7 +204,40 @@ class UserService {
const user = await this.db.recoveryModule.resetPassword(password, recoveryToken);
const appSettings = await this.settingsService.getSettings();
const token = this.issueToken(user._doc, appSettings);
return { user, token };
const refreshToken = this.issueRefreshToken(user._doc, appSettings);
return { user, token, refreshToken };
};
refreshAuthToken = async (oldAuthToken: string, refreshTokenFromHeader: string) => {
const appSettings = await this.settingsService.getSettings();
const refreshTokenSecret = appSettings?.refreshTokenSecret ?? appSettings?.jwtSecret;
const jwtSecret = appSettings?.jwtSecret;
// Verify refresh token
try {
this.jwt.verify(refreshTokenFromHeader, refreshTokenSecret);
} catch (err: any) {
const errorMessage =
err.name === "TokenExpiredError" ? "Refresh token has expired" : "Invalid refresh token";
throw this.errorService.createAuthenticationError(errorMessage);
}
// Refresh token is valid, get payload from old auth token (ignoring expiration)
let payloadData: any;
try {
payloadData = this.jwt.verify(oldAuthToken, jwtSecret, { ignoreExpiration: true });
} catch (err: any) {
throw this.errorService.createAuthenticationError("Invalid auth token");
}
// Remove old token metadata
delete payloadData.iat;
delete payloadData.exp;
// Issue new access token
const newAuthToken = this.issueToken(payloadData, appSettings);
return { user: payloadData, token: newAuthToken, refreshToken: refreshTokenFromHeader };
};
deleteUser = async (user: any) => {
@@ -3,6 +3,8 @@ const SERVICE_NAME = "SettingsService";
const envConfig = {
jwtSecret: process.env.JWT_SECRET,
jwtTTL: process.env.TOKEN_TTL,
refreshTokenSecret: process.env.REFRESH_TOKEN_SECRET || process.env.JWT_SECRET,
refreshTokenTTL: process.env.REFRESH_TOKEN_TTL || "7d",
systemEmailHost: process.env.SYSTEM_EMAIL_HOST,
nodeEnv: process.env.NODE_ENV,
logLevel: process.env.LOG_LEVEL,