diff --git a/apps/browser/src/auth/popup/login-v1.component.ts b/apps/browser/src/auth/popup/login-v1.component.ts
index eee1bcc4d3f..a64f4ef384d 100644
--- a/apps/browser/src/auth/popup/login-v1.component.ts
+++ b/apps/browser/src/auth/popup/login-v1.component.ts
@@ -25,14 +25,11 @@ import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.serv
import { ToastService } from "@bitwarden/components";
import { PasswordGenerationServiceAbstraction } from "@bitwarden/generator-legacy";
-import { flagEnabled } from "../../platform/flags";
-
@Component({
selector: "app-login",
templateUrl: "login-v1.component.html",
})
export class LoginComponentV1 extends BaseLoginComponent implements OnInit {
- showPasswordless = false;
constructor(
devicesApiService: DevicesApiServiceAbstraction,
appIdService: AppIdService,
@@ -82,14 +79,11 @@ export class LoginComponentV1 extends BaseLoginComponent implements OnInit {
await syncService.fullSync(true);
};
this.successRoute = "/tabs/vault";
- this.showPasswordless = flagEnabled("showPasswordless");
}
async ngOnInit(): Promise
{
await super.ngOnInit();
- if (this.showPasswordless) {
- await this.validateEmail();
- }
+ await this.validateEmail();
}
settings() {
diff --git a/apps/browser/src/auth/popup/login-via-auth-request.component.html b/apps/browser/src/auth/popup/login-via-auth-request-v1.component.html
similarity index 100%
rename from apps/browser/src/auth/popup/login-via-auth-request.component.html
rename to apps/browser/src/auth/popup/login-via-auth-request-v1.component.html
diff --git a/apps/browser/src/auth/popup/login-via-auth-request.component.ts b/apps/browser/src/auth/popup/login-via-auth-request-v1.component.ts
similarity index 91%
rename from apps/browser/src/auth/popup/login-via-auth-request.component.ts
rename to apps/browser/src/auth/popup/login-via-auth-request-v1.component.ts
index 9dc0d7d5454..66c69d0a41a 100644
--- a/apps/browser/src/auth/popup/login-via-auth-request.component.ts
+++ b/apps/browser/src/auth/popup/login-via-auth-request-v1.component.ts
@@ -2,7 +2,7 @@ import { Location } from "@angular/common";
import { Component } from "@angular/core";
import { Router } from "@angular/router";
-import { LoginViaAuthRequestComponent as BaseLoginWithDeviceComponent } from "@bitwarden/angular/auth/components/login-via-auth-request.component";
+import { LoginViaAuthRequestComponentV1 as BaseLoginViaAuthRequestComponentV1 } from "@bitwarden/angular/auth/components/login-via-auth-request-v1.component";
import {
AuthRequestServiceAbstraction,
LoginStrategyServiceAbstraction,
@@ -27,9 +27,9 @@ import { KeyService } from "@bitwarden/key-management";
@Component({
selector: "app-login-via-auth-request",
- templateUrl: "login-via-auth-request.component.html",
+ templateUrl: "login-via-auth-request-v1.component.html",
})
-export class LoginViaAuthRequestComponent extends BaseLoginWithDeviceComponent {
+export class LoginViaAuthRequestComponentV1 extends BaseLoginViaAuthRequestComponentV1 {
constructor(
router: Router,
keyService: KeyService,
diff --git a/apps/browser/src/auth/popup/login/extension-login-component.service.spec.ts b/apps/browser/src/auth/popup/login/extension-login-component.service.spec.ts
index a7e29171015..4d3a7763013 100644
--- a/apps/browser/src/auth/popup/login/extension-login-component.service.spec.ts
+++ b/apps/browser/src/auth/popup/login/extension-login-component.service.spec.ts
@@ -8,7 +8,6 @@ import { EnvironmentService } from "@bitwarden/common/platform/abstractions/envi
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
import { PasswordGenerationServiceAbstraction } from "@bitwarden/generator-legacy";
-import { flagEnabled } from "../../../platform/flags";
import { BrowserPlatformUtilsService } from "../../../platform/services/platform-utils/browser-platform-utils.service";
import { ExtensionAnonLayoutWrapperDataService } from "../extension-anon-layout-wrapper/extension-anon-layout-wrapper-data.service";
@@ -62,18 +61,6 @@ describe("ExtensionLoginComponentService", () => {
expect(service).toBeTruthy();
});
- describe("isLoginViaAuthRequestSupported", () => {
- it("returns true if showPasswordless flag is enabled", () => {
- (flagEnabled as jest.Mock).mockReturnValue(true);
- expect(service.isLoginViaAuthRequestSupported()).toBe(true);
- });
-
- it("returns false if showPasswordless flag is disabled", () => {
- (flagEnabled as jest.Mock).mockReturnValue(false);
- expect(service.isLoginViaAuthRequestSupported()).toBeFalsy();
- });
- });
-
describe("showBackButton", () => {
it("sets showBackButton in extensionAnonLayoutWrapperDataService", () => {
service.showBackButton(true);
diff --git a/apps/browser/src/auth/popup/login/extension-login-component.service.ts b/apps/browser/src/auth/popup/login/extension-login-component.service.ts
index 8630030e8e2..3b643fe9c87 100644
--- a/apps/browser/src/auth/popup/login/extension-login-component.service.ts
+++ b/apps/browser/src/auth/popup/login/extension-login-component.service.ts
@@ -7,7 +7,6 @@ import { EnvironmentService } from "@bitwarden/common/platform/abstractions/envi
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
import { PasswordGenerationServiceAbstraction } from "@bitwarden/generator-legacy";
-import { flagEnabled } from "../../../platform/flags";
import { ExtensionAnonLayoutWrapperDataService } from "../extension-anon-layout-wrapper/extension-anon-layout-wrapper-data.service";
@Injectable()
@@ -33,10 +32,6 @@ export class ExtensionLoginComponentService
this.clientType = this.platformUtilsService.getClientType();
}
- isLoginViaAuthRequestSupported(): boolean {
- return flagEnabled("showPasswordless");
- }
-
showBackButton(showBackButton: boolean): void {
this.extensionAnonLayoutWrapperDataService.setAnonLayoutWrapperData({ showBackButton });
}
diff --git a/apps/browser/src/auth/popup/settings/account-security.component.html b/apps/browser/src/auth/popup/settings/account-security.component.html
index 00e1fd17150..e0dfde7be77 100644
--- a/apps/browser/src/auth/popup/settings/account-security.component.html
+++ b/apps/browser/src/auth/popup/settings/account-security.component.html
@@ -65,17 +65,14 @@
{{ "vaultTimeoutAction1" | i18n }}
-
+
+
+
+
{{ "vaultTimeoutActionDesc" | i18n }}
diff --git a/apps/browser/src/autofill/services/autofill.service.ts b/apps/browser/src/autofill/services/autofill.service.ts
index e79f6f69a36..24054794b62 100644
--- a/apps/browser/src/autofill/services/autofill.service.ts
+++ b/apps/browser/src/autofill/services/autofill.service.ts
@@ -1597,16 +1597,6 @@ export default class AutofillService implements AutofillServiceInterface {
) {
fillFields.email = f;
break;
- } else if (
- !fillFields.address &&
- AutofillService.isFieldMatch(
- f[attr],
- IdentityAutoFillConstants.AddressFieldNames,
- IdentityAutoFillConstants.AddressFieldNameValues,
- )
- ) {
- fillFields.address = f;
- break;
} else if (
!fillFields.address1 &&
AutofillService.isFieldMatch(f[attr], IdentityAutoFillConstants.Address1FieldNames)
@@ -1625,6 +1615,16 @@ export default class AutofillService implements AutofillServiceInterface {
) {
fillFields.address3 = f;
break;
+ } else if (
+ !fillFields.address &&
+ AutofillService.isFieldMatch(
+ f[attr],
+ IdentityAutoFillConstants.AddressFieldNames,
+ IdentityAutoFillConstants.AddressFieldNameValues,
+ )
+ ) {
+ fillFields.address = f;
+ break;
} else if (
!fillFields.postalCode &&
AutofillService.isFieldMatch(f[attr], IdentityAutoFillConstants.PostalCodeFieldNames)
@@ -1818,11 +1818,6 @@ export default class AutofillService implements AutofillServiceInterface {
continue;
}
- if (this.shouldMakeIdentityAddressFillScript(filledFields, keywordsList)) {
- this.makeIdentityAddressFillScript(fillScript, filledFields, field, identity);
- continue;
- }
-
if (this.shouldMakeIdentityAddress1FillScript(filledFields, keywordsCombined)) {
this.makeScriptActionWithValue(fillScript, identity.address1, field, filledFields);
continue;
@@ -1838,6 +1833,11 @@ export default class AutofillService implements AutofillServiceInterface {
continue;
}
+ if (this.shouldMakeIdentityAddressFillScript(filledFields, keywordsList)) {
+ this.makeIdentityAddressFillScript(fillScript, filledFields, field, identity);
+ continue;
+ }
+
if (this.shouldMakeIdentityPostalCodeFillScript(filledFields, keywordsCombined)) {
this.makeScriptActionWithValue(fillScript, identity.postalCode, field, filledFields);
continue;
diff --git a/apps/browser/src/autofill/shared/styles/variables.scss b/apps/browser/src/autofill/shared/styles/variables.scss
index 208e2bef0a3..ad3924e37a9 100644
--- a/apps/browser/src/autofill/shared/styles/variables.scss
+++ b/apps/browser/src/autofill/shared/styles/variables.scss
@@ -2,7 +2,7 @@
$dark-icon-themes: "theme_dark", "theme_solarizedDark", "theme_nord";
-$font-family-sans-serif: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+$font-family-sans-serif: "DM Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
$font-family-source-code-pro: "Source Code Pro", monospace;
$font-size-base: 14px;
$text-color: #212529;
diff --git a/apps/browser/src/manifest.json b/apps/browser/src/manifest.json
index 46aa3cefd70..9c2d2d610bc 100644
--- a/apps/browser/src/manifest.json
+++ b/apps/browser/src/manifest.json
@@ -52,19 +52,37 @@
"permissions": [
"",
"*://*/*",
- "tabs",
- "contextMenus",
- "storage",
- "unlimitedStorage",
+ "alarms",
"clipboardRead",
"clipboardWrite",
+ "contextMenus",
"idle",
- "alarms",
+ "storage",
+ "tabs",
+ "unlimitedStorage",
+ "webNavigation",
"webRequest",
- "webRequestBlocking",
- "webNavigation"
+ "webRequestBlocking"
+ ],
+ "__safari__permissions": [
+ "",
+ "*://*/*",
+ "alarms",
+ "clipboardRead",
+ "clipboardWrite",
+ "contextMenus",
+ "idle",
+ "nativeMessaging",
+ "storage",
+ "tabs",
+ "unlimitedStorage",
+ "webNavigation",
+ "webRequest",
+ "webRequestBlocking"
],
"optional_permissions": ["nativeMessaging", "privacy"],
+ "__firefox__optional_permissions": ["nativeMessaging"],
+ "__safari__optional_permissions": null,
"content_security_policy": "script-src 'self' 'wasm-unsafe-eval'; object-src 'self'",
"sandbox": {
"pages": [
@@ -75,6 +93,7 @@
],
"content_security_policy": "sandbox allow-scripts; script-src 'self'"
},
+ "__firefox__sandbox": null,
"commands": {
"_execute_browser_action": {
"suggested_key": {
@@ -83,7 +102,14 @@
},
"description": "__MSG_commandOpenPopup__"
},
- "_execute_sidebar_action": {
+ "__firefox___execute_sidebar_action": {
+ "suggested_key": {
+ "default": "Alt+Shift+Y",
+ "linux": "Alt+Shift+U"
+ },
+ "description": "__MSG_commandOpenSidebar__"
+ },
+ "__opera___execute_sidebar_action": {
"suggested_key": {
"default": "Alt+Shift+Y",
"linux": "Alt+Shift+U"
@@ -125,20 +151,26 @@
"overlay/list.html",
"popup/fonts/*"
],
- "applications": {
+ "__firefox__browser_specific_settings": {
"gecko": {
"id": "{446900e4-71c2-419f-a6a7-df9c091e268b}",
"strict_min_version": "91.0"
}
},
- "sidebar_action": {
+ "__firefox__sidebar_action": {
"default_title": "Bitwarden",
"default_panel": "popup/index.html?uilocation=sidebar",
"default_icon": "images/icon19.png",
"open_at_install": false,
"browser_style": false
},
- "storage": {
- "managed_schema": "managed_schema.json"
- }
+ "__opera__sidebar_action": {
+ "default_title": "Bitwarden",
+ "default_panel": "popup/index.html?uilocation=sidebar",
+ "default_icon": "images/icon19.png",
+ "open_at_install": false,
+ "browser_style": false
+ },
+ "storage": { "managed_schema": "managed_schema.json" },
+ "__firefox__storage": null
}
diff --git a/apps/browser/src/manifest.v3.json b/apps/browser/src/manifest.v3.json
index 8118c212fc7..fb44505ae8d 100644
--- a/apps/browser/src/manifest.v3.json
+++ b/apps/browser/src/manifest.v3.json
@@ -41,6 +41,9 @@
"background": {
"service_worker": "background.js"
},
+ "__firefox__background": {
+ "scripts": ["background.js"]
+ },
"action": {
"default_icon": {
"19": "images/icon19.png",
@@ -51,21 +54,40 @@
},
"permissions": [
"activeTab",
- "tabs",
- "contextMenus",
- "storage",
- "unlimitedStorage",
+ "alarms",
"clipboardRead",
"clipboardWrite",
+ "contextMenus",
"idle",
- "alarms",
- "scripting",
"offscreen",
+ "scripting",
+ "storage",
+ "tabs",
+ "unlimitedStorage",
+ "webNavigation",
"webRequest",
- "webRequestAuthProvider",
- "webNavigation"
+ "webRequestAuthProvider"
+ ],
+ "__safari__permissions": [
+ "activeTab",
+ "alarms",
+ "clipboardRead",
+ "clipboardWrite",
+ "contextMenus",
+ "idle",
+ "nativeMessaging",
+ "offscreen",
+ "scripting",
+ "storage",
+ "tabs",
+ "unlimitedStorage",
+ "webNavigation",
+ "webRequest",
+ "webRequestAuthProvider"
],
"optional_permissions": ["nativeMessaging", "privacy"],
+ "__firefox__optional_permissions": ["nativeMessaging"],
+ "__safari__optional_permissions": null,
"host_permissions": ["https://*/*", "http://*/*"],
"content_security_policy": {
"extension_pages": "script-src 'self' 'wasm-unsafe-eval'; object-src 'self'",
@@ -79,6 +101,7 @@
"overlay/list.html"
]
},
+ "__firefox__sandbox": null,
"commands": {
"_execute_action": {
"suggested_key": {
@@ -87,7 +110,7 @@
},
"description": "__MSG_commandOpenPopup__"
},
- "_execute_sidebar_action": {
+ "__firefox___execute_sidebar_action": {
"suggested_key": {
"default": "Alt+Shift+Y",
"linux": "Alt+Shift+U"
@@ -133,13 +156,13 @@
"matches": [""]
}
],
- "applications": {
+ "__firefox__browser_specific_settings": {
"gecko": {
"id": "{446900e4-71c2-419f-a6a7-df9c091e268b}",
"strict_min_version": "91.0"
}
},
- "sidebar_action": {
+ "__firefox__sidebar_action": {
"default_title": "Bitwarden",
"default_panel": "popup/index.html?uilocation=sidebar",
"default_icon": "images/icon19.png",
@@ -147,5 +170,6 @@
},
"storage": {
"managed_schema": "managed_schema.json"
- }
+ },
+ "__firefox__storage": null
}
diff --git a/apps/browser/src/platform/popup/layout/popup-compact-mode.service.ts b/apps/browser/src/platform/popup/layout/popup-compact-mode.service.ts
new file mode 100644
index 00000000000..ffcd2321b15
--- /dev/null
+++ b/apps/browser/src/platform/popup/layout/popup-compact-mode.service.ts
@@ -0,0 +1,31 @@
+import { inject, Injectable } from "@angular/core";
+import { map, Observable } from "rxjs";
+
+import { GlobalStateProvider, KeyDefinition, THEMING_DISK } from "@bitwarden/common/platform/state";
+import { CompactModeService } from "@bitwarden/components";
+
+const COMPACT_MODE = new KeyDefinition(THEMING_DISK, "compactMode", {
+ deserializer: (s) => s,
+});
+
+/**
+ * Service to persist Compact Mode to state / user settings.
+ **/
+@Injectable({ providedIn: "root" })
+export class PopupCompactModeService implements CompactModeService {
+ private state = inject(GlobalStateProvider).get(COMPACT_MODE);
+
+ enabled$: Observable = this.state.state$.pipe(map((state) => state ?? false));
+
+ init() {
+ this.enabled$.subscribe((enabled) => {
+ enabled
+ ? document.body.classList.add("tw-bit-compact")
+ : document.body.classList.remove("tw-bit-compact");
+ });
+ }
+
+ async setEnabled(enabled: boolean) {
+ await this.state.update(() => enabled);
+ }
+}
diff --git a/apps/browser/src/platform/popup/layout/popup-footer.component.html b/apps/browser/src/platform/popup/layout/popup-footer.component.html
index 777e0ab60da..50ad535c891 100644
--- a/apps/browser/src/platform/popup/layout/popup-footer.component.html
+++ b/apps/browser/src/platform/popup/layout/popup-footer.component.html
@@ -1,7 +1,7 @@