passbolt-browser-extension 5.13.0 → 5.14.2

package/src/all/background_page/controller/account/updatePrivateKeyController.test.js

@@ -24,7 +24,11 @@ import FileService from "../../service/file/fileService";
 import SsoDataStorage from "../../service/indexedDB_storage/ssoDataStorage";
 import { clientSsoKit } from "../../model/entity/sso/ssoKitClientPart.test.data";
 import GenerateSsoKitService from "../../service/sso/generateSsoKitService";
-import { anonymousOrganizationSettings } from "../../model/entity/organizationSettings/organizationSettingsEntity.test.data";
+import { anonymousSiteSettings } from "passbolt-styleguide/src/shared/models/entity/siteSettings/siteSettingsEntity.test.data";
+import SiteSettingsEntity from "passbolt-styleguide/src/shared/models/entity/siteSettings/siteSettingsEntity";
+import GetOrFindSiteSettingsService from "../../service/siteSettings/getOrFindSiteSettingsService";
+import AccountEntity from "../../model/entity/account/accountEntity";
+import { defaultAccountDto } from "../../model/entity/account/accountEntity.test.data";
 import { mockApiResponse, mockApiResponseError } from "../../../../../test/mocks/mockApiResponse";
 import { enableFetchMocks } from "jest-fetch-mock";
 import SsoKitClientPartEntity from "../../model/entity/sso/ssoKitClientPartEntity";
