© Bitwarden Inc. 2015-{{ year }}
{{ "serverVersion" | i18n }}: {{ data.serverConfig?.version }}
diff --git a/apps/browser/src/popup/settings/about.component.ts b/apps/browser/src/popup/settings/about.component.ts
index 61b5749b513..d7f98c1e7f7 100644
--- a/apps/browser/src/popup/settings/about.component.ts
+++ b/apps/browser/src/popup/settings/about.component.ts
@@ -1,14 +1,13 @@
import { CommonModule } from "@angular/common";
import { Component } from "@angular/core";
-import { combineLatest, map } from "rxjs";
+import { Observable, combineLatest, defer, map } from "rxjs";
import { JslibModule } from "@bitwarden/angular/jslib.module";
import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
import { ButtonModule, DialogModule } from "@bitwarden/components";
-import { BrowserApi } from "../../platform/browser/browser-api";
-
@Component({
templateUrl: "about.component.html",
standalone: true,
@@ -16,7 +15,7 @@ import { BrowserApi } from "../../platform/browser/browser-api";
})
export class AboutComponent {
protected year = new Date().getFullYear();
- protected version = BrowserApi.getApplicationVersion();
+ protected version$: Observable;
protected data$ = combineLatest([
this.configService.serverConfig$,
@@ -26,5 +25,8 @@ export class AboutComponent {
constructor(
private configService: ConfigService,
private environmentService: EnvironmentService,
- ) {}
+ private platformUtilsService: PlatformUtilsService,
+ ) {
+ this.version$ = defer(() => this.platformUtilsService.getApplicationVersion());
+ }
}
diff --git a/apps/browser/src/popup/settings/settings.component.ts b/apps/browser/src/popup/settings/settings.component.ts
index fa6c64fcc58..c7e5b7dc952 100644
--- a/apps/browser/src/popup/settings/settings.component.ts
+++ b/apps/browser/src/popup/settings/settings.component.ts
@@ -21,6 +21,7 @@ import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vaul
import { VaultTimeoutService } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout.service";
import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
import { PolicyType } from "@bitwarden/common/admin-console/enums";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
import { DeviceType } from "@bitwarden/common/enums";
import { VaultTimeoutAction } from "@bitwarden/common/enums/vault-timeout-action.enum";
@@ -86,6 +87,7 @@ export class SettingsComponent implements OnInit {
private destroy$ = new Subject();
constructor(
+ private accountService: AccountService,
private policyService: PolicyService,
private formBuilder: FormBuilder,
private platformUtilsService: PlatformUtilsService,
@@ -434,8 +436,9 @@ export class SettingsComponent implements OnInit {
type: "info",
});
+ const userId = (await firstValueFrom(this.accountService.activeAccount$))?.id;
if (confirmed) {
- this.messagingService.send("logout");
+ this.messagingService.send("logout", { userId: userId });
}
}
diff --git a/apps/browser/src/tools/background/fileless-importer.background.ts b/apps/browser/src/tools/background/fileless-importer.background.ts
index 07c6408e8d2..fed5541f520 100644
--- a/apps/browser/src/tools/background/fileless-importer.background.ts
+++ b/apps/browser/src/tools/background/fileless-importer.background.ts
@@ -183,7 +183,7 @@ class FilelessImporterBackground implements FilelessImporterBackgroundInterface
return;
}
- const filelessImportFeatureFlagEnabled = await this.configService.getFeatureFlag(
+ const filelessImportFeatureFlagEnabled = await this.configService.getFeatureFlag(
FeatureFlag.BrowserFilelessImport,
);
const userAuthStatus = await this.authService.getAuthStatus();
diff --git a/apps/browser/src/tools/popup/services/browser-send-state.service.ts b/apps/browser/src/tools/popup/services/browser-send-state.service.ts
index 52aeb01a925..11e71c9b20f 100644
--- a/apps/browser/src/tools/popup/services/browser-send-state.service.ts
+++ b/apps/browser/src/tools/popup/services/browser-send-state.service.ts
@@ -46,7 +46,9 @@ export class BrowserSendStateService {
* the send component on the browser
*/
async setBrowserSendComponentState(value: BrowserSendComponentState): Promise {
- await this.activeUserBrowserSendComponentState.update(() => value);
+ await this.activeUserBrowserSendComponentState.update(() => value, {
+ shouldUpdate: (current) => !(current == null && value == null),
+ });
}
/** Get the active user's browser component state
@@ -60,6 +62,8 @@ export class BrowserSendStateService {
* @param { BrowserComponentState } value set the scroll position and search text for the send component on the browser
*/
async setBrowserSendTypeComponentState(value: BrowserComponentState): Promise {
- await this.activeUserBrowserSendTypeComponentState.update(() => value);
+ await this.activeUserBrowserSendTypeComponentState.update(() => value, {
+ shouldUpdate: (current) => !(current == null && value == null),
+ });
}
}
diff --git a/apps/browser/src/vault/popup/components/vault/current-tab.component.ts b/apps/browser/src/vault/popup/components/vault/current-tab.component.ts
index 4d2674fd703..d882dfd525d 100644
--- a/apps/browser/src/vault/popup/components/vault/current-tab.component.ts
+++ b/apps/browser/src/vault/popup/components/vault/current-tab.component.ts
@@ -292,6 +292,8 @@ export class CurrentTabComponent implements OnInit, OnDestroy {
const ciphers = await this.cipherService.getAllDecryptedForUrl(
this.url,
otherTypes.length > 0 ? otherTypes : null,
+ null,
+ false,
);
this.loginCiphers = [];
diff --git a/apps/browser/src/vault/services/vault-browser-state.service.ts b/apps/browser/src/vault/services/vault-browser-state.service.ts
index a0d55a9d550..43a28928da5 100644
--- a/apps/browser/src/vault/services/vault-browser-state.service.ts
+++ b/apps/browser/src/vault/services/vault-browser-state.service.ts
@@ -52,7 +52,9 @@ export class VaultBrowserStateService {
}
async setBrowserGroupingsComponentState(value: BrowserGroupingsComponentState): Promise {
- await this.activeUserVaultBrowserGroupingsComponentState.update(() => value);
+ await this.activeUserVaultBrowserGroupingsComponentState.update(() => value, {
+ shouldUpdate: (current) => !(current == null && value == null),
+ });
}
async getBrowserVaultItemsComponentState(): Promise {
@@ -60,6 +62,8 @@ export class VaultBrowserStateService {
}
async setBrowserVaultItemsComponentState(value: BrowserComponentState): Promise {
- await this.activeUserVaultBrowserComponentState.update(() => value);
+ await this.activeUserVaultBrowserComponentState.update(() => value, {
+ shouldUpdate: (current) => !(current == null && value == null),
+ });
}
}
diff --git a/apps/browser/tsconfig.json b/apps/browser/tsconfig.json
index 505f1533ae8..e1bf2b7211c 100644
--- a/apps/browser/tsconfig.json
+++ b/apps/browser/tsconfig.json
@@ -2,6 +2,7 @@
"compilerOptions": {
"moduleResolution": "node",
"noImplicitAny": true,
+ "allowSyntheticDefaultImports": true,
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"module": "ES2020",
diff --git a/apps/cli/package.json b/apps/cli/package.json
index b06caacfd48..d6c449de484 100644
--- a/apps/cli/package.json
+++ b/apps/cli/package.json
@@ -71,7 +71,7 @@
"papaparse": "5.4.1",
"proper-lockfile": "4.1.2",
"rxjs": "7.8.1",
- "tldts": "6.1.16",
+ "tldts": "6.1.18",
"zxcvbn": "4.4.2"
}
}
diff --git a/apps/cli/src/auth/commands/login.command.ts b/apps/cli/src/auth/commands/login.command.ts
index 3606285c723..bd61727a6c7 100644
--- a/apps/cli/src/auth/commands/login.command.ts
+++ b/apps/cli/src/auth/commands/login.command.ts
@@ -231,7 +231,7 @@ export class LoginCommand {
}
}
if (response.requiresTwoFactor) {
- const twoFactorProviders = this.twoFactorService.getSupportedProviders(null);
+ const twoFactorProviders = await this.twoFactorService.getSupportedProviders(null);
if (twoFactorProviders.length === 0) {
return Response.badRequest("No providers available for this client.");
}
@@ -272,7 +272,7 @@ export class LoginCommand {
if (
twoFactorToken == null &&
- response.twoFactorProviders.size > 1 &&
+ Object.keys(response.twoFactorProviders).length > 1 &&
selectedProvider.type === TwoFactorProviderType.Email
) {
const emailReq = new TwoFactorEmailRequest();
diff --git a/apps/cli/src/bw.ts b/apps/cli/src/bw.ts
index ffe6c128b58..b3fb68fe638 100644
--- a/apps/cli/src/bw.ts
+++ b/apps/cli/src/bw.ts
@@ -314,7 +314,7 @@ export class Main {
this.singleUserStateProvider,
);
- this.derivedStateProvider = new DefaultDerivedStateProvider(storageServiceProvider);
+ this.derivedStateProvider = new DefaultDerivedStateProvider();
this.stateProvider = new DefaultStateProvider(
this.activeUserStateProvider,
@@ -344,6 +344,7 @@ export class Main {
this.storageService,
this.logService,
new MigrationBuilderService(),
+ ClientType.Cli,
);
this.stateService = new StateService(
@@ -455,7 +456,11 @@ export class Main {
this.stateProvider,
);
- this.twoFactorService = new TwoFactorService(this.i18nService, this.platformUtilsService);
+ this.twoFactorService = new TwoFactorService(
+ this.i18nService,
+ this.platformUtilsService,
+ this.globalStateProvider,
+ );
this.passwordStrengthService = new PasswordStrengthService();
diff --git a/apps/desktop/src/app/services/services.module.ts b/apps/desktop/src/app/services/services.module.ts
index b888df80133..1e3a7fdfa59 100644
--- a/apps/desktop/src/app/services/services.module.ts
+++ b/apps/desktop/src/app/services/services.module.ts
@@ -15,6 +15,7 @@ import {
SafeInjectionToken,
STATE_FACTORY,
INTRAPROCESS_MESSAGING_SUBJECT,
+ CLIENT_TYPE,
} from "@bitwarden/angular/services/injection-tokens";
import { JslibServicesModule } from "@bitwarden/angular/services/jslib-services.module";
import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout-settings.service";
@@ -25,6 +26,7 @@ import { KdfConfigService as KdfConfigServiceAbstraction } from "@bitwarden/comm
import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/auth/abstractions/master-password.service.abstraction";
import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
import { AutofillSettingsServiceAbstraction } from "@bitwarden/common/autofill/services/autofill-settings.service";
+import { ClientType } from "@bitwarden/common/enums";
import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from "@bitwarden/common/platform/abstractions/crypto-function.service";
import { CryptoService as CryptoServiceAbstraction } from "@bitwarden/common/platform/abstractions/crypto.service";
import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
@@ -275,6 +277,10 @@ const safeProviders: SafeProvider[] = [
useClass: NativeMessagingManifestService,
deps: [],
}),
+ safeProvider({
+ provide: CLIENT_TYPE,
+ useValue: ClientType.Desktop,
+ }),
];
@NgModule({
diff --git a/apps/desktop/src/locales/fr/messages.json b/apps/desktop/src/locales/fr/messages.json
index 86550b736f3..e82420a1f51 100644
--- a/apps/desktop/src/locales/fr/messages.json
+++ b/apps/desktop/src/locales/fr/messages.json
@@ -1636,7 +1636,7 @@
"message": "Error enabling browser integration"
},
"browserIntegrationErrorDesc": {
- "message": "An error has occurred while enabling browser integration."
+ "message": "Une erreur s'est produite lors de l'action de l'intégration du navigateur."
},
"browserIntegrationMasOnlyDesc": {
"message": "Malheureusement l'intégration avec le navigateur est uniquement supportée dans la version Mac App Store pour le moment."
@@ -2698,7 +2698,7 @@
"description": "Label indicating the most common import formats"
},
"success": {
- "message": "Success"
+ "message": "Succès"
},
"troubleshooting": {
"message": "Résolution de problèmes"
diff --git a/apps/desktop/src/locales/hu/messages.json b/apps/desktop/src/locales/hu/messages.json
index 5c91fb4b944..838b3fc7c8e 100644
--- a/apps/desktop/src/locales/hu/messages.json
+++ b/apps/desktop/src/locales/hu/messages.json
@@ -2698,7 +2698,7 @@
"description": "Label indicating the most common import formats"
},
"success": {
- "message": "Success"
+ "message": "Sikeres"
},
"troubleshooting": {
"message": "Hibaelhárítás"
diff --git a/apps/desktop/src/locales/lv/messages.json b/apps/desktop/src/locales/lv/messages.json
index aa057f54ab6..e2e068362e3 100644
--- a/apps/desktop/src/locales/lv/messages.json
+++ b/apps/desktop/src/locales/lv/messages.json
@@ -2698,7 +2698,7 @@
"description": "Label indicating the most common import formats"
},
"success": {
- "message": "Success"
+ "message": "Izdevās"
},
"troubleshooting": {
"message": "Sarežģījumu novēršana"
diff --git a/apps/desktop/src/locales/nl/messages.json b/apps/desktop/src/locales/nl/messages.json
index b5f2a413d6f..f56572259ba 100644
--- a/apps/desktop/src/locales/nl/messages.json
+++ b/apps/desktop/src/locales/nl/messages.json
@@ -2698,7 +2698,7 @@
"description": "Label indicating the most common import formats"
},
"success": {
- "message": "Success"
+ "message": "Succes"
},
"troubleshooting": {
"message": "Probleemoplossing"
diff --git a/apps/desktop/src/locales/zh_CN/messages.json b/apps/desktop/src/locales/zh_CN/messages.json
index 9837be29e3d..aad13e06ef1 100644
--- a/apps/desktop/src/locales/zh_CN/messages.json
+++ b/apps/desktop/src/locales/zh_CN/messages.json
@@ -2698,7 +2698,7 @@
"description": "Label indicating the most common import formats"
},
"success": {
- "message": "Success"
+ "message": "成功"
},
"troubleshooting": {
"message": "故障排除"
diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.ts
index da4c14b4aa6..d11fceeacc9 100644
--- a/apps/desktop/src/main.ts
+++ b/apps/desktop/src/main.ts
@@ -6,6 +6,7 @@ import { Subject, firstValueFrom } from "rxjs";
import { TokenService as TokenServiceAbstraction } from "@bitwarden/common/auth/abstractions/token.service";
import { AccountServiceImplementation } from "@bitwarden/common/auth/services/account.service";
import { TokenService } from "@bitwarden/common/auth/services/token.service";
+import { ClientType } from "@bitwarden/common/enums";
import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
import { KeyGenerationService as KeyGenerationServiceAbstraction } from "@bitwarden/common/platform/abstractions/key-generation.service";
import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
@@ -157,7 +158,7 @@ export class Main {
activeUserStateProvider,
singleUserStateProvider,
globalStateProvider,
- new DefaultDerivedStateProvider(storageServiceProvider),
+ new DefaultDerivedStateProvider(),
);
this.environmentService = new DefaultEnvironmentService(stateProvider, accountService);
@@ -190,6 +191,7 @@ export class Main {
this.storageService,
this.logService,
new MigrationBuilderService(),
+ ClientType.Desktop,
);
// TODO: this state service will have access to on disk storage, but not in memory storage.
diff --git a/apps/desktop/src/platform/services/desktop-settings.service.ts b/apps/desktop/src/platform/services/desktop-settings.service.ts
index d967e5fb1d9..09ddad07c1b 100644
--- a/apps/desktop/src/platform/services/desktop-settings.service.ts
+++ b/apps/desktop/src/platform/services/desktop-settings.service.ts
@@ -164,7 +164,7 @@ export class DesktopSettingsService {
/**
* Sets the setting for whether or not the application should be shown in the dock.
- * @param value `true` if the application should should in the dock, `false` if it should not.
+ * @param value `true` if the application should show in the dock, `false` if it should not.
*/
async setAlwaysShowDock(value: boolean) {
await this.alwaysShowDockState.update(() => value);
diff --git a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts
index b1a84c22f35..7de0c98cd5a 100644
--- a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts
+++ b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts
@@ -58,7 +58,6 @@ export class OrganizationLayoutComponent implements OnInit, OnDestroy {
protected showPaymentMethodWarningBanners$ = this.configService.getFeatureFlag$(
FeatureFlag.ShowPaymentMethodWarningBanners,
- false,
);
constructor(
diff --git a/apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.ts b/apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.ts
index dea6f4999b2..b18effac862 100644
--- a/apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.ts
+++ b/apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.ts
@@ -194,7 +194,7 @@ export class GroupAddEditComponent implements OnInit, OnDestroy {
}),
);
}),
- shareReplay({ refCount: false }),
+ shareReplay({ refCount: true, bufferSize: 1 }),
);
restrictGroupAccess$ = combineLatest([
diff --git a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts
index f1af9506505..a67bea39c0a 100644
--- a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts
+++ b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts
@@ -218,7 +218,6 @@ export class MemberDialogComponent implements OnDestroy {
groups: groups$,
flexibleCollectionsV1Enabled: this.configService.getFeatureFlag$(
FeatureFlag.FlexibleCollectionsV1,
- false,
),
})
.pipe(takeUntil(this.destroy$))
@@ -620,7 +619,7 @@ export class MemberDialogComponent implements OnDestroy {
}
function mapCollectionToAccessItemView(
- collection: CollectionView,
+ collection: CollectionAdminView,
organization: Organization,
flexibleCollectionsV1Enabled: boolean,
accessSelection?: CollectionAccessSelectionView,
@@ -632,7 +631,8 @@ function mapCollectionToAccessItemView(
labelName: collection.name,
listName: collection.name,
readonly:
- group !== undefined || !collection.canEdit(organization, flexibleCollectionsV1Enabled),
+ group !== undefined ||
+ !collection.canEditUserAccess(organization, flexibleCollectionsV1Enabled),
readonlyPermission: accessSelection ? convertToPermission(accessSelection) : undefined,
viaGroupName: group?.name,
};
diff --git a/apps/web/src/app/admin-console/organizations/settings/account.component.ts b/apps/web/src/app/admin-console/organizations/settings/account.component.ts
index 1ce05f7a302..d8091e46aef 100644
--- a/apps/web/src/app/admin-console/organizations/settings/account.component.ts
+++ b/apps/web/src/app/admin-console/organizations/settings/account.component.ts
@@ -44,12 +44,10 @@ export class AccountComponent {
protected flexibleCollectionsMigrationEnabled$ = this.configService.getFeatureFlag$(
FeatureFlag.FlexibleCollectionsMigration,
- false,
);
flexibleCollectionsV1Enabled$ = this.configService.getFeatureFlag$(
FeatureFlag.FlexibleCollectionsV1,
- false,
);
// FormGroup validators taken from server Organization domain object
diff --git a/apps/web/src/app/admin-console/organizations/settings/two-factor-setup.component.ts b/apps/web/src/app/admin-console/organizations/settings/two-factor-setup.component.ts
index abf1d249e16..80d77968f2d 100644
--- a/apps/web/src/app/admin-console/organizations/settings/two-factor-setup.component.ts
+++ b/apps/web/src/app/admin-console/organizations/settings/two-factor-setup.component.ts
@@ -10,6 +10,7 @@ import { PolicyService } from "@bitwarden/common/admin-console/abstractions/poli
import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type";
import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
+import { DialogService } from "@bitwarden/components";
import { TwoFactorDuoComponent } from "../../../auth/settings/two-factor-duo.component";
import { TwoFactorSetupComponent as BaseTwoFactorSetupComponent } from "../../../auth/settings/two-factor-setup.component";
@@ -22,6 +23,7 @@ import { TwoFactorSetupComponent as BaseTwoFactorSetupComponent } from "../../..
export class TwoFactorSetupComponent extends BaseTwoFactorSetupComponent {
tabbedHeader = false;
constructor(
+ dialogService: DialogService,
apiService: ApiService,
modalService: ModalService,
messagingService: MessagingService,
@@ -31,6 +33,7 @@ export class TwoFactorSetupComponent extends BaseTwoFactorSetupComponent {
billingAccountProfileStateService: BillingAccountProfileStateService,
) {
super(
+ dialogService,
apiService,
modalService,
messagingService,
diff --git a/apps/web/src/app/auth/key-rotation/user-key-rotation.service.ts b/apps/web/src/app/auth/key-rotation/user-key-rotation.service.ts
index 94c62081154..dc5f9337247 100644
--- a/apps/web/src/app/auth/key-rotation/user-key-rotation.service.ts
+++ b/apps/web/src/app/auth/key-rotation/user-key-rotation.service.ts
@@ -90,7 +90,7 @@ export class UserKeyRotationService {
request.emergencyAccessKeys = await this.emergencyAccessService.getRotatedKeys(newUserKey);
request.resetPasswordKeys = await this.resetPasswordService.getRotatedKeys(newUserKey);
- if (await this.configService.getFeatureFlag(FeatureFlag.KeyRotationImprovements)) {
+ if (await this.configService.getFeatureFlag(FeatureFlag.KeyRotationImprovements)) {
await this.apiService.postUserKeyUpdate(request);
} else {
await this.rotateUserKeyAndEncryptedDataLegacy(request);
diff --git a/apps/web/src/app/auth/settings/two-factor-authenticator.component.html b/apps/web/src/app/auth/settings/two-factor-authenticator.component.html
index 33bf4fb1304..e17714cca79 100644
--- a/apps/web/src/app/auth/settings/two-factor-authenticator.component.html
+++ b/apps/web/src/app/auth/settings/two-factor-authenticator.component.html
@@ -15,13 +15,6 @@
×