Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-06-20 09:35:22 +02:00
Code Issues Projects Releases Wiki Activity

Hard code account switching off on Safari (#7510)

Browse Source 
The better place for this is arguably in environment configurations, but I don't want to expand that functionality more than it has to in hopes that this is a rare/one-off occurrence.
This commit is contained in:
Matt Gibson 2024-01-17 15:01:24 -05:00 committed by GitHub
parent d7ef60d3ba
commit a102f8d90a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/browser/src/autofill/popup/settings/autofill.component.ts
View File

@ -9,7 +9,7 @@ import { StateService } from "@bitwarden/common/platform/abstractions/state.serv
import { UriMatchType } from "@bitwarden/common/vault/enums";
import { BrowserApi } from "../../../platform/browser/browser-api";
import { flagEnabled } from "../../../platform/flags";
import { enableAccountSwitching } from "../../../platform/flags";
import { AutofillService } from "../../services/abstractions/autofill.service";
import { AutofillOverlayVisibility } from "../../utils/autofill-overlay.enum";
@ -65,7 +65,7 @@ export class AutofillComponent implements OnInit {
{ name: i18nService.t("never"), value: UriMatchType.Never },
];
this.accountSwitcherEnabled = flagEnabled("accountSwitching");
this.accountSwitcherEnabled = enableAccountSwitching();
this.disablePasswordManagerLink = this.getDisablePasswordManagerLink();
}

13
apps/browser/src/platform/flags.ts
View File

@ -8,6 +8,8 @@ import {
import { GroupPolicyEnvironment } from "../admin-console/types/group-policy-environment";
import { BrowserApi } from "./browser/browser-api";
// required to avoid linting errors when there are no flags
/* eslint-disable-next-line @typescript-eslint/ban-types */
export type Flags = {
@ -32,3 +34,14 @@ export function devFlagEnabled(flag: keyof DevFlags) {
export function devFlagValue(flag: keyof DevFlags) {
return baseDevFlagValue(flag);
}
/** Helper method to sync flag specifically for account switching, which as platform-based values.
* If this pattern needs to be repeated, it's better handled by increasing complexity of webpack configurations
* Not by expanding these flag getters.
*/
export function enableAccountSwitching(): boolean {
if (BrowserApi.isSafariApi) {
return false;
}
return flagEnabled("accountSwitching");
}

4
apps/browser/src/platform/popup/header.component.ts
View File

@ -4,7 +4,7 @@ import { Observable, map } from "rxjs";
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
import { flagEnabled } from "../flags";
import { enableAccountSwitching } from "../flags";
@Component({
selector: "app-header",
@ -17,7 +17,7 @@ export class HeaderComponent {
constructor(accountService: AccountService) {
this.authedAccounts$ = accountService.accounts$.pipe(
map((accounts) => {
if (!flagEnabled("accountSwitching")) {
if (!enableAccountSwitching()) {
return false;
}

4
apps/browser/src/popup/settings/excluded-domains.component.ts
View File

@ -8,7 +8,7 @@ import { StateService } from "@bitwarden/common/platform/abstractions/state.serv
import { Utils } from "@bitwarden/common/platform/misc/utils";
import { BrowserApi } from "../../platform/browser/browser-api";
import { flagEnabled } from "../../platform/flags";
import { enableAccountSwitching } from "../../platform/flags";
interface ExcludedDomain {
uri: string;
@ -36,7 +36,7 @@ export class ExcludedDomainsComponent implements OnInit, OnDestroy {
private ngZone: NgZone,
private platformUtilsService: PlatformUtilsService,
) {
this.accountSwitcherEnabled = flagEnabled("accountSwitching");
this.accountSwitcherEnabled = enableAccountSwitching();
}
async ngOnInit() {

4
apps/browser/src/popup/settings/options.component.ts
View File

@ -9,7 +9,7 @@ import { ThemeType } from "@bitwarden/common/platform/enums";
import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service";
import { UriMatchType } from "@bitwarden/common/vault/enums";
import { flagEnabled } from "../../platform/flags";
import { enableAccountSwitching } from "../../platform/flags";
@Component({
selector: "app-options",
@ -77,7 +77,7 @@ export class OptionsComponent implements OnInit {
{ name: i18nService.t("autoFillOnPageLoadNo"), value: false },
];
this.accountSwitcherEnabled = flagEnabled("accountSwitching");
this.accountSwitcherEnabled = enableAccountSwitching();
}
async ngOnInit() {

4
apps/browser/src/popup/settings/settings.component.ts
View File

@ -36,7 +36,7 @@ import { DialogService } from "@bitwarden/components";
import { SetPinComponent } from "../../auth/popup/components/set-pin.component";
import { BiometricErrors, BiometricErrorTypes } from "../../models/biometricErrors";
import { BrowserApi } from "../../platform/browser/browser-api";
import { flagEnabled } from "../../platform/flags";
import { enableAccountSwitching } from "../../platform/flags";
import BrowserPopupUtils from "../../platform/popup/browser-popup-utils";
import { AboutComponent } from "./about.component";
@ -102,7 +102,7 @@ export class SettingsComponent implements OnInit {
private dialogService: DialogService,
private changeDetectorRef: ChangeDetectorRef,
) {
this.accountSwitcherEnabled = flagEnabled("accountSwitching");
this.accountSwitcherEnabled = enableAccountSwitching();
}
async ngOnInit() {