@@ -42,14 +46,15 @@ beforeEach(() => {
 });
 
 describe("UpdatePrivateKeyController", () => {
+  const account = new AccountEntity(defaultAccountDto());
   const mockOrganisationSettingCall = (ssoEnabled = false) => {
-    const organizationSettings = anonymousOrganizationSettings();
+    const organizationSettings = anonymousSiteSettings();
     if (ssoEnabled) {
       organizationSettings.passbolt.plugins.sso = { enabled: true };
     }
-    fetch.doMockOnceIf(new RegExp("/settings.json"), () =>
-      mockApiResponse(organizationSettings, { servertime: Date.now() / 1000 }),
-    );
+    jest
+      .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+      .mockImplementation(() => new SiteSettingsEntity(organizationSettings));
   };
 
   describe("UpdatePrivateKeyController::exec", () => {
@@ -76,7 +81,7 @@ describe("UpdatePrivateKeyController", () => {
         },
       };
 
-      const controller = new UpdatePrivateKeyController(worker, null, defaultApiClientOptions());
+      const controller = new UpdatePrivateKeyController(worker, null, defaultApiClientOptions(), account);
       const oldPassphrase = pgpKeys.ada.passphrase;
       const newPassphrase = "newPassphrase";
       await controller.exec(oldPassphrase, newPassphrase);
@@ -85,7 +90,7 @@ describe("UpdatePrivateKeyController", () => {
     it("Should throw an error if no passphrase is provided.", async () => {
       expect.assertions(2);
       await MockExtension.withConfiguredAccount();
-      const controller = new UpdatePrivateKeyController(null, null, defaultApiClientOptions());
+      const controller = new UpdatePrivateKeyController(null, null, defaultApiClientOptions(), account);
 
       const nullPassphrase = null;
       const stringPassphrase = "stringPassphrase";
@@ -106,7 +111,7 @@ describe("UpdatePrivateKeyController", () => {
     it("Should throw an error if passphrases are not strings.", async () => {
       expect.assertions(2);
       await MockExtension.withConfiguredAccount();
-      const controller = new UpdatePrivateKeyController(null, null, defaultApiClientOptions());
+      const controller = new UpdatePrivateKeyController(null, null, defaultApiClientOptions(), account);
 
       const notStringPassphrase = {};
       const stringPassphrase = "stringPassphrase";
@@ -164,7 +169,7 @@ describe("UpdatePrivateKeyController", () => {
 
       mockedSaveFile.mockImplementation(async () => {});
 
-      const controller = new UpdatePrivateKeyController(worker, null, defaultApiClientOptions());
+      const controller = new UpdatePrivateKeyController(worker, null, defaultApiClientOptions(), account);
       const oldPassphrase = pgpKeys.ada.passphrase;
       await controller.exec(oldPassphrase, newPassphrase);
     });
@@ -195,7 +200,7 @@ describe("UpdatePrivateKeyController", () => {
 
       mockedSaveFile.mockImplementation(() => {});
 
-      const controller = new UpdatePrivateKeyController(worker, null, defaultApiClientOptions());
+      const controller = new UpdatePrivateKeyController(worker, null, defaultApiClientOptions(), account);
       await controller.exec(pgpKeys.ada.passphrase, "newPassphrase");
 
       expect(GenerateSsoKitService.generateSsoKits).not.toHaveBeenCalled();
@@ -235,7 +240,7 @@ describe("UpdatePrivateKeyController", () => {
 
       mockedSaveFile.mockImplementation(async () => {});
 
-      const controller = new UpdatePrivateKeyController(worker, null, defaultApiClientOptions());
+      const controller = new UpdatePrivateKeyController(worker, null, defaultApiClientOptions(), account);
       const oldPassphrase = pgpKeys.ada.passphrase;
       try {
         await controller.exec(oldPassphrase, newPassphrase);
@@ -281,7 +286,7 @@ describe("UpdatePrivateKeyController", () => {
 
       mockedSaveFile.mockImplementation(async () => {});
 
-      const controller = new UpdatePrivateKeyController(worker, null, defaultApiClientOptions());
+      const controller = new UpdatePrivateKeyController(worker, null, defaultApiClientOptions(), account);
       const oldPassphrase = pgpKeys.ada.passphrase;
       await controller.exec(oldPassphrase, newPassphrase);
     });
@@ -320,7 +325,7 @@ describe("UpdatePrivateKeyController", () => {
 
       mockedSaveFile.mockImplementation(async () => {});
 
-      const controller = new UpdatePrivateKeyController(worker, null, defaultApiClientOptions());
+      const controller = new UpdatePrivateKeyController(worker, null, defaultApiClientOptions(), account);
       try {
         await controller.exec("wrong passphrase", newPassphrase);
       } catch (e) {

package/src/all/background_page/controller/accountRecovery/accountRecoveryGenerateOrganizationKeyController.js

@@ -24,11 +24,13 @@ class AccountRecoveryGenerateOrganizationKeyController {
    * @param {Worker} worker
    * @param {string} requestId uuid
    * @param {ApiClientOptions} apiClientOptions The api client options.
+   * @param {AccountEntity} account The user account.
    */
-  constructor(worker, requestId, apiClientOptions) {
+  constructor(worker, requestId, apiClientOptions, account) {
     this.worker = worker;
     this.requestId = requestId;
     this.apiClientOptions = apiClientOptions;
+    this.account = account;
   }
 
   /**
@@ -54,7 +56,7 @@ class AccountRecoveryGenerateOrganizationKeyController {
   async exec(generateGpgKeyPairOptionsDto = {}) {
     generateGpgKeyPairOptionsDto = {
       ...generateGpgKeyPairOptionsDto,
-      date: await GetGpgKeyCreationDateService.getDate(this.apiClientOptions),
+      date: await GetGpgKeyCreationDateService.getDate(this.account, this.apiClientOptions),
     };
     const generateKeyPairOptions =
       GenerateGpgKeyPairOptionsEntity.createForOrkKeyGeneration(generateGpgKeyPairOptionsDto);

package/src/all/background_page/controller/accountRecovery/accountRecoveryGenerateOrganizationKeyController.test.js

@@ -16,12 +16,29 @@ import AccountRecoveryGenerateOrganizationKeyController from "./accountRecoveryG
 import MockExtension from "../../../../../test/mocks/mockExtension";
 import { defaultApiClientOptions } from "passbolt-styleguide/src/shared/lib/apiClient/apiClientOptions.test.data";
 import * as openpgp from "openpgp";
+import { anonymousSiteSettings } from "passbolt-styleguide/src/shared/models/entity/siteSettings/siteSettingsEntity.test.data";
+import SiteSettingsEntity from "passbolt-styleguide/src/shared/models/entity/siteSettings/siteSettingsEntity";
+import GetOrFindSiteSettingsService from "../../service/siteSettings/getOrFindSiteSettingsService";
+import AccountEntity from "../../model/entity/account/accountEntity";
+import { defaultAccountDto } from "../../model/entity/account/accountEntity.test.data";
 
 describe("AccountRecoveryGenerateOrganizationKeyController", () => {
+  beforeEach(() => {
+    jest
+      .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+      .mockImplementation(() => new SiteSettingsEntity(anonymousSiteSettings()));
+  });
+
   describe("AccountRecoveryGenerateOrganizationKeyController::exec", () => {
     it("Should assert provided generate key pair dto is valid.", async () => {
       await MockExtension.withConfiguredAccount();
-      const controller = new AccountRecoveryGenerateOrganizationKeyController(null, null, defaultApiClientOptions());
+      const account = new AccountEntity(defaultAccountDto());
+      const controller = new AccountRecoveryGenerateOrganizationKeyController(
+        null,
+        null,
+        defaultApiClientOptions(),
+        account,
+      );
       const promise = controller.exec();
 
       expect.assertions(1);
@@ -30,7 +47,13 @@ describe("AccountRecoveryGenerateOrganizationKeyController", () => {
 
     it("Should generate an account recovery organization key pair.", async () => {
       await MockExtension.withConfiguredAccount();
-      const controller = new AccountRecoveryGenerateOrganizationKeyController(null, null, defaultApiClientOptions());
+      const account = new AccountEntity(defaultAccountDto());
+      const controller = new AccountRecoveryGenerateOrganizationKeyController(
+        null,
+        null,
+        defaultApiClientOptions(),
+        account,
+      );
       const generateKeyPairDto = {
         name: "key name",
         email: "key@email.com",

package/src/all/background_page/controller/accountRecovery/accountRecoveryLoginController.js

@@ -38,7 +38,7 @@ class AccountRecoveryLoginController {
     this.worker = worker;
     this.requestId = requestId;
     this.authVerifyLoginChallengeService = new AuthVerifyLoginChallengeService(apiClientOptions);
-    this.updateSsoCredentialsService = new UpdateSsoCredentialsService(apiClientOptions);
+    this.updateSsoCredentialsService = new UpdateSsoCredentialsService(apiClientOptions, account);
     this.checkPassphraseService = new CheckPassphraseService(new Keyring());
     this.userRememberMeLatestChoiceLocalStorage = new UserRememberMeLatestChoiceLocalStorage(account);
   }

package/src/all/background_page/controller/accountRecovery/accountRecoveryLoginController.test.js

@@ -20,7 +20,9 @@ import SsoDataStorage from "../../service/indexedDB_storage/ssoDataStorage";
 import GenerateSsoKitService from "../../service/sso/generateSsoKitService";
 import AccountRecoveryLoginController from "./accountRecoveryLoginController";
 import { enableFetchMocks } from "jest-fetch-mock";
-import { anonymousOrganizationSettings } from "../../model/entity/organizationSettings/organizationSettingsEntity.test.data";
+import { anonymousSiteSettings } from "passbolt-styleguide/src/shared/models/entity/siteSettings/siteSettingsEntity.test.data";
+import SiteSettingsEntity from "passbolt-styleguide/src/shared/models/entity/siteSettings/siteSettingsEntity";
+import GetOrFindSiteSettingsService from "../../service/siteSettings/getOrFindSiteSettingsService";
 import { mockApiResponse } from "../../../../../test/mocks/mockApiResponse";
 import { defaultEmptySettings, withAzureSsoSettings } from "../sso/getCurrentSsoSettingsController.test.data";
 import { clientSsoKit } from "../../model/entity/sso/ssoKitClientPart.test.data";
@@ -38,19 +40,22 @@ beforeEach(async () => {
   enableFetchMocks();
   jest.clearAllMocks();
   await MockExtension.withConfiguredAccount();
+  jest
+    .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+    .mockImplementation(() => new SiteSettingsEntity(anonymousSiteSettings()));
 });
 
 describe("AccountRecoveryLoginController", () => {
   describe("AccountRecoveryLoginController::exec", () => {
     const passphrase = "ada@passbolt.com";
     const mockOrganisationSettings = (withSsoEnabled = true) => {
-      const organizationSettings = anonymousOrganizationSettings();
+      const organizationSettings = anonymousSiteSettings();
       organizationSettings.passbolt.plugins.sso = {
         enabled: withSsoEnabled,
       };
-      fetch.doMockOnceIf(new RegExp("/settings.json"), () =>
-        mockApiResponse(organizationSettings, { servertime: Date.now() / 1000 }),
-      );
+      jest
+        .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+        .mockImplementation(() => new SiteSettingsEntity(organizationSettings));
     };
 
     const mockOrganisationSettingsSsoSettings = (ssoSettings) => {

package/src/all/background_page/controller/accountRecovery/recoverAccountController.js

@@ -40,7 +40,7 @@ class RecoverAccountController {
     this.accountRecoveryModel = new AccountRecoveryModel(apiClientOptions);
     this.setupModel = new SetupModel(apiClientOptions);
     this.accountModel = new AccountModel(apiClientOptions);
-    this.updateSsoCredentialsService = new UpdateSsoCredentialsService(apiClientOptions);
+    this.apiClientOptions = apiClientOptions;
     // The temporary account stored in the session storage
     this.temporaryAccount = null;
   }
@@ -210,7 +210,11 @@ class RecoverAccountController {
      * The server part is kept as the user needs to be logged in to request a DELETE on the API.
      */
     await SsoDataStorage.flush();
-    await this.updateSsoCredentialsService.updateSsoKitIfNeeded(passphrase);
+    const updateSsoCredentialsService = new UpdateSsoCredentialsService(
+      this.apiClientOptions,
+      this.temporaryAccount.account,
+    );
+    await updateSsoCredentialsService.updateSsoKitIfNeeded(passphrase);
   }
 }
 

package/src/all/background_page/controller/accountRecovery/recoverAccountController.test.js

@@ -30,12 +30,17 @@ import InvalidMasterPasswordError from "../../error/invalidMasterPasswordError";
 import { OpenpgpAssertion } from "../../utils/openpgp/openpgpAssertions";
 import SsoDataStorage from "../../service/indexedDB_storage/ssoDataStorage";
 import GenerateSsoKitService from "../../service/sso/generateSsoKitService";
-import { anonymousOrganizationSettings } from "../../model/entity/organizationSettings/organizationSettingsEntity.test.data";
+import { anonymousSiteSettings } from "passbolt-styleguide/src/shared/models/entity/siteSettings/siteSettingsEntity.test.data";
+import SiteSettingsEntity from "passbolt-styleguide/src/shared/models/entity/siteSettings/siteSettingsEntity";
+import GetOrFindSiteSettingsService from "../../service/siteSettings/getOrFindSiteSettingsService";
 import AccountTemporarySessionStorageService from "../../service/sessionStorage/accountTemporarySessionStorageService";
 
 beforeEach(() => {
   enableFetchMocks();
   jest.clearAllMocks();
+  jest
+    .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+    .mockImplementation(() => new SiteSettingsEntity(anonymousSiteSettings()));
 });
 
 describe("RecoverAccountController", () => {
@@ -48,11 +53,13 @@ describe("RecoverAccountController", () => {
     const passphrase = pgpKeys.account_recovery_request.passphrase;
 
     const mockOrganisationSettings = (isSsoEnabled) => {
-      const organizationSettings = anonymousOrganizationSettings();
+      const organizationSettings = anonymousSiteSettings();
       if (isSsoEnabled) {
         organizationSettings.passbolt.plugins.sso = { enabled: true };
       }
-      fetch.doMockOnce(() => mockApiResponse(organizationSettings, { servertime: Date.now() / 1000 }));
+      jest
+        .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+        .mockImplementation(() => new SiteSettingsEntity(organizationSettings));
     };
 
     it("Should perform the account recovery.", async () => {
@@ -198,7 +205,7 @@ describe("RecoverAccountController", () => {
 
       expect.assertions(3);
       const expetedProvider = "azure";
-      const organizationSettings = anonymousOrganizationSettings();
+      const organizationSettings = anonymousSiteSettings();
       organizationSettings.passbolt.plugins.sso = { enabled: true };
 
       // Mock API fetch account recovery request get response.

package/src/all/background_page/controller/auth/authCheckStatus.test.data.js

@@ -13,16 +13,16 @@
  */
 
 export const userLoggedOutAuthStatus = () => ({
-  isAuthenticated: false,
-  isMfaRequired: false,
+  is_authenticated: false,
+  is_mfa_authenticated: true,
 });
 
 export const userLoggedInAuthStatus = () => ({
-  isAuthenticated: true,
-  isMfaRequired: false,
+  is_authenticated: true,
+  is_mfa_authenticated: true,
 });
 
 export const userRequireMfaAuthStatus = () => ({
-  isAuthenticated: true,
-  isMfaRequired: true,
+  is_authenticated: true,
+  is_mfa_authenticated: false,
 });

package/src/all/background_page/controller/auth/authCheckStatusController.js

@@ -14,10 +14,18 @@
 import CheckAuthStatusService from "../../service/auth/checkAuthStatusService";
 
 class AuthCheckStatusController {
-  constructor(worker, requestId) {
+  /**
+   * AuthCheckStatusController Constructor
+   *
+   * @param {Worker} worker
+   * @param {string} requestId
+   * @param {ApiClientOptions} apiClientOptions
+   * @param {AccountEntity} account
+   */
+  constructor(worker, requestId, apiClientOptions, account) {
     this.worker = worker;
     this.requestId = requestId;
-    this.checkAuthStatusService = new CheckAuthStatusService();
+    this.checkAuthStatusService = new CheckAuthStatusService(account, apiClientOptions);
   }
 
   /**
@@ -38,7 +46,7 @@ class AuthCheckStatusController {
   /**
    * Controller executor.
    * @param {boolean} flushCache should the cache be flushed before
-   * @returns {Promise<{isAuthenticated: {bool}, isMfaRequired: {bool}}>}
+   * @returns {Promise<OnlineSessionEntity>}
    */
   async exec(flushCache) {
     return await this.checkAuthStatusService.checkAuthStatus(flushCache);

package/src/all/background_page/controller/auth/authCheckStatusController.test.js

@@ -13,9 +13,11 @@
  */
 
 import MfaAuthenticationRequiredError from "../../error/mfaAuthenticationRequiredError";
-import AuthenticationStatusService from "../../service/authenticationStatusService";
-import AuthStatusLocalStorage from "../../service/local_storage/authStatusLocalStorage";
 import AuthCheckStatusController from "./authCheckStatusController";
+import OnlineSessionEntity from "passbolt-styleguide/src/shared/models/entity/session/onlineSessionEntity";
+import AccountEntity from "../../model/entity/account/accountEntity";
+import { defaultApiClientOptions } from "passbolt-styleguide/src/shared/lib/apiClient/apiClientOptions.test.data";
+import { defaultAccountDto } from "../../model/entity/account/accountEntity.test.data";
 
 beforeEach(() => {
   jest.clearAllMocks();
@@ -24,73 +26,101 @@ beforeEach(() => {
 describe("AuthCheckStatusController", () => {
   it("should return the auth status matching the unauthanticated state", async () => {
     expect.assertions(3);
-    jest.spyOn(AuthStatusLocalStorage, "get").mockImplementation(() => undefined);
-    jest.spyOn(AuthStatusLocalStorage, "flush");
-    jest.spyOn(AuthenticationStatusService, "isAuthenticated").mockImplementation(() => false);
 
-    const controller = new AuthCheckStatusController();
+    const account = new AccountEntity(defaultAccountDto());
+    const controller = new AuthCheckStatusController(null, null, defaultApiClientOptions(), account);
+
+    jest.spyOn(controller.checkAuthStatusService.activeSessionLocalStorage, "get").mockImplementation(() => undefined);
+    jest.spyOn(controller.checkAuthStatusService.activeSessionLocalStorage, "flush");
+    jest
+      .spyOn(controller.checkAuthStatusService.authenticationStatusService, "isAuthenticated")
+      .mockImplementation(() => false);
+
     const authStatus = await controller.exec(true);
 
-    expect(AuthStatusLocalStorage.get).not.toHaveBeenCalled();
-    expect(AuthStatusLocalStorage.flush).not.toHaveBeenCalled();
-    expect(authStatus).toStrictEqual({
-      isAuthenticated: false,
-      isMfaRequired: false,
-    });
+    expect(controller.checkAuthStatusService.activeSessionLocalStorage.get).toHaveBeenCalledTimes(1);
+    expect(controller.checkAuthStatusService.activeSessionLocalStorage.flush).not.toHaveBeenCalled();
+    expect(authStatus).toStrictEqual(
+      new OnlineSessionEntity({
+        is_authenticated: false,
+        is_mfa_authenticated: true,
+      }),
+    );
   });
 
   it("expects the user to be fully authenticated", async () => {
     expect.assertions(3);
-    jest.spyOn(AuthStatusLocalStorage, "get").mockImplementation(() => undefined);
-    jest.spyOn(AuthStatusLocalStorage, "flush");
-    jest.spyOn(AuthenticationStatusService, "isAuthenticated").mockImplementation(() => true);
 
-    const controller = new AuthCheckStatusController();
+    const account = new AccountEntity(defaultAccountDto());
+    const controller = new AuthCheckStatusController(null, null, defaultApiClientOptions(), account);
+
+    jest.spyOn(controller.checkAuthStatusService.activeSessionLocalStorage, "get").mockImplementation(() => undefined);
+    jest.spyOn(controller.checkAuthStatusService.activeSessionLocalStorage, "flush");
+    jest
+      .spyOn(controller.checkAuthStatusService.authenticationStatusService, "isAuthenticated")
+      .mockImplementation(() => true);
+
     const authStatus = await controller.exec(true);
 
-    expect(AuthStatusLocalStorage.get).not.toHaveBeenCalled();
-    expect(AuthStatusLocalStorage.flush).not.toHaveBeenCalled();
-    expect(authStatus).toStrictEqual({
-      isAuthenticated: true,
-      isMfaRequired: false,
-    });
+    expect(controller.checkAuthStatusService.activeSessionLocalStorage.get).toHaveBeenCalledTimes(1);
+    expect(controller.checkAuthStatusService.activeSessionLocalStorage.flush).not.toHaveBeenCalled();
+    expect(authStatus).toStrictEqual(
+      new OnlineSessionEntity({
+        is_authenticated: true,
+        is_mfa_authenticated: true,
+      }),
+    );
   });
 
   it("expects the user to require MFA authentication", async () => {
     expect.assertions(3);
-    jest.spyOn(AuthStatusLocalStorage, "get").mockImplementation(() => undefined);
-    jest.spyOn(AuthStatusLocalStorage, "flush");
-    jest.spyOn(AuthenticationStatusService, "isAuthenticated").mockImplementation(() => {
-      throw new MfaAuthenticationRequiredError();
-    });
 
-    const controller = new AuthCheckStatusController();
+    const account = new AccountEntity(defaultAccountDto());
+    const controller = new AuthCheckStatusController(null, null, defaultApiClientOptions(), account);
+
+    jest.spyOn(controller.checkAuthStatusService.activeSessionLocalStorage, "get").mockImplementation(() => undefined);
+    jest.spyOn(controller.checkAuthStatusService.activeSessionLocalStorage, "flush");
+    jest
+      .spyOn(controller.checkAuthStatusService.authenticationStatusService, "isAuthenticated")
+      .mockImplementation(() => {
+        throw new MfaAuthenticationRequiredError();
+      });
+
     const authStatus = await controller.exec(true);
 
-    expect(AuthStatusLocalStorage.get).not.toHaveBeenCalled();
-    expect(AuthStatusLocalStorage.flush).not.toHaveBeenCalled();
-    expect(authStatus).toStrictEqual({
-      isAuthenticated: true,
-      isMfaRequired: true,
-    });
+    expect(controller.checkAuthStatusService.activeSessionLocalStorage.get).toHaveBeenCalledTimes(1);
+    expect(controller.checkAuthStatusService.activeSessionLocalStorage.flush).not.toHaveBeenCalled();
+    expect(authStatus).toStrictEqual(
+      new OnlineSessionEntity({
+        is_authenticated: true,
+        is_mfa_authenticated: false,
+      }),
+    );
   });
 
   it("should return the auth status from the local storage", async () => {
     expect.assertions(4);
     const expectedAuthStatus = {
-      isAuthenticated: false,
-      isMfaRequired: false,
+      is_authenticated: false,
+      is_mfa_authenticated: true,
     };
-    jest.spyOn(AuthStatusLocalStorage, "get").mockImplementation(() => expectedAuthStatus);
-    jest.spyOn(AuthStatusLocalStorage, "flush");
-    jest.spyOn(AuthenticationStatusService, "isAuthenticated");
+    const account = new AccountEntity(defaultAccountDto());
+
+    const controller = new AuthCheckStatusController(null, null, defaultApiClientOptions(), account);
+
+    jest
+      .spyOn(controller.checkAuthStatusService.activeSessionLocalStorage, "get")
+      .mockImplementation(() => expectedAuthStatus);
+    jest.spyOn(controller.checkAuthStatusService.activeSessionLocalStorage, "flush");
+    jest
+      .spyOn(controller.checkAuthStatusService.authenticationStatusService, "isAuthenticated")
+      .mockImplementation(() => true);
 
-    const controller = new AuthCheckStatusController();
     const authStatus = await controller.exec(false);
 
-    expect(AuthStatusLocalStorage.get).toHaveBeenCalledTimes(1);
-    expect(AuthStatusLocalStorage.flush).not.toHaveBeenCalled();
-    expect(AuthenticationStatusService.isAuthenticated).not.toHaveBeenCalled();
-    expect(authStatus).toStrictEqual(expectedAuthStatus);
+    expect(controller.checkAuthStatusService.activeSessionLocalStorage.get).toHaveBeenCalledTimes(1);
+    expect(controller.checkAuthStatusService.activeSessionLocalStorage.flush).not.toHaveBeenCalled();
+    expect(controller.checkAuthStatusService.authenticationStatusService.isAuthenticated).not.toHaveBeenCalled();
+    expect(authStatus.toDto()).toStrictEqual(expectedAuthStatus);
   });
 });

package/src/all/background_page/controller/auth/authIsMfaRequiredController.js

@@ -14,10 +14,18 @@
 import CheckAuthStatusService from "../../service/auth/checkAuthStatusService";
 
 class AuthIsMfaRequiredController {
-  constructor(worker, requestId) {
+  /**
+   * AuthCheckStatusController Constructor
+   *
+   * @param {Worker} worker
+   * @param {string} requestId
+   * @param {ApiClientOptions} apiClientOptions
+   * @param {AccountEntity} account
+   */
+  constructor(worker, requestId, apiClientOptions, account) {
     this.worker = worker;
     this.requestId = requestId;
-    this.checkAuthStatusService = new CheckAuthStatusService();
+    this.checkAuthStatusService = new CheckAuthStatusService(account, apiClientOptions);
   }
 
   /**
@@ -38,7 +46,7 @@ class AuthIsMfaRequiredController {
    */
   async exec() {
     const authStatus = await this.checkAuthStatusService.checkAuthStatus(true);
-    return authStatus.isMfaRequired;
+    return !authStatus.isMfaAuthenticated;
   }
 }
 

package/src/all/background_page/controller/auth/authIsMfaRequiredController.test.js

@@ -14,6 +14,10 @@
 
 import { userLoggedInAuthStatus, userLoggedOutAuthStatus, userRequireMfaAuthStatus } from "./authCheckStatus.test.data";
 import AuthIsMfaRequiredController from "./authIsMfaRequiredController";
+import AccountEntity from "../../model/entity/account/accountEntity";
+import { defaultAccountDto } from "../../model/entity/account/accountEntity.test.data";
+import { defaultApiClientOptions } from "passbolt-styleguide/src/shared/lib/apiClient/apiClientOptions.test.data";
+import OnlineSessionEntity from "passbolt-styleguide/src/shared/models/entity/session/onlineSessionEntity";
 
 beforeEach(() => {
   jest.clearAllMocks();
@@ -23,36 +27,41 @@ describe("AuthIsMfaRequiredController", () => {
   it("should return true if the user needs to authenticate with MFA", async () => {
     expect.assertions(1);
 
-    const controller = new AuthIsMfaRequiredController();
+    const account = new AccountEntity(defaultAccountDto());
+    const controller = new AuthIsMfaRequiredController(null, null, defaultApiClientOptions(), account);
     jest
       .spyOn(controller.checkAuthStatusService, "checkAuthStatus")
-      .mockImplementation(async () => userRequireMfaAuthStatus());
+      .mockImplementation(async () => new OnlineSessionEntity(userRequireMfaAuthStatus()));
 
     const isMfaRequired = await controller.exec();
-    expect(isMfaRequired).toStrictEqual(true);
+    expect(isMfaRequired).toBeTruthy();
   });
 
   it("should return false if the user does not need to authenticate with MFA", async () => {
     expect.assertions(1);
 
-    const controller = new AuthIsMfaRequiredController();
+    const account = new AccountEntity(defaultAccountDto());
+    const controller = new AuthIsMfaRequiredController(null, null, defaultApiClientOptions(), account);
     jest
       .spyOn(controller.checkAuthStatusService, "checkAuthStatus")
-      .mockImplementation(async () => userLoggedInAuthStatus());
+      .mockImplementation(async () => new OnlineSessionEntity(userLoggedInAuthStatus()));
 
     const isMfaRequired = await controller.exec();
-    expect(isMfaRequired).toStrictEqual(false);
+    expect(isMfaRequired).toBeFalsy();
   });
 
   it("should return the MFA status part of the authentication status", async () => {
     expect.assertions(1);
 
-    const controller = new AuthIsMfaRequiredController();
+    const account = new AccountEntity(defaultAccountDto());
+    const controller = new AuthIsMfaRequiredController(null, null, defaultApiClientOptions(), account);
 
     const authStatus = userLoggedOutAuthStatus();
-    jest.spyOn(controller.checkAuthStatusService, "checkAuthStatus").mockImplementation(async () => authStatus);
+    jest
+      .spyOn(controller.checkAuthStatusService, "checkAuthStatus")
+      .mockImplementation(async () => new OnlineSessionEntity(authStatus));
 
     const isMfaRequired = await controller.exec();
-    expect(isMfaRequired).toStrictEqual(authStatus.isMfaRequired);
+    expect(isMfaRequired).toStrictEqual(!authStatus.is_mfa_authenticated);
   });
 });

package/src/all/background_page/controller/auth/authLoginController.js

@@ -35,7 +35,7 @@ class AuthLoginController {
     this.requestId = requestId;
     this.account = account;
     this.authVerifyLoginChallengeService = new AuthVerifyLoginChallengeService(apiClientOptions);
-    this.updateSsoCredentialsService = new UpdateSsoCredentialsService(apiClientOptions);
+    this.updateSsoCredentialsService = new UpdateSsoCredentialsService(apiClientOptions, account);
     this.checkPassphraseService = new CheckPassphraseService(new Keyring());
     this.userRememberMeLatestChoiceLocalStorage = new UserRememberMeLatestChoiceLocalStorage(account);
   }

package/src/all/background_page/controller/auth/authLoginController.test.js

@@ -20,7 +20,9 @@ import SsoDataStorage from "../../service/indexedDB_storage/ssoDataStorage";
 import GenerateSsoKitService from "../../service/sso/generateSsoKitService";
 import AuthLoginController from "./authLoginController";
 import { enableFetchMocks } from "jest-fetch-mock";
-import { anonymousOrganizationSettings } from "../../model/entity/organizationSettings/organizationSettingsEntity.test.data";
+import { anonymousSiteSettings } from "passbolt-styleguide/src/shared/models/entity/siteSettings/siteSettingsEntity.test.data";
+import SiteSettingsEntity from "passbolt-styleguide/src/shared/models/entity/siteSettings/siteSettingsEntity";
+import GetOrFindSiteSettingsService from "../../service/siteSettings/getOrFindSiteSettingsService";
 import { mockApiResponse } from "../../../../../test/mocks/mockApiResponse";
 import { defaultEmptySettings, withAzureSsoSettings } from "../sso/getCurrentSsoSettingsController.test.data";
 import { clientSsoKit } from "../../model/entity/sso/ssoKitClientPart.test.data";
@@ -33,19 +35,22 @@ beforeEach(async () => {
   enableFetchMocks();
   jest.clearAllMocks();
   await MockExtension.withConfiguredAccount();
+  jest
+    .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+    .mockImplementation(() => new SiteSettingsEntity(anonymousSiteSettings()));
 });
 
 describe("AuthLoginController", () => {
   describe("AuthLoginController::exec", () => {
     const passphrase = "ada@passbolt.com";
     const mockOrganisationSettings = (withSsoEnabled = true) => {
-      const organizationSettings = anonymousOrganizationSettings();
+      const organizationSettings = anonymousSiteSettings();
       organizationSettings.passbolt.plugins.sso = {
         enabled: withSsoEnabled,
       };
-      fetch.doMockOnceIf(new RegExp("/settings.json"), () =>
-        mockApiResponse(organizationSettings, { servertime: Date.now() / 1000 }),
-      );
+      jest
+        .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+        .mockImplementation(() => new SiteSettingsEntity(organizationSettings));
     };
 
     const mockOrganisationSettingsSsoSettings = (ssoSettings) => {