{{ "additionalOptions" | i18n }}
diff --git a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts
index a0db7b5a200..b6282f1e7b1 100644
--- a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts
+++ b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts
@@ -29,6 +29,7 @@ import {
} from "../shared/offboarding-survey.component";
import { BillingSyncApiKeyComponent } from "./billing-sync-api-key.component";
+import { DownloadLicenceDialogComponent } from "./download-license.component";
import { ManageBilling } from "./icons/manage-billing.icon";
import { SecretsManagerSubscriptionOptions } from "./sm-adjust-subscription.component";
@@ -354,8 +355,12 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy
this.showChangePlan = false;
}
- downloadLicense() {
- this.showDownloadLicense = !this.showDownloadLicense;
+ async downloadLicense() {
+ DownloadLicenceDialogComponent.open(this.dialogService, {
+ data: {
+ organizationId: this.organizationId,
+ },
+ });
}
async manageBillingSync() {
diff --git a/apps/web/src/app/layouts/user-layout.component.ts b/apps/web/src/app/layouts/user-layout.component.ts
index 1ce8d4d2278..757b8220f3a 100644
--- a/apps/web/src/app/layouts/user-layout.component.ts
+++ b/apps/web/src/app/layouts/user-layout.component.ts
@@ -10,7 +10,7 @@ import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abs
import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
+import { SyncService } from "@bitwarden/common/platform/sync";
import { IconModule, LayoutComponent, NavigationModule } from "@bitwarden/components";
import { PaymentMethodWarningsModule } from "../billing/shared";
diff --git a/apps/web/src/app/oss-routing.module.ts b/apps/web/src/app/oss-routing.module.ts
index c7b4631fa30..8509e987eb4 100644
--- a/apps/web/src/app/oss-routing.module.ts
+++ b/apps/web/src/app/oss-routing.module.ts
@@ -7,7 +7,9 @@ import {
redirectGuard,
tdeDecryptionRequiredGuard,
UnauthGuard,
+ unauthGuardFn,
} from "@bitwarden/angular/auth/guards";
+import { AnonLayoutWrapperComponent, AnonLayoutWrapperData } from "@bitwarden/auth/angular";
import { flagEnabled, Flags } from "../utils/flags";
@@ -40,6 +42,7 @@ import { UpdatePasswordComponent } from "./auth/update-password.component";
import { UpdateTempPasswordComponent } from "./auth/update-temp-password.component";
import { VerifyEmailTokenComponent } from "./auth/verify-email-token.component";
import { VerifyRecoverDeleteComponent } from "./auth/verify-recover-delete.component";
+import { EnvironmentSelectorComponent } from "./components/environment-selector/environment-selector.component";
import { DataProperties } from "./core";
import { FrontendLayoutComponent } from "./layouts/frontend-layout.component";
import { UserLayoutComponent } from "./layouts/user-layout.component";
@@ -141,12 +144,6 @@ const routes: Routes = [
data: { titleId: "acceptFamilySponsorship", doNotSaveUrl: false } satisfies DataProperties,
},
{ path: "recover", pathMatch: "full", redirectTo: "recover-2fa" },
- {
- path: "recover-2fa",
- component: RecoverTwoFactorComponent,
- canActivate: [UnauthGuard],
- data: { titleId: "recoverAccountTwoStep" } satisfies DataProperties,
- },
{
path: "recover-delete",
component: RecoverDeleteComponent,
@@ -203,6 +200,31 @@ const routes: Routes = [
},
],
},
+ {
+ path: "",
+ component: AnonLayoutWrapperComponent,
+ children: [
+ {
+ path: "recover-2fa",
+ canActivate: [unauthGuardFn()],
+ children: [
+ {
+ path: "",
+ component: RecoverTwoFactorComponent,
+ },
+ {
+ path: "",
+ component: EnvironmentSelectorComponent,
+ outlet: "environment-selector",
+ },
+ ],
+ data: {
+ pageTitle: "recoverAccountTwoStep",
+ titleId: "recoverAccountTwoStep",
+ } satisfies DataProperties & AnonLayoutWrapperData,
+ },
+ ],
+ },
{
path: "",
component: UserLayoutComponent,
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/components/organization-options.component.ts b/apps/web/src/app/vault/individual-vault/vault-filter/components/organization-options.component.ts
index 8dd63e62ddb..5a138c3147b 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/components/organization-options.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/components/organization-options.component.ts
@@ -13,7 +13,7 @@ import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
+import { SyncService } from "@bitwarden/common/platform/sync";
import { DialogService } from "@bitwarden/components";
import { OrganizationUserResetPasswordService } from "../../../../admin-console/organizations/members/services/organization-user-reset-password/organization-user-reset-password.service";
diff --git a/apps/web/src/app/vault/individual-vault/vault.component.ts b/apps/web/src/app/vault/individual-vault/vault.component.ts
index ca04b3aa51f..ae3a0657788 100644
--- a/apps/web/src/app/vault/individual-vault/vault.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault.component.ts
@@ -45,9 +45,9 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { SyncService } from "@bitwarden/common/platform/sync";
import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
import { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service";
-import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service";
import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
import { CollectionData } from "@bitwarden/common/vault/models/data/collection.data";
diff --git a/apps/web/src/app/vault/org-vault/vault.component.ts b/apps/web/src/app/vault/org-vault/vault.component.ts
index 514cb8150d1..dfdce5c818e 100644
--- a/apps/web/src/app/vault/org-vault/vault.component.ts
+++ b/apps/web/src/app/vault/org-vault/vault.component.ts
@@ -48,10 +48,10 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { SyncService } from "@bitwarden/common/platform/sync";
import { OrganizationId } from "@bitwarden/common/types/guid";
import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
import { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service";
-import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service";
import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
diff --git a/apps/web/src/app/vault/settings/purge-vault.component.ts b/apps/web/src/app/vault/settings/purge-vault.component.ts
index 869cbaab1b4..9a677af7b5d 100644
--- a/apps/web/src/app/vault/settings/purge-vault.component.ts
+++ b/apps/web/src/app/vault/settings/purge-vault.component.ts
@@ -8,7 +8,7 @@ import { UserVerificationService } from "@bitwarden/common/auth/abstractions/use
import { Verification } from "@bitwarden/common/auth/types/verification";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
+import { SyncService } from "@bitwarden/common/platform/sync";
import { DialogService } from "@bitwarden/components";
export interface PurgeVaultDialogData {
diff --git a/libs/angular/src/auth/components/login-via-auth-request.component.ts b/libs/angular/src/auth/components/login-via-auth-request.component.ts
index 401abab3b19..f898fa4ee8d 100644
--- a/libs/angular/src/auth/components/login-via-auth-request.component.ts
+++ b/libs/angular/src/auth/components/login-via-auth-request.component.ts
@@ -246,7 +246,10 @@ export class LoginViaAuthRequestComponent
const deviceIdentifier = await this.appIdService.getAppId();
const publicKey = Utils.fromBufferToB64(this.authRequestKeyPair.publicKey);
- const accessCode = await this.passwordGenerationService.generatePassword({ length: 25 });
+ const accessCode = await this.passwordGenerationService.generatePassword({
+ type: "password",
+ length: 25,
+ });
this.fingerprintPhrase = (
await this.cryptoService.getFingerprint(this.email, this.authRequestKeyPair.publicKey)
diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts
index 048c1829001..8c676bdb9d9 100644
--- a/libs/angular/src/services/jslib-services.module.ts
+++ b/libs/angular/src/services/jslib-services.module.ts
@@ -187,6 +187,9 @@ import { DefaultStateProvider } from "@bitwarden/common/platform/state/implement
import { StateEventRegistrarService } from "@bitwarden/common/platform/state/state-event-registrar.service";
import { StateEventRunnerService } from "@bitwarden/common/platform/state/state-event-runner.service";
/* eslint-enable import/no-restricted-paths */
+import { SyncService } from "@bitwarden/common/platform/sync";
+// eslint-disable-next-line no-restricted-imports -- Needed for DI
+import { DefaultSyncService } from "@bitwarden/common/platform/sync/internal";
import {
DefaultThemeStateService,
ThemeStateService,
@@ -226,8 +229,6 @@ import {
FolderService as FolderServiceAbstraction,
InternalFolderService,
} from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
-import { SyncNotifierService as SyncNotifierServiceAbstraction } from "@bitwarden/common/vault/abstractions/sync/sync-notifier.service.abstraction";
-import { SyncService as SyncServiceAbstraction } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
import { TotpService as TotpServiceAbstraction } from "@bitwarden/common/vault/abstractions/totp.service";
import { VaultSettingsService as VaultSettingsServiceAbstraction } from "@bitwarden/common/vault/abstractions/vault-settings/vault-settings.service";
import { CipherService } from "@bitwarden/common/vault/services/cipher.service";
@@ -235,8 +236,6 @@ import { CollectionService } from "@bitwarden/common/vault/services/collection.s
import { CipherFileUploadService } from "@bitwarden/common/vault/services/file-upload/cipher-file-upload.service";
import { FolderApiService } from "@bitwarden/common/vault/services/folder/folder-api.service";
import { FolderService } from "@bitwarden/common/vault/services/folder/folder.service";
-import { SyncNotifierService } from "@bitwarden/common/vault/services/sync/sync-notifier.service";
-import { SyncService } from "@bitwarden/common/vault/services/sync/sync.service";
import { TotpService } from "@bitwarden/common/vault/services/totp.service";
import { VaultSettingsService } from "@bitwarden/common/vault/services/vault-settings/vault-settings.service";
import { ToastService } from "@bitwarden/components";
@@ -644,8 +643,8 @@ const safeProviders: SafeProvider[] = [
deps: [ApiServiceAbstraction, FileUploadServiceAbstraction, InternalSendService],
}),
safeProvider({
- provide: SyncServiceAbstraction,
- useClass: SyncService,
+ provide: SyncService,
+ useClass: DefaultSyncService,
deps: [
InternalMasterPasswordServiceAbstraction,
AccountServiceAbstraction,
@@ -796,7 +795,7 @@ const safeProviders: SafeProvider[] = [
useClass: devFlagEnabled("noopNotifications") ? NoopNotificationsService : NotificationsService,
deps: [
LogService,
- SyncServiceAbstraction,
+ SyncService,
AppIdServiceAbstraction,
ApiServiceAbstraction,
EnvironmentService,
@@ -942,12 +941,7 @@ const safeProviders: SafeProvider[] = [
// it depends on SyncService so that new data can be retrieved through the sync
// rather than updating the OrganizationService directly. Instead OrganizationService
// subscribes to sync notifications and will update itself based on that.
- deps: [ApiServiceAbstraction, SyncServiceAbstraction],
- }),
- safeProvider({
- provide: SyncNotifierServiceAbstraction,
- useClass: SyncNotifierService,
- deps: [],
+ deps: [ApiServiceAbstraction, SyncService],
}),
safeProvider({
provide: DefaultConfigService,
@@ -1122,7 +1116,7 @@ const safeProviders: SafeProvider[] = [
EncryptService,
I18nServiceAbstraction,
OrganizationApiServiceAbstraction,
- SyncServiceAbstraction,
+ SyncService,
],
}),
safeProvider({
diff --git a/libs/auth/src/common/abstractions/login-strategy.service.ts b/libs/auth/src/common/abstractions/login-strategy.service.ts
index eae6dc2a275..a46636532bf 100644
--- a/libs/auth/src/common/abstractions/login-strategy.service.ts
+++ b/libs/auth/src/common/abstractions/login-strategy.service.ts
@@ -3,7 +3,6 @@ import { Observable } from "rxjs";
import { AuthenticationType } from "@bitwarden/common/auth/enums/authentication-type";
import { AuthResult } from "@bitwarden/common/auth/models/domain/auth-result";
import { TokenTwoFactorRequest } from "@bitwarden/common/auth/models/request/identity-token/token-two-factor.request";
-import { AuthRequestResponse } from "@bitwarden/common/auth/models/response/auth-request.response";
import { MasterKey } from "@bitwarden/common/types/key";
import {
@@ -72,12 +71,4 @@ export abstract class LoginStrategyServiceAbstraction {
* Creates a master key from the provided master password and email.
*/
makePreloginKey: (masterPassword: string, email: string) => Promise;
- /**
- * Sends a response to an auth request.
- */
- passwordlessLogin: (
- id: string,
- key: string,
- requestApproved: boolean,
- ) => Promise;
}
diff --git a/libs/auth/src/common/services/login-strategies/login-strategy.service.ts b/libs/auth/src/common/services/login-strategies/login-strategy.service.ts
index f425bc697c5..7169fd69e93 100644
--- a/libs/auth/src/common/services/login-strategies/login-strategy.service.ts
+++ b/libs/auth/src/common/services/login-strategies/login-strategy.service.ts
@@ -24,8 +24,6 @@ import {
PBKDF2KdfConfig,
} from "@bitwarden/common/auth/models/domain/kdf-config";
import { TokenTwoFactorRequest } from "@bitwarden/common/auth/models/request/identity-token/token-two-factor.request";
-import { PasswordlessAuthRequest } from "@bitwarden/common/auth/models/request/passwordless-auth.request";
-import { AuthRequestResponse } from "@bitwarden/common/auth/models/response/auth-request.response";
import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
import { PreloginRequest } from "@bitwarden/common/models/request/prelogin.request";
import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
@@ -39,7 +37,6 @@ import { MessagingService } from "@bitwarden/common/platform/abstractions/messag
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
import { KdfType } from "@bitwarden/common/platform/enums/kdf-type.enum";
-import { Utils } from "@bitwarden/common/platform/misc/utils";
import { GlobalState, GlobalStateProvider } from "@bitwarden/common/platform/state";
import { DeviceTrustServiceAbstraction } from "@bitwarden/common/src/auth/abstractions/device-trust.service.abstraction";
import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength";
@@ -263,47 +260,6 @@ export class LoginStrategyService implements LoginStrategyServiceAbstraction {
return await this.cryptoService.makeMasterKey(masterPassword, email, kdfConfig);
}
- // TODO: move to auth request service
- async passwordlessLogin(
- id: string,
- key: string,
- requestApproved: boolean,
- ): Promise {
- const pubKey = Utils.fromB64ToArray(key);
-
- const userId = (await firstValueFrom(this.accountService.activeAccount$)).id;
- const masterKey = await firstValueFrom(this.masterPasswordService.masterKey$(userId));
- let keyToEncrypt;
- let encryptedMasterKeyHash = null;
-
- if (masterKey) {
- keyToEncrypt = masterKey.encKey;
-
- // Only encrypt the master password hash if masterKey exists as
- // we won't have a masterKeyHash without a masterKey
- const masterKeyHash = await firstValueFrom(this.masterPasswordService.masterKeyHash$(userId));
- if (masterKeyHash != null) {
- encryptedMasterKeyHash = await this.cryptoService.rsaEncrypt(
- Utils.fromUtf8ToArray(masterKeyHash),
- pubKey,
- );
- }
- } else {
- const userKey = await this.cryptoService.getUserKey();
- keyToEncrypt = userKey.key;
- }
-
- const encryptedKey = await this.cryptoService.rsaEncrypt(keyToEncrypt, pubKey);
-
- const request = new PasswordlessAuthRequest(
- encryptedKey.encryptedString,
- encryptedMasterKeyHash?.encryptedString,
- await this.appIdService.getAppId(),
- requestApproved,
- );
- return await this.apiService.putAuthRequest(id, request);
- }
-
private async clearCache(): Promise {
await this.currentAuthnTypeState.update((_) => null);
await this.loginStrategyCacheState.update((_) => null);
diff --git a/libs/common/src/abstractions/api.service.ts b/libs/common/src/abstractions/api.service.ts
index 73e4f74e63f..ed43849d62b 100644
--- a/libs/common/src/abstractions/api.service.ts
+++ b/libs/common/src/abstractions/api.service.ts
@@ -103,6 +103,7 @@ import { EventResponse } from "../models/response/event.response";
import { ListResponse } from "../models/response/list.response";
import { ProfileResponse } from "../models/response/profile.response";
import { UserKeyResponse } from "../models/response/user-key.response";
+import { SyncResponse } from "../platform/sync";
import { UserId } from "../types/guid";
import { AttachmentRequest } from "../vault/models/request/attachment.request";
import { CipherBulkDeleteRequest } from "../vault/models/request/cipher-bulk-delete.request";
@@ -124,7 +125,6 @@ import {
CollectionResponse,
} from "../vault/models/response/collection.response";
import { OptionalCipherResponse } from "../vault/models/response/optional-cipher.response";
-import { SyncResponse } from "../vault/models/response/sync.response";
/**
* @deprecated The `ApiService` class is deprecated and calls should be extracted into individual
diff --git a/libs/common/src/vault/services/sync/sync.service.ts b/libs/common/src/platform/sync/default-sync.service.ts
similarity index 74%
rename from libs/common/src/vault/services/sync/sync.service.ts
rename to libs/common/src/platform/sync/default-sync.service.ts
index 109ecea0358..5058288487f 100644
--- a/libs/common/src/vault/services/sync/sync.service.ts
+++ b/libs/common/src/platform/sync/default-sync.service.ts
@@ -1,50 +1,53 @@
import { firstValueFrom } from "rxjs";
-import { LogoutReason, UserDecryptionOptionsServiceAbstraction } from "@bitwarden/auth/common";
+import { UserDecryptionOptionsServiceAbstraction } from "../../../../auth/src/common/abstractions";
+import { LogoutReason } from "../../../../auth/src/common/types";
+import { ApiService } from "../../abstractions/api.service";
+import { InternalOrganizationServiceAbstraction } from "../../admin-console/abstractions/organization/organization.service.abstraction";
+import { InternalPolicyService } from "../../admin-console/abstractions/policy/policy.service.abstraction";
+import { ProviderService } from "../../admin-console/abstractions/provider.service";
+import { OrganizationUserType } from "../../admin-console/enums";
+import { OrganizationData } from "../../admin-console/models/data/organization.data";
+import { PolicyData } from "../../admin-console/models/data/policy.data";
+import { ProviderData } from "../../admin-console/models/data/provider.data";
+import { PolicyResponse } from "../../admin-console/models/response/policy.response";
+import { AccountService } from "../../auth/abstractions/account.service";
+import { AuthService } from "../../auth/abstractions/auth.service";
+import { AvatarService } from "../../auth/abstractions/avatar.service";
+import { KeyConnectorService } from "../../auth/abstractions/key-connector.service";
+import { InternalMasterPasswordServiceAbstraction } from "../../auth/abstractions/master-password.service.abstraction";
+import { TokenService } from "../../auth/abstractions/token.service";
+import { ForceSetPasswordReason } from "../../auth/models/domain/force-set-password-reason";
+import { DomainSettingsService } from "../../autofill/services/domain-settings.service";
+import { BillingAccountProfileStateService } from "../../billing/abstractions";
+import { DomainsResponse } from "../../models/response/domains.response";
+import { ProfileResponse } from "../../models/response/profile.response";
+import { SendData } from "../../tools/send/models/data/send.data";
+import { SendResponse } from "../../tools/send/models/response/send.response";
+import { SendApiService } from "../../tools/send/services/send-api.service.abstraction";
+import { InternalSendService } from "../../tools/send/services/send.service.abstraction";
+import { UserId } from "../../types/guid";
+import { CipherService } from "../../vault/abstractions/cipher.service";
+import { CollectionService } from "../../vault/abstractions/collection.service";
+import { FolderApiServiceAbstraction } from "../../vault/abstractions/folder/folder-api.service.abstraction";
+import { InternalFolderService } from "../../vault/abstractions/folder/folder.service.abstraction";
+import { CipherData } from "../../vault/models/data/cipher.data";
+import { CollectionData } from "../../vault/models/data/collection.data";
+import { FolderData } from "../../vault/models/data/folder.data";
+import { CipherResponse } from "../../vault/models/response/cipher.response";
+import { CollectionDetailsResponse } from "../../vault/models/response/collection.response";
+import { FolderResponse } from "../../vault/models/response/folder.response";
+import { CryptoService } from "../abstractions/crypto.service";
+import { LogService } from "../abstractions/log.service";
+import { StateService } from "../abstractions/state.service";
+import { MessageSender } from "../messaging";
+import { sequentialize } from "../misc/sequentialize";
-import { ApiService } from "../../../abstractions/api.service";
-import { InternalOrganizationServiceAbstraction } from "../../../admin-console/abstractions/organization/organization.service.abstraction";
-import { InternalPolicyService } from "../../../admin-console/abstractions/policy/policy.service.abstraction";
-import { ProviderService } from "../../../admin-console/abstractions/provider.service";
-import { OrganizationUserType } from "../../../admin-console/enums";
-import { OrganizationData } from "../../../admin-console/models/data/organization.data";
-import { PolicyData } from "../../../admin-console/models/data/policy.data";
-import { ProviderData } from "../../../admin-console/models/data/provider.data";
-import { PolicyResponse } from "../../../admin-console/models/response/policy.response";
-import { AccountService } from "../../../auth/abstractions/account.service";
-import { AuthService } from "../../../auth/abstractions/auth.service";
-import { AvatarService } from "../../../auth/abstractions/avatar.service";
-import { KeyConnectorService } from "../../../auth/abstractions/key-connector.service";
-import { InternalMasterPasswordServiceAbstraction } from "../../../auth/abstractions/master-password.service.abstraction";
-import { TokenService } from "../../../auth/abstractions/token.service";
-import { ForceSetPasswordReason } from "../../../auth/models/domain/force-set-password-reason";
-import { DomainSettingsService } from "../../../autofill/services/domain-settings.service";
-import { BillingAccountProfileStateService } from "../../../billing/abstractions/account/billing-account-profile-state.service";
-import { DomainsResponse } from "../../../models/response/domains.response";
-import { ProfileResponse } from "../../../models/response/profile.response";
-import { CryptoService } from "../../../platform/abstractions/crypto.service";
-import { LogService } from "../../../platform/abstractions/log.service";
-import { StateService } from "../../../platform/abstractions/state.service";
-import { MessageSender } from "../../../platform/messaging";
-import { sequentialize } from "../../../platform/misc/sequentialize";
-import { CoreSyncService } from "../../../platform/sync/core-sync.service";
-import { SendData } from "../../../tools/send/models/data/send.data";
-import { SendResponse } from "../../../tools/send/models/response/send.response";
-import { SendApiService } from "../../../tools/send/services/send-api.service.abstraction";
-import { InternalSendService } from "../../../tools/send/services/send.service.abstraction";
-import { UserId } from "../../../types/guid";
-import { CipherService } from "../../../vault/abstractions/cipher.service";
-import { FolderApiServiceAbstraction } from "../../../vault/abstractions/folder/folder-api.service.abstraction";
-import { InternalFolderService } from "../../../vault/abstractions/folder/folder.service.abstraction";
-import { CipherData } from "../../../vault/models/data/cipher.data";
-import { FolderData } from "../../../vault/models/data/folder.data";
-import { CipherResponse } from "../../../vault/models/response/cipher.response";
-import { FolderResponse } from "../../../vault/models/response/folder.response";
-import { CollectionService } from "../../abstractions/collection.service";
-import { CollectionData } from "../../models/data/collection.data";
-import { CollectionDetailsResponse } from "../../models/response/collection.response";
+import { CoreSyncService } from "./core-sync.service";
+
+export class DefaultSyncService extends CoreSyncService {
+ syncInProgress = false;
-export class SyncService extends CoreSyncService {
constructor(
private masterPasswordService: InternalMasterPasswordServiceAbstraction,
accountService: AccountService,
diff --git a/libs/common/src/platform/sync/index.ts b/libs/common/src/platform/sync/index.ts
new file mode 100644
index 00000000000..641d591ff09
--- /dev/null
+++ b/libs/common/src/platform/sync/index.ts
@@ -0,0 +1,2 @@
+export { SyncService } from "./sync.service";
+export { SyncResponse } from "./sync.response";
diff --git a/libs/common/src/platform/sync/internal.ts b/libs/common/src/platform/sync/internal.ts
index f515e90a07e..d74f200e0da 100644
--- a/libs/common/src/platform/sync/internal.ts
+++ b/libs/common/src/platform/sync/internal.ts
@@ -1 +1,2 @@
+export { DefaultSyncService } from "./default-sync.service";
export { CoreSyncService } from "./core-sync.service";
diff --git a/libs/common/src/vault/types/sync-event-args.ts b/libs/common/src/platform/sync/sync-event-args.ts
similarity index 94%
rename from libs/common/src/vault/types/sync-event-args.ts
rename to libs/common/src/platform/sync/sync-event-args.ts
index 4f7d870a58f..10b7b7c4101 100644
--- a/libs/common/src/vault/types/sync-event-args.ts
+++ b/libs/common/src/platform/sync/sync-event-args.ts
@@ -1,4 +1,4 @@
-import { SyncResponse } from "../models/response/sync.response";
+import { SyncResponse } from "./sync.response";
type SyncStatus = "Started" | "Completed";
diff --git a/libs/common/src/vault/models/response/sync.response.ts b/libs/common/src/platform/sync/sync.response.ts
similarity index 69%
rename from libs/common/src/vault/models/response/sync.response.ts
rename to libs/common/src/platform/sync/sync.response.ts
index 42778a8cef9..9e7173d3ebb 100644
--- a/libs/common/src/vault/models/response/sync.response.ts
+++ b/libs/common/src/platform/sync/sync.response.ts
@@ -1,12 +1,11 @@
-import { PolicyResponse } from "../../../admin-console/models/response/policy.response";
-import { BaseResponse } from "../../../models/response/base.response";
-import { DomainsResponse } from "../../../models/response/domains.response";
-import { ProfileResponse } from "../../../models/response/profile.response";
-import { SendResponse } from "../../../tools/send/models/response/send.response";
-
-import { CipherResponse } from "./cipher.response";
-import { CollectionDetailsResponse } from "./collection.response";
-import { FolderResponse } from "./folder.response";
+import { PolicyResponse } from "../../admin-console/models/response/policy.response";
+import { BaseResponse } from "../../models/response/base.response";
+import { DomainsResponse } from "../../models/response/domains.response";
+import { ProfileResponse } from "../../models/response/profile.response";
+import { SendResponse } from "../../tools/send/models/response/send.response";
+import { CipherResponse } from "../../vault/models/response/cipher.response";
+import { CollectionDetailsResponse } from "../../vault/models/response/collection.response";
+import { FolderResponse } from "../../vault/models/response/folder.response";
export class SyncResponse extends BaseResponse {
profile?: ProfileResponse;
diff --git a/libs/common/src/platform/sync/sync.service.ts b/libs/common/src/platform/sync/sync.service.ts
new file mode 100644
index 00000000000..741657d5353
--- /dev/null
+++ b/libs/common/src/platform/sync/sync.service.ts
@@ -0,0 +1,58 @@
+import {
+ SyncCipherNotification,
+ SyncFolderNotification,
+ SyncSendNotification,
+} from "../../models/response/notification.response";
+
+/**
+ * A class encapsulating sync operations and data.
+ */
+export abstract class SyncService {
+ /**
+ * A boolean indicating if a sync is currently in progress via this instance and this instance only.
+ *
+ * @deprecated Trusting this property is not safe as it only tells if the current instance is currently
+ * doing a sync operation but does not tell if another instance of SyncService is doing a sync operation.
+ */
+ abstract syncInProgress: boolean;
+
+ /**
+ * Gets the date of the last sync for the currently active user.
+ *
+ * @returns The date of the last sync or null if there is no active user or the active user has not synced before.
+ */
+ abstract getLastSync(): Promise;
+
+ /**
+ * Updates a users last sync date.
+ * @param date The date to be set as the users last sync date.
+ * @param userId The userId of the user to update the last sync date for.
+ */
+ abstract setLastSync(date: Date, userId?: string): Promise;
+
+ /**
+ * Optionally does a full sync operation including going to the server to gather the source
+ * of truth and set that data to state.
+ * @param forceSync A boolean dictating if a sync should be forced. If `true` a sync will happen
+ * as long as the current user is authenticated. If `false` it will only sync if either a sync
+ * has not happened before or the last sync date for the active user is before their account
+ * revision date. Try to always use `false` if possible.
+ *
+ * @param allowThrowOnError A boolean dictating whether or not caught errors should be rethrown.
+ * `true` if they can be rethrown, `false` if they should not be rethrown.
+ */
+ abstract fullSync(forceSync: boolean, allowThrowOnError?: boolean): Promise;
+
+ abstract syncUpsertFolder(
+ notification: SyncFolderNotification,
+ isEdit: boolean,
+ ): Promise;
+ abstract syncDeleteFolder(notification: SyncFolderNotification): Promise;
+ abstract syncUpsertCipher(
+ notification: SyncCipherNotification,
+ isEdit: boolean,
+ ): Promise;
+ abstract syncDeleteCipher(notification: SyncFolderNotification): Promise;
+ abstract syncUpsertSend(notification: SyncSendNotification, isEdit: boolean): Promise;
+ abstract syncDeleteSend(notification: SyncSendNotification): Promise;
+}
diff --git a/libs/common/src/services/api.service.ts b/libs/common/src/services/api.service.ts
index bae9a34c10c..61cfcb25837 100644
--- a/libs/common/src/services/api.service.ts
+++ b/libs/common/src/services/api.service.ts
@@ -121,6 +121,7 @@ import { EnvironmentService } from "../platform/abstractions/environment.service
import { LogService } from "../platform/abstractions/log.service";
import { PlatformUtilsService } from "../platform/abstractions/platform-utils.service";
import { Utils } from "../platform/misc/utils";
+import { SyncResponse } from "../platform/sync";
import { UserId } from "../types/guid";
import { AttachmentRequest } from "../vault/models/request/attachment.request";
import { CipherBulkDeleteRequest } from "../vault/models/request/cipher-bulk-delete.request";
@@ -142,7 +143,6 @@ import {
CollectionResponse,
} from "../vault/models/response/collection.response";
import { OptionalCipherResponse } from "../vault/models/response/optional-cipher.response";
-import { SyncResponse } from "../vault/models/response/sync.response";
/**
* @deprecated The `ApiService` class is deprecated and calls should be extracted into individual
diff --git a/libs/common/src/services/notifications.service.ts b/libs/common/src/services/notifications.service.ts
index cae6fedbb8b..51589f52fae 100644
--- a/libs/common/src/services/notifications.service.ts
+++ b/libs/common/src/services/notifications.service.ts
@@ -21,8 +21,8 @@ import { EnvironmentService } from "../platform/abstractions/environment.service
import { LogService } from "../platform/abstractions/log.service";
import { MessagingService } from "../platform/abstractions/messaging.service";
import { StateService } from "../platform/abstractions/state.service";
+import { SyncService } from "../platform/sync/sync.service";
import { UserId } from "../types/guid";
-import { SyncService } from "../vault/abstractions/sync/sync.service.abstraction";
export class NotificationsService implements NotificationsServiceAbstraction {
private signalrConnection: signalR.HubConnection;
diff --git a/libs/common/src/vault/abstractions/cipher.service.ts b/libs/common/src/vault/abstractions/cipher.service.ts
index 34bc8193553..2c0676f6442 100644
--- a/libs/common/src/vault/abstractions/cipher.service.ts
+++ b/libs/common/src/vault/abstractions/cipher.service.ts
@@ -1,5 +1,7 @@
import { Observable } from "rxjs";
+import { LocalData } from "@bitwarden/common/vault/models/data/local.data";
+
import { UriMatchStrategySetting } from "../../models/domain/domain-service";
import { SymmetricCryptoKey } from "../../platform/models/domain/symmetric-crypto-key";
import { CipherId, CollectionId, OrganizationId } from "../../types/guid";
@@ -14,6 +16,7 @@ import { AddEditCipherInfo } from "../types/add-edit-cipher-info";
export abstract class CipherService {
cipherViews$: Observable>;
ciphers$: Observable>;
+ localData$: Observable>;
/**
* An observable monitoring the add/edit cipher info saved to memory.
*/
diff --git a/libs/common/src/vault/abstractions/sync/sync-notifier.service.abstraction.ts b/libs/common/src/vault/abstractions/sync/sync-notifier.service.abstraction.ts
deleted file mode 100644
index f519850aa66..00000000000
--- a/libs/common/src/vault/abstractions/sync/sync-notifier.service.abstraction.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Observable } from "rxjs";
-
-import { SyncEventArgs } from "../../types/sync-event-args";
-
-export abstract class SyncNotifierService {
- sync$: Observable;
- next: (event: SyncEventArgs) => void;
-}
diff --git a/libs/common/src/vault/abstractions/sync/sync.service.abstraction.ts b/libs/common/src/vault/abstractions/sync/sync.service.abstraction.ts
index cfe73317555..1a1b8e7c758 100644
--- a/libs/common/src/vault/abstractions/sync/sync.service.abstraction.ts
+++ b/libs/common/src/vault/abstractions/sync/sync.service.abstraction.ts
@@ -1,19 +1,2 @@
-import {
- SyncCipherNotification,
- SyncFolderNotification,
- SyncSendNotification,
-} from "../../../models/response/notification.response";
-
-export abstract class SyncService {
- syncInProgress: boolean;
-
- getLastSync: () => Promise;
- setLastSync: (date: Date, userId?: string) => Promise;
- fullSync: (forceSync: boolean, allowThrowOnError?: boolean) => Promise;
- syncUpsertFolder: (notification: SyncFolderNotification, isEdit: boolean) => Promise;
- syncDeleteFolder: (notification: SyncFolderNotification) => Promise;
- syncUpsertCipher: (notification: SyncCipherNotification, isEdit: boolean) => Promise;
- syncDeleteCipher: (notification: SyncFolderNotification) => Promise;
- syncUpsertSend: (notification: SyncSendNotification, isEdit: boolean) => Promise;
- syncDeleteSend: (notification: SyncSendNotification) => Promise;
-}
+// TEMP: Re-export of original SyncService location to allow for team specific PR's
+export { SyncService } from "../../../platform/sync";
diff --git a/libs/common/src/vault/services/sync/sync-notifier.service.ts b/libs/common/src/vault/services/sync/sync-notifier.service.ts
deleted file mode 100644
index 870ccfb849c..00000000000
--- a/libs/common/src/vault/services/sync/sync-notifier.service.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Subject } from "rxjs";
-
-import { SyncNotifierService as SyncNotifierServiceAbstraction } from "../../abstractions/sync/sync-notifier.service.abstraction";
-import { SyncEventArgs } from "../../types/sync-event-args";
-
-/**
- * This class should most likely have 0 dependencies because it will hopefully
- * be rolled into SyncService once upon a time.
- */
-export class SyncNotifierService implements SyncNotifierServiceAbstraction {
- private _sync = new Subject();
-
- sync$ = this._sync.asObservable();
-
- next(event: SyncEventArgs): void {
- this._sync.next(event);
- }
-}
diff --git a/libs/components/src/async-actions/form-button.directive.ts b/libs/components/src/async-actions/form-button.directive.ts
index 5fe40423644..4e0facf17b2 100644
--- a/libs/components/src/async-actions/form-button.directive.ts
+++ b/libs/components/src/async-actions/form-button.directive.ts
@@ -40,13 +40,13 @@ export class BitFormButtonDirective implements OnDestroy {
if (this.type === "submit") {
buttonComponent.loading = loading;
} else {
- buttonComponent.disabled = loading;
+ buttonComponent.disabled = this.disabled || loading;
}
});
submitDirective.disabled$.pipe(takeUntil(this.destroy$)).subscribe((disabled) => {
if (this.disabled !== false) {
- buttonComponent.disabled = disabled;
+ buttonComponent.disabled = this.disabled || disabled;
}
});
}
diff --git a/libs/components/src/async-actions/in-forms.stories.ts b/libs/components/src/async-actions/in-forms.stories.ts
index ff060c6a7de..ec6005dd607 100644
--- a/libs/components/src/async-actions/in-forms.stories.ts
+++ b/libs/components/src/async-actions/in-forms.stories.ts
@@ -33,6 +33,7 @@ const template = `
+
`;
diff --git a/libs/components/src/icon/icons/index.ts b/libs/components/src/icon/icons/index.ts
index 9de81f19913..ea583031f61 100644
--- a/libs/components/src/icon/icons/index.ts
+++ b/libs/components/src/icon/icons/index.ts
@@ -2,3 +2,4 @@ export * from "./deactivated-org";
export * from "./search";
export * from "./no-access";
export * from "./vault";
+export * from "./no-results";
diff --git a/libs/components/src/icon/icons/no-results.ts b/libs/components/src/icon/icons/no-results.ts
new file mode 100644
index 00000000000..f68e67f88ce
--- /dev/null
+++ b/libs/components/src/icon/icons/no-results.ts
@@ -0,0 +1,18 @@
+import { svgIcon } from "../icon";
+
+export const NoResults = svgIcon`
+
+
+`;
diff --git a/libs/components/src/section/index.ts b/libs/components/src/section/index.ts
index ea2aa32a22f..9a0983e18e4 100644
--- a/libs/components/src/section/index.ts
+++ b/libs/components/src/section/index.ts
@@ -1 +1,2 @@
export * from "./section.component";
+export * from "./section-header.component";
diff --git a/libs/components/src/section/section-header.component.html b/libs/components/src/section/section-header.component.html
new file mode 100644
index 00000000000..d17022d5eb7
--- /dev/null
+++ b/libs/components/src/section/section-header.component.html
@@ -0,0 +1,8 @@
+
diff --git a/libs/components/src/section/section-header.component.ts b/libs/components/src/section/section-header.component.ts
new file mode 100644
index 00000000000..9f7b1a21f16
--- /dev/null
+++ b/libs/components/src/section/section-header.component.ts
@@ -0,0 +1,16 @@
+import { Component } from "@angular/core";
+
+import { TypographyModule } from "../typography";
+
+@Component({
+ standalone: true,
+ selector: "bit-section-header",
+ templateUrl: "./section-header.component.html",
+ imports: [TypographyModule],
+ host: {
+ class:
+ // apply bottom and x padding when a `bit-card` or `bit-item` is the immediate sibling, or nested in the immediate sibling
+ "tw-block has-[+_*_bit-card]:tw-pb-1 has-[+_bit-card]:tw-pb-1 has-[+_*_bit-item]:tw-pb-1 has-[+_bit-item]:tw-pb-1 has-[+_*_bit-card]:tw-px-1 has-[+_bit-card]:tw-px-1 has-[+_*_bit-item]:tw-px-1 has-[+_bit-item]:tw-px-1",
+ },
+})
+export class SectionHeaderComponent {}
diff --git a/libs/components/src/section/section.mdx b/libs/components/src/section/section.mdx
new file mode 100644
index 00000000000..33e640e4f06
--- /dev/null
+++ b/libs/components/src/section/section.mdx
@@ -0,0 +1,89 @@
+import { Meta, Story, Primary, Controls, Canvas } from "@storybook/addon-docs";
+
+import * as stories from "./section.stories";
+
+
+
+```ts
+import { SectionComponent, SectionHeaderComponent } from "@bitwarden/components";
+```
+
+# Section
+
+Sections are simple containers that apply a responsive bottom margin and utilize the semantic
+`section` HTML element.
+
+
+
+## Section Header
+
+Sections often contain a heading. Use `bit-section-header` inside of the `bit-section`.
+
+```html
+
+
+ I'm a section header
+
+ Section content here!
+
+```
+
+### Section Header Padding
+
+When placed inside of a section with a `bit-card` or `bit-item` as the immediate next sibling (or
+nested in the immediate next sibling), the section header will automatically apply bottom and x-axis
+padding to align the header with the border radius of the card/item.
+
+```html
+
+
+ I'm a section header
+
+
+
+ I'm card content
+
+
+```
+
+
+
+If placed inside of a section without a `bit-card` or `bit-item`, or with a `bit-card`/`bit-item`
+that is not a descendant of the immediate next sibling, the padding is not applied.
+
+
+
+### Section Header Content Slots
+
+`bit-section-header` contains the following slots to help position the content:
+
+| Slot | Description |
+| ------------ | ------------------------------- |
+| default | title text of the header |
+| `slot="end"` | placed at the end of the header |
+
+#### Default slot
+
+Anything passed to the default slot will display as part of the title. The title should be a
+`bitTypography` element, usually an `h2` styled as an `h6`.
+
+Title suffixes (typically an icon or icon button) can be added as well. A gap is automatically
+applied between the children of the default slot.
+
+
+
+#### End slot
+
+The `end` slot will typically be used for text or an icon button.
+
+
diff --git a/libs/components/src/section/section.stories.ts b/libs/components/src/section/section.stories.ts
index 65b6a67d476..0f720d1dba0 100644
--- a/libs/components/src/section/section.stories.ts
+++ b/libs/components/src/section/section.stories.ts
@@ -1,15 +1,24 @@
import { Meta, StoryObj, componentWrapperDecorator, moduleMetadata } from "@storybook/angular";
+import { CardComponent } from "../card";
+import { IconButtonModule } from "../icon-button";
+import { ItemModule } from "../item";
import { TypographyModule } from "../typography";
-import { SectionComponent } from "./section.component";
+import { SectionComponent, SectionHeaderComponent } from "./";
export default {
title: "Component Library/Section",
component: SectionComponent,
decorators: [
moduleMetadata({
- imports: [TypographyModule],
+ imports: [
+ TypographyModule,
+ SectionHeaderComponent,
+ CardComponent,
+ IconButtonModule,
+ ItemModule,
+ ],
}),
componentWrapperDecorator((story) => `${story}
`),
],
@@ -17,19 +26,149 @@ export default {
type Story = StoryObj;
-/** Sections are simple containers that apply a responsive bottom margin. They often contain a heading. */
export const Default: Story = {
- render: (args) => ({
- props: args,
- template: `
+ render: () => ({
+ template: /*html*/ `
+
Foo
- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras vitae congue risus. Interdum et malesuada fames ac ante ipsum primis in faucibus. Nunc elementum odio nibh, eget pellentesque sem ornare vitae. Etiam vel ante et velit fringilla egestas a sed sem. Fusce molestie nisl et nisi accumsan dapibus. Interdum et malesuada fames ac ante ipsum primis in faucibus. Sed eu risus ex.
+
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras vitae congue risus. Interdum et malesuada fames ac ante ipsum primis in faucibus. Nunc elementum odio nibh, eget pellentesque sem ornare vitae. Etiam vel ante et velit fringilla egestas a sed sem. Fusce molestie nisl et nisi accumsan dapibus. Interdum et malesuada fames ac ante ipsum primis in faucibus. Sed eu risus ex.
+
Bar
- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras vitae congue risus. Interdum et malesuada fames ac ante ipsum primis in faucibus. Nunc elementum odio nibh, eget pellentesque sem ornare vitae. Etiam vel ante et velit fringilla egestas a sed sem. Fusce molestie nisl et nisi accumsan dapibus. Interdum et malesuada fames ac ante ipsum primis in faucibus. Sed eu risus ex.
+
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras vitae congue risus. Interdum et malesuada fames ac ante ipsum primis in faucibus. Nunc elementum odio nibh, eget pellentesque sem ornare vitae. Etiam vel ante et velit fringilla egestas a sed sem. Fusce molestie nisl et nisi accumsan dapibus. Interdum et malesuada fames ac ante ipsum primis in faucibus. Sed eu risus ex.
`,
}),
};
+
+export const HeaderVariants: Story = {
+ render: () => ({
+ template: /*html*/ `
+
+
+ Title only
+
+
+
+
+ Title with icon button suffix
+
+
+
+ `,
+ }),
+};
+
+export const HeaderEndSlotVariants: Story = {
+ render: () => ({
+ template: /*html*/ `
+
+
+ Title with end slot text
+
+ 13
+
+
+
+ Title with end slot icon button
+
+
+
+ `,
+ }),
+};
+
+export const HeaderWithPadding: Story = {
+ render: () => ({
+ template: /*html*/ `
+
+
+
+
+ Card as immediate sibling
+
+
+
+
+ bit-section-header has padding
+
+
+
+
+
+ Card nested in immediate sibling
+
+
+
+
+
+ bit-section-header has padding
+
+
+
+
+
+
+ Item as immediate sibling
+
+
+
+
+ bit-section-header has padding
+
+
+
+
+
+ Item nested in immediate sibling
+
+
+
+
+
+ bit-section-header has padding
+
+
+
+
+
+
+
+ No card or item used
+
+
+
+
+
just a div, so bit-section-header has no padding
+
+
+
+
+
+ Card nested in non-immediate sibling
+
+
+
+
+ a div here
+
+
+ bit-section-header has no padding
+
+
+