From 87f3999a0b388f418caa2bdc38fc348722627c01 Mon Sep 17 00:00:00 2001 From: BlackDex Date: Wed, 30 Nov 2022 17:52:03 +0100 Subject: [PATCH] Update to web-vault v2022.11.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR updates the web-vault to v2022.11.1 It also replaces the main logo and top left icon to indicate it is Vaultwarden. And the footer text has been change to `Vaultwarden (unofficial Bitwarden® server)` This hopefully helps causing less confusion. --- .dockerignore | 1 + Dockerfile | 5 +- patches/v2022.11.1.patch | 347 +++++++++++++++++++++++++++++++++ resources/icon-dark.png | Bin 0 -> 734 bytes resources/icon-white.png | Bin 0 -> 734 bytes resources/logo-dark@2x.png | Bin 0 -> 5473 bytes resources/logo-white@2x.png | Bin 0 -> 4187 bytes scripts/apply_patches.sh | 6 + scripts/generate_patch_file.sh | 7 +- 9 files changed, 363 insertions(+), 3 deletions(-) create mode 100644 patches/v2022.11.1.patch create mode 100644 resources/icon-dark.png create mode 100644 resources/icon-white.png create mode 100644 resources/logo-dark@2x.png create mode 100644 resources/logo-white@2x.png diff --git a/.dockerignore b/.dockerignore index 482e191..0ad6512 100644 --- a/.dockerignore +++ b/.dockerignore @@ -10,3 +10,4 @@ web-vault # Other .github Makefile +.vscode diff --git a/Dockerfile b/Dockerfile index b9cdc1d..938ce36 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-v2022.10.2 -ARG VAULT_VERSION=703860f1ac7bad2dfa9a98640a568db26fdcf5ed +# Using https://github.com/bitwarden/clients/releases/tag/web-v2022.11.1 +ARG VAULT_VERSION=eea3ddcaf2c5fc1c3ed3d405367cfed2d0789736 WORKDIR /vault RUN git init @@ -38,6 +38,7 @@ RUN git fetch --depth 1 origin "${VAULT_VERSION}" RUN git -c advice.detachedHead=false checkout FETCH_HEAD COPY --chown=node:node patches /patches +COPY --chown=node:node resources /resources COPY --chown=node:node scripts/apply_patches.sh /apply_patches.sh RUN bash /apply_patches.sh diff --git a/patches/v2022.11.1.patch b/patches/v2022.11.1.patch new file mode 100644 index 0000000..ff7b8c4 --- /dev/null +++ b/patches/v2022.11.1.patch @@ -0,0 +1,347 @@ +diff --git a/apps/web/src/404.html b/apps/web/src/404.html +index 6cf5e363d..275c34f72 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 2022 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 9bd0fda6f..4ef20fa5c 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 75089529f..969d81a8a 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/web-platform-utils.service.ts b/apps/web/src/app/core/web-platform-utils.service.ts +index 115d53401..e62638e35 100644 +--- a/apps/web/src/app/core/web-platform-utils.service.ts ++++ b/apps/web/src/app/core/web-platform-utils.service.ts +@@ -188,11 +188,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 { +diff --git a/apps/web/src/app/layouts/footer.component.html b/apps/web/src/app/layouts/footer.component.html +index 98836bfd5..1239167c4 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 d737bc9f0..6a312c0b1 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 b7e5a69fb..2a0d9fc8b 100644 +--- a/apps/web/src/app/layouts/navbar.component.html ++++ b/apps/web/src/app/layouts/navbar.component.html +@@ -67,7 +67,7 @@ + + {{ "accountSettings" | i18n }} + +- ++ + + {{ "getHelp" | i18n }} + +diff --git a/apps/web/src/app/organizations/create/organization-information.component.html b/apps/web/src/app/organizations/create/organization-information.component.html +index 6029cfd83..04324b7d1 100644 +--- a/apps/web/src/app/organizations/create/organization-information.component.html ++++ b/apps/web/src/app/organizations/create/organization-information.component.html +@@ -12,7 +12,7 @@ + + + +- {{ "billingEmail" | i18n }} ++ {{ "email" | i18n }} + + + +diff --git a/apps/web/src/app/organizations/settings/account.component.html b/apps/web/src/app/organizations/settings/account.component.html +index 1d11412bf..c7911e418 100644 +--- a/apps/web/src/app/organizations/settings/account.component.html ++++ b/apps/web/src/app/organizations/settings/account.component.html +@@ -30,7 +30,7 @@ + /> +
+
+- ++ + { + this.organization = await this.organizationService.get(params.organizationId); +diff --git a/apps/web/src/app/send/access.component.html b/apps/web/src/app/send/access.component.html +index b58186102..bfcbc352b 100644 +--- a/apps/web/src/app/send/access.component.html ++++ b/apps/web/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/apps/web/src/app/settings/billing-history-view.component.ts b/apps/web/src/app/settings/billing-history-view.component.ts +index 4a2ff349a..c8090b08e 100644 +--- a/apps/web/src/app/settings/billing-history-view.component.ts ++++ b/apps/web/src/app/settings/billing-history-view.component.ts +@@ -34,7 +34,7 @@ export class BillingHistoryViewComponent implements OnInit { + return; + } + this.loading = true; +- this.billing = await this.apiService.getUserBillingHistory(); ++ this.billing = null; + this.loading = false; + } + } +diff --git a/apps/web/src/app/settings/settings.component.ts b/apps/web/src/app/settings/settings.component.ts +index 2a2fc4d27..26053e486 100644 +--- a/apps/web/src/app/settings/settings.component.ts ++++ b/apps/web/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.getHasPremiumFromOrganization(); + 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/apps/web/src/app/vault/vault.component.ts b/apps/web/src/app/vault/vault.component.ts +index 9f9c0d378..fcb85250b 100644 +--- a/apps/web/src/app/vault/vault.component.ts ++++ b/apps/web/src/app/vault/vault.component.ts +@@ -91,11 +91,7 @@ export class VaultComponent 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"); + + // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe + this.route.queryParams.pipe(first()).subscribe(async (params) => { +diff --git a/apps/web/src/scss/styles.scss b/apps/web/src/scss/styles.scss +index 0003f521c..41d6fca76 100644 +--- a/apps/web/src/scss/styles.scss ++++ b/apps/web/src/scss/styles.scss +@@ -58,3 +58,68 @@ + @import "./tables"; + @import "./toasts"; + @import "./vault-filters"; ++ ++/**** START Vaultwarden CHANGES ****/ ++/* This combines all selectors extending it into one */ ++%vw-hide { display: none !important; } ++ ++/* This allows searching for the combined style in the browsers dev-tools (look into the head tag) */ ++#vw-hide,head { @extend %vw-hide; } ++ ++/* Hide the Billing Page tab */ ++bit-tab-link[route="billing"] { @extend %vw-hide; } ++ ++/* Hide any link pointing to Free Bitwarden Families */ ++a[href$="/settings/sponsored-families"] { @extend %vw-hide; } ++ ++/* Hide the `Enterprise Single Sign-On` button on the login page */ ++a[href$="/sso"] { @extend %vw-hide; } ++ ++/* Hide Two-Factor menu in Organization settings */ ++app-org-settings a[href$="/settings/two-factor"] { @extend %vw-hide; } ++ ++/* Hide Business Owned checkbox */ ++app-org-info > form:nth-child(1) > div:nth-child(3) { @extend %vw-hide; } ++ ++/* Hide organization plans */ ++app-organization-plans > 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 Business Name and Identifier */ ++app-org-account form div.form-group:nth-child(3) { @extend %vw-hide; } ++app-org-account form div.form-group:nth-child(4) { @extend %vw-hide; } ++ ++/* 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; } ++ ++/* 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; } ++ ++/* Replace the Bitwarden Shield at the top left with a Vaultwarden icon */ ++.bwi-shield:before { ++ content: '' !important; ++ width: 32px !important; ++ height: 40px !important; ++ display: block !important; ++ background-image: url(../images/icon-white.png) !important; ++ background-repeat: no-repeat; ++ background-position-y: bottom; ++} ++/**** END Vaultwarden CHANGES ****/ +diff --git a/libs/angular/src/components/register.component.ts b/libs/angular/src/components/register.component.ts +index 029639e7e..6c3606341 100644 +--- a/libs/angular/src/components/register.component.ts ++++ b/libs/angular/src/components/register.component.ts +@@ -35,7 +35,7 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn + showPassword = false; + formPromise: Promise; + referenceData: ReferenceEventRequest; +- showTerms = true; ++ showTerms = false; + showErrorSummary = false; + passwordStrengthResult: any; + color: string; +@@ -88,7 +88,7 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn + protected logService: LogService + ) { + super(environmentService, i18nService, platformUtilsService); +- this.showTerms = !platformUtilsService.isSelfHost(); ++ this.showTerms = false; + } + + async ngOnInit() { +@@ -96,6 +96,15 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn + } + + async submit(showToast = true) { ++ 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; ++ } ++ + let email = this.formGroup.value.email; + email = email.trim().toLowerCase(); + let name = this.formGroup.value.name; diff --git a/resources/icon-dark.png b/resources/icon-dark.png new file mode 100644 index 0000000000000000000000000000000000000000..960424ba791985827a89e9329fe00fbfbf53e8fe GIT binary patch literal 734 zcmV<40wMj0P)kdg0007|Nkl+wC?-RqPx_5AKQPGsSv;xAE7^b&c6_ zw3E=%!by%c9~|Ogiy6|@(&*{aHDoalJA^s&e+ODnOBm4zp{px|#xFw4f)4b5vtCyrUy@JWFwV1u@eYhA9p!y{}@0ve01^Ln70d zLJDCUl7;e3&qdD77>!tnWV`glVxXk_Dn*~R(DShmbcMDS#p_baWu_FyJ|sI=ZRq6P z&LsP#bIVLDlpXwJ1FPH3lK$rlA-Aj$OWMuq*6~Bxc@_nwrxETeU$(W&gZBxI`qM$P zDrsHoyUtY7mrZJ5Q%rS@_4S0tMp@EkD5`&NF7~vJZOfPGLEGtg+Qs?T31%dVb<{TO z)0}S4XNLVX0>wI_V)+0nA927h3?CsC3*oBm9io=NtlCJeT&LozTq&;J0jT5R0s=p@ QN&o-=07*qoM6N<$g1&TO761SM literal 0 HcmV?d00001 diff --git a/resources/icon-white.png b/resources/icon-white.png new file mode 100644 index 0000000000000000000000000000000000000000..7fc9d42e7462d9cacaf30ef5e55bca4b42d89b97 GIT binary patch literal 734 zcmV<40wMj0P)kdg0007|Nklr`Q4j^F8Aq_qpFcp0NOchPnB00jEd+KCxZ%Z)YtnJ2&s! z`vgF8%23}|vbhAP&C1B?R?qJ@s{zU8R?4vu942N6zBg$ECl^XcfatIcnWhWc0CpXA zeP;lFfR1T7?+Sk*+0Qqibk8sWw<*E*4g`NG9MM1?2mC6Sr2@a3Iyg#x1eIF^zX2X^ zKuc+v?gT&xyk}9ODzE%Z=vKlQ_S^-V2*^!lY<02q(m}D@P@gj zcwVy5@xf_o(D9AK1=owd$@I_EsJx#4yr@L&)BNW+5EWT~V>5V;1pc>T^Sz9JL2`EH9G?XU`oQHG zT+V+WIk)*fGYecHbFKtM2sw!E?2oyZWRnFSs8D&apW*Ht#9kU%)DJrf5UpVqHQ=a0 zeW91eULnB_8J?yEqRU(;f|h9+-wFI-sa(q7&3+B~l!!j}i5jJ%AN4li@!U*0;DAio z9Z;(PyJzem&{jAio2&zVvx&9sWm%Ja1E4n{ENd@o+rTfmoktibQNlyHFH2?a!H1A! zro%=WX|;{rWVT>SkR-6BV741t&- z0E>Jng6J!YMjq=UEta+}Mm~S(h*p`%YFoT_h*|=(Y9qCBor<{907*qoM6N<$f?p3wcmMzZ literal 0 HcmV?d00001 diff --git a/resources/logo-dark@2x.png b/resources/logo-dark@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..5b1efb464059d5ef3b146cda0092dc3268eca3dc GIT binary patch literal 5473 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 literal 0 HcmV?d00001 diff --git a/scripts/apply_patches.sh b/scripts/apply_patches.sh index cb465a7..70a8461 100755 --- a/scripts/apply_patches.sh +++ b/scripts/apply_patches.sh @@ -14,6 +14,12 @@ if [[ -z ${PATCH_NAME} ]]; then fi fi +echo "Patching images" +cp -vf ../resources/logo-dark@2x.png ./apps/web/src/images/logo-dark@2x.png +cp -vf ../resources/logo-white@2x.png ./apps/web/src/images/logo-white@2x.png +cp -vf ../resources/icon-white.png ./apps/web/src/images/icon-white.png + echo "Using patch: ${PATCH_NAME}" git apply "../patches/${PATCH_NAME}" --reject + echo "Patching successful!" diff --git a/scripts/generate_patch_file.sh b/scripts/generate_patch_file.sh index ae2cdb8..cea46e4 100755 --- a/scripts/generate_patch_file.sh +++ b/scripts/generate_patch_file.sh @@ -23,7 +23,12 @@ fi PATCH_FILENAME="${VAULT_VERSION}.patch" if [ "$(git status --porcelain | wc -l)" -ge 1 ]; then - git --no-pager diff --no-color --minimal -- . ':!package-lock.json' > "../patches/${PATCH_FILENAME}" + git --no-pager diff --no-color --minimal -- . \ + ':!package-lock.json' \ + ':!apps/web/src/images/logo-dark@2x.png' \ + ':!apps/web/src/images/logo-white@2x.png' \ + ':!apps/web/src/images/icon-white.png' \ + > "../patches/${PATCH_FILENAME}" echo "Patch has been created here: patches/${PATCH_FILENAME}" else echo "No changes found, skip generating a patch file."