From 00f128f105770488b331cd279c15edd0c61065eb Mon Sep 17 00:00:00 2001 From: Stefan Melmuk Date: Thu, 16 Feb 2023 07:34:41 +0100 Subject: [PATCH] update web-vault to v2023.2.0 --- Dockerfile | 4 +- patches/v2023.2.0.patch | 445 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 447 insertions(+), 2 deletions(-) create mode 100644 patches/v2023.2.0.patch diff --git a/Dockerfile b/Dockerfile index feb4697..b30aa81 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.1.1 -ARG VAULT_VERSION=8b9bdddf812f1e443d2d1ff1d1906c396e3afbdd +# Using https://github.com/bitwarden/clients/releases/tag/web-v2023.2.0 +ARG VAULT_VERSION=3f05a1772ea7f321768a13ec42beee1e5e1f9033 WORKDIR /vault RUN git init diff --git a/patches/v2023.2.0.patch b/patches/v2023.2.0.patch new file mode 100644 index 0000000..b6d0488 --- /dev/null +++ b/patches/v2023.2.0.patch @@ -0,0 +1,445 @@ +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/app.component.ts b/apps/web/src/app/app.component.ts +index b9dac0c6db..e7b84133eb 100644 +--- a/apps/web/src/app/app.component.ts ++++ b/apps/web/src/app/app.component.ts +@@ -172,6 +172,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/apps/web/src/app/core/init.service.ts b/apps/web/src/app/core/init.service.ts +index 8baa7c0ddc..8f3b5d4641 100644 +--- a/apps/web/src/app/core/init.service.ts ++++ b/apps/web/src/app/core/init.service.ts +@@ -37,11 +37,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/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 e2271f713b..298766d73e 100644 +--- a/apps/web/src/app/core/web-platform-utils.service.ts ++++ b/apps/web/src/app/core/web-platform-utils.service.ts +@@ -194,15 +194,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 98836bfd5d..1239167c43 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 d737bc9f02..6a312c0b1f 100644 +--- a/apps/web/src/app/layouts/frontend-layout.component.html ++++ b/apps/web/src/app/layouts/frontend-layout.component.html +@@ -1,5 +1,5 @@ + +
+- © {{ 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 ff96e851a4..111261b2e3 100644 +--- a/apps/web/src/app/layouts/navbar.component.html ++++ b/apps/web/src/app/layouts/navbar.component.html +@@ -2,7 +2,7 @@ + +