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 0000000..960424b Binary files /dev/null and b/resources/icon-dark.png differ diff --git a/resources/icon-white.png b/resources/icon-white.png new file mode 100644 index 0000000..7fc9d42 Binary files /dev/null and b/resources/icon-white.png differ diff --git a/resources/logo-dark@2x.png b/resources/logo-dark@2x.png new file mode 100644 index 0000000..5b1efb4 Binary files /dev/null and b/resources/logo-dark@2x.png differ diff --git a/resources/logo-white@2x.png b/resources/logo-white@2x.png new file mode 100644 index 0000000..2942357 Binary files /dev/null and b/resources/logo-white@2x.png differ 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."