From 5652417b24c7aef181341826f015427d56fdbe7b Mon Sep 17 00:00:00 2001 From: Stefan Melmuk Date: Wed, 11 Jan 2023 07:48:58 +0100 Subject: [PATCH] fix hiding of firefox relay and duckduckgo also remove superfluous styles as suggested by @BlackDex --- patches/v2023.1.0.patch | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/patches/v2023.1.0.patch b/patches/v2023.1.0.patch index 0e63259..f0c4eaf 100644 --- a/patches/v2023.1.0.patch +++ b/patches/v2023.1.0.patch @@ -256,6 +256,19 @@ index 652ee24a1..5a63562cc 100644 size: 160, }); }, 100); +diff --git a/apps/web/src/app/tools/generator.component.ts b/apps/web/src/app/tools/generator.component.ts +index 6a5f00c19..1bf8daf31 100644 +--- a/apps/web/src/app/tools/generator.component.ts ++++ b/apps/web/src/app/tools/generator.component.ts +@@ -40,7 +40,7 @@ export class GeneratorComponent extends BaseGeneratorComponent { + route, + window + ); +- if (platformUtilsService.isSelfHost()) { ++ if (true) { + // Cannot use Firefox Relay on self hosted web vaults due to CORS issues with Firefox Relay API + this.forwardOptions.splice( + this.forwardOptions.findIndex((o) => o.value === "firefoxrelay"), diff --git a/apps/web/src/app/vault/vault.component.ts b/apps/web/src/app/vault/vault.component.ts index 4113b3ab2..7a8227232 100644 --- a/apps/web/src/app/vault/vault.component.ts @@ -359,12 +372,6 @@ index 0003f521c..41d6fca76 100644 +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; } + -+/* Hide Firefox Relay - It is CORS protected for SaaS only */ -+#forwardtype_firefoxrelay, label[for^=forwardtype_firefoxrelay] { @extend %vw-hide; } -+ -+/* Hide DuckDuckGo - It does not work for self-hosted either. */ -+#forwardtype_duckduckgo, label[for^=forwardtype_duckduckgo] { @extend %vw-hide; } -+ +/* Hide Device Verification form at the Two Step Login screen */ +app-security > app-two-factor-setup > form { @extend %vw-hide; } +