mirror of
https://github.com/dani-garcia/bw_web_builds.git
synced 2024-12-26 12:28:15 +03:00
0277844cf9
Some misc changes. - Moved old patch files to a `legacy` sub-folder - If a legacy patch is used, show a warning and pause for 10 seconds - Updated the checkout and Dockerfile so both use the same way of cloning the Bitwarden/client repo - Updated the `patch_web_vault.sh` script to try and detect the vault version - Added two new make commands to prepare and release a new version - Added a `.env` feature for the `Makefile` to set some defaults Mainly used for using either `docker` or `podman` and for the GitHub Release script to have a predefined GPG user/key
80 lines
3.7 KiB
Diff
80 lines
3.7 KiB
Diff
diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts
|
|
index f1b5b392..2bfc2f2e 100644
|
|
--- a/src/app/services/services.module.ts
|
|
+++ b/src/app/services/services.module.ts
|
|
@@ -120,20 +120,16 @@ const notificationsService = new NotificationsService(userService, syncService,
|
|
const environmentService = new EnvironmentService(apiService, storageService, notificationsService);
|
|
const auditService = new AuditService(cryptoFunctionService, apiService);
|
|
|
|
-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 3df655fd..7e57cffe 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-create-organization > form > div.form-check { @extend %bwrs-hide; }
|
|
+app-create-organization > 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;
|