From 4f2bcf3c24b0dc83ee525acce1103e387ef43ffd Mon Sep 17 00:00:00 2001 From: BlackDex Date: Sat, 18 Jun 2022 16:05:48 +0200 Subject: [PATCH] Updated web-vault to v2022.5.2 --- Dockerfile | 4 +- patches/v2022.5.2.patch | 312 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 314 insertions(+), 2 deletions(-) create mode 100644 patches/v2022.5.2.patch diff --git a/Dockerfile b/Dockerfile index 07fdbec..4959bd6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,8 +23,8 @@ USER node # Can be a tag, release, but prefer a commit hash because it's not changeable # https://github.com/bitwarden/web/commit/${VAULT_VERSION} # -# Using https://github.com/bitwarden/web/releases/tag/2022.05.0 -ARG VAULT_VERSION=ec80782d8f2ec593adf4f2d874fc8b97783c9d33 +# Using https://github.com/bitwarden/web/releases/tag/v2022.5.2 +ARG VAULT_VERSION=b7cee309ba120aa4aa454be1c7690dbdfc38491f RUN git clone https://github.com/bitwarden/web.git /vault WORKDIR /vault diff --git a/patches/v2022.5.2.patch b/patches/v2022.5.2.patch new file mode 100644 index 0000000..11f9591 --- /dev/null +++ b/patches/v2022.5.2.patch @@ -0,0 +1,312 @@ +Submodule jslib contains modified content +diff --git a/jslib/angular/src/components/register.component.ts b/jslib/angular/src/components/register.component.ts +index d4b99e17..c1626200 100644 +--- a/jslib/angular/src/components/register.component.ts ++++ b/jslib/angular/src/components/register.component.ts +@@ -28,7 +28,7 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn + formPromise: Promise; + masterPasswordScore: number; + referenceData: ReferenceEventRequest; +- showTerms = true; ++ showTerms = false; + acceptPolicies = false; + + protected successRoute = "login"; +@@ -47,7 +47,7 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn + protected logService: LogService + ) { + super(environmentService, i18nService, platformUtilsService); +- this.showTerms = !platformUtilsService.isSelfHost(); ++ this.showTerms = false; + } + + async ngOnInit() { +@@ -85,6 +85,15 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn + } + + async submit() { ++ if (typeof crypto.subtle === 'undefined') { ++ this.platformUtilsService.showToast( ++ "error", ++ "This browser requires HTTPS to use the web vault", ++ "Check the Vaultwarden wiki for details on how to enable it" ++ ); ++ return; ++ } ++ + if (!this.acceptPolicies && this.showTerms) { + this.platformUtilsService.showToast( + "error", +diff --git a/src/404.html b/src/404.html +index 6cf5e363..54d11495 100644 +--- a/src/404.html ++++ b/src/404.html +@@ -42,11 +42,10 @@ + +

+

+- You can return to the web vault, check our +- status page or +- contact us. ++ You can return to the web vault, or ++ contact us. +

