diff --git a/apps/browser/src/autofill/services/autofill.service.spec.ts b/apps/browser/src/autofill/services/autofill.service.spec.ts index 24b1c90b3f..23f690544d 100644 --- a/apps/browser/src/autofill/services/autofill.service.spec.ts +++ b/apps/browser/src/autofill/services/autofill.service.spec.ts @@ -1,6 +1,8 @@ import { mock, mockReset, MockProxy } from "jest-mock-extended"; import { BehaviorSubject, of } from "rxjs"; +import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; +import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; import { UserVerificationService } from "@bitwarden/common/auth/services/user-verification/user-verification.service"; import { AutofillOverlayVisibility } from "@bitwarden/common/autofill/constants"; import { AutofillSettingsService } from "@bitwarden/common/autofill/services/autofill-settings.service"; @@ -78,12 +80,17 @@ describe("AutofillService", () => { const userVerificationService = mock(); const billingAccountProfileStateService = mock(); const platformUtilsService = mock(); + let activeAccountStatusMock$: BehaviorSubject; + let authService: MockProxy; beforeEach(() => { scriptInjectorService = new BrowserScriptInjectorService(platformUtilsService, logService); inlineMenuVisibilityMock$ = new BehaviorSubject(AutofillOverlayVisibility.OnFieldFocus); autofillSettingsService = mock(); (autofillSettingsService as any).inlineMenuVisibility$ = inlineMenuVisibilityMock$; + activeAccountStatusMock$ = new BehaviorSubject(AuthenticationStatus.Unlocked); + authService = mock(); + authService.activeAccountStatus$ = activeAccountStatusMock$; autofillService = new AutofillService( cipherService, autofillSettingsService, @@ -95,6 +102,7 @@ describe("AutofillService", () => { billingAccountProfileStateService, scriptInjectorService, accountService, + authService, ); domainSettingsService = new DefaultDomainSettingsService(fakeStateProvider); @@ -287,6 +295,18 @@ describe("AutofillService", () => { }); }); + it("skips injecting the autofiller script when the user's account is not unlocked", async () => { + activeAccountStatusMock$.next(AuthenticationStatus.Locked); + + await autofillService.injectAutofillScripts(sender.tab, sender.frameId, true); + + expect(BrowserApi.executeScriptInTab).not.toHaveBeenCalledWith(tabMock.id, { + file: "content/autofiller.js", + frameId: sender.frameId, + ...defaultExecuteScriptOptions, + }); + }); + it("will inject the bootstrap-autofill-overlay script if the user has the autofill overlay enabled", async () => { await autofillService.injectAutofillScripts(sender.tab, sender.frameId); diff --git a/apps/browser/src/autofill/services/autofill.service.ts b/apps/browser/src/autofill/services/autofill.service.ts index 5348ca5b9a..9ec2052381 100644 --- a/apps/browser/src/autofill/services/autofill.service.ts +++ b/apps/browser/src/autofill/services/autofill.service.ts @@ -3,7 +3,9 @@ import { pairwise } from "rxjs/operators"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; +import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction"; +import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; import { AutofillOverlayVisibility } from "@bitwarden/common/autofill/constants"; import { AutofillSettingsServiceAbstraction } from "@bitwarden/common/autofill/services/autofill-settings.service"; import { DomainSettingsService } from "@bitwarden/common/autofill/services/domain-settings.service"; @@ -61,6 +63,7 @@ export default class AutofillService implements AutofillServiceInterface { private billingAccountProfileStateService: BillingAccountProfileStateService, private scriptInjectorService: ScriptInjectorService, private accountService: AccountService, + private authService: AuthService, ) {} /** @@ -113,6 +116,8 @@ export default class AutofillService implements AutofillServiceInterface { // Autofill user settings loaded from state can await the active account state indefinitely // if not guarded by an active account check (e.g. the user is logged in) const activeAccount = await firstValueFrom(this.accountService.activeAccount$); + const authStatus = await firstValueFrom(this.authService.activeAccountStatus$); + const accountIsUnlocked = authStatus === AuthenticationStatus.Unlocked; let overlayVisibility: InlineMenuVisibilitySetting = AutofillOverlayVisibility.Off; let autoFillOnPageLoadIsEnabled = false; @@ -126,7 +131,7 @@ export default class AutofillService implements AutofillServiceInterface { const injectedScripts = [mainAutofillScript]; - if (activeAccount) { + if (activeAccount && accountIsUnlocked) { autoFillOnPageLoadIsEnabled = await this.getAutofillOnPageLoad(); } diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts index a382a76781..51d18f15a3 100644 --- a/apps/browser/src/background/main.background.ts +++ b/apps/browser/src/background/main.background.ts @@ -872,6 +872,7 @@ export default class MainBackground { this.billingAccountProfileStateService, this.scriptInjectorService, this.accountService, + this.authService, ); this.auditService = new AuditService(this.cryptoFunctionService, this.apiService); @@ -1332,7 +1333,7 @@ export default class MainBackground { ]); //Needs to be checked before state is cleaned - const needStorageReseed = await this.needsStorageReseed(userId); + const needStorageReseed = await this.needsStorageReseed(userBeingLoggedOut); await this.stateService.clean({ userId: userBeingLoggedOut }); await this.accountService.clean(userBeingLoggedOut); diff --git a/apps/browser/src/popup/services/services.module.ts b/apps/browser/src/popup/services/services.module.ts index d260b4ec7b..342b3d26a6 100644 --- a/apps/browser/src/popup/services/services.module.ts +++ b/apps/browser/src/popup/services/services.module.ts @@ -341,6 +341,7 @@ const safeProviders: SafeProvider[] = [ BillingAccountProfileStateService, ScriptInjectorService, AccountServiceAbstraction, + AuthService, ], }), safeProvider({ diff --git a/apps/web/src/app/auth/trial-initiation/content/enterprise-content.component.html b/apps/web/src/app/auth/trial-initiation/content/enterprise-content.component.html index 120748d4c0..4abb44db4f 100644 --- a/apps/web/src/app/auth/trial-initiation/content/enterprise-content.component.html +++ b/apps/web/src/app/auth/trial-initiation/content/enterprise-content.component.html @@ -1,34 +1,51 @@ -

The Password Manager Trusted by Millions

-
-

Everything enterprises need out of a password manager:

+

Start your 7-day free trial of Bitwarden

+
+

+ Strengthen business security with the password manager designed for seamless administration and + employee usability. +

    -
  • Secure password sharing
    • -
  • - Easy, flexible SSO and SCIM integrations +
  • + Instantly and securely share credentials with the groups and individuals who need them +
    • +
  • + Strengthen employee security practices through centralized administrative control and + policies +
    • +
  • + Streamline user onboarding and automate account provisioning with turnkey SSO and SCIM + integrations +
    • +
  • + Migrate to Bitwarden in minutes with comprehensive import options +
    • +
  • + Save time and increase productivity with autofill and instant device syncing +
    • +
  • + Empower employees to secure their digital life at home, at work, and on the go by offering a + free Families plan to all Enterprise users
    • -
  • Free families plan for users
    • -
  • Quick import and migration tools
    • -
  • Simple, streamlined user experience
    • -
  • Priority support and trainers
- -
- - - -
+
diff --git a/apps/web/src/app/auth/trial-initiation/content/logo-badges.component.html b/apps/web/src/app/auth/trial-initiation/content/logo-badges.component.html new file mode 100644 index 0000000000..d1b33eab3a --- /dev/null +++ b/apps/web/src/app/auth/trial-initiation/content/logo-badges.component.html @@ -0,0 +1,11 @@ +
+
+ + third party awards + +
+
diff --git a/apps/web/src/app/auth/trial-initiation/content/logo-badges.component.ts b/apps/web/src/app/auth/trial-initiation/content/logo-badges.component.ts new file mode 100644 index 0000000000..c23432b67c --- /dev/null +++ b/apps/web/src/app/auth/trial-initiation/content/logo-badges.component.ts @@ -0,0 +1,7 @@ +import { Component } from "@angular/core"; + +@Component({ + selector: "app-logo-badges", + templateUrl: "logo-badges.component.html", +}) +export class LogoBadgesComponent {} diff --git a/apps/web/src/app/auth/trial-initiation/content/teams1-content.component.html b/apps/web/src/app/auth/trial-initiation/content/teams1-content.component.html index d26bbabaef..42f99be26b 100644 --- a/apps/web/src/app/auth/trial-initiation/content/teams1-content.component.html +++ b/apps/web/src/app/auth/trial-initiation/content/teams1-content.component.html @@ -1,21 +1,36 @@ -

Start Your Teams Free Trial Now

-
-
$4 per month / per user
-
Annual subscription
-
+

Start your 7-day free trial for Teams

+

- Millions of individuals, teams, and organizations worldwide trust Bitwarden for secure password - storage and sharing. + Strengthen business security with an easy-to-use password manager your team will love.

-
    -
  • Collaborate and share securely
    • -
  • Deploy and manage quickly and easily
    • -
  • Access anywhere on any device
    • -
  • Create your account to get started
    • +
      +
    • + Instantly and securely share credentials with the groups and individuals who need them +
      • +
    • + Migrate to Bitwarden in minutes with comprehensive import options +
      • +
    • + Save time and increase productivity with autofill and instant device syncing +
      • +
    • + Enhance security practices across your team with easy user management +
    - - +
    diff --git a/apps/web/src/app/auth/trial-initiation/trial-initiation.module.ts b/apps/web/src/app/auth/trial-initiation/trial-initiation.module.ts index 6e25e97858..57d982fd00 100644 --- a/apps/web/src/app/auth/trial-initiation/trial-initiation.module.ts +++ b/apps/web/src/app/auth/trial-initiation/trial-initiation.module.ts @@ -24,6 +24,7 @@ import { DefaultContentComponent } from "./content/default-content.component"; import { EnterpriseContentComponent } from "./content/enterprise-content.component"; import { Enterprise1ContentComponent } from "./content/enterprise1-content.component"; import { Enterprise2ContentComponent } from "./content/enterprise2-content.component"; +import { LogoBadgesComponent } from "./content/logo-badges.component"; import { LogoCnet5StarsComponent } from "./content/logo-cnet-5-stars.component"; import { LogoCnetComponent } from "./content/logo-cnet.component"; import { LogoForbesComponent } from "./content/logo-forbes.component"; @@ -69,6 +70,7 @@ import { VerticalStepperModule } from "./vertical-stepper/vertical-stepper.modul CnetTeamsContentComponent, AbmEnterpriseContentComponent, AbmTeamsContentComponent, + LogoBadgesComponent, LogoCnet5StarsComponent, LogoCnetComponent, LogoForbesComponent, diff --git a/apps/web/src/app/billing/individual/user-subscription.component.html b/apps/web/src/app/billing/individual/user-subscription.component.html index bed41c8dc5..5f9e6463f1 100644 --- a/apps/web/src/app/billing/individual/user-subscription.component.html +++ b/apps/web/src/app/billing/individual/user-subscription.component.html @@ -1,10 +1,10 @@ - {{ "loading" | i18n }} + {{ "loading" | i18n }} -

    {{ "subscriptionPendingCanceled" | i18n }}

    +

    {{ "subscriptionPendingCanceled" | i18n }}
    @@ -39,12 +37,12 @@
    {{ sub.expiration | date: "mediumDate" }}
    {{ "neverExpires" | i18n }}
    -
    -
    +
    +
    {{ "status" | i18n }}
    - {{ (subscription && subscription.status) || "-" }} + {{ (subscription && subscription.status) || "-" }} {{ "pendingCancellation" | i18n }} @@ -61,19 +59,19 @@
    -
    - {{ "details" | i18n }} - - +
    + {{ "details" | i18n }} + +
    - - + - -
    + {{ i.name }} {{ i.quantity > 1 ? "×" + i.quantity : "" }} @ {{ i.amount | currency: "$" }} {{ i.quantity * i.amount | currency: "$" }} /{{ i.interval | i18n }}{{ i.quantity * i.amount | currency: "$" }} /{{ i.interval | i18n }}
    + +
    @@ -91,27 +89,9 @@ {{ "launchCloudSubscription" | i18n }}
    -
    -
    - -

    {{ "updateLicense" | i18n }}

    - - -
    -
    -
    +
    -

    {{ "storage" | i18n }}

    -

    {{ "subscriptionStorage" | i18n: sub.maxStorageGb || 0 : sub.storageName || "0 MB" }}

    -
    -
    - {{ storagePercentage / 100 | percent }} -
    -
    +

    {{ "storage" | i18n }}

    +

    + {{ "subscriptionStorage" | i18n: sub.maxStorageGb || 0 : sub.storageName || "0 MB" }} +

    + -
    -
    - -
    diff --git a/apps/web/src/app/billing/individual/user-subscription.component.ts b/apps/web/src/app/billing/individual/user-subscription.component.ts index fa21317c18..8535f23f82 100644 --- a/apps/web/src/app/billing/individual/user-subscription.component.ts +++ b/apps/web/src/app/billing/individual/user-subscription.component.ts @@ -20,6 +20,10 @@ import { OffboardingSurveyDialogResultType, openOffboardingSurvey, } from "../shared/offboarding-survey.component"; +import { + UpdateLicenseDialogComponent, + UpdateLicenseDialogResult, +} from "../shared/update-license-dialog.component"; @Component({ templateUrl: "user-subscription.component.html", @@ -131,21 +135,16 @@ export class UserSubscriptionComponent implements OnInit { }); } - updateLicense() { + updateLicense = async () => { if (this.loading) { return; } - this.showUpdateLicense = true; - } - - closeUpdateLicense(load: boolean) { - this.showUpdateLicense = false; - if (load) { - // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling. - // eslint-disable-next-line @typescript-eslint/no-floating-promises - this.load(); + const dialogRef = UpdateLicenseDialogComponent.open(this.dialogService); + const result = await lastValueFrom(dialogRef.closed); + if (result === UpdateLicenseDialogResult.Updated) { + await this.load(); } - } + }; adjustStorage = (add: boolean) => { return async () => { diff --git a/apps/web/src/app/billing/shared/billing-shared.module.ts b/apps/web/src/app/billing/shared/billing-shared.module.ts index 35fe33c7e0..0031cff775 100644 --- a/apps/web/src/app/billing/shared/billing-shared.module.ts +++ b/apps/web/src/app/billing/shared/billing-shared.module.ts @@ -12,6 +12,7 @@ import { PaymentMethodComponent } from "./payment-method.component"; import { PaymentComponent } from "./payment.component"; import { SecretsManagerSubscribeComponent } from "./sm-subscribe.component"; import { TaxInfoComponent } from "./tax-info.component"; +import { UpdateLicenseDialogComponent } from "./update-license-dialog.component"; import { UpdateLicenseComponent } from "./update-license.component"; @NgModule({ @@ -24,6 +25,7 @@ import { UpdateLicenseComponent } from "./update-license.component"; PaymentMethodComponent, SecretsManagerSubscribeComponent, UpdateLicenseComponent, + UpdateLicenseDialogComponent, OffboardingSurveyComponent, ], exports: [ @@ -34,6 +36,7 @@ import { UpdateLicenseComponent } from "./update-license.component"; BillingHistoryComponent, SecretsManagerSubscribeComponent, UpdateLicenseComponent, + UpdateLicenseDialogComponent, OffboardingSurveyComponent, ], }) diff --git a/apps/web/src/app/billing/shared/update-license-dialog.component.html b/apps/web/src/app/billing/shared/update-license-dialog.component.html new file mode 100644 index 0000000000..6430c47528 --- /dev/null +++ b/apps/web/src/app/billing/shared/update-license-dialog.component.html @@ -0,0 +1,40 @@ +
    + + + + {{ "licenseFile" | i18n }} +
    + + {{ licenseFile ? licenseFile.name : ("noFileChosen" | i18n) }} +
    + + {{ "licenseFileDesc" | i18n: "bitwarden_premium_license.json" }} +     +     + + + + +     +
    diff --git a/apps/web/src/app/billing/shared/update-license-dialog.component.ts b/apps/web/src/app/billing/shared/update-license-dialog.component.ts new file mode 100644 index 0000000000..5f9a1e94be --- /dev/null +++ b/apps/web/src/app/billing/shared/update-license-dialog.component.ts @@ -0,0 +1,38 @@ +import { Component } from "@angular/core"; +import { FormBuilder } from "@angular/forms"; + +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { DialogService } from "@bitwarden/components"; + +import { UpdateLicenseComponent } from "./update-license.component"; + +export enum UpdateLicenseDialogResult { + Updated = "updated", + Cancelled = "cancelled", +} +@Component({ + templateUrl: "update-license-dialog.component.html", +}) +export class UpdateLicenseDialogComponent extends UpdateLicenseComponent { + constructor( + apiService: ApiService, + i18nService: I18nService, + platformUtilsService: PlatformUtilsService, + organizationApiService: OrganizationApiServiceAbstraction, + formBuilder: FormBuilder, + ) { + super(apiService, i18nService, platformUtilsService, organizationApiService, formBuilder); + } + async submitLicense() { + await this.submit(); + } + submitLicenseDialog = async () => { + await this.submitLicense(); + }; + static open(dialogService: DialogService) { + return dialogService.open(UpdateLicenseDialogComponent); + } +} diff --git a/apps/web/src/app/tools/vault-export/export.component.ts b/apps/web/src/app/tools/vault-export/export.component.ts index 7902d2818d..df53e599ed 100644 --- a/apps/web/src/app/tools/vault-export/export.component.ts +++ b/apps/web/src/app/tools/vault-export/export.component.ts @@ -42,4 +42,9 @@ export class ExportComponent extends BaseExportComponent { organizationService, ); } + + protected saved() { + super.saved(); + this.platformUtilsService.showToast("success", null, this.i18nService.t("exportSuccess")); + } } diff --git a/apps/web/src/app/vault/org-vault/vault.component.html b/apps/web/src/app/vault/org-vault/vault.component.html index 06907b9e5d..af8789c906 100644 --- a/apps/web/src/app/vault/org-vault/vault.component.html +++ b/apps/web/src/app/vault/org-vault/vault.component.html @@ -62,7 +62,7 @@ [showPremiumFeatures]="organization?.useTotp" [showBulkMove]="false" [showBulkTrashOptions]="filter.type === 'trash'" - [useEvents]="organization?.useEvents" + [useEvents]="organization?.canAccessEventLogs" [showAdminActions]="true" (onEvent)="onVaultItemsEvent($event)" [showBulkEditCollectionAccess]="organization?.flexibleCollections" diff --git a/apps/web/src/images/register-layout/vault-signup-badges.png b/apps/web/src/images/register-layout/vault-signup-badges.png new file mode 100644 index 0000000000..7a80ffaebb Binary files /dev/null and b/apps/web/src/images/register-layout/vault-signup-badges.png differ diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json index c21955179d..e090f6a7ab 100644 --- a/apps/web/src/locales/en/messages.json +++ b/apps/web/src/locales/en/messages.json @@ -2102,7 +2102,7 @@ "message": "Bitwarden Families plan." }, "addons": { - "message": "Addons" + "message": "Add-ons" }, "premiumAccess": { "message": "Premium access"