Skip to content

Commit

Permalink
Merge branch 'feature/PB-34181_As-a-windows-app-I-should-support-the-…
Browse files Browse the repository at this point in the history
…490-version-of-the-browser-extension' into 'develop'

PB-34181 - adapt code for 4.9.0

See merge request passbolt/desktop/passbolt-windows!151
  • Loading branch information
scadra committed Jul 25, 2024
2 parents 92f3830 + 32439a3 commit d636379
Show file tree
Hide file tree
Showing 14 changed files with 82 additions and 50 deletions.
3 changes: 2 additions & 1 deletion passbolt/Models/Messaging/Topics/GroupTopics.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public class GroupTopics
public const string CREATE = "passbolt.groups.create";
public const string UPDATE = "passbolt.groups.update";
public const string DELETE = "passbolt.groups.delete";
public const string DELETE_DRY_RUN = "passbolt.groups.delete-dry-run";
public const string DELETE_DRY_RUN = "passbolt.groups.delete-dry-run";
public const string FIND_MY_GROUPS = "passbolt.groups.find-my-groups";
}
}
3 changes: 2 additions & 1 deletion passbolt/Models/Messaging/Topics/ResourceTopics.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public class ResourceTopics
public const string DELETE_ALL = "passbolt.resources.delete-all";
public const string GET_ALL = "passbolt.resource-type.get-all";
public const string GET_GRID_SETTING = "passbolt.resources.get-grid-setting";
public const string SET_GRID_SETTING = "passbolt.resources.set-grid-setting";
public const string SET_GRID_SETTING = "passbolt.resources.set-grid-setting";
public const string FIND_DETAILS = "passbolt.resources.find-details";
}
}
1 change: 1 addition & 0 deletions passbolt/Webviews/Background/index-auth.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
*/

import './src/polyfill/browserPolyfill';
import "./src/polyfill/commandPolyfill"
import './src/polyfill/desktopPolyfill';
import './src/polyfill/storagePolyfill';
import './src/polyfill/runtimePolyfill';
Expand Down
1 change: 1 addition & 0 deletions passbolt/Webviews/Background/index-import.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
*/

import './src/polyfill/browserPolyfill';
import "./src/polyfill/commandPolyfill"
import './src/polyfill/desktopPolyfill';
import './src/polyfill/storagePolyfill';
import './src/polyfill/runtimePolyfill';
Expand Down
1 change: 1 addition & 0 deletions passbolt/Webviews/Background/index-workspace.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
*/

import './src/polyfill/browserPolyfill';
import "./src/polyfill/commandPolyfill"
import './src/polyfill/desktopPolyfill';
import './src/polyfill/storagePolyfill';
import './src/polyfill/runtimePolyfill';
Expand Down
56 changes: 28 additions & 28 deletions passbolt/Webviews/Background/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions passbolt/Webviews/Background/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
"@babel/preset-react": "^7.22.15",
"buffer": "^6.0.3",
"openpgp": "^5.11.1",
"passbolt-browser-extension": "4.8.2",
"passbolt-styleguide": "4.8.0",
"passbolt-browser-extension": "4.9.1",
"passbolt-styleguide": "4.9.3",
"setimmediate": "^1.0.5",
"stream-browserify": "^3.0.0",
"validator": "^13.7.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {v4 as uuidv4} from "uuid";
import VerifyAccountKitController from "./verifyAccountKitController";
import AuthImportStorageService from "../services/authImportStorageService";
import AuthImportEntity from "../entity/AuthImportEntity/authImportEntity";
import {pgpKeys} from "passbolt-browser-extension/test/fixtures/pgpKeys/keys";
import {pgpKeys} from "passbolt-styleguide/test/fixture/pgpKeys/keys";
import {defaultData} from "../services/verifyAccountKitService.test.data";

describe('VerifyAccountKitController', () => {
Expand Down
2 changes: 1 addition & 1 deletion passbolt/Webviews/Background/src/polyfill/alarmPolyfill.js
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ export default class AlarmsPolyfill {
/**
* Class representing an alarm event.
*/
class OnAlarmEvent {
export class OnAlarmEvent {
/**
* Create a new OnAlarmEvent object.
*/
Expand Down
26 changes: 26 additions & 0 deletions passbolt/Webviews/Background/src/polyfill/commandPolyfill.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/**
* 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 1.3.0
*/

import { OnAlarmEvent } from "./alarmPolyfill"

/**
* Polyfill to mock the commands API from browser extension
*/
export default class CommandsPolyfill {
constructor() {
this.onCommand = new OnAlarmEvent()
}
}

window.chrome.commands = new CommandsPolyfill()
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import {defaultAccountDto} from "passbolt-browser-extension/src/all/background_page/model/entity/account/accountEntity.test.data";
import VerifyAccountKitService from "./verifyAccountKitService";
import {defaultData} from "./verifyAccountKitService.test.data";
import {pgpKeys} from "passbolt-browser-extension/test/fixtures/pgpKeys/keys";
import {pgpKeys} from "passbolt-styleguide/test/fixture/pgpKeys/keys";

describe('VerifyAccountKitService', () => {
let verifyAccountKitService;
Expand Down
1 change: 1 addition & 0 deletions passbolt/Webviews/Background/test/jest.setup.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import "./polyfill/chromePolyfill"
import "../src/polyfill/alarmPolyfill"
import "../src/polyfill/commandPolyfill"
import "../src/polyfill/desktopPolyfill"
import "../src/polyfill/runtimePolyfill"
import "../src/polyfill/storagePolyfill"
Expand Down
28 changes: 14 additions & 14 deletions passbolt/Webviews/Rendered/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion passbolt/Webviews/Rendered/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"main": "index.js",
"dependencies": {
"copy-webpack-plugin": "^11.0.0",
"passbolt-styleguide": "4.8.0",
"passbolt-styleguide": "4.9.3",
"prop-types": "^15.8.1",
"react": "17.0.2",
"react-dom": "17.0.2",
Expand Down

0 comments on commit d636379

Please sign in to comment.