From b69a4fc6d50605d81137dbe0dfa77650fe5539b4 Mon Sep 17 00:00:00 2001 From: Stefan Melmuk Date: Thu, 22 Jun 2023 04:29:52 +0200 Subject: [PATCH] update web-vault to v2023.5.1 --- Dockerfile | 4 +- patches/v2023.5.1.patch | 455 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 457 insertions(+), 2 deletions(-) create mode 100644 patches/v2023.5.1.patch diff --git a/Dockerfile b/Dockerfile index 3846393..73290cc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,8 +28,8 @@ USER node # Can be a tag, release, but prefer a commit hash because it's not changeable # https://github.com/bitwarden/clients/commit/${VAULT_VERSION} # -# Using https://github.com/bitwarden/clients/releases/tag/web-v2023.5.0 -ARG VAULT_VERSION=7bb3f49abdbcf9dc4aed264feca822be9772fbd9 +# Using https://github.com/bitwarden/clients/releases/tag/web-v2023.5.1 +ARG VAULT_VERSION=ee8e3f062cd4a9dd82d325940a54e8c0980c5b2f WORKDIR /vault RUN git init diff --git a/patches/v2023.5.1.patch b/patches/v2023.5.1.patch new file mode 100644 index 0000000..be2eb53 --- /dev/null +++ b/patches/v2023.5.1.patch @@ -0,0 +1,455 @@ +diff --git a/apps/web/src/404.html b/apps/web/src/404.html +index 5a650b3673..275c34f726 100644 +--- a/apps/web/src/404.html ++++ b/apps/web/src/404.html +@@ -28,7 +28,7 @@ + +@@ -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 2023 Bitwarden, Inc.
++
Vaultwarden (unofficial Bitwarden® server)
+ + +diff --git a/apps/web/src/app/admin-console/organizations/create/organization-information.component.html b/apps/web/src/app/admin-console/organizations/create/organization-information.component.html +index 6029cfd833..04324b7d19 100644 +--- a/apps/web/src/app/admin-console/organizations/create/organization-information.component.html ++++ b/apps/web/src/app/admin-console/organizations/create/organization-information.component.html +@@ -12,7 +12,7 @@ + + + +- {{ "billingEmail" | i18n }} ++ {{ "email" | i18n }} + + + +diff --git a/apps/web/src/app/admin-console/organizations/settings/account.component.html b/apps/web/src/app/admin-console/organizations/settings/account.component.html +index 096ae89015..d7f1b9356a 100644 +--- a/apps/web/src/app/admin-console/organizations/settings/account.component.html ++++ b/apps/web/src/app/admin-console/organizations/settings/account.component.html +@@ -30,7 +30,7 @@ + /> + +
+- ++ + { + // Workaround to ignore stateService.activeAccount until process.env.URLS are set + // TODO: Remove this when implementing ticket PM-2637 + this.environmentService.initialized = false; + 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); + this.environmentService.initialized = true; + +diff --git a/apps/web/src/app/core/router.service.ts b/apps/web/src/app/core/router.service.ts +index aa9041875a..6809363759 100644 +--- a/apps/web/src/app/core/router.service.ts ++++ b/apps/web/src/app/core/router.service.ts +@@ -23,7 +23,7 @@ export class RouterService { + .subscribe((event: NavigationEnd) => { + this.currentUrl = event.url; + +- let title = i18nService.t("pageTitle", "Bitwarden"); ++ let title = i18nService.t("pageTitle", "Vaultwarden"); + let child = this.activatedRoute.firstChild; + while (child.firstChild) { + child = child.firstChild; +diff --git a/apps/web/src/app/core/web-platform-utils.service.ts b/apps/web/src/app/core/web-platform-utils.service.ts +index 7b9a7b9477..1a26e31160 100644 +--- a/apps/web/src/app/core/web-platform-utils.service.ts ++++ b/apps/web/src/app/core/web-platform-utils.service.ts +@@ -133,15 +133,15 @@ export class WebPlatformUtilsService implements PlatformUtilsService { + } + + isDev(): boolean { +- return process.env.NODE_ENV === "development"; ++ return false; + } + + isSelfHost(): boolean { +- return WebPlatformUtilsService.isSelfHost(); ++ return false; + } + + static isSelfHost(): boolean { +- return process.env.ENV.toString() === "selfhosted"; ++ return false; + } + + copyToClipboard(text: string, options?: any): void | boolean { +diff --git a/apps/web/src/app/layouts/footer.component.html b/apps/web/src/app/layouts/footer.component.html +index 8cacb4ceba..37d7cfb031 100644 +--- a/apps/web/src/app/layouts/footer.component.html ++++ b/apps/web/src/app/layouts/footer.component.html +@@ -1,6 +1,6 @@ +
+
+-
© {{ year }} Bitwarden Inc.
++
Vaultwarden (unofficial Bitwarden® server)
+
+
+ {{ "versionNumber" | i18n : version }} +diff --git a/apps/web/src/app/layouts/frontend-layout.component.html b/apps/web/src/app/layouts/frontend-layout.component.html +index 84608acff0..9fdb254237 100644 +--- a/apps/web/src/app/layouts/frontend-layout.component.html ++++ b/apps/web/src/app/layouts/frontend-layout.component.html +@@ -1,6 +1,6 @@ + +
+-
++
+ + + +
+ +- © {{ year }} Bitwarden Inc.
++ Vaultwarden (unofficial Bitwarden® server)
+ {{ "versionNumber" | i18n : version }} +
+diff --git a/apps/web/src/app/layouts/navbar.component.html b/apps/web/src/app/layouts/navbar.component.html +index 0f13d7ddee..88698b00e8 100644 +--- a/apps/web/src/app/layouts/navbar.component.html ++++ b/apps/web/src/app/layouts/navbar.component.html +@@ -1,6 +1,6 @@ +