+ +-
© Copyright 2022 Bitwarden, Inc.
++
© Copyright 2022 Bitwarden, Inc. (Powered by Vaultwarden)
+ + +diff --git a/src/app/app.component.ts b/src/app/app.component.ts +index 9e26f680..dd759fd7 100644 +--- a/src/app/app.component.ts ++++ b/src/app/app.component.ts +@@ -165,6 +165,10 @@ export class AppComponent implements OnDestroy, OnInit { + break; + } + case "showToast": ++ if (typeof message.text === "string" && typeof crypto.subtle === 'undefined') { ++ message.title="This browser requires HTTPS to use the web vault"; ++ message.text="Check the Vaultwarden wiki for details on how to enable it"; ++ } + this.showToast(message); + break; + case "setFullWidth": +diff --git a/src/app/layouts/footer.component.html b/src/app/layouts/footer.component.html +index 8601e123..22a0248b 100644 +--- a/src/app/layouts/footer.component.html ++++ b/src/app/layouts/footer.component.html +@@ -1,6 +1,6 @@ +
+
+-
© {{ year }}, Bitwarden Inc.
++
© {{ year }}, Bitwarden Inc. (Powered by Vaultwarden)
+
+
+ {{ "versionNumber" | i18n: version }} +diff --git a/src/app/layouts/frontend-layout.component.html b/src/app/layouts/frontend-layout.component.html +index 479302d3..84930683 100644 +--- a/src/app/layouts/frontend-layout.component.html ++++ b/src/app/layouts/frontend-layout.component.html +@@ -1,5 +1,5 @@ + +
+- © {{ year }}, Bitwarden Inc.
++ © {{ year }}, Bitwarden Inc. (Powered by Vaultwarden)
+ {{ "versionNumber" | i18n: version }} +
+diff --git a/src/app/layouts/navbar.component.html b/src/app/layouts/navbar.component.html +index 9bbd8d2e..d2438cae 100644 +--- a/src/app/layouts/navbar.component.html ++++ b/src/app/layouts/navbar.component.html +@@ -69,7 +69,7 @@ + + {{ "accountSettings" | i18n }} + +- ++ + + {{ "getHelp" | i18n }} + +diff --git a/src/app/modules/vault/modules/individual-vault/individual-vault.component.ts b/src/app/modules/vault/modules/individual-vault/individual-vault.component.ts +index 47e1906a..def8164c 100644 +--- a/src/app/modules/vault/modules/individual-vault/individual-vault.component.ts ++++ b/src/app/modules/vault/modules/individual-vault/individual-vault.component.ts +@@ -94,11 +94,7 @@ export class IndividualVaultComponent implements OnInit, OnDestroy { + async ngOnInit() { + this.showVerifyEmail = !(await this.tokenService.getEmailVerified()); + this.showBrowserOutdated = window.navigator.userAgent.indexOf("MSIE") !== -1; +- this.trashCleanupWarning = this.i18nService.t( +- this.platformUtilsService.isSelfHost() +- ? "trashCleanupWarningSelfHosted" +- : "trashCleanupWarning" +- ); ++ this.trashCleanupWarning = this.i18nService.t("trashCleanupWarningSelfHosted"); + + this.route.queryParams.pipe(first()).subscribe(async (params) => { + await this.syncService.fullSync(false); +diff --git a/src/app/modules/vault/modules/organization-vault/organization-vault.component.ts b/src/app/modules/vault/modules/organization-vault/organization-vault.component.ts +index 59d97bf7..fd96ed3b 100644 +--- a/src/app/modules/vault/modules/organization-vault/organization-vault.component.ts ++++ b/src/app/modules/vault/modules/organization-vault/organization-vault.component.ts +@@ -81,11 +81,7 @@ export class OrganizationVaultComponent implements OnInit, OnDestroy { + ) {} + + ngOnInit() { +- this.trashCleanupWarning = this.i18nService.t( +- this.platformUtilsService.isSelfHost() +- ? "trashCleanupWarningSelfHosted" +- : "trashCleanupWarning" +- ); ++ this.trashCleanupWarning = this.i18nService.t("trashCleanupWarningSelfHosted"); + this.route.parent.params.subscribe(async (params: any) => { + this.organization = await this.organizationService.get(params.organizationId); + this.vaultFilterComponent.organization = this.organization; +diff --git a/src/app/send/access.component.html b/src/app/send/access.component.html +index 19bc107b..7e1dbcc7 100644 +--- a/src/app/send/access.component.html ++++ b/src/app/send/access.component.html +@@ -137,15 +137,6 @@ +
+

+ {{ "sendAccessTaglineProductDesc" | i18n }}
+- {{ "sendAccessTaglineLearnMore" | i18n }} +- Bitwarden Send +- {{ "sendAccessTaglineOr" | i18n }} +- {{ +- "sendAccessTaglineSignUp" | i18n +- }} +- {{ "sendAccessTaglineTryToday" | i18n }} +

+
+
+diff --git a/src/app/services/init.service.ts b/src/app/services/init.service.ts +index eacfea97..c2f81033 100644 +--- a/src/app/services/init.service.ts ++++ b/src/app/services/init.service.ts +@@ -36,11 +36,23 @@ export class InitService { + ) {} + + init() { ++ function getBaseUrl() { ++ // If the base URL is `https://vaultwarden.example.com/base/path/`, ++ // `window.location.href` should have one of the following forms: ++ // ++ // - `https://vaultwarden.example.com/base/path/` ++ // - `https://vaultwarden.example.com/base/path/#/some/route[?queryParam=...]` ++ // ++ // We want to get to just `https://vaultwarden.example.com/base/path`. ++ let baseUrl = window.location.href; ++ baseUrl = baseUrl.replace(/#.*/, ''); // Strip off `#` and everything after. ++ baseUrl = baseUrl.replace(/\/+$/, ''); // Trim any trailing `/` chars. ++ return baseUrl; ++ } + return async () => { + await this.stateService.init(); + +- const urls = process.env.URLS as Urls; +- urls.base ??= this.win.location.origin; ++ const urls = {base: getBaseUrl()}; + this.environmentService.setUrls(urls); + + setTimeout(() => this.notificationsService.init(), 3000); +diff --git a/src/app/settings/settings.component.ts b/src/app/settings/settings.component.ts +index 9756ba41..348c3843 100644 +--- a/src/app/settings/settings.component.ts ++++ b/src/app/settings/settings.component.ts +@@ -55,10 +55,6 @@ export class SettingsComponent implements OnInit, OnDestroy { + this.hasFamilySponsorshipAvailable = await this.organizationService.canManageSponsorships(); + const hasPremiumFromOrg = await this.stateService.getCanAccessPremium(); + let billing = null; +- if (!this.selfHosted) { +- billing = await this.apiService.getUserBillingHistory(); +- } +- this.hideSubscription = +- !this.premium && hasPremiumFromOrg && (this.selfHosted || billing?.hasNoHistory); ++ this.hideSubscription = true; + } + } +diff --git a/src/app/settings/user-billing-history.component.ts b/src/app/settings/user-billing-history.component.ts +index ae26862d..69ff16a0 100644 +--- a/src/app/settings/user-billing-history.component.ts ++++ b/src/app/settings/user-billing-history.component.ts +@@ -39,7 +39,7 @@ export class UserBillingHistoryComponent implements OnInit { + return; + } + this.loading = true; +- this.billing = await this.apiService.getUserBillingHistory(); ++ this.billing = null; + this.loading = false; + } + +diff --git a/src/app/vault/add-edit.component.html b/src/app/vault/add-edit.component.html +index 37410ea5..8c9e1a6f 100644 +--- a/src/app/vault/add-edit.component.html ++++ b/src/app/vault/add-edit.component.html +@@ -182,7 +182,7 @@ +
+
+ form > div.form-check { @extend %vw-hide; } ++app-organization-plans > form > h2.mt-5 { @extend %vw-hide; } ++ ++/* Hide the `This account is owned by a business` checkbox and label */ ++#ownedBusiness, label[for^=ownedBusiness] { @extend %vw-hide; } ++ ++/* Hide External Id field for Collections */ ++app-collection-add-edit form div.form-group:nth-child(2) { @extend %vw-hide; } ++ ++/* Hide the radio button and label for the `Custom` org user type */ ++#userTypeCustom, label[for^=userTypeCustom] { @extend %vw-hide; } ++ ++/* Hide the warning that policy config is moving to Business Portal */ ++app-org-policies > app-callout { @extend %vw-hide; } ++ ++/* Hide Business Name and Identifier */ ++app-org-account form div.form-group:nth-child(3) { display: none; } ++app-org-account form div.form-group:nth-child(4) { display: none; } ++ ++/* Hide Tax Info and Form in Organization settings */ ++app-org-account > div.secondary-header:nth-child(3) { @extend %vw-hide; } ++app-org-account > div.secondary-header:nth-child(3) + p { @extend %vw-hide; } ++app-org-account > div.secondary-header:nth-child(3) + p + form { @extend %vw-hide; } ++/**** END Vaultwarden CHANGES ****/ +diff --git a/src/services/webPlatformUtils.service.ts b/src/services/webPlatformUtils.service.ts +index 755600a1..25f4561e 100644 +--- a/src/services/webPlatformUtils.service.ts ++++ b/src/services/webPlatformUtils.service.ts +@@ -240,11 +240,11 @@ export class WebPlatformUtilsService implements PlatformUtilsService { + } + + isDev(): boolean { +- return process.env.NODE_ENV === "development"; ++ return false; + } + + isSelfHost(): boolean { +- return process.env.ENV.toString() === "selfhosted"; ++ return false; + } + + copyToClipboard(text: string, options?: any): void | boolean {