From 9a8cae836b986516dd8cfdb660df958c7b6e1ed5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa?=
<dani-garcia@users.noreply.github.com>
Date: Mon, 17 Dec 2018 22:21:18 +0100
Subject: [PATCH] Remove vault patch file, and point users to the vault builds
repo for the patch
---
BUILD.md | 10 +++++++---
docker/set-vault-baseurl.patch | 27 ---------------------------
2 files changed, 7 insertions(+), 30 deletions(-)
delete mode 100644 docker/set-vault-baseurl.patch
diff --git a/BUILD.md b/BUILD.md
index 1e35113f..43336717 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -32,10 +32,14 @@ cd web-vault
git checkout "$(git tag | tail -n1)"
```
-- Apply the patch file from `docker/set-vault-baseurl.patch`:
+- Download the patch file from [dani-garcia/bw_web_builds](https://github.com/dani-garcia/bw_web_builds/tree/master/patches) and copy it to the `web-vault` folder.
+To choose the version to use, assuming the web vault is version `vX.Y.Z`:
+ - If there is a patch with version `vX.Y.Z`, use that one
+ - Otherwise, pick the one with the largest version that is still smaller than `vX.Y.Z`
+- Apply the patch
```sh
-# In the Vault repository directory
-git apply /path/to/bitwarden_rs/docker/set-vault-baseurl.patch
+# In the 'web-vault' directory
+git apply vX.Y.Z.patch
```
- Then, build the Vault:
diff --git a/docker/set-vault-baseurl.patch b/docker/set-vault-baseurl.patch
deleted file mode 100644
index f05b7763..00000000
--- a/docker/set-vault-baseurl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- 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,