feat/sessions

__tests__/data/usecases/db-signout.spec.ts

@@ -13,14 +13,17 @@ const makeSut = () => {
 describe('Signout Usecases', () => {
   it('Should call signoutRepository with correct accountId', async () => {
     const { sut, signoutRepository } = makeSut();
-    await sut('any_account_id');
-    expect(signoutRepository).toHaveBeenCalledWith('any_account_id');
+    await sut('any_account_id', 'valid_accessToken');
+    expect(signoutRepository).toHaveBeenCalledWith(
+      'any_account_id',
+      'valid_accessToken'
+    );
   });
 
   it('Should throw if signoutRepository throws', async () => {
     const { sut, signoutRepository } = makeSut();
     signoutRepository.mockRejectedValue(new Error());
-    const promise = sut('any_account_id');
+    const promise = sut('any_account_id', 'valid_accessToken');
     await expect(promise).rejects.toThrow();
   });
 });

__tests__/infra/db/mongoose/repositories/load-account-by-token-repository.spec.ts

@@ -17,7 +17,7 @@ describe('LoadAccountByTokenMongoRepository', () => {
 
   it('Should return null account loaded not found', async () => {
     const sut = makeSut();
-    const account = await sut(faker.random.uuid());
+    const account = await sut(faker.random.alphaNumeric(10));
     expect(account).toBeNull();
   });
 
@@ -29,10 +29,15 @@ describe('LoadAccountByTokenMongoRepository', () => {
       lastName: faker.name.lastName(),
       email: faker.internet.email(),
       password: faker.internet.password(),
-      accessToken,
+      sessions: [
+        {
+          accessToken,
+          createdAt: new Date(2023, 9, 24),
+          updatedAt: new Date(2023, 9, 24),
+        },
+      ],
     });
     const account = await sut(accessToken);
     expect(account).toBeTruthy();
-    expect(account.accessToken).toBe(accessToken);
   });
 });

__tests__/infra/db/mongoose/repositories/signout-repository.spec.ts

@@ -23,11 +23,17 @@ describe('SignoutRepository', () => {
       lastName: faker.name.lastName(),
       email: faker.internet.email(),
       password: faker.internet.password(),
-      accessToken,
+      sessions: [
+        {
+          accessToken,
+          createdAt: new Date(2023, 9, 24),
+          updatedAt: new Date(2023, 9, 24),
+        },
+      ],
     });
-    expect(account.accessToken).toBe(accessToken);
-    await sut(account.id);
+    expect(account.sessions[0].accessToken).toBe(accessToken);
+    await sut(account.id, accessToken);
     const result = await AccountModel.findById(account.id);
-    expect(result.accessToken).toBeNull();
+    expect(result.sessions).toHaveLength(0);
   });
 });

__tests__/infra/db/mongoose/repositories/update-access-token-repository.spec.ts

@@ -23,10 +23,10 @@ describe('UpdateAccessTokenMongoRepository', () => {
       email: faker.internet.email(),
       password: faker.internet.password(),
     });
-    expect(account.accessToken).toBeFalsy();
+    expect(account.sessions).toHaveLength(0);
     const accessToken = faker.datatype.uuid();
     await sut(account.id, accessToken);
     const result = await AccountModel.findById(account.id);
-    expect(result.accessToken).toBe(accessToken);
+    expect(result.sessions).toHaveLength(1);
   });
 });

__tests__/interface/controllers/signout-controller.spec.ts

