fix(login): return data in the old format, no breaking change

middlewares/login.js

@@ -19,15 +19,15 @@ module.exports.login = async (req, res) => {
     });
 
     if (!user) {
-        return errors.makeUnauthorizedError(res, 'User is not found.');
+        return errors.makeForbiddenError(res, 'User is not found.');
     }
 
     if (!await user.checkPassword(req.body.password)) {
-        return errors.makeUnauthorizedError(res, 'Password is not valid.');
+        return errors.makeForbiddenError(res, 'Password is not valid.');
     }
 
     if (!user.mail_confirmed_at) {
-        return errors.makeUnauthorizedError(res, 'Please confirm your mail first.');
+        return errors.makeForbiddenError(res, 'Please confirm your mail first.');
     }
 
     // Some fields can be empty while registering, but we shouldn't allow login for such users.
@@ -43,10 +43,8 @@ module.exports.login = async (req, res) => {
 
     return res.json({
         success: true,
-        data: {
-            access_token: accessToken.value,
-            refresh_token: refreshToken.value
-        }
+        access_token: accessToken.value,
+        refresh_token: refreshToken.value
     });
 };
 
@@ -110,7 +108,7 @@ module.exports.renew = async (req, res) => {
     });
 
     if (!token) {
-        return res.status(401).json({
+        return res.status(403).json({
             success: false,
             message: 'Token is not found.'
         });

package.json

@@ -70,7 +70,7 @@
   },
   "dependencies": {
     "@bugsnag/js": "^6.5.0",
-    "bcrypt": "^3.0.7",
+    "bcrypt": "^3.0.8",
     "body-parser": "^1.19.0",
     "eslint": "^6.8.0",
     "express": "^4.17.1",

scripts/seed.js

@@ -22,7 +22,7 @@ async function createAdmin() {
         last_name: 'Admin',
         username: 'admin',
         email: 'admin@example.com',
-        password: '5ecret5ecret',
+        password: '5ecr3t5ecr3t',
         about_me: 'I\'m the superadmin of the system, please do not remove me.',
         date_of_birth: '1970-01-01',
         gender: 'machine',

test/api/authorization.test.js

@@ -26,7 +26,7 @@ describe('Authorization', () => {
             }
         });
 
-        expect(res.statusCode).toEqual(401);
+        expect(res.statusCode).toEqual(403);
         expect(res.body.success).toEqual(false);
         expect(res.body).not.toHaveProperty('data');
         expect(res.body).toHaveProperty('message');
@@ -44,7 +44,7 @@ describe('Authorization', () => {
             }
         });
 
-        expect(res.statusCode).toEqual(401);
+        expect(res.statusCode).toEqual(403);
         expect(res.body.success).toEqual(false);
         expect(res.body).not.toHaveProperty('data');
         expect(res.body).toHaveProperty('message');
@@ -62,7 +62,7 @@ describe('Authorization', () => {
             }
         });
 
-        expect(res.statusCode).toEqual(401);
+        expect(res.statusCode).toEqual(403);
         expect(res.body.success).toEqual(false);
         expect(res.body).not.toHaveProperty('data');
         expect(res.body).toHaveProperty('message');
@@ -80,7 +80,7 @@ describe('Authorization', () => {
             }
         });
 
-        expect(res.statusCode).toEqual(401);
+        expect(res.statusCode).toEqual(403);
         expect(res.body.success).toEqual(false);
         expect(res.body).not.toHaveProperty('data');
         expect(res.body).toHaveProperty('message');
@@ -120,7 +120,8 @@ describe('Authorization', () => {
 
         expect(res.statusCode).toEqual(200);
         expect(res.body.success).toEqual(true);
-        expect(res.body).toHaveProperty('data');
+        expect(res.body).toHaveProperty('access_token');
+        expect(res.body).toHaveProperty('refresh_token');
         expect(res.body).not.toHaveProperty('errors');
     });
 
@@ -138,7 +139,8 @@ describe('Authorization', () => {
 
         expect(res.statusCode).toEqual(200);
         expect(res.body.success).toEqual(true);
-        expect(res.body).toHaveProperty('data');
+        expect(res.body).toHaveProperty('access_token');
+        expect(res.body).toHaveProperty('refresh_token');
         expect(res.body).not.toHaveProperty('errors');
     });
 
@@ -156,7 +158,8 @@ describe('Authorization', () => {
 
         expect(res.statusCode).toEqual(200);
         expect(res.body.success).toEqual(true);
-        expect(res.body).toHaveProperty('data');
+        expect(res.body).toHaveProperty('access_token');
+        expect(res.body).toHaveProperty('refresh_token');
         expect(res.body).not.toHaveProperty('errors');
     });
 });

test/api/renew.test.js

@@ -25,7 +25,7 @@ describe('Tokens renewal', () => {
             }
         });
 
-        expect(res.statusCode).toEqual(401);
+        expect(res.statusCode).toEqual(403);
         expect(res.body.success).toEqual(false);
         expect(res.body).not.toHaveProperty('data');
         expect(res.body).toHaveProperty('message');