passbolt-browser-extension 5.13.0 → 5.14.2

package/src/all/background_page/model/passwordExpiry/passwordExpirySettingsModel.test.js

@@ -26,6 +26,7 @@ import {
 } from "passbolt-styleguide/src/shared/models/entity/passwordExpiry/passwordExpirySettingsEntity.test.data";
 import PasswordExpirySettingsEntity from "passbolt-styleguide/src/shared/models/entity/passwordExpiry/passwordExpirySettingsEntity";
 import PasswordExpirySettingsModel from "./passwordExpirySettingsModel";
+import GetOrFindSiteSettingsService from "../../service/siteSettings/getOrFindSiteSettingsService";
 import { v4 as uuid } from "uuid";
 import PassboltBadResponseError from "passbolt-styleguide/src/shared/lib/Error/PassboltBadResponseError";
 import PasswordExpiryProSettingsEntity from "passbolt-styleguide/src/shared/models/entity/passwordExpiryPro/passwordExpiryProSettingsEntity";
@@ -40,7 +41,7 @@ describe("PasswordExpiry model", () => {
     const account = new AccountEntity(defaultAccountDto());
     apiClientOptions = BuildApiClientOptionsService.buildFromAccount(account);
     model = new PasswordExpirySettingsModel(account, apiClientOptions);
-    jest.spyOn(model.organisationSettingsModel, "getOrFind").mockImplementation(() =>
+    jest.spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind").mockImplementation(() =>
       Promise.resolve({
         isPluginEnabled: () => false,
       }),
@@ -216,7 +217,7 @@ describe("PasswordExpiry model", () => {
     it("should return an PasswordExpiryProSettingsEntity when passwordExpiryPolicies is enabled ", async () => {
       expect.assertions(1);
 
-      jest.spyOn(model.organisationSettingsModel, "getOrFind").mockImplementation(() =>
+      jest.spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind").mockImplementation(() =>
         Promise.resolve({
           isPluginEnabled: () => true,
         }),

package/src/all/background_page/model/resource/resourceModel.js

@@ -11,7 +11,6 @@
  * @link          https://www.passbolt.com Passbolt(tm)
  */
 import ResourceLocalStorage from "../../service/local_storage/resourceLocalStorage";
-import ResourceTypeModel from "../../model/resourceType/resourceTypeModel";
 import ResourcesCollection from "../entity/resource/resourcesCollection";
 import PermissionEntity from "passbolt-styleguide/src/shared/models/entity/permission/permissionEntity";
 import PermissionsCollection from "passbolt-styleguide/src/shared/models/entity/permission/permissionsCollection";
@@ -19,6 +18,7 @@ import ResourceEntity from "../entity/resource/resourceEntity";
 import PermissionChangesCollection from "../entity/permission/change/permissionChangesCollection";
 import ResourceService from "../../service/api/resource/resourceService";
 import PlaintextEntity from "../entity/plaintext/plaintextEntity";
+import GetSecretSchemaResourceTypeService from "../../service/resourceType/getSecretSchemaResourceTypeService";
 
 const MAX_LENGTH_PLAINTEXT = 4096;
 
@@ -29,9 +29,9 @@ class ResourceModel {
    * @param {AccountEntity} account the user account
    * @public
    */
-  constructor(apiClientOptions) {
+  constructor(apiClientOptions, account) {
     this.resourceService = new ResourceService(apiClientOptions);
-    this.resourceTypeModel = new ResourceTypeModel(apiClientOptions);
+    this.getSecretSchemaResourceTypeService = new GetSecretSchemaResourceTypeService(account, apiClientOptions);
   }
 
   /*
@@ -151,7 +151,7 @@ class ResourceModel {
       return plaintextDto;
     }
 
-    const schema = await this.resourceTypeModel.getSecretSchemaById(resourceTypeId);
+    const schema = await this.getSecretSchemaResourceTypeService.getByResourceTypeId(resourceTypeId);
     if (!schema) {
       throw new TypeError("Could not find the schema definition for the requested resource type.");
     }

package/src/all/background_page/model/user/userModel.js

@@ -17,8 +17,7 @@ import UserEntity from "../entity/user/userEntity";
 import UsersCollection from "passbolt-styleguide/src/shared/models/entity/user/usersCollection";
 import Validator from "validator";
 import RoleEntity from "passbolt-styleguide/src/shared/models/entity/role/roleEntity";
-import UserMeSessionStorageService from "../../service/sessionStorage/userMeSessionStorageService";
-import OrganizationSettingsModel from "../organizationSettings/organizationSettingsModel";
+import GetOrFindSiteSettingsService from "../../service/siteSettings/getOrFindSiteSettingsService";
 
 /**
  * @deprecated
@@ -33,7 +32,7 @@ class UserModel {
    */
   constructor(apiClientOptions, account = null) {
     this.userApiService = new UserApiService(apiClientOptions);
-    this.organisationSettingsModel = new OrganizationSettingsModel(apiClientOptions);
+    this.apiClientOptions = apiClientOptions;
     this.account = account;
   }
 
@@ -49,16 +48,17 @@ class UserModel {
       profile: true,
       gpgkey: false,
       groups_users: false,
-      last_logged_in: true,
       pending_account_recovery_request: true,
       account_recovery_user_setting: true,
     };
-    // Add is_mfa_enabled contain if the user account role name is admin
+    // last_logged_in and is_mfa_enabled contains are only available for admin.
 
     if (this.account && this.account.roleName === RoleEntity.ROLE_ADMIN) {
+      contains.last_logged_in = true;
       contains.is_mfa_enabled = true;
-      const organizationSettings = await this.organisationSettingsModel.getOrFind();
-      if (organizationSettings.isPluginEnabled("metadata")) {
+      const getOrFindSiteSettingsService = new GetOrFindSiteSettingsService(this.account, this.apiClientOptions);
+      const siteSettings = await getOrFindSiteSettingsService.getOrFind(false);
+      if (siteSettings.isPluginEnabled("metadata")) {
         contains.missing_metadata_key_ids = true;
       }
     }
@@ -78,27 +78,6 @@ class UserModel {
     return this.userApiService.resendInvite(username);
   }
 
-  /**
-   * Get or find the signed-in user information.
-   * @param {boolean} refreshCache (Optional) Should request the API and refresh the cache. Default false.
-   * @returns {Promise<UserEntity>}
-   */
-  async getOrFindMe(refreshCache = false) {
-    let user = await UserMeSessionStorageService.get(this.account);
-    if (!user || refreshCache) {
-      const contains = { profile: true, role: true, account_recovery_user_setting: true };
-      const organizationSettings = await this.organisationSettingsModel.getOrFind();
-      if (organizationSettings.isPluginEnabled("metadata")) {
-        contains.missing_metadata_key_ids = true;
-      }
-      user = await this.findOne(this.account.userId, contains, true);
-
-      await UserMeSessionStorageService.set(this.account, user);
-    }
-
-    return user;
-  }
-
   /**
    * Get a collection of all users from the local storage.
    * If the local storage is unset, initialize it.

package/src/all/background_page/model/user/userModel.test.js

@@ -25,10 +25,11 @@ import UserModel from "./userModel";
 import UserLocalStorage from "../../service/local_storage/userLocalStorage";
 import UserEntity from "../entity/user/userEntity";
 import CollectionValidationError from "passbolt-styleguide/src/shared/models/entity/abstract/collectionValidationError";
-import { adminAccountDto } from "../entity/account/accountEntity.test.data";
+import { adminAccountDto, defaultAccountDto } from "../entity/account/accountEntity.test.data";
 import AccountEntity from "../entity/account/accountEntity";
-import { defaultCeOrganizationSettings } from "../entity/organizationSettings/organizationSettingsEntity.test.data";
-import MockExtension from "../../../../../test/mocks/mockExtension";
+import { defaultCeSiteSettings } from "passbolt-styleguide/src/shared/models/entity/siteSettings/siteSettingsEntity.test.data";
+import GetOrFindSiteSettingsService from "../../service/siteSettings/getOrFindSiteSettingsService";
+import SiteSettingsEntity from "passbolt-styleguide/src/shared/models/entity/siteSettings/siteSettingsEntity";
 
 beforeAll(() => {
   enableFetchMocks();
@@ -147,12 +148,12 @@ describe("UserModel", () => {
 
       const apiClientOption = defaultApiClientOptions();
       const model = new UserModel(apiClientOption, account);
-      const siteSettingsDto = defaultCeOrganizationSettings();
-      siteSettingsDto.passbolt.plugins.metadata = false;
+      const siteSettingsDto = defaultCeSiteSettings();
+      siteSettingsDto.passbolt.plugins.metadata = { enabled: false };
 
       jest
-        .spyOn(model.organisationSettingsModel.organizationSettingsService, "find")
-        .mockImplementation(() => siteSettingsDto);
+        .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+        .mockImplementation(() => new SiteSettingsEntity(siteSettingsDto));
 
       jest.spyOn(model, "findAll");
 
@@ -195,11 +196,11 @@ describe("UserModel", () => {
 
       const apiClientOption = defaultApiClientOptions();
       const model = new UserModel(apiClientOption, account);
-      const siteSettingsDto = defaultCeOrganizationSettings();
+      const siteSettingsDto = defaultCeSiteSettings();
 
       jest
-        .spyOn(model.organisationSettingsModel.organizationSettingsService, "find")
-        .mockImplementation(() => siteSettingsDto);
+        .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+        .mockImplementation(() => new SiteSettingsEntity(siteSettingsDto));
 
       jest.spyOn(model, "findAll");
 
@@ -220,6 +221,46 @@ describe("UserModel", () => {
         true,
       );
     });
+
+    it("should not add contains last_logged_in and is_mfa_enabled if user is not an administrator", async () => {
+      expect.assertions(1);
+      const account = new AccountEntity(
+        defaultAccountDto({
+          role_name: RoleEntity.ROLE_USER,
+        }),
+      );
+
+      const dtoOptions = {
+        withRole: true,
+        withGroupsUsers: true,
+        withGpgkey: true,
+        withAccountRecoveryUserSetting: true,
+        withPendingAccountRecoveryUserRequest: true,
+      };
+      const dto1 = defaultUserDto({ username: "ada@passbolt.com" }, dtoOptions);
+      const dtos = [dto1];
+
+      fetch.doMockOnceIf(/users\.json/, async () => mockApiResponse(dtos));
+
+      const apiClientOption = defaultApiClientOptions();
+      const model = new UserModel(apiClientOption, account);
+
+      jest.spyOn(model, "findAll");
+
+      await model.updateLocalStorage();
+
+      expect(model.findAll).toHaveBeenCalledWith(
+        {
+          account_recovery_user_setting: true,
+          gpgkey: false,
+          groups_users: false,
+          pending_account_recovery_request: true,
+          profile: true,
+        },
+        null,
+        true,
+      );
+    });
   });
 
   describe("UserModel::findOne", () => {
@@ -282,95 +323,6 @@ describe("UserModel", () => {
       expect(entity._groups_users).toHaveLength(0);
     });
   });
-
-  describe("UserModel::getOrFindMe", () => {
-    it("should, with the option profile, role, account_recovery_user_setting without missing_metadata_key_ids if plugin is disabled", async () => {
-      expect.assertions(2);
-
-      const account = new AccountEntity(adminAccountDto());
-
-      const dtoOptions = {
-        withGpgkey: true,
-        withAccountRecoveryUserSetting: true,
-        withPendingAccountRecoveryUserRequest: true,
-      };
-      const dto = defaultUserDto(
-        {
-          id: "f642271d-bbb1-401e-bbd1-7ec370f8e19b",
-          username: "betty@passbolt.com",
-          groups_users: [],
-          missing_metadata_key_ids: [],
-        },
-        dtoOptions,
-      );
-
-      //Mock the API call and check if the call is the one expected
-      fetch.doMockOnceIf(/users\/.*\.json/, async () => mockApiResponse(dto));
-      await MockExtension.withConfiguredAccount();
-      const apiClientOption = defaultApiClientOptions();
-      const model = new UserModel(apiClientOption, account);
-      const siteSettingsDto = defaultCeOrganizationSettings();
-      siteSettingsDto.passbolt.plugins.metadata = false;
-
-      jest
-        .spyOn(model.organisationSettingsModel.organizationSettingsService, "find")
-        .mockImplementation(() => siteSettingsDto);
-
-      jest.spyOn(model, "findOne");
-
-      const entity = await model.getOrFindMe(true);
-
-      expect(model.findOne).toHaveBeenCalledWith(
-        "f642271d-bbb1-401e-bbd1-7ec370f8e19b",
-        { account_recovery_user_setting: true, profile: true, role: true },
-        true,
-      );
-      expect(entity).toEqual(new UserEntity(dto));
-    });
-    it("should, with the option profile, role, account_recovery_user_setting and missing_metadata_key_ids if plugin is enabled", async () => {
-      expect.assertions(2);
-
-      const account = new AccountEntity(adminAccountDto());
-
-      const dtoOptions = {
-        withGpgkey: true,
-        withAccountRecoveryUserSetting: true,
-        withPendingAccountRecoveryUserRequest: true,
-      };
-      const dto = defaultUserDto(
-        {
-          id: "f642271d-bbb1-401e-bbd1-7ec370f8e19b",
-          username: "betty@passbolt.com",
-          groups_users: [],
-          missing_metadata_key_ids: [],
-        },
-        dtoOptions,
-      );
-
-      //Mock the API call and check if the call is the one expected
-      fetch.doMockOnceIf(/users\/.*\.json/, async () => mockApiResponse(dto));
-      await MockExtension.withConfiguredAccount();
-      const apiClientOption = defaultApiClientOptions();
-      const model = new UserModel(apiClientOption, account);
-      const siteSettingsDto = defaultCeOrganizationSettings();
-      siteSettingsDto.passbolt.plugins.metadata = true;
-
-      jest
-        .spyOn(model.organisationSettingsModel.organizationSettingsService, "find")
-        .mockImplementation(() => siteSettingsDto);
-
-      jest.spyOn(model, "findOne");
-
-      const entity = await model.getOrFindMe(true);
-
-      expect(model.findOne).toHaveBeenCalledWith(
-        "f642271d-bbb1-401e-bbd1-7ec370f8e19b",
-        { account_recovery_user_setting: true, missing_metadata_key_ids: true, profile: true, role: true },
-        true,
-      );
-      expect(entity).toEqual(new UserEntity(dto));
-    });
-  });
   describe("UserModel::findAll", () => {
     it("should throw an error if users or its associated content do not validated.", async () => {
       expect.assertions(2);

package/src/all/background_page/pagemod/appBootstrapPagemod.js

@@ -16,6 +16,7 @@ import ParseAppUrlService from "../service/app/parseAppUrlService";
 import { PortEvents } from "../event/portEvents";
 import CheckAuthStatusService from "../service/auth/checkAuthStatusService";
 import GetActiveAccountService from "../service/account/getActiveAccountService";
+import BuildApiClientOptionsService from "../service/account/buildApiClientOptionsService";
 
 class AppBootstrap extends Pagemod {
   /**
@@ -94,7 +95,9 @@ class AppBootstrap extends Pagemod {
    * @returns {Promise<boolean>}
    */
   async assertUserAuthenticated() {
-    const checkAuthStatusService = new CheckAuthStatusService();
+    const account = await GetActiveAccountService.get();
+    const apiClientOptions = BuildApiClientOptionsService.buildFromAccount(account);
+    const checkAuthStatusService = new CheckAuthStatusService(account, apiClientOptions);
     const authStatus = await checkAuthStatusService.checkAuthStatus(true);
     return authStatus.isAuthenticated;
   }

package/src/all/background_page/pagemod/appBootstrapPagemod.test.js

@@ -21,6 +21,9 @@ import { PortEvents } from "../event/portEvents";
 import CheckAuthStatusService from "../service/auth/checkAuthStatusService";
 import { userLoggedInAuthStatus, userLoggedOutAuthStatus } from "../controller/auth/authCheckStatus.test.data";
 import GetActiveAccountService from "../service/account/getActiveAccountService";
+import OnlineSessionEntity from "passbolt-styleguide/src/shared/models/entity/session/onlineSessionEntity";
+import AccountEntity from "../model/entity/account/accountEntity";
+import { defaultAccountDto } from "../model/entity/account/accountEntity.test.data";
 
 const spyAddWorker = jest.spyOn(WorkersSessionStorage, "addWorker");
 jest.spyOn(ScriptExecution.prototype, "injectPortname").mockImplementation(jest.fn());
@@ -62,10 +65,10 @@ describe("AppBootstrap", () => {
     it("Should be able to attach app bootstrap pagemod to browser frame", async () => {
       expect.assertions(1);
       // mock functions
-      jest.spyOn(GetActiveAccountService, "get").mockImplementation(() => {});
+      jest.spyOn(GetActiveAccountService, "get").mockImplementation(() => new AccountEntity(defaultAccountDto()));
       jest
         .spyOn(CheckAuthStatusService.prototype, "checkAuthStatus")
-        .mockImplementation(async () => userLoggedInAuthStatus());
+        .mockImplementation(async () => new OnlineSessionEntity(userLoggedInAuthStatus()));
       jest.spyOn(UserSettings.prototype, "getDomain").mockImplementation(() => "https://passbolt.dev");
       const result = await AppBootstrap.canBeAttachedTo({
         frameId: Pagemod.TOP_FRAME_ID,

package/src/all/background_page/pagemod/appPagemod.js

@@ -22,7 +22,7 @@ import { ResourceTypeEvents } from "../event/resourceTypeEvents";
 import { RoleEvents } from "../event/roleEvents";
 import { KeyringEvents } from "../event/keyringEvents";
 import { SecretEvents } from "../event/secretEvents";
-import { OrganizationSettingsEvents } from "../event/organizationSettingsEvents";
+import { SiteSettingsEvents } from "../event/siteSettingsEvents";
 import { ShareEvents } from "../event/shareEvents";
 import { UserEvents } from "../event/userEvents";
 import { GroupEvents } from "../event/groupEvents";
@@ -43,6 +43,8 @@ import GetActiveAccountService from "../service/account/getActiveAccountService"
 import { PermissionEvents } from "../event/permissionEvents";
 import { AccountEvents } from "../event/accountEvents";
 import { AppSignOutEvents } from "../event/appSignOutEvents";
+import UserApiService from "passbolt-styleguide/src/shared/services/api/user/userApiService";
+import UserEntity from "../model/entity/user/userEntity";
 
 class App extends Pagemod {
   /**
@@ -67,7 +69,7 @@ class App extends Pagemod {
       RoleEvents,
       KeyringEvents,
       SecretEvents,
-      OrganizationSettingsEvents,
+      SiteSettingsEvents,
       ShareEvents,
       UserEvents,
       GroupEvents,
@@ -97,9 +99,11 @@ class App extends Pagemod {
   async attachEvents(port) {
     try {
       const tab = port._port.sender.tab;
-      const checkAuthStatusService = new CheckAuthStatusService();
+      const account = await GetActiveAccountService.get();
+      const apiClientOptions = BuildApiClientOptionsService.buildFromAccount(account);
+      const checkAuthStatusService = new CheckAuthStatusService(account, apiClientOptions);
       const authStatus = await checkAuthStatusService.checkAuthStatus(true);
-      if (!authStatus.isAuthenticated || authStatus.isMfaRequired) {
+      if (!authStatus.isAuthenticated || !authStatus.isMfaAuthenticated) {
         console.error("Can not attach application if user is not logged in, connect only app sign-out events.");
         for (const event of this.appSignOutEvent) {
           event.listen({ port, tab });
@@ -111,8 +115,30 @@ class App extends Pagemod {
       const appInitController = new AppInitController();
       await appInitController.main();
 
-      const account = await GetActiveAccountService.get({ role: true });
-      const apiClientOptions = BuildApiClientOptionsService.buildFromAccount(account);
+      /*
+       * Get the user from the API to add the role name into the account
+       * This is used in some classes to add contain for API request or to throw an Error
+       * - UserModel.updateLocalStorage
+       * - FindAndUpdateUsersLocalStorageService.findAndUpdateAll
+       * - ShareMetadataKeyPrivateService.shareOneMissing
+       * - ShareMetadataKeyPrivateService.shareAllMissing
+       *
+       * If an issue happen the role name will not be updated and the App will start anyway with fewer permissions
+       */
+      try {
+        // Load the application settings, necessary to validate the account username.
+        const userApiService = new UserApiService(apiClientOptions);
+        const userDto = await userApiService.get(account.userId, {
+          role: true,
+        });
+        const userEntity = new UserEntity(userDto);
+        // Add in the account the role name if the option object have role (only for authenticated user)
+        account.set("role_name", userEntity.role?.name);
+      } catch (error) {
+        console.error("appPagemod::add role name to the account cannot be retrieved, some features could be missing.");
+        console.error(error);
+      }
+
       for (const event of this.events) {
         event.listen({ port, tab }, apiClientOptions, account);
       }

package/src/all/background_page/pagemod/appPagemod.test.js

@@ -16,7 +16,7 @@ import App from "./appPagemod";
 import { UserEvents } from "../event/userEvents";
 import { KeyringEvents } from "../event/keyringEvents";
 import { AuthEvents } from "../event/authEvents";
-import { OrganizationSettingsEvents } from "../event/organizationSettingsEvents";
+import { SiteSettingsEvents } from "../event/siteSettingsEvents";
 import { LocaleEvents } from "../event/localeEvents";
 import { AppEvents } from "../event/appEvents";
 import { FolderEvents } from "../event/folderEvents";
@@ -35,7 +35,6 @@ import { ThemeEvents } from "../event/themeEvents";
 import { MobileEvents } from "../event/mobileEvents";
 import { PownedPasswordEvents } from "../event/pownedPasswordEvents";
 import { MfaEvents } from "../event/mfaEvents";
-import { v4 as uuid } from "uuid";
 import BuildApiClientOptionsService from "../service/account/buildApiClientOptionsService";
 import { enableFetchMocks } from "jest-fetch-mock";
 import { RememberMeEvents } from "../event/rememberMeEvents";
@@ -45,6 +44,11 @@ import GetActiveAccountService from "../service/account/getActiveAccountService"
 import { PermissionEvents } from "../event/permissionEvents";
 import { AccountEvents } from "../event/accountEvents";
 import { AppSignOutEvents } from "../event/appSignOutEvents";
+import OnlineSessionEntity from "passbolt-styleguide/src/shared/models/entity/session/onlineSessionEntity";
+import UserApiService from "passbolt-styleguide/src/shared/services/api/user/userApiService";
+import { defaultAdminUserDto } from "passbolt-styleguide/src/shared/models/entity/user/userEntity.test.data";
+import AccountEntity from "../model/entity/account/accountEntity";
+import { defaultAccountDto } from "../model/entity/account/accountEntity.test.data";
 
 jest.spyOn(ConfigEvents, "listen").mockImplementation(jest.fn());
 jest.spyOn(AppEvents, "listen").mockImplementation(jest.fn());
@@ -55,7 +59,7 @@ jest.spyOn(ResourceTypeEvents, "listen").mockImplementation(jest.fn());
 jest.spyOn(RoleEvents, "listen").mockImplementation(jest.fn());
 jest.spyOn(KeyringEvents, "listen").mockImplementation(jest.fn());
 jest.spyOn(SecretEvents, "listen").mockImplementation(jest.fn());
-jest.spyOn(OrganizationSettingsEvents, "listen").mockImplementation(jest.fn());
+jest.spyOn(SiteSettingsEvents, "listen").mockImplementation(jest.fn());
 jest.spyOn(ShareEvents, "listen").mockImplementation(jest.fn());
 jest.spyOn(UserEvents, "listen").mockImplementation(jest.fn());
 jest.spyOn(GroupEvents, "listen").mockImplementation(jest.fn());
@@ -73,6 +77,7 @@ jest.spyOn(RememberMeEvents, "listen").mockImplementation(jest.fn());
 jest.spyOn(PermissionEvents, "listen").mockImplementation(jest.fn());
 jest.spyOn(AccountEvents, "listen").mockImplementation(jest.fn());
 jest.spyOn(AppSignOutEvents, "listen").mockImplementation(jest.fn());
+jest.mock("../service/auth/checkAuthStatusService");
 
 describe("App", () => {
   beforeEach(() => {
@@ -83,7 +88,7 @@ describe("App", () => {
 
   describe("App::attachEvents", () => {
     it("Should attach app events", async () => {
-      expect.assertions(30);
+      expect.assertions(32);
       // data mocked
       const port = {
         _port: {
@@ -98,15 +103,22 @@ describe("App", () => {
       jest.spyOn(browser.cookies, "get").mockImplementation(() => ({ value: "csrf-token" }));
       jest
         .spyOn(CheckAuthStatusService.prototype, "checkAuthStatus")
-        .mockImplementation(async () => userLoggedInAuthStatus());
-      const mockedAccount = { user_id: uuid(), domain: "https://test-domain.passbolt.com" };
+        .mockImplementation(async () => new OnlineSessionEntity(userLoggedInAuthStatus()));
+      const mockedAccount = new AccountEntity(defaultAccountDto());
       const mockApiClient = BuildApiClientOptionsService.buildFromAccount(mockedAccount);
+      // resource name added when UserApiService is created.
+      mockApiClient.setResourceName("users");
+      const adminUserDto = defaultAdminUserDto();
       jest.spyOn(GetActiveAccountService, "get").mockImplementation(() => mockedAccount);
+      jest.spyOn(UserApiService.prototype, "get").mockImplementation(() => adminUserDto);
+      jest.spyOn(mockedAccount, "set");
       // process
       await App.attachEvents(port);
       // expectations
       const expectedPortAndTab = { port: port, tab: port._port.sender.tab };
-      expect(GetActiveAccountService.get).toHaveBeenCalledWith({ role: true });
+      expect(GetActiveAccountService.get).toHaveBeenCalledTimes(1);
+      expect(UserApiService.prototype.get).toHaveBeenCalledWith(mockedAccount.userId, { role: true });
+      expect(mockedAccount.set).toHaveBeenCalledWith("role_name", adminUserDto.role.name);
       expect(ConfigEvents.listen).toHaveBeenCalledWith(expectedPortAndTab, mockApiClient, mockedAccount);
       expect(AppEvents.listen).toHaveBeenCalledWith(expectedPortAndTab, mockApiClient, mockedAccount);
       expect(AuthEvents.listen).toHaveBeenCalledWith(expectedPortAndTab, mockApiClient, mockedAccount);
@@ -116,7 +128,7 @@ describe("App", () => {
       expect(RoleEvents.listen).toHaveBeenCalledWith(expectedPortAndTab, mockApiClient, mockedAccount);
       expect(KeyringEvents.listen).toHaveBeenCalledWith(expectedPortAndTab, mockApiClient, mockedAccount);
       expect(SecretEvents.listen).toHaveBeenCalledWith(expectedPortAndTab, mockApiClient, mockedAccount);
-      expect(OrganizationSettingsEvents.listen).toHaveBeenCalledWith(expectedPortAndTab, mockApiClient, mockedAccount);
+      expect(SiteSettingsEvents.listen).toHaveBeenCalledWith(expectedPortAndTab, mockApiClient, mockedAccount);
       expect(ShareEvents.listen).toHaveBeenCalledWith(expectedPortAndTab, mockApiClient, mockedAccount);
       expect(UserEvents.listen).toHaveBeenCalledWith(expectedPortAndTab, mockApiClient, mockedAccount);
       expect(GroupEvents.listen).toHaveBeenCalledWith(expectedPortAndTab, mockApiClient, mockedAccount);
@@ -147,7 +159,7 @@ describe("App", () => {
         RoleEvents,
         KeyringEvents,
         SecretEvents,
-        OrganizationSettingsEvents,
+        SiteSettingsEvents,
         ShareEvents,
         UserEvents,
         GroupEvents,
@@ -185,7 +197,7 @@ describe("App", () => {
       jest.spyOn(browser.cookies, "get").mockImplementation(() => ({ value: "csrf-token" }));
       jest
         .spyOn(CheckAuthStatusService.prototype, "checkAuthStatus")
-        .mockImplementation(async () => userLoggedOutAuthStatus());
+        .mockImplementation(async () => new OnlineSessionEntity(userLoggedOutAuthStatus()));
       // process
       await App.attachEvents(port);
       // expectations

package/src/all/background_page/pagemod/authPagemod.js

@@ -16,7 +16,7 @@ import { UserEvents } from "../event/userEvents";
 import { KeyringEvents } from "../event/keyringEvents";
 import { AuthEvents } from "../event/authEvents";
 import { ConfigEvents } from "../event/configEvents";
-import { OrganizationSettingsEvents } from "../event/organizationSettingsEvents";
+import { SiteSettingsEvents } from "../event/siteSettingsEvents";
 import { LocaleEvents } from "../event/localeEvents";
 import BuildApiClientOptionsService from "../service/account/buildApiClientOptionsService";
 import { RememberMeEvents } from "../event/rememberMeEvents";
@@ -35,15 +35,7 @@ class Auth extends Pagemod {
    * @inheritDoc
    */
   get events() {
-    return [
-      ConfigEvents,
-      UserEvents,
-      KeyringEvents,
-      AuthEvents,
-      OrganizationSettingsEvents,
-      LocaleEvents,
-      RememberMeEvents,
-    ];
+    return [ConfigEvents, UserEvents, KeyringEvents, AuthEvents, SiteSettingsEvents, LocaleEvents, RememberMeEvents];
   }
 
   /**

package/src/all/background_page/pagemod/authPagemod.test.js

@@ -16,7 +16,7 @@ import Auth from "./authPagemod";
 import { UserEvents } from "../event/userEvents";
 import { KeyringEvents } from "../event/keyringEvents";
 import { AuthEvents } from "../event/authEvents";
-import { OrganizationSettingsEvents } from "../event/organizationSettingsEvents";
+import { SiteSettingsEvents } from "../event/siteSettingsEvents";
 import { LocaleEvents } from "../event/localeEvents";
 import { v4 as uuid } from "uuid";
 import { enableFetchMocks } from "jest-fetch-mock";
@@ -28,7 +28,7 @@ jest.spyOn(ConfigEvents, "listen").mockImplementation(jest.fn());
 jest.spyOn(UserEvents, "listen").mockImplementation(jest.fn());
 jest.spyOn(KeyringEvents, "listen").mockImplementation(jest.fn());
 jest.spyOn(AuthEvents, "listen").mockImplementation(jest.fn());
-jest.spyOn(OrganizationSettingsEvents, "listen").mockImplementation(jest.fn());
+jest.spyOn(SiteSettingsEvents, "listen").mockImplementation(jest.fn());
 jest.spyOn(LocaleEvents, "listen").mockImplementation(jest.fn());
 jest.spyOn(RememberMeEvents, "listen").mockImplementation(jest.fn());
 
@@ -65,7 +65,7 @@ describe("Auth", () => {
       expect(UserEvents.listen).toHaveBeenCalledWith(expectedPortAndTab, mockApiClient, mockedAccount);
       expect(KeyringEvents.listen).toHaveBeenCalledWith(expectedPortAndTab, mockApiClient, mockedAccount);
       expect(AuthEvents.listen).toHaveBeenCalledWith(expectedPortAndTab, mockApiClient, mockedAccount);
-      expect(OrganizationSettingsEvents.listen).toHaveBeenCalledWith(expectedPortAndTab, mockApiClient, mockedAccount);
+      expect(SiteSettingsEvents.listen).toHaveBeenCalledWith(expectedPortAndTab, mockApiClient, mockedAccount);
       expect(LocaleEvents.listen).toHaveBeenCalledWith(expectedPortAndTab, mockApiClient, mockedAccount);
       expect(RememberMeEvents.listen).toHaveBeenCalledWith(expectedPortAndTab, mockApiClient, mockedAccount);
       expect(Auth.events).toStrictEqual([
@@ -73,7 +73,7 @@ describe("Auth", () => {
         UserEvents,
         KeyringEvents,
         AuthEvents,
-        OrganizationSettingsEvents,
+        SiteSettingsEvents,
         LocaleEvents,
         RememberMeEvents,
       ]);

package/src/all/background_page/pagemod/pagemodManager.test.js

@@ -23,6 +23,9 @@ import PublicWebsiteSignInPagemod from "./publicWebsiteSignInPagemod";
 import CheckAuthStatusService from "../service/auth/checkAuthStatusService";
 import { userLoggedInAuthStatus } from "../controller/auth/authCheckStatus.test.data";
 import GetActiveAccountService from "../service/account/getActiveAccountService";
+import OnlineSessionEntity from "passbolt-styleguide/src/shared/models/entity/session/onlineSessionEntity";
+import AccountEntity from "../model/entity/account/accountEntity";
+import { defaultAccountDto } from "../model/entity/account/accountEntity.test.data";
 
 jest.spyOn(pagemod.prototype, "injectFiles").mockImplementation(jest.fn());
 jest.spyOn(pagemod.prototype, "attachEvents").mockImplementation(jest.fn());
@@ -91,10 +94,10 @@ describe("PagemodManager", () => {
         url: "https://passbolt.dev/app",
       };
       // mock functions
-      jest.spyOn(GetActiveAccountService, "get").mockImplementation(() => {});
+      jest.spyOn(GetActiveAccountService, "get").mockImplementation(() => new AccountEntity(defaultAccountDto()));
       jest
         .spyOn(CheckAuthStatusService.prototype, "checkAuthStatus")
-        .mockImplementation(async () => userLoggedInAuthStatus());
+        .mockImplementation(async () => new OnlineSessionEntity(userLoggedInAuthStatus()));
       jest.spyOn(UserSettings.prototype, "getDomain").mockImplementation(() => "https://passbolt.dev");
       // process
       await PagemodManager.exec(details);

package/src/all/background_page/pagemod/quickAccessPagemod.js

@@ -19,7 +19,7 @@ import { QuickAccessEvents } from "../event/quickAccessEvents";
 import { GroupEvents } from "../event/groupEvents";
 import { ResourceEvents } from "../event/resourceEvents";
 import { SecretEvents } from "../event/secretEvents";
-import { OrganizationSettingsEvents } from "../event/organizationSettingsEvents";
+import { SiteSettingsEvents } from "../event/siteSettingsEvents";
 import { TabEvents } from "../event/tabEvents";
 import { LocaleEvents } from "../event/localeEvents";
 import { PownedPasswordEvents } from "../event/pownedPasswordEvents";
@@ -50,7 +50,7 @@ class QuickAccess extends Pagemod {
       GroupEvents,
       ResourceEvents,
       SecretEvents,
-      OrganizationSettingsEvents,
+      SiteSettingsEvents,
       TabEvents,
       LocaleEvents,
       PownedPasswordEvents,