@@ -6,6 +6,9 @@ import { mockSignout } from '@test-suite/interface';
 const makeSut = () => {
   const mockHttpRequest = (): HttpRequest => ({
     accountId: 'any_account_id',
+    headers: {
+      'x-access-token': 'Bearer any_token',
+    },
   });
   const signout = jest.fn(mockSignout());
   const sut = signoutController({ signout });
@@ -16,7 +19,7 @@ describe('SignoutController', () => {
   it('Should call signout with correct accountId', async () => {
     const { sut, signout, mockHttpRequest } = makeSut();
     await sut(mockHttpRequest());
-    expect(signout).toHaveBeenCalledWith('any_account_id');
+    expect(signout).toHaveBeenCalledWith('any_account_id', 'any_token');
   });
 
   it('Should return 500 if signout throws', async () => {

__tests__/main/routes/signout-route.test.ts

@@ -20,12 +20,16 @@ describe('Delete /signout', () => {
 
   it('Should return 204 on signout success', async () => {
     const accessToken = await mockAuthenticateUser();
-    const accountBeforeSignout = await AccountModel.findOne({ accessToken });
+    const accountBeforeSignout = await AccountModel.findOne({
+      'sessions.accessToken': accessToken,
+    });
     await request(app)
       .delete('/api/v1/signout')
       .set('x-access-token', accessToken)
       .expect(204);
-    const accountAfterSignout = await AccountModel.findOne({ accessToken });
+    const accountAfterSignout = await AccountModel.findOne({
+      'sessions.accessToken': accessToken,
+    });
     expect(accountBeforeSignout).toBeTruthy();
     expect(accountAfterSignout).toBeFalsy();
   });

globalConfig.json

@@ -1 +1 @@
-{"mongoUri":"mongodb://127.0.0.1:32875/"}
+{"mongoUri":"mongodb://127.0.0.1:46787/"}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "auth-microservice",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "",
   "main": "index.js",
   "scripts": {

src/data/protocols/db/signout-repository.ts

@@ -1,7 +1,8 @@
 import { Signout } from '@src/domain/usecases';
 
 export type SignoutRepository = (
-  accountId: string
+  accountId: string,
+  accessToken: string
 ) => SignoutRepository.Response;
 
 export namespace SignoutRepository {

src/data/usecases/db-signout/index.ts

@@ -2,6 +2,6 @@ import { BuildDbSignoutRepository } from './protocols';
 
 export const dbSignout: BuildDbSignoutRepository =
   ({ signoutRepository }) =>
-  async (accountId: string) => {
-    await signoutRepository(accountId);
+  async (accountId: string, accessToken: string) => {
+    await signoutRepository(accountId, accessToken);
   };

src/domain/models/account.ts

@@ -1,12 +1,18 @@
+type Session = {
+  accessToken: string;
+  createdAt: Date;
+  updatedAt: Date;
+};
+
 export type AccountModel = {
   id: string;
   firstName: string;
   lastName: string;
   email: string;
   password: string;
-  accessToken?: string;
-  forgotPasswordAccessToken?: number;
-  forgotPasswordExpiresIn?: Date;
-  createdAt?: Date;
-  updatedAt?: Date;
+  sessions: Session[];
+  forgotPasswordAccessToken: number;
+  forgotPasswordExpiresIn: Date;
+  createdAt: Date;
+  updatedAt: Date;
 };

src/domain/usecases/signout.ts

@@ -1,4 +1,7 @@
-export type Signout = (accountId: string) => Signout.Response;
+export type Signout = (
+  accountId: string,
+  accessToken: string
+) => Signout.Response;
 
 export namespace Signout {
   export type Response = Promise<void>;

src/infra/db/mongoose/models/account-models.ts

@@ -5,6 +5,16 @@ import {
   Schemas,
 } from './models-protocols';
 
+const SessionSchema = new Schema(
+  {
+    accessToken: {
+      type: String,
+      required: true,
+    },
+  },
+  { timestamps: true }
+);
+
 const AccountSchema = new Schema<AccountDocument>(
   {
     firstName: {
@@ -29,8 +39,9 @@ const AccountSchema = new Schema<AccountDocument>(
       required: true,
       minlength: [6, 'password must be at least 6 characters'],
     },
-    accessToken: {
-      type: String,
+    sessions: {
+      type: [SessionSchema],
+      default: [],
     },
     forgotPasswordAccessToken: {
       type: Number,

src/infra/db/mongoose/repositories/index.ts

@@ -33,15 +33,21 @@ export const loadAccountByIdRepository: LoadAccountByIdRepository = async (
 
 export const loadAccountByTokenRepository: LoadAccountByTokenRepository =
   async (accessToken) => {
-    const account = await AccountModel.findOne({ accessToken }).lean();
+    const account = await AccountModel.findOne({
+      'sessions.accessToken': accessToken,
+    }).lean();
     return MongoHelper.serialize(account);
   };
 
 export const updateAccessTokenRepository: UpdateAccessTokenRepository = async (
   id,
   token
 ) => {
-  await AccountModel.findByIdAndUpdate(id, { accessToken: token });
+  await AccountModel.findByIdAndUpdate(id, {
+    $push: {
+      sessions: { accessToken: token },
+    },
+  });
 };
 
 export const updateForgotPasswordAccessTokenRepository: UpdateForgotPasswordAccessTokenRepository =
@@ -68,8 +74,11 @@ export const updatePasswordRepository: UpdatePasswordRepository = async (
   });
 };
 
-export const signoutRepository: SignoutRepository = async (id) => {
-  await AccountModel.findByIdAndUpdate(id, {
-    accessToken: null,
+export const signoutRepository: SignoutRepository = async (
+  accountId,
+  accessToken
+) => {
+  await AccountModel.findByIdAndUpdate(accountId, {
+    $pull: { sessions: { accessToken } },
   });
 };

src/interface/controllers/signout/index.ts

@@ -4,7 +4,11 @@ import { BuildSignoutController } from './protocols';
 const buildSignoutController: BuildSignoutController =
   ({ signout }) =>
   async (httpRequest) => {
-    await signout(httpRequest.accountId);
+    const header =
+      httpRequest.headers?.['x-access-token'] ||
+      httpRequest.headers?.authorization;
+    const accessToken = header.replace(/^Bearer\s+/, '');
+    await signout(httpRequest.accountId, accessToken);
     return noContent();
   };
 

test-suite/domain/index.ts

@@ -9,8 +9,16 @@ export const mockAccount = (): AccountModel => {
     lastName: 'valid_last_name',
     email: 'valid_email',
     password: 'valid_password',
-    accessToken: 'valid_accessToken',
+    sessions: [
+      {
+        accessToken: 'valid_accessToken',
+        createdAt: new Date(2023, 9, 24),
+        updatedAt: new Date(2023, 9, 24),
+      },
+    ],
     forgotPasswordAccessToken: 123456,
     forgotPasswordExpiresIn: date,
+    createdAt: new Date(2023, 9, 24),
+    updatedAt: new Date(2023, 9, 24),
   };
 };

test-suite/helper/index.ts

@@ -37,7 +37,18 @@ export const mockCreateAccountOnDb =
 export const mockAuthenticateUser = async (): Promise<string> => {
   const { accountId } = await mockCreateAccountOnDb();
   const accessToken = sign({ accountId }, env.jwtSecret);
-  await AccountModel.updateOne({ _id: accountId }, { accessToken });
+  await AccountModel.updateOne(
+    { _id: accountId },
+    {
+      sessions: [
+        {
+          accessToken,
+          createdAt: new Date(),
+          updatedAt: new Date(),
+        },
+      ],
+    }
+  );
   return accessToken;
 };