Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
b985f55
commit d5e3db9
Showing
1 changed file
with
92 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,92 @@ | ||
diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts | ||
index a92bf70c..cf5a4cb4 100644 | ||
--- a/src/app/services/services.module.ts | ||
+++ b/src/app/services/services.module.ts | ||
@@ -123,20 +123,16 @@ const environmentService = new EnvironmentService(apiService, storageService, no | ||
const auditService = new AuditService(cryptoFunctionService, apiService); | ||
const eventLoggingService = new EventLoggingService(storageService, apiService, userService, cipherService); | ||
|
||
-const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost(), | ||
+const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost() || true, | ||
platformUtilsService, storageService, appIdService); | ||
containerService.attachToWindow(window); | ||
|
||
export function initFactory(): Function { | ||
return async () => { | ||
await (storageService as HtmlStorageService).init(); | ||
- const isDev = platformUtilsService.isDev(); | ||
- if (!isDev && platformUtilsService.isSelfHost()) { | ||
- environmentService.baseUrl = window.location.origin; | ||
- } else { | ||
- environmentService.notificationsUrl = isDev ? 'http://localhost:61840' : | ||
- 'https://notifications.bitwarden.com'; // window.location.origin + '/notifications'; | ||
- } | ||
+ const isDev = false; | ||
+ environmentService.baseUrl = window.location.origin; | ||
+ environmentService.notificationsUrl = window.location.origin + '/notifications'; | ||
apiService.setUrls({ | ||
base: isDev ? null : window.location.origin, | ||
api: isDev ? 'http://localhost:4000' : null, | ||
diff --git a/src/app/settings/two-factor-u2f.component.ts b/src/app/settings/two-factor-u2f.component.ts | ||
index 5560c476..a9b954a8 100644 | ||
--- a/src/app/settings/two-factor-u2f.component.ts | ||
+++ b/src/app/settings/two-factor-u2f.component.ts | ||
@@ -128,6 +128,7 @@ export class TwoFactorU2fComponent extends TwoFactorBaseComponent implements OnI | ||
(window as any).u2f.register(u2fChallenge.appId, [{ | ||
version: u2fChallenge.version, | ||
challenge: u2fChallenge.challenge, | ||
+ attestation: 'direct', | ||
}], [], (data: any) => { | ||
this.ngZone.run(() => { | ||
this.u2fListening = false; | ||
diff --git a/src/scss/styles.scss b/src/scss/styles.scss | ||
index 2e1dbec9..2d9b635f 100644 | ||
--- a/src/scss/styles.scss | ||
+++ b/src/scss/styles.scss | ||
@@ -1,5 +1,34 @@ | ||
@import "../css/webfonts.css"; | ||
|
||
+/**** START Bitwarden_RS CHANGES ****/ | ||
+/* This combines all selectors extending it into one */ | ||
+%bwrs-hide { display: none !important; } | ||
+ | ||
+/* This allows searching for the combined style in the browsers dev-tools (look into the head tag) */ | ||
+#bwrs-hide, head { @extend %bwrs-hide; } | ||
+ | ||
+/* Hide any link pointing to billing */ | ||
+a[href$="/settings/billing"] { @extend %bwrs-hide; } | ||
+ | ||
+/* Hide any link pointing to subscriptions */ | ||
+a[href$="/settings/subscription"] { @extend %bwrs-hide; } | ||
+ | ||
+/* Hide Two-Factor menu in Organization settings */ | ||
+app-org-settings a[href$="/settings/two-factor"] { @extend %bwrs-hide; } | ||
+ | ||
+/* Hide 2FA Email button */ | ||
+ul.list-group.list-group-2fa > li:nth-child(5) button { @extend %bwrs-hide; } | ||
+ | ||
+/* Hide organization plans */ | ||
+app-organization-plans > form > div.form-check { @extend %bwrs-hide; } | ||
+app-organization-plans > form > h2.mt-5 { @extend %bwrs-hide; } | ||
+ | ||
+/* Hide Tax Info in Organization settings */ | ||
+app-org-account > div.secondary-header.border-0.mb-0:nth-child(3) { @extend %bwrs-hide; } | ||
+app-org-account > p { @extend %bwrs-hide; } | ||
+app-org-account > a.btn.btn-outline-secondary { @extend %bwrs-hide; } | ||
+/**** END Bitwarden_RS CHANGES ****/ | ||
+ | ||
$primary: #3c8dbc; | ||
$primary-accent: #286090; | ||
$secondary: #ced4da; | ||
diff --git a/webpack.config.js b/webpack.config.js | ||
index aecb1860..44acdc1d 100644 | ||
--- a/webpack.config.js | ||
+++ b/webpack.config.js | ||
@@ -170,6 +170,7 @@ const config = { | ||
}, | ||
minimizer: [ | ||
new TerserPlugin({ | ||
+ sourceMap: true, | ||
terserOptions: { | ||
safari10: true, | ||
}, |