passbolt-browser-extension 5.12.1 → 5.13.0

package/.devcontainer/safe-chain-config.json

@@ -1,6 +1,7 @@
 {
   "minimumPackageAgeHours": 48,
   "npm": {
-    "minimumPackageAgeExclusions": ["@passbolt/*", "@aikidosec/*"]
+    "minimumPackageAgeExclusions": ["passbolt-browser-extension", "passbolt-styleguide", "@aikidosec/*"],
+    "directDownloadMinimumPackageAgeExclusions": ["passbolt-browser-extension", "passbolt-styleguide"]
   }
 }

package/.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,30 +1,38 @@
-##IMPORTANT: PLEASE READ
+---
+name: Report a bug
+about: Report a bug in the Passbolt browser extension.
+title: ""
+labels: bug
+assignees: ""
+---
 
-Only use github issues for bugs.
+<!--
+PLEASE READ
 
-We will be more than happy to help you on the community forum for:
-- feature requests: https://community.passbolt.com/c/backlog
-- issues related to an installation: https://community.passbolt.com/c/installation-issues
-- general questions: https://community.passbolt.com/c/uncategorized
+This tracker is only for browser extension bugs. For anything else:
 
-This is only a issue tracker for bugs related to the Passbolt Browser Extensions.
-For passbolt API, docker, command line interface, in short any other bugs 
-please use [the other relevant repositories](https://github.com/passbolt).
+- Security issues: https://www.passbolt.com/docs/contribute/security/vulnerability/
+- Feature requests: https://community.passbolt.com/c/backlog
+- Installation issues: https://community.passbolt.com/c/installation-issues
+- General questions: https://community.passbolt.com/c/uncategorized
 
-If you are certain this is a new Browser Extension bug please use the following format:
+If you are certain this is a browser extension bug, please fill in the format below.
+-->
 
-## ISSUE NAME
-* Passbolt Version: EXACT RELEASE VERSION OR COMMIT HASH, HERE.
-* Platform and Target:
--- Browser: NAME AND VERSION
--- Web server: NAME AND VERSION
--- etc.: OTHER RELEVANT PLATFORM INFO
+* Browser extension version: <!-- e.g. 5.13.0 -->
+* API edition & version: <!-- e.g. CE 5.12.0 -->
+* Environment
+  * Client: <!-- browser and OS, e.g. Chrome 148.1 on Ubuntu 26.04 -->
+  * Server: <!-- e.g. Debian 13, Docker latest-ce, or Passbolt Cloud -->
 
-### What you did
-EXPLAIN WHAT YOU DID, PREFERABLY WITH CODE EXAMPLES, HERE.
+### What you did?
 
-### What happened
-EXPLAIN WHAT IS ACTUALLY HAPPENING, HERE.
+<!-- Explain what you did, preferably with steps or code examples. -->
 
-### What you expected to happen
-EXPLAIN WHAT IS TO BE EXPECTED, HERE.
+### What happened?
+
+<!-- Explain what actually happened. -->
+
+### What you expected to happen?
+
+<!-- Explain what you expected instead. -->

package/.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Request a feature or change
+    url: https://community.passbolt.com/c/backlog
+    about: Suggest and vote on features in the community forum.
+  - name: Get installation help
+    url: https://community.passbolt.com/c/installation-issues
+    about: Ask installation and configuration questions in the community forum.
+  - name: Ask a question
+    url: https://community.passbolt.com/c/uncategorized
+    about: Ask usage questions in the community forum.

package/.jpmignore

@@ -21,7 +21,6 @@ Gruntfile.js
 CHANGELOG.MD
 README.MD
 npm-debug.log
-config.json.default
 
 #jest test coverage
 /coverage

package/CHANGELOG.md

@@ -4,6 +4,86 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [5.13.0] - 2026-06-11
+### Added
+PB-51594 Move findAllForActionLogController and test to the correct location
+PB-48516 Build process improvement - Webpack
+PB-51534 Update group edit call in groupApiService to contain "my_group_user" as urlOptions
+PB-51580 PCD 1.1 - Migrate SearchUsersAndGroupsController off ShareModel
+PB-51585 PCD 1.2 - Migrate resourceCreateService ShareModel usage to ShareResourceService
+PB-51586 PCD 1.3 - Move passbolt.share.get-folders to controller pattern
+PB-51587 PCD 1.4 - Clear ShareModel
+PB-51588 PCD 1.5 - Migrate MoveFolderController off FolderModel
+PB-51589 PCD 1.6 - Migrate MoveOneFolderService off FolderModel
+PB-51590 PCD 1.7 - Migrate MoveResourcesService off FolderModel + ResourceModel
+PB-51782 PCD 2.01 - Create SynchroniseKeyringController and binding
+PB-51783 PCD 2.02 - Create KeyringServiceWorkerService
+PB-51785 PCD 2.04 - Create GetOrFindGroupService
+PB-51786 PCD 2.05 - Create GetOrFindGroupController and binding
+PB-51787 PCD 2.06 - Create GetOrFindGroupsUsersService
+PB-51788 PCD 2.07 - Create GetOrFindGroupsUsersController and binding
+PB-51789 PCD 2.08 - Create GetOrFindUsersService
+PB-51790 PCD 2.09 - Create GetOrFindUsersController and binding
+PB-51791 PCD 2.10 - Add new methods getByIds, getGroupsUsersByGropuId on GroupServiceWorkerService
+PB-51999 PCD 2.10.B - Consolidate UserEntity between browser extension and styleguide
+PB-52000 PCD 2.10.C - Move GroupEntity + GroupsCollection to the styleguide
+PB-51792 PCD 2.11 - Create UserServiceWorkerService
+PB-51793 PCD 2.12 - Create PermissionServiceWorkerService
+PB-51794 PCD 2.13 - Create SearchUsersAndGroupsService
+PB-51795 PCD 2.14 - Refactor ShareService into ShareApiService
+PB-51796 PCD 2.15 - Update GroupApiService to support the new filter
+PB-51798 PCD 2.17 - Update FindAndUpdateGroupsLocalStorageService to add a method findForLocalStorageByIds
+PB-51799 PCD 2.18 - Align UserLocalStorage to add memory cache
+PB-51800 PCD 2.19 - Rename UserService to UserApiService
+PB-52047 CE/PRO upgrade
+PB-49605 Grid columns min-width
+PB-51808 PCD 2.27 - Create UserPermissionItem
+PB-51809 PCD 2.28 - Create GroupUserPermissionItem
+PB-47929 PAG - WP1.1 Add pagination support to ResourceService
+PB-47930 PAG - WP1.2 Paginate resource fetch for updating local storage in FindResourceService
+PB-52056 Add create method to SubscriptionKeyServiceWorkerService
+PB-52057 Add delete method to SubscriptionKeyServiceWorkerService
+PB-52058 Adapt EditSubscriptionKey to be customizable
+PB-52061 Adapt DisplaySubscriptionKeyTeasing to handle upgrade from app
+PB-52064 Create ConfirmDowngradeSubscriptionDialog
+PB-52062 Adapt DisplaySubscriptionKey to handle downgrading
+PB-52128 DisplaySubscriptionKey new layout
+
+### Security
+PB-51937 Fix ws GHSA-58qx-3vcg-4xpx - MEDIUM CVSS3.1
+PB-51938 Fix brace-expansion GHSA-jxxr-4gwj-5jf2 - MEDIUM CVSS3.1
+PB-52029 Fix tmp GHSA-ph9p-34f9-6g65 - HIGH CVSS4.0
+PB-51532 Include GitLab file from ci-definitions repo
+PB-51642 Fix fast-uri GHSA-q3j6-qgpj-74h6 - HIGH CVSS3.1
+PB-51643 Fix @babel/plugin-transform-modules-systemjs GHSA-fv7c-fp4j-7gwp - HIGH CVSS3.1
+PB-51940 Fix qs GHSA-q8mj-m7cp-5q26 - MEDIUM CVSS4.0
+PB-52030 Fix webpack-dev-server GHSA-79cf-xcqc-c78w - MEDIUM CVSS3.1
+PB-51698 Use correct passbolt repo names in safe-chain whitelist
+
+### Fixed
+PB-52148 CSP is blocking upload to TOTP QRCode on Firefox
+PB-50949 Fix MetadataKeysSettingsLocalStorageContext and MetadataTypesSettingsLocalStorageContext entity issue on storage changes
+PB-52047 Fix Passbolt Pro Edition wording
+PB-52156 Fix password preview button min-width
+
+### Maintenance
+PB-48560 Use NODE_ENV for webpack mode config
+PB-48564 Remove grunt-header
+PB-48528 Transpile LESS from webpack
+PB-48558 Extract translations directly from webpack
+PB-48559 Remove rimraf
+PB-49064 Remove Grunt
+PB-48516 Replace eval sourcemap by inline
+PB-48516 Prevent br tags to be added in translations.
+PB-48516 Remove duplicated translations
+PB-51793: Add PermissionServiceWorkerService and transfer Permission entity and collection on styleguide
+PB-51160 Update Firefox manifest to avoid Mozilla warnings
+PB-52155 Update github issue template
+
+## [5.12.2] - 2026-05-19
+### Fixed
+- PB-51648 Fix add user to group reducing set timeout
+
 ## [5.12.1] - 2026-05-12
 ### Fixed
 - PB-51546 On Safari after log out, the login page does not show until the page is refreshed
@@ -2721,7 +2801,8 @@ self registration settings option in the left-side bar
 - AP: User with plugin installed
 - LU: Logged in user
 
-[Unreleased]: https://github.com/passbolt/passbolt_browser_extension/compare/v5.12.1...HEAD
+[Unreleased]: https://github.com/passbolt/passbolt_browser_extension/compare/v5.12.2...HEAD
+[5.12.2]: https://github.com/passbolt/passbolt_browser_extension/compare/v5.12.1...v5.12.2
 [5.12.1]: https://github.com/passbolt/passbolt_browser_extension/compare/v5.12.0...v5.12.1
 [5.12.0]: https://github.com/passbolt/passbolt_browser_extension/compare/v5.11.3...v5.12.0
 [5.11.3]: https://github.com/passbolt/passbolt_browser_extension/compare/v5.11.2...v5.11.3

package/CONTRIBUTING.md

@@ -15,18 +15,7 @@ There are a few guidelines that we need contributors to follow so that we have a
 
 ### Reporting a security Issue
 
-If you've found a security related issue in Passbolt, please don't open an issue in GitHub.
-Instead contact us at security@passbolt.com. In the spirit of responsible disclosure we ask that the reporter keep the
-issue confidential until we announce it.
-
-The passbolt team will take the following actions:
-- Try to first reproduce the issue and confirm the vulnerability.
-- Acknowledge to the reporter that we’ve received the issue and are working on a fix.
-- Get a fix/patch prepared and create associated automated tests.
-- Prepare a post describing the vulnerability, and the possible exploits.
-- Release new versions of all affected major versions.
-- Prominently feature the problem in the release announcement.
-- Provide credits in the release announcement to the reporter if they so desire.
+If you've found a security related issue in Passbolt, please don't open an issue on GitHub. Follow our responsible disclosure process: https://www.passbolt.com/docs/contribute/security/vulnerability/.
 
 ### Reporting a bug
 Please only use github for bugs or pull request.

package/README.md

@@ -5,14 +5,14 @@
 	  /_/    \__,_/____/____/_.___/\____/_/\__/
 
 	Open source password manager for teams
-	(c) 2025 Passbolt SA
+	(c) 2026 Passbolt SA
 	https://www.passbolt.com
 
 ## License
 
 Passbolt - Open source password manager for teams
 
-(c) 2025 Passbolt SA
+(c) 2026 Passbolt SA
 
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
 Public License (AGPL) as published by the Free Software Foundation version 3.
@@ -54,22 +54,11 @@ such as auto filling your passwords when visiting known websites.
 
 # Contributing
 
-Please check ```CONTRIBUTING.md``` for more information about how to get involved.
+Please check [CONTRIBUTING.md](CONTRIBUTING.md) for more information about how to get involved.
 
-### Reporting a security Issue
+## Reporting a security Issue
 
-If you've found a security related issue in Passbolt, please don't open an issue in GitHub.
-Instead contact us at security@passbolt.com. In the spirit of responsible disclosure we ask that the reporter keep the
-issue confidential until we announce it.
-
-The passbolt team will take the following actions:
-- Try to first reproduce the issue and confirm the vulnerability.
-- Acknowledge to the reporter that we’ve received the issue and are working on a fix.
-- Get a fix/patch prepared and create associated automated tests.
-- Prepare a post describing the vulnerability, and the possible exploits.
-- Release new versions of all affected major versions.
-- Prominently feature the problem in the release announcement.
-- Provide credits in the release announcement to the reporter if they so desire.
+If you've found a security related issue in Passbolt, please don't open an issue on GitHub. Follow our responsible disclosure process: https://www.passbolt.com/docs/contribute/security/vulnerability/.
 
 # Quick how-to for developers
 

package/RELEASE_NOTES.md

@@ -1,5 +1,4 @@
-Passbolt 5.12.1 fixes some slowlyness issues on Safari during navigation
+Passbolt 5.12.2 fixes an issue that arose in Chrome 148, which caused a service worker that did not respond within the specified time limit to be terminated.
 
 ### Fixed
-- PB-51546 On Safari after log out, the login page does not show until the page is refreshed
-- PB-51547 On Safari after log in, some pages take a lot of time to display
+- PB-51648 Fix add user to group reducing set timeout

package/SECURITY.md

@@ -0,0 +1,7 @@
+# Security Policy
+
+For general information about security at Passbolt, see https://www.passbolt.com/security
+
+## Reporting a security issue
+
+If you've found a security issue in Passbolt, please do not open a public issue. Follow our responsible disclosure process: https://www.passbolt.com/docs/contribute/security/vulnerability/

package/i18next.config.js

@@ -0,0 +1,28 @@
+/**
+ * Passbolt ~ Open source password manager for teams
+ * Copyright (c) Passbolt SA (https://www.passbolt.com)
+ *
+ * Licensed under GNU Affero General Public License version 3 of the or any later version.
+ * For full copyright and license information, please see the LICENSE.txt
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright (c) Passbolt SA (https://www.passbolt.com)
+ * @license       https://opensource.org/licenses/AGPL-3.0 AGPL License
+ * @link          https://www.passbolt.com Passbolt(tm)
+ * @since         5.12.0
+ */
+const { defineConfig } = require('i18next-cli');
+
+module.exports = defineConfig({
+  locales: ['en-UK'],
+  extract: {
+    input: ['src/all/**/*.{js,jsx}'],
+    output: 'src/all/locales/{{language}}/{{namespace}}.json',
+    functions: ['t', '*.t', 'translate', '*.translate'],
+    defaultNS: 'common',
+    keySeparator: false,
+    nsSeparator: false,
+    sort: true,
+    defaultValue: key => key,
+  },
+});

package/jest.config.json

@@ -1,6 +1,7 @@
 {
   "testEnvironment": "node",
   "setupFiles": [
+    "<rootDir>/test/jest.env-setup.js",
     "jest-webextension-mock",
     "<rootDir>/test/jest-webextension-force-runtime-id-setup-files.js"
   ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "passbolt-browser-extension",
-  "version": "5.12.1",
+  "version": "5.13.0",
   "license": "AGPL-3.0",
   "copyright": "Copyright 2025 Passbolt SA",
   "description": "Passbolt web extension for the open source password manager for teams",
@@ -21,7 +21,7 @@
     "kdbxweb": "2.1.1",
     "openpgp": "^6.1.1",
     "papaparse": "^5.5.2",
-    "passbolt-styleguide": "^5.12.1",
+    "passbolt-styleguide": "^5.13.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "secrets-passbolt": "github:passbolt/secrets.js#v2.0.1",
@@ -34,7 +34,7 @@
     "@babel/core": "^7.23.2",
     "@babel/helpers": "^7.26.10",
     "@babel/plugin-transform-runtime": "^7.22.9",
-    "@babel/preset-env": "^7.22.9",
+    "@babel/preset-env": "^7.29.5",
     "@babel/preset-react": "^7.28.5",
     "@babel/runtime": "^7.27.0",
     "@babel/runtime-corejs3": "^7.26.10",
@@ -43,7 +43,8 @@
     "babel-jest": "^30.3.0",
     "babel-loader": "^8.2.3",
     "buffer": "^6.0.3",
-    "crx": "^5.0.1",
+    "copy-webpack-plugin": "^14.0.0",
+    "dotenv": "^16.4.5",
     "eslint": "^9.39.4",
     "eslint-config-prettier": "^10.1.8",
     "eslint-import-resolver-alias": "^1.1.2",
@@ -59,11 +60,7 @@
     "filereader": "^0.10.3",
     "formdata-node": "^6.0.3",
     "globals": "^16.4.0",
-    "grunt": "^1.0.3",
-    "grunt-contrib-clean": "^2.0.0",
-    "grunt-contrib-copy": "^1.0.0",
-    "grunt-shell": "^4.0.0",
-    "i18next-parser": "^9.3.0",
+    "i18next-cli": "^1.58.0",
     "jest": "^30.3.0",
     "jest-environment-jsdom": "^30.3.0",
     "jest-environment-node": "^30.3.0",
@@ -74,7 +71,7 @@
     "prettier": "3.6.2",
     "terser-webpack-plugin": "^5.4.0",
     "text-encoding-utf-8": "^1.0.2",
-    "web-ext": "^10.1.0",
+    "web-ext": "^10.3.0",
     "webpack": "^5.105.2",
     "webpack-cli": "^7.0.2"
   },
@@ -83,41 +80,24 @@
     "uuid": "^14.0.0"
   },
   "scripts": {
-    "build": "npx grunt build",
-    "build:background-page": "webpack --config webpack.background-page.config.js",
-    "build:safari:background-page": "webpack --config webpack.safari-background-page.config.js",
-    "build:service-worker": "webpack --config webpack.service-worker.config.js; webpack --config webpack-offscreens.config.js",
-    "build:content-scripts": "npm run build:content-scripts:app; npm run build:content-scripts:browser-integration; npm run build:content-scripts:public-website",
-    "build:content-scripts:app": "webpack --config webpack-content-scripts.config.js",
-    "build:content-scripts:browser-integration": "webpack --config webpack-content-scripts.browser-integration.config.js",
-    "build:content-scripts:public-website": "webpack --config webpack-content-scripts.public-website-sign-in.config.js",
-    "build:web-accessible-resources": "npm run build:web-accessible-resources:app; npm run build:web-accessible-resources:browser-integration",
-    "build:web-accessible-resources:app": "webpack --config webpack-data.config.js; webpack --config webpack-data.download.config.js",
-    "build:web-accessible-resources:browser-integration": "webpack --config webpack-data.in-form-call-to-action.config.js; webpack --config webpack-data.in-form-menu.config.js",
-    "dev:build:background-page": "webpack --env debug=true --config webpack.background-page.config.js",
-    "dev:build:safari:background-page": "webpack --env debug=true --config webpack.safari-background-page.config.js",
-    "dev:build:service-worker": "webpack --env debug=true --config webpack.service-worker.config.js; webpack --env debug=true --config webpack-offscreens.config.js",
-    "dev:build:content-scripts": "npm run dev:build:content-scripts:app; npm run dev:build:content-scripts:browser-integration; npm run dev:build:content-scripts:public-website",
-    "dev:build:content-scripts:app": "webpack --env debug=true --config webpack-content-scripts.config.js",
-    "dev:build:content-scripts:browser-integration": "webpack --env debug=true --config webpack-content-scripts.browser-integration.config.js",
-    "dev:build:content-scripts:public-website": "webpack --env debug=true --config webpack-content-scripts.public-website-sign-in.config.js",
-    "dev:build:web-accessible-resources": "npm run dev:build:web-accessible-resources:app; npm run dev:build:web-accessible-resources:browser-integration",
-    "dev:build:web-accessible-resources:app": "webpack --env debug=true --config webpack-data.config.js; webpack --env debug=true --config webpack-data.download.config.js",
-    "dev:build:web-accessible-resources:browser-integration": "webpack --env debug=true --config webpack-data.in-form-call-to-action.config.js; webpack --env debug=true --config webpack-data.in-form-menu.config.js",
-    "dev:safari:build": "grunt build-safari-debug;",
+    "build": "webpack",
+    "build:firefox": "webpack --config webpack.firefox.config.js",
+    "build:chromium-mv2": "webpack --config webpack.chromium-mv2.config.js",
+    "build:chromium-mv3": "webpack --config webpack.chromium-mv3.config.js",
+    "build:safari": "webpack --config webpack.safari.config.js",
+    "dev:build:firefox": "NODE_ENV=development webpack --config webpack.firefox.config.js",
+    "dev:build:chromium-mv2": "NODE_ENV=development webpack --config webpack.chromium-mv2.config.js",
+    "dev:build:chromium-mv3": "NODE_ENV=development webpack --config webpack.chromium-mv3.config.js",
+    "dev:build:safari": "NODE_ENV=development webpack --config webpack.safari.config.js",
     "dev:safari:convert": "xcrun safari-web-extension-converter --app-name Passbolt-Safari-Extension --swift --macos-only --project-location ./build-safari-extension --bundle-identifier com.passbolt.safari-extension --force --no-open build/all/",
-    "dev:watch:build:background-page": "npm run dev:build:background-page -- -w",
-    "dev:watch:build:service-worker": "npm run dev:build:service-worker -- -w",
-    "dev:watch:build:content-scripts:app": "npm run dev:build:content-scripts:app -- -w",
-    "dev:watch:build:content-scripts:browser-integration": "npm run dev:build:content-scripts:browser-integration -- -w",
-    "dev:watch:build:content-scripts:public-website": "npm run dev:build:content-scripts:public-website -- -w",
-    "dev:watch:build:web-accessible-resources:app": "npm run dev:build:web-accessible-resources:app -- -w",
-    "dev:watch:build:web-accessible-resources:browser-integration": "npm run dev:build:web-accessible-resources:browser-integration -- -w",
+    "dev:watch:build:firefox": "npm run dev:build:firefox -- -w",
+    "dev:watch:build:chromium-mv2": "npm run dev:build:chromium-mv2 -- -w",
+    "dev:watch:build:chromium-mv3": "npm run dev:build:chromium-mv3 -- -w",
+    "dev:watch:build:safari": "npm run dev:build:safari -- -w",
     "lint": "npm run lint:lockfile && npm run lint:eslint",
     "lint:lockfile": "lockfile-lint --path package-lock.json --allowed-hosts npm github.com --allowed-schemes \"https:\" \"git+ssh:\" --empty-hostname false --allowed-urls \"secrets-passbolt@2.0.1-ccce02543c135b0d92f69a70e960d634e7d64609@\"",
     "lint:eslint": "eslint src --max-warnings 0",
     "lint:eslint-fix": "eslint --fix src",
-    "i18n:externalize": "i18next -c ./i18next-parser.config.js",
     "test": "npm run test:unit",
     "test:unit": "jest --no-cache ./src/all/ ./src/chrome-mv3/ ./src/chrome/ ./src/safari/",
     "test:coverage": "jest --no-cache ./src/all/ ./src/chrome-mv3/ ./src/safari/ --coverage",

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

@@ -40,7 +40,7 @@ import AccountRecoveryResponseEntity from "../../model/entity/accountRecovery/ac
 import MockExtension from "../../../../../test/mocks/mockExtension";
 import UserLocalStorage from "../../service/local_storage/userLocalStorage";
 import { defaultUserDto } from "passbolt-styleguide/src/shared/models/entity/user/userEntity.test.data";
-import UsersCollection from "../../model/entity/user/usersCollection";
+import UsersCollection from "passbolt-styleguide/src/shared/models/entity/user/usersCollection";
 import { OpenpgpAssertion } from "../../utils/openpgp/openpgpAssertions";
 
 jest.mock("../../service/passphrase/getPassphraseService");

package/src/all/background_page/{event → controller/actionLog}/findAllForActionLogController.js

@@ -11,7 +11,7 @@
  * @link          https://www.passbolt.com Passbolt(tm)
  * @since         5.4.0
  */
-import FindActionLogService from "../model/actionLog/findActionLogService";
+import FindActionLogService from "../../model/actionLog/findActionLogService";
 
 class FindAllForActionLogController {
   /**

package/src/all/background_page/{event → controller/actionLog}/findAllForActionLogController.test.js

@@ -11,12 +11,12 @@
  * @link          https://www.passbolt.com Passbolt(tm)
  * @since         5.4.0
  */
-import AccountEntity from "../model/entity/account/accountEntity";
-import { defaultAccountDto } from "../model/entity/account/accountEntity.test.data";
+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 FindAllForActionLogController from "./findAllForActionLogController";
-import { defaultActionLogsCollection } from "../model/entity/actionLog/actionLogsCollection.test.data";
-import ActionLogsCollection from "../model/entity/actionLog/actionLogsCollection";
+import { defaultActionLogsCollection } from "../../model/entity/actionLog/actionLogsCollection.test.data";
+import ActionLogsCollection from "../../model/entity/actionLog/actionLogsCollection";
 import { v4 as uuid } from "uuid";
 
 describe("FindAllForActionLogController", () => {

package/src/all/background_page/controller/export/exportResourcesFileController.test.js

@@ -50,6 +50,7 @@ import { resourceCollectionV4ToExport } from "../../service/resource/export/expo
 import { defaultDecryptedSharedMetadataKeysDtos } from "passbolt-styleguide/src/shared/models/entity/metadata/metadataKeysCollection.test.data";
 import MetadataKeysCollection from "passbolt-styleguide/src/shared/models/entity/metadata/metadataKeysCollection";
 import GetOrFindMetadataKeysService from "../../service/metadata/getOrFindMetadataKeysService";
+import { mockPassboltResponse } from "passbolt-styleguide/test/mocks/mockApiResponse";
 
 beforeEach(async () => {
   await MockExtension.withConfiguredAccount();
@@ -112,7 +113,9 @@ describe("ExportResourcesFileController", () => {
             folder_parent_id: foldersDto[0].id,
             totp: defaultTotpDto({ secret_key: "THISISASECRET" }),
           });
-          jest.spyOn(ResourceService.prototype, "findAll").mockImplementation(() => resourceCollectionV4);
+          jest
+            .spyOn(ResourceService.prototype, "findAll")
+            .mockImplementation(() => mockPassboltResponse(resourceCollectionV4));
           const result = await controller.exec(file);
 
           const blobFile = new Blob([result.file], { type: "text/csv" });
@@ -169,7 +172,9 @@ describe("ExportResourcesFileController", () => {
           });
 
           const exportResourcesFileEntity = new ExportResourcesFileEntity(file);
-          jest.spyOn(ResourceService.prototype, "findAll").mockImplementation(() => resourceCollectionV4);
+          jest
+            .spyOn(ResourceService.prototype, "findAll")
+            .mockImplementation(() => mockPassboltResponse(resourceCollectionV4));
           await getKDBXContent(exportResourcesFileEntity, new ResourcesCollection(resourceCollectionV4));
 
           const result = await controller.exec(file);

package/src/all/background_page/controller/folder/folderCreateController.js

@@ -12,6 +12,7 @@
  * @since         2.13.0
  */
 import FolderModel from "../../model/folder/folderModel";
+import FindFoldersService from "../../service/folder/findFoldersService";
 import i18n from "../../sdk/i18n";
 import ProgressService from "../../service/progress/progressService";
 
@@ -28,6 +29,7 @@ class FolderCreateController {
     this.worker = worker;
     this.requestId = requestId;
     this.folderModel = new FolderModel(clientOptions, account);
+    this.findFoldersService = new FindFoldersService(clientOptions);
     this.progressService = new ProgressService(this.worker, i18n.t("Creating folder..."));
   }
 
@@ -52,7 +54,7 @@ class FolderCreateController {
          * TODO a remember me option to skip confirmation dialog
          */
         await this.progressService.finishStep(i18n.t("Fetching parent permissions"), true);
-        const targetFolder = await this.folderModel.findForShare(folderEntity.folderParentId);
+        const targetFolder = await this.findFoldersService.findByIdWithPermissions(folderEntity.folderParentId);
 
         await this.progressService.finishStep(i18n.t("Saving permissions..."), true);
         const changes = await this.folderModel.calculatePermissionsChangesForCreate(folderEntity, targetFolder);

package/src/all/background_page/controller/group/findMyGroupsController.test.js

@@ -13,11 +13,11 @@
  */
 
 import { enableFetchMocks } from "jest-fetch-mock";
-import { defaultGroupsDtos } from "../../model/entity/group/groupsCollection.test.data";
+import { defaultGroupsDtos } from "passbolt-styleguide/src/shared/models/entity/group/groupsCollection.test.data";
 import { mockApiResponse } from "../../../../../test/mocks/mockApiResponse";
 import FindMyGroupsController from "./findMyGroupsController";
 import { defaultApiClientOptions } from "passbolt-styleguide/src/shared/lib/apiClient/apiClientOptions.test.data";
-import GroupsCollection from "../../model/entity/group/groupsCollection";
+import GroupsCollection from "passbolt-styleguide/src/shared/models/entity/group/groupsCollection";
 import MockExtension from "../../../../../test/mocks/mockExtension";
 import { pgpKeys } from "passbolt-styleguide/test/fixture/pgpKeys/keys";
 import FindGroupsService from "../../service/group/findGroupsService";

package/src/all/background_page/controller/group/getOrFindGroupsController.js

@@ -0,0 +1,61 @@
+/**
+ * Passbolt ~ Open source password manager for teams
+ * Copyright (c) Passbolt SA (https://www.passbolt.com)
+ *
+ * Licensed under GNU Affero General Public License version 3 of the or any later version.
+ * For full copyright and license information, please see the LICENSE.txt
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright (c) Passbolt SA (https://www.passbolt.com)
+ * @license       https://opensource.org/licenses/AGPL-3.0 AGPL License
+ * @link          https://www.passbolt.com Passbolt(tm)
+ * @since         5.13.0
+ */
+import GetOrFindGroupsService from "../../service/group/getOrFindGroupsService";
+import { assertArrayUUID } from "../../utils/assertions";
+
+/**
+ * Controller for the `passbolt.groups.get-by-ids` event. Returns the groups matching the given ids,
+ * served from the local storage cache when available and otherwise fetched from the API.
+ */
+class GetOrFindGroupsController {
+  /**
+   * Constructor.
+   * @param {Worker} worker The associated worker.
+   * @param {string} requestId The associated request id.
+   * @param {ApiClientOptions} apiClientOptions The api client options.
+   * @param {AccountEntity} account The user account.
+   */
+  constructor(worker, requestId, apiClientOptions, account) {
+    this.worker = worker;
+    this.requestId = requestId;
+    this.getOrFindGroupsService = new GetOrFindGroupsService(account, apiClientOptions);
+  }
+
+  /**
+   * Controller executor.
+   * @param {Array<string>} groupIds The ids of the groups to retrieve.
+   * @returns {Promise<void>}
+   */
+  async _exec(groupIds) {
+    try {
+      const result = await this.exec(groupIds);
+      this.worker.port.emit(this.requestId, "SUCCESS", result);
+    } catch (error) {
+      console.error(error);
+      this.worker.port.emit(this.requestId, "ERROR", error);
+    }
+  }
+
+  /**
+   * Find all the groups matching the given ids.
+   * @param {Array<string>} groupIds The ids of the groups to retrieve.
+   * @returns {Promise<GroupsCollection>}
+   */
+  async exec(groupIds) {
+    assertArrayUUID(groupIds);
+    return this.getOrFindGroupsService.getOrFindByIds(groupIds);
+  }
+}
+
+export default GetOrFindGroupsController;