+ 
-
+
-
- 
-
-
- 
-
-
- 
-
-
- 
-
-
- 
-
+ 
+ 
+ 
+ 
+
+
-
-
+
+
The Bitwarden browser extension is written using the Web Extension API and Angular.
diff --git a/apps/browser/config/base.json b/apps/browser/config/base.json
index 348f00d1f36..8a3ccc14d3c 100644
--- a/apps/browser/config/base.json
+++ b/apps/browser/config/base.json
@@ -2,6 +2,7 @@
"dev_flags": {},
"flags": {
"showPasswordless": true,
- "enableCipherKeyEncryption": false
+ "enableCipherKeyEncryption": false,
+ "accountSwitching": false
}
}
diff --git a/apps/browser/config/development.json b/apps/browser/config/development.json
index eafd0ffd878..1b628c173ce 100644
--- a/apps/browser/config/development.json
+++ b/apps/browser/config/development.json
@@ -7,6 +7,7 @@
},
"flags": {
"showPasswordless": true,
- "enableCipherKeyEncryption": false
+ "enableCipherKeyEncryption": false,
+ "accountSwitching": true
}
}
diff --git a/apps/browser/config/production.json b/apps/browser/config/production.json
index f57c3d9bc38..027003f6c75 100644
--- a/apps/browser/config/production.json
+++ b/apps/browser/config/production.json
@@ -1,5 +1,6 @@
{
"flags": {
- "enableCipherKeyEncryption": false
+ "enableCipherKeyEncryption": false,
+ "accountSwitching": true
}
}
diff --git a/apps/browser/gulpfile.js b/apps/browser/gulpfile.js
index 2f672ffcdd4..6a0980fc27f 100644
--- a/apps/browser/gulpfile.js
+++ b/apps/browser/gulpfile.js
@@ -1,13 +1,11 @@
const child = require("child_process");
const fs = require("fs");
-const del = require("del");
+const { rimraf } = require("rimraf");
const gulp = require("gulp");
-const filter = require("gulp-filter");
const gulpif = require("gulp-if");
const jeditor = require("gulp-json-editor");
const replace = require("gulp-replace");
-const zip = require("gulp-zip");
const manifest = require("./src/manifest.json");
@@ -47,7 +45,10 @@ function distFileName(browserName, ext) {
return `dist-${browserName}${buildString()}.${ext}`;
}
-function dist(browserName, manifest) {
+async function dist(browserName, manifest) {
+ const { default: zip } = await import("gulp-zip");
+ const { default: filter } = await import("gulp-filter");
+
return gulp
.src(paths.build + "**/*")
.pipe(filter(["**"].concat(filters.fonts).concat(filters.safari)))
@@ -60,6 +61,10 @@ function dist(browserName, manifest) {
function distFirefox() {
return dist("firefox", (manifest) => {
delete manifest.storage;
+ delete manifest.sandbox;
+ manifest.optional_permissions = manifest.optional_permissions.filter(
+ (permission) => permission !== "privacy",
+ );
return manifest;
});
}
@@ -123,13 +128,13 @@ function distSafariApp(cb, subBuildPath) {
"--sign",
subBuildPath === "mas"
? "3rd Party Mac Developer Application: Bitwarden Inc"
- : "E661AB6249AEB60B0F47ABBD7326B2877D2575B0",
+ : "E7C9978F6FBCE0553429185C405E61F5380BE8EB",
"--entitlements",
entitlementsPath,
];
}
- return del([buildPath + "**/*"])
+ return rimraf([buildPath + "**/*"], { glob: true })
.then(() => safariCopyAssets(paths.safari + "**/*", buildPath))
.then(() => safariCopyBuild(paths.build + "**/*", buildPath + "safari/app"))
.then(() => {
@@ -143,7 +148,9 @@ function distSafariApp(cb, subBuildPath) {
stdOutProc(proc);
return new Promise((resolve) => proc.on("close", resolve));
})
- .then(() => {
+ .then(async () => {
+ const { default: filter } = await import("gulp-filter");
+
const libs = fs
.readdirSync(builtAppexFrameworkPath)
.filter((p) => p.endsWith(".dylib"))
@@ -167,7 +174,7 @@ function distSafariApp(cb, subBuildPath) {
},
() => {
return cb;
- }
+ },
);
}
@@ -178,7 +185,7 @@ function safariCopyAssets(source, dest) {
.on("error", reject)
.pipe(gulpif("safari/Info.plist", replace("0.0.1", manifest.version)))
.pipe(
- gulpif("safari/Info.plist", replace("0.0.2", process.env.BUILD_NUMBER || manifest.version))
+ gulpif("safari/Info.plist", replace("0.0.2", process.env.BUILD_NUMBER || manifest.version)),
)
.pipe(gulpif("desktop.xcodeproj/project.pbxproj", replace("../../../build", "../safari/app")))
.pipe(gulp.dest(dest))
@@ -186,7 +193,9 @@ function safariCopyAssets(source, dest) {
});
}
-function safariCopyBuild(source, dest) {
+async function safariCopyBuild(source, dest) {
+ const { default: filter } = await import("gulp-filter");
+
return new Promise((resolve, reject) => {
gulp
.src(source)
@@ -202,8 +211,8 @@ function safariCopyBuild(source, dest) {
delete manifest.optional_permissions;
manifest.permissions.push("nativeMessaging");
return manifest;
- })
- )
+ }),
+ ),
)
.pipe(gulp.dest(dest))
.on("end", resolve);
@@ -215,7 +224,10 @@ function stdOutProc(proc) {
proc.stderr.on("data", (data) => console.error(data.toString()));
}
-function ciCoverage(cb) {
+async function ciCoverage(cb) {
+ const { default: zip } = await import("gulp-zip");
+ const { default: filter } = await import("gulp-filter");
+
return gulp
.src(paths.coverage + "**/*")
.pipe(filter(["**", "!coverage/coverage*.zip"]))
diff --git a/apps/browser/jest.config.js b/apps/browser/jest.config.js
index cde02cd9959..73f5ada287a 100644
--- a/apps/browser/jest.config.js
+++ b/apps/browser/jest.config.js
@@ -9,7 +9,10 @@ module.exports = {
...sharedConfig,
preset: "jest-preset-angular",
setupFilesAfterEnv: ["+ {{ "accountLimitReached" | i18n }} +
+