refactor: refresh token

package-lock.json

@@ -18,7 +18,8 @@
         "knex": "^2.2.0",
         "multer": "^1.4.5-lts.1",
         "sqlite3": "^5.0.11",
-        "swagger-ui-express": "^4.5.0"
+        "swagger-ui-express": "^4.5.0",
+        "uuid": "^9.0.0"
       },
       "devDependencies": {
         "nodemon": "^2.0.19"
@@ -2534,6 +2535,14 @@
         "node": ">= 0.4.0"
       }
     },
+    "node_modules/uuid": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
+      "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
     "node_modules/vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
@@ -4509,6 +4518,11 @@
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
       "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="
     },
+    "uuid": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
+      "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg=="
+    },
     "vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",

package.json

@@ -21,9 +21,10 @@
     "knex": "^2.2.0",
     "multer": "^1.4.5-lts.1",
     "sqlite3": "^5.0.11",
-    "swagger-ui-express": "^4.5.0"
+    "swagger-ui-express": "^4.5.0",
+    "uuid": "^9.0.0"
   },
   "devDependencies": {
     "nodemon": "^2.0.19"
   }
-}
+}

src/controllers/SessionsController.js

@@ -23,14 +23,12 @@ class SessionsController {
     const generateTokenProvider = new GenerateToken();
     const token = await generateTokenProvider.execute(user.id);
 
-    await knex("users_tokens").where({ user_id: user.id }).delete();
-
     const generateRefreshToken = new GenerateRefreshToken();
-    generateRefreshToken.execute(user.id, token);
+    const refresh_token = await generateRefreshToken.execute(user.id);
 
     delete user.password;
 
-    response.status(201).json({ token, user });
+    response.status(201).json({ user, token, refresh_token });
   }
 }
 

src/controllers/UserRefreshToken.js

@@ -6,33 +6,33 @@ const dayjs = require("dayjs");
 
 class UserRefreshToken {
   async create(request, response) {
-    const { token } = request.body;
+    const { refresh_token } = request.body;
 
-    if (!token) {
+    if (!refresh_token) {
       throw new AppError("Informe o token de autenticação.", 401);
     }
 
-    const userToken = await knex("users_tokens").where({ token }).first();
+    const refreshToken = await knex("refresh_token").where({ refresh_token }).first();
 
-    if (!userToken) {
-      throw new AppError("Refresh token não encontrado para este usuário.", 404);
+    if (!refreshToken) {
+      throw new AppError("Refresh token não encontrado para este usuário.", 401);
     }
 
     const generateTokenProvider = new GenerateToken();
-    const refreshToken = await generateTokenProvider.execute(userToken.user_id);
+    const token = await generateTokenProvider.execute(refreshToken.user_id);
 
-    const refreshTokenExpired = dayjs().isAfter(dayjs.unix(userToken.expires_in));
+    const refreshTokenExpired = dayjs().isAfter(dayjs.unix(refreshToken.expires_in));
 
     if (refreshTokenExpired) {
-      await knex("users_tokens").where({ user_id: userToken.user_id }).delete();
+      await knex("refresh_token").where({ user_id: refreshToken.user_id }).delete();
 
       const generateRefreshToken = new GenerateRefreshToken();
-      await generateRefreshToken.execute(userToken.user_id, refreshToken);
+      const newRefreshToken = await generateRefreshToken.execute(refreshToken.user_id, refresh_token);
 
-      return response.json({ token: refreshToken });
+      return response.json({ token, refresh_token: newRefreshToken });
     }
 
-    return response.json({ token });
+    return response.json({ token, refresh_token });
   }
 }
 

src/database/migrations/20220823161207_createUsersToken.js

@@ -1,9 +1,9 @@
-exports.up = knex => knex.schema.createTable("users_tokens", table => {
+exports.up = knex => knex.schema.createTable("refresh_token", table => {
   table.increments("id");
   table.integer("expires_in")
+  table.text("refresh_token")
   table.integer("user_id").references("id").inTable("users");
-  table.text("token").notNullable();
   table.timestamp("created_at").default(knex.fn.now());
 });
 
-exports.down = knex => knex.schema.dropTable("users_tokens");
+exports.down = knex => knex.schema.dropTable("users_tokens");

src/middlewares/ensureAuthenticated.js

@@ -9,7 +9,6 @@ async function ensureAuthenticated(request, response, next) {
     throw new AppError("JWT token não informado", 401);
   }
 
-
   const [, token] = authHeader.split(" ");
 
   try {

src/providers/GenerateRefreshToken.js

@@ -1,15 +1,21 @@
 const knex = require("../database");
 const dayjs = require("dayjs");
+const uuid = require('uuid')
 
 class GenerateRefreshToken {
-  async execute(userId, newToken) {
-    const expires_in = dayjs().add(15, "second").unix();
+  async execute(user_id) {
+    await knex("refresh_token").where({ user_id }).delete();
 
-    await knex("users_tokens").insert({
-      user_id: userId,
+    const expires_in = dayjs().add(15, "m").unix();
+    const refresh_token = uuid.v4();
+
+    await knex("refresh_token").insert({
+      user_id,
       expires_in,
-      token: newToken
+      refresh_token
     });
+
+    return refresh_token;
   }
 }