Submodule jslib contains modified content diff --git a/jslib/angular/src/components/register.component.ts b/jslib/angular/src/components/register.component.ts index fd91af2..abcfd62 100644 --- a/jslib/angular/src/components/register.component.ts +++ b/jslib/angular/src/components/register.component.ts @@ -30,7 +30,7 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn formPromise: Promise; masterPasswordScore: number; referenceData: ReferenceEventRequest; - showTerms = true; + showTerms = false; acceptPolicies: boolean = false; protected successRoute = 'login'; @@ -43,7 +43,7 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn protected passwordGenerationService: PasswordGenerationService, environmentService: EnvironmentService, protected logService: LogService) { super(environmentService, i18nService, platformUtilsService); - this.showTerms = !platformUtilsService.isSelfHost(); + this.showTerms = false; } async ngOnInit() { @@ -81,6 +81,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.

- © Copyright 2021 Bitwarden, Inc. + © Copyright 2021 Bitwarden, Inc. (Powered by Vaultwarden)
diff --git a/src/app/app.component.ts b/src/app/app.component.ts index f01ecb69..22fd7dc2 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -160,6 +160,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/src/app/layouts/footer.component.html b/src/app/layouts/footer.component.html index b001b9e3..c1bd2ac8 100644 --- a/src/app/layouts/footer.component.html +++ b/src/app/layouts/footer.component.html @@ -1,7 +1,7 @@
- © {{year}}, Bitwarden Inc. + © {{year}}, Bitwarden Inc. (Powered by Vaultwarden)
diff --git a/src/app/layouts/frontend-layout.component.html b/src/app/layouts/frontend-layout.component.html index 4c2c4ca1..dc990b22 100644 --- a/src/app/layouts/frontend-layout.component.html +++ b/src/app/layouts/frontend-layout.component.html @@ -1,5 +1,5 @@
- © {{year}}, Bitwarden Inc. + © {{year}}, Bitwarden Inc. (Powered by Vaultwarden)
{{'versionNumber' | i18n : version}}
diff --git a/src/app/layouts/navbar.component.html b/src/app/layouts/navbar.component.html index 8581e239..24ae6788 100644 --- a/src/app/layouts/navbar.component.html +++ b/src/app/layouts/navbar.component.html @@ -46,7 +46,7 @@ {{'myAccount' | i18n}} - + {{'getHelp' | i18n}} diff --git a/src/app/organizations/vault/vault.component.ts b/src/app/organizations/vault/vault.component.ts index 715453fd..b7c2a7b2 100644 --- a/src/app/organizations/vault/vault.component.ts +++ b/src/app/organizations/vault/vault.component.ts @@ -63,9 +63,7 @@ export class VaultComponent implements OnInit, OnDestroy { private platformUtilsService: PlatformUtilsService) { } ngOnInit() { - this.trashCleanupWarning = this.i18nService.t( - this.platformUtilsService.isSelfHost() ? 'trashCleanupWarningSelfHosted' : 'trashCleanupWarning' - ); + this.trashCleanupWarning = this.i18nService.t('trashCleanupWarningSelfHosted'); this.route.parent.params.pipe(first()).subscribe(async params => { this.organization = await this.userService.getOrganization(params.organizationId); diff --git a/src/app/send/access.component.html b/src/app/send/access.component.html index 84944a2b..107ad359 100644 --- a/src/app/send/access.component.html +++ b/src/app/send/access.component.html @@ -8,7 +8,7 @@
- {{'viewSendHiddenEmailWarning' | i18n }} + {{'viewSendHiddenEmailWarning' | i18n }} {{'learnMore' | i18n}}.
@@ -82,10 +82,7 @@

{{'sendAccessTaglineProductDesc' | i18n}}
{{'sendAccessTaglineLearnMore' | i18n}} Bitwarden Send - {{'sendAccessTaglineOr' | i18n}} {{'sendAccessTaglineSignUp' | i18n}} - {{'sendAccessTaglineTryToday' | i18n}} + href="https://www.bitwarden.com/products/send/" target="_blank">Bitwarden Send.

diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts index 9064202e..4e818965 100644 --- a/src/app/services/services.module.ts +++ b/src/app/services/services.module.ts @@ -155,12 +155,23 @@ const userVerificationService = new UserVerificationService(cryptoService, i18nS containerService.attachToWindow(window); export function initFactory(): Function { + function getBaseUrl() { + // If the base URL is `https://bitwarden.example.com/base/path/`, + // `window.location.href` should have one of the following forms: + // + // - `https://bitwarden.example.com/base/path/` + // - `https://bitwarden.example.com/base/path/#/some/route[?queryParam=...]` + // + // We want to get to just `https://bitwarden.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 (storageService as HtmlStorageService).init(); - const urls = process.env.URLS as Urls; - urls.base ??= window.location.origin; - environmentService.setUrls(urls, false); + environmentService.setUrls({ base: getBaseUrl() }, false); setTimeout(() => notificationsService.init(), 3000); diff --git a/src/app/vault/vault.component.ts b/src/app/vault/vault.component.ts index d91211eb..edd2a82d 100644 --- a/src/app/vault/vault.component.ts +++ b/src/app/vault/vault.component.ts @@ -81,9 +81,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'); this.route.queryParams.pipe(first()).subscribe(async params => { await this.syncService.fullSync(false); diff --git a/src/scss/styles.scss b/src/scss/styles.scss index 45a91fe1..4509368f 100644 --- a/src/scss/styles.scss +++ b/src/scss/styles.scss @@ -55,3 +55,49 @@ @import "./plugins"; @import "./tables"; @import "./toasts"; + +/**** 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 any link pointing to billing */ +a[href$="/settings/billing"] { @extend %vw-hide; } + +/* Hide any link pointing to subscriptions */ +a[href$="/settings/subscription"] { @extend %vw-hide; } + +/* Hide any link pointing to Sponsored 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 the info box that advertises Bitwarden Send */ +app-send-info.d-block { @extend %vw-hide; } + +/* Hide Two-Factor menu in Organization settings */ +app-org-settings a[href$="/settings/two-factor"] { @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 the radio button and label for the `Custom` org user type */ +#userTypeCustom, label[for^=userTypeCustom] { + @extend %vw-hide; +} + +/* Hide the warning that policy config is moving to Business Portal */ +app-org-policies > app-callout { @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; } +/**** END Vaultwarden CHANGES ****/ diff --git a/src/services/webPlatformUtils.service.ts b/src/services/webPlatformUtils.service.ts index 13f754c0..c40612d8 100644 --- a/src/services/webPlatformUtils.service.ts +++ b/src/services/webPlatformUtils.service.ts @@ -224,11 +224,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 {