feat(DTFS2-6711): link up account blocked page

e2e-tests/portal/cypress/e2e/journeys/login/resend-sign-in-link.spec.js

@@ -1,4 +1,4 @@
-const { checkYourEmail, signInLink } = require('../../pages');
+const { checkYourEmail, signInLink, landingPage } = require('../../pages');
 const relative = require('../../relativeURL');
 const MOCK_USERS = require('../../../../../e2e-fixtures');
 
@@ -64,6 +64,23 @@ context('Resending sign in links', () => {
       checkYourEmail.attemptsRemaining().should('not.exist');
       checkYourEmail.sendNewSignInLinkButton().should('not.exist');
     });
+
+    it('The user is blocked if they attempt to sign in after using all resend email attempts', () => {
+      checkYourEmail.attemptsRemaining().should('contain', '2 attempts remaining');
+      checkYourEmail.visit();
+      checkYourEmail.sendNewSignInLink();
+
+      checkYourEmail.visit();
+      checkYourEmail.sendNewSignInLink();
+
+      checkYourEmail.visit();
+      landingPage.visit();
+      cy.enterUsernameAndPassword(BANK1_MAKER1);
+
+      landingPage.accountSuspended().should('exist');
+      checkYourEmail.visit();
+      checkYourEmail.accountSuspended().should('exist');
+    });
   });
 });
 

e2e-tests/portal/cypress/e2e/pages/landingPage.js

@@ -6,6 +6,7 @@ const landingPage = {
   emailError: (text) => cy.get('[data-cy="email-error"]').contains(text),
   passwordError: (text) => cy.get('[data-cy="password-error"]').contains(text),
   expectError: (text) => cy.get('[data-cy="error-summary"]').contains(text),
+  accountSuspended: () => cy.get('[data-cy="account-suspended"]'),
 };
 
 module.exports = landingPage;

e2e-tests/portal/cypress/e2e/pages/login/check-your-email.js

@@ -4,6 +4,7 @@ const checkYourEmail = {
   obscuredSignInLinkTargetEmailAddressText: () => cy.get('[data-cy="obscured-sign-in-link-target-email-address"]'),
   attemptsRemaining: () => cy.get('[data-cy="attempts-remaining"]'),
   sendNewSignInLink: () => checkYourEmail.sendNewSignInLinkButton().click(),
+  accountSuspended: () => cy.get('[data-cy="account-suspended"]'),
   csrfToken: () => cy.get('[data-cy=csrf-input]').then((csrfInput) => csrfInput.attr('value')),
 };
 

portal-api/api-tests/api-test-users.js

@@ -1,7 +1,7 @@
 const api = require('./api');
 const db = require('../src/drivers/db-client');
 const { genPassword } = require('../src/crypto/utils');
-const wipeDB = require('./wipeDB');
+const databaseHelper = require('./database-helper');
 const { MAKER, CHECKER, ADMIN, READ_ONLY } = require('../src/v1/roles/roles');
 const { FEATURE_FLAGS } = require('../src/config/feature-flag.config');
 const { createLoggedInUserSession } = require('../test-helpers/api-test-helpers/database/user-repository');
