From 549f75c9e271ca9b8b8f919ee996526b31e659a8 Mon Sep 17 00:00:00 2001
From: Vidhu Kant Sharma <vidhukant@vidhukant.com>
Date: Mon, 14 Apr 2025 01:48:12 +0530
Subject: Bug fix: refresh token not containing the version

---
 package.json           | 2 +-
 src/controller/auth.ts | 8 ++++++--
 src/util/auth.ts       | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 302cc5f..eab1f15 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "financer",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Pocket Money Tracker",
   "main": "dist/index.js",
   "scripts": {
diff --git a/src/controller/auth.ts b/src/controller/auth.ts
index 13196fb..0135e13 100644
--- a/src/controller/auth.ts
+++ b/src/controller/auth.ts
@@ -34,6 +34,8 @@ const signup = async (req: Request, res: Response) => {
                 "password": hash,
             });
 
+            const refreshToken = getRefreshToken(user.id, user.refreshTokenVersion)
+
             // @ts-ignore
             delete user["password"];
             // @ts-ignore
@@ -42,7 +44,7 @@ const signup = async (req: Request, res: Response) => {
             res.status(201).json({
                 user: user,
                 accessToken: getAccessToken(user.id),
-                refreshToken: getRefreshToken(user.id, user.refreshTokenVersion)
+                refreshToken: refreshToken
             });
         } catch (error) {
             res.status(500).json({ error: "Internal Server Error" });
@@ -62,6 +64,8 @@ const login = async (req: Request, res: Response) => {
             }
 
             if (isMatch) {
+                const refreshToken = getRefreshToken(user.id, user.refreshTokenVersion)
+
                 // @ts-ignore
                 delete user["password"];
                 // @ts-ignore
@@ -70,7 +74,7 @@ const login = async (req: Request, res: Response) => {
                 res.status(200).json({
                     user: user,
                     accessToken: getAccessToken(user.id),
-                    refreshToken: getRefreshToken(user.id, user.refreshTokenVersion)
+                    refreshToken: refreshToken
                 });
             } else {
                 res.status(400).json({ error: "Invalid Credentials" });
diff --git a/src/util/auth.ts b/src/util/auth.ts
index d892bc3..863b931 100644
--- a/src/util/auth.ts
+++ b/src/util/auth.ts
@@ -6,7 +6,7 @@ const getAccessToken = (userId: Number) =>
 
 const getRefreshToken = (userId: Number, version: Number) =>
     // @ts-ignore
-    jwt.sign({ userId: userId,  version: version, }, process.env.REFRESH_TOKEN_SECRET, { expiresIn: "15d" });
+    jwt.sign({ userId: userId, version: version, }, process.env.REFRESH_TOKEN_SECRET, { expiresIn: "15d" });
 
 const verifyRefreshToken = (token: string) => {
     try {
-- 
cgit v1.2.3