From 4414f436648633cadfcc005fbb3031d478f47b3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa?=
Date: Wed, 22 Sep 2021 19:52:19 +0200
Subject: [PATCH] v2.23.0
---
Dockerfile | 4 +-
patches/v2.23.0.patch | 268 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 270 insertions(+), 2 deletions(-)
create mode 100644 patches/v2.23.0.patch
diff --git a/Dockerfile b/Dockerfile
index c2d441f..5e7f89d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,8 +25,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/v2.22.3
-ARG VAULT_VERSION=cfefcf7876f3ef56e707b4ca6bd6b0135c0118d3
+# Using https://github.com/bitwarden/web/releases/tag/v2.23.0
+ARG VAULT_VERSION=cfa3d81cf87ed59c471021608b9b922023c825f1
RUN git clone https://github.com/bitwarden/web.git /vault
WORKDIR /vault
diff --git a/patches/v2.23.0.patch b/patches/v2.23.0.patch
new file mode 100644
index 0000000..693facb
--- /dev/null
+++ b/patches/v2.23.0.patch
@@ -0,0 +1,268 @@
+Submodule jslib contains modified content
+diff --git a/jslib/angular/src/components/register.component.ts b/jslib/angular/src/components/register.component.ts
+index aecf9ce..7dec3e7 100644
+--- a/jslib/angular/src/components/register.component.ts
++++ b/jslib/angular/src/components/register.component.ts
+@@ -29,7 +29,7 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn
+ formPromise: Promise;
+ masterPasswordScore: number;
+ referenceData: ReferenceEventRequest;
+- showTerms = true;
++ showTerms = false;
+ acceptPolicies: boolean = false;
+
+ protected successRoute = 'login';
+@@ -41,7 +41,7 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn
+ platformUtilsService: PlatformUtilsService,
+ protected passwordGenerationService: PasswordGenerationService, environmentService: EnvironmentService) {
+ super(environmentService, i18nService, platformUtilsService);
+- this.showTerms = !platformUtilsService.isSelfHost();
++ this.showTerms = false;
+ }
+
+ async ngOnInit() {
+@@ -79,6 +79,12 @@ 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', this.i18nService.t('errorOccurred'),
+ this.i18nService.t('acceptPoliciesError'));
+diff --git a/src/404.html b/src/404.html
+index eba36375..cb8883ec 100644
+--- a/src/404.html
++++ b/src/404.html
+@@ -41,10 +41,10 @@
+
+
+ You can return to the web vault, check our status page
+- or contact us.
++ or contact us.
+
+
+