@@ -266,7 +266,7 @@ const setUpApiTestUser = async (as) => {
 
 const initialise = async (app) => {
   if (notYetInitialised) {
-    await wipeDB.wipe(['users']);
+    await databaseHelper.wipe(['users']);
 
     const { as } = api(app);
 

portal-api/api-tests/database-helper.js

@@ -0,0 +1,76 @@
+const { ObjectId } = require('mongodb');
+const db = require('../src/drivers/db-client');
+
+const wipe = async (collections) => {
+  const drop = async (collection) =>
+    new Promise((resolve) => {
+      db.getCollection(collection).then((c) => c.drop(() => resolve()));
+    });
+
+  const dropPromises = [];
+  for (const collection of collections) {
+    dropPromises.push(drop(collection));
+  }
+  const dropped = await Promise.all(dropPromises);
+  return dropped;
+};
+
+const wipeAll = async () => {
+  const wiped = await wipe([
+    'deals',
+    'facilities',
+    'banks',
+    'transactions',
+    'industrySectors',
+    'mandatoryCriteria',
+    'eligibilityCriteria',
+    'users',
+    'gef-mandatoryCriteriaVersioned',
+  ]);
+  return wiped;
+};
+
+const deleteUser = async (user) => {
+  const { username } = user;
+
+  if (typeof username !== 'string') {
+    throw new Error('Invalid Username');
+  }
+
+  const usersCollection = await db.getCollection('users');
+  await usersCollection.deleteMany({ username: { $eq: username } });
+};
+
+const unsetUserProperties = async ({ username, properties }) => {
+  if (typeof username !== 'string') {
+    throw new Error('Invalid Username');
+  }
+
+  const unsetUpdate = properties.reduce((acc, property) => {
+    acc[property] = null;
+    return acc;
+  }, {});
+
+  const usersCollection = await db.getCollection('users');
+  await usersCollection.updateOne({ username: { $eq: username } }, { $unset: unsetUpdate });
+};
+
+const setUserProperties = async ({ username, update }) => {
+  if (typeof username !== 'string') {
+    throw new Error('Invalid Username');
+  }
+
+  const usersCollection = await db.getCollection('users');
+  await usersCollection.updateOne({ username: { $eq: username } }, { $set: update });
+};
+
+const getUserById = async (userId) => (await db.getCollection('users')).findOne({ _id: { $eq: ObjectId(userId) } });
+
+module.exports = {
+  wipe,
+  wipeAll,
+  deleteUser,
+  unsetUserProperties,
+  setUserProperties,
+  getUserById,
+};

portal-api/api-tests/v1/banks/banks.api-test.js

@@ -1,6 +1,6 @@
 const app = require('../../../src/createApp');
 const testUserCache = require('../../api-test-users');
-const wipeDB = require('../../wipeDB');
+const databaseHelper = require('../../database-helper');
 
 const { as } = require('../../api')(app);
 const { expectMongoId, expectMongoIds } = require('../../expectMongoIds');
@@ -28,7 +28,7 @@ describe.skip('/v1/banks', () => {
   });
 
   beforeEach(async () => {
-    await wipeDB.wipe(['banks']);
+    await databaseHelper.wipe(['banks']);
   });
 
   describe('GET /v1/banks', () => {

portal-api/api-tests/v1/bonds/bond-change-cover-start-date-validation.api-test.js

@@ -1,6 +1,6 @@
 const moment = require('moment');
 const aDeal = require('../deals/deal-builder');
-const wipeDB = require('../../wipeDB');
+const databaseHelper = require('../../database-helper');
 const app = require('../../../src/createApp');
 const testUserCache = require('../../api-test-users');
 const { as } = require('../../api')(app);
@@ -73,8 +73,8 @@ describe('/v1/deals/:id/bond/:bondId/change-cover-start-date', () => {
   });
 
   beforeEach(async () => {
-    await wipeDB.wipe(['deals']);
-    await wipeDB.wipe(['facilities']);
+    await databaseHelper.wipe(['deals']);
+    await databaseHelper.wipe(['facilities']);
   });
 
   describe('PUT /v1/deals/:id/bond/:bondId/change-cover-start-date', () => {

portal-api/api-tests/v1/bonds/bond-change-cover-start-date.api-test.js

@@ -1,5 +1,5 @@
 const moment = require('moment');
-const wipeDB = require('../../wipeDB');
+const databaseHelper = require('../../database-helper');
 const aDeal = require('../deals/deal-builder');
 const app = require('../../../src/createApp');
 const testUserCache = require('../../api-test-users');
@@ -78,8 +78,8 @@ describe('/v1/deals/:id/bond/change-cover-start-date', () => {
   });
 
   beforeEach(async () => {
-    await wipeDB.wipe(['deals']);
-    await wipeDB.wipe(['facilities']);
+    await databaseHelper.wipe(['deals']);
+    await databaseHelper.wipe(['facilities']);
     await createDealAndBond();
   });
 

portal-api/api-tests/v1/bonds/bond-issue-facility-validation.api-test.js

@@ -1,6 +1,6 @@
 const moment = require('moment');
 const aDeal = require('../deals/deal-builder');
-const wipeDB = require('../../wipeDB');
+const databaseHelper = require('../../database-helper');
 const app = require('../../../src/createApp');
 const testUserCache = require('../../api-test-users');
 const { as } = require('../../api')(app);
@@ -75,8 +75,8 @@ describe('/v1/deals/:id/bond/:bondId/issue-facility', () => {
   });
 
   beforeEach(async () => {
-    await wipeDB.wipe(['deals']);
-    await wipeDB.wipe(['facilities']);
+    await databaseHelper.wipe(['deals']);
+    await databaseHelper.wipe(['facilities']);
   });
 
   describe('PUT /v1/deals/:id/bond/:bondId/issue-facility', () => {

portal-api/api-tests/v1/bonds/bond-issue-facility.api-test.js

@@ -1,5 +1,5 @@
 const moment = require('moment');
-const wipeDB = require('../../wipeDB');
+const databaseHelper = require('../../database-helper');
 const aDeal = require('../deals/deal-builder');
 const app = require('../../../src/createApp');
 const testUserCache = require('../../api-test-users');
@@ -90,8 +90,8 @@ describe('/v1/deals/:id/bond/:id/issue-facility', () => {
   });
 
   beforeEach(async () => {
-    await wipeDB.wipe(['deals']);
-    await wipeDB.wipe(['facilities']);
+    await databaseHelper.wipe(['deals']);
+    await databaseHelper.wipe(['facilities']);
     await createBond();
   });
 

portal-api/api-tests/v1/bonds/bonds-validation.api-test.js

@@ -1,5 +1,5 @@
 const moment = require('moment');
-const wipeDB = require('../../wipeDB');
+const databaseHelper = require('../../database-helper');
 const aDeal = require('../deals/deal-builder');
 const app = require('../../../src/createApp');
 const testUserCache = require('../../api-test-users');
@@ -61,8 +61,8 @@ describe('/v1/deals/:id/bond', () => {
   });
 
   beforeEach(async () => {
-    await wipeDB.wipe(['deals']);
-    await wipeDB.wipe(['facilities']);
+    await databaseHelper.wipe(['deals']);
+    await databaseHelper.wipe(['facilities']);
 
     const dealResponse = await as(aBarclaysMaker).post(newDeal).to('/v1/deals/');
     deal = dealResponse.body;

portal-api/api-tests/v1/bonds/bonds.api-test.js

@@ -1,5 +1,5 @@
 const moment = require('moment');
-const wipeDB = require('../../wipeDB');
+const databaseHelper = require('../../database-helper');
 const aDeal = require('../deals/deal-builder');
 const app = require('../../../src/createApp');
 const testUserCache = require('../../api-test-users');
@@ -98,8 +98,8 @@ describe('/v1/deals/:id/bond', () => {
   });
 
   beforeEach(async () => {
-    await wipeDB.wipe(['deals']);
-    await wipeDB.wipe(['facilities']);
+    await databaseHelper.wipe(['deals']);
+    await databaseHelper.wipe(['facilities']);
   });
 
   describe('GET /v1/deals/:id/bond/:id', () => {

portal-api/api-tests/v1/deals/deal-clone.api-test.js

@@ -1,4 +1,4 @@
-const wipeDB = require('../../wipeDB');
+const databaseHelper = require('../../database-helper');
 const app = require('../../../src/createApp');
 const testUserCache = require('../../api-test-users');
 const completedDeal = require('../../fixtures/deal-fully-completed');
@@ -57,7 +57,7 @@ describe('/v1/deals/:id/clone', () => {
   });
 
   beforeEach(async () => {
-    await wipeDB.wipe(['deals', 'facilities']);
+    await databaseHelper.wipe(['deals', 'facilities']);
   });
 
   describe('POST /v1/deals/:id/clone', () => {

portal-api/api-tests/v1/deals/deal-comments.api-test.js

@@ -1,4 +1,4 @@
-const wipeDB = require('../../wipeDB');
+const databaseHelper = require('../../database-helper');
 
 const app = require('../../../src/createApp');
 const testUserCache = require('../../api-test-users');
@@ -31,8 +31,8 @@ describe('deal comments controller', () => {
   });
 
   afterEach(async () => {
-    await wipeDB.wipe(['deals']);
-    await wipeDB.wipe(['facilities']);
+    await databaseHelper.wipe(['deals']);
+    await databaseHelper.wipe(['facilities']);
   });
 
   it('should update a comment', async () => {

portal-api/api-tests/v1/deals/deal-eligibility-criteria.api-test.js

@@ -1,4 +1,4 @@
-const wipeDB = require('../../wipeDB');
+const databaseHelper = require('../../database-helper');
 const aDeal = require('./deal-builder');
 
 const app = require('../../../src/createApp');
@@ -34,8 +34,8 @@ describe('/v1/deals/:id/eligibility-criteria', () => {
   });
 
   beforeEach(async () => {
-    await wipeDB.wipe(['deals']);
-    await wipeDB.wipe(['facilities']);
+    await databaseHelper.wipe(['deals']);
+    await databaseHelper.wipe(['facilities']);
   });
 
   describe('PUT /v1/deals/:id/eligibility-criteria', () => {

portal-api/api-tests/v1/deals/deal-eligibility-documentation.api-test.js

@@ -1,4 +1,4 @@
-const wipeDB = require('../../wipeDB');
+const databaseHelper = require('../../database-helper');
 const aDeal = require('./deal-builder');
 
 const app = require('../../../src/createApp');
@@ -33,8 +33,8 @@ describe('/v1/deals/:id/eligibility-documentation', () => {
   });
 
   beforeEach(async () => {
-    await wipeDB.wipe(['deals']);
-    await wipeDB.wipe(['facilities']);
+    await databaseHelper.wipe(['deals']);
+    await databaseHelper.wipe(['facilities']);
   });
 
   describe('GET /v1/deals/:id/eligibility-documentation/:fieldname/:filename', () => {

portal-api/api-tests/v1/deals/deal-name.api-test.js

@@ -1,4 +1,4 @@
-const wipeDB = require('../../wipeDB');
+const databaseHelper = require('../../database-helper');
 const aDeal = require('./deal-builder');
 
 const app = require('../../../src/createApp');
@@ -36,8 +36,8 @@ describe('/v1/deals/:id/additionalRefName', () => {
   });
 
   beforeEach(async () => {
-    await wipeDB.wipe(['deals']);
-    await wipeDB.wipe(['facilities']);
+    await databaseHelper.wipe(['deals']);
+    await databaseHelper.wipe(['facilities']);
   });
 
   describe('PUT /v1/deals/:id/additionalRefName', () => {

portal-api/api-tests/v1/deals/deal-status-accepted.api-test.js

@@ -1,5 +1,5 @@
 const moment = require('moment');
-const wipeDB = require('../../wipeDB');
+const databaseHelper = require('../../database-helper');
 
 const app = require('../../../src/createApp');
 const testUserCache = require('../../api-test-users');
@@ -14,8 +14,8 @@ describe('PUT /v1/deals/:id/status - to `Accepted by UKEF`', () => {
   let aSuperuser;
 
   beforeAll(async () => {
-    await wipeDB.wipe(['deals']);
-    await wipeDB.wipe(['facilities']);
+    await databaseHelper.wipe(['deals']);
+    await databaseHelper.wipe(['facilities']);
     const testUsers = await testUserCache.initialise(app);
     const barclaysMakers = testUsers().withRole(MAKER).withBankName('Barclays Bank').all();
     [aBarclaysMaker] = barclaysMakers;

portal-api/api-tests/v1/deals/deal-validation.api-test.js

@@ -1,4 +1,4 @@
-const wipeDB = require('../../wipeDB');
+const databaseHelper = require('../../database-helper');
 const app = require('../../../src/createApp');
 const testUserCache = require('../../api-test-users');
 const { as } = require('../../api')(app);
@@ -13,8 +13,8 @@ describe('/v1/deals', () => {
   });
 
   beforeEach(async () => {
-    await wipeDB.wipe(['deals']);
-    await wipeDB.wipe(['facilities']);
+    await databaseHelper.wipe(['deals']);
+    await databaseHelper.wipe(['facilities']);
   });
 
   describe('POST /v1/deals', () => {