summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Richter2018-09-13 23:40:27 +0200
committerMarkus Richter2018-09-13 23:40:27 +0200
commitcf6695b0ceba7e70846b39f77f9afd2a09176d71 (patch)
treefb15c63f487b09d535dc6f42aa1d642e65f6197a
parent9653e53f2e266c1e98ffba3759a4b22b9c88f499 (diff)
downloadaur-cf6695b0ceba7e70846b39f77f9afd2a09176d71.tar.gz
update vault baseurl patch
-rw-r--r--.SRCINFO4
-rw-r--r--0001-Set-Vault-BaseURL-git.patch9
-rw-r--r--PKGBUILD4
3 files changed, 9 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index dff481028c16..d777f364d671 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = bitwarden_rs-vault-git
pkgdesc = Integrates the Vault Web-Interface into bitwarden_rs.
- pkgver = v2.1.1.r28.g34f6bc2
+ pkgver = v2.2.0.r42.g3a136e1
pkgrel = 1
url = https://github.com/bitwarden/web
install = bitwarden_rs-vault.install
@@ -14,7 +14,7 @@ pkgbase = bitwarden_rs-vault-git
source = 0001-Set-Vault-BaseURL-git.patch
source = bitwarden_rs-vault.install
sha512sums = SKIP
- sha512sums = e79bc76448f3a310eaab825d412d85d46f77dad5372a6d48f649281ed2734f48db0f42b232add39e33434ce581042c784e10324903c8c234c0f18eb72ed1e8dd
+ sha512sums = be85a1a6c032c6b881667fdf7ff864e91cdccaa44a8a081732acb2b1e284d12f7dbfd2c0d0536abc2a52181b57dbf6d76a2be80a8fbc69d731a3878d9cc88422
sha512sums = 5265612afd40cb757e7d6550ca902f9c02c558e7d03607a181df923374efdf9eff85296c216db7c96d9987eb1fe0834a7eb90de7dcd988c9f7443dc69b9469b1
pkgname = bitwarden_rs-vault-git
diff --git a/0001-Set-Vault-BaseURL-git.patch b/0001-Set-Vault-BaseURL-git.patch
index bac487fedebe..c51e4dd3f986 100644
--- a/0001-Set-Vault-BaseURL-git.patch
+++ b/0001-Set-Vault-BaseURL-git.patch
@@ -1,6 +1,6 @@
--- a/src/app/services/services.module.ts
+++ b/src/app/services/services.module.ts
-@@ -120,20 +120,15 @@ const environmentService = new EnvironmentService(apiService, storageService, notificationsService);
+@@ -120,18 +120,15 @@ const environmentService = new EnvironmentService(apiService, storageService, notificationsService);
const auditService = new AuditService(cryptoFunctionService, apiService);
-const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost(),
@@ -12,14 +12,15 @@
return async () => {
await (storageService as HtmlStorageService).init();
- const isDev = platformUtilsService.isDev();
-+ const isDev = false;
- if (!isDev && platformUtilsService.isSelfHost()) {
- environmentService.baseUrl = window.location.origin;
- } else {
- environmentService.notificationsUrl = isDev ? 'http://localhost:61840' :
-- window.location.origin + '/notifications';
+- 'https://notifications.bitwarden.com'; // window.location.origin + '/notifications';
- }
++ const isDev = false;
+ environmentService.baseUrl = window.location.origin;
++ environmentService.notificationsUrl = window.location.origin + '/notifications';
++
await apiService.setUrls({
base: isDev ? null : window.location.origin,
- api: isDev ? 'http://localhost:4000' : null,
diff --git a/PKGBUILD b/PKGBUILD
index b0828cb1484d..5d102cda725b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Markus Richter <mqus at disroot dot org>
pkgname=bitwarden_rs-vault-git
-pkgver=v2.1.1.r28.g34f6bc2
+pkgver=v2.2.0.r42.g3a136e1
pkgrel=1
pkgdesc="Integrates the Vault Web-Interface into bitwarden_rs."
arch=('any')
@@ -16,7 +16,7 @@ source=("git+https://github.com/bitwarden/web.git"
"0001-Set-Vault-BaseURL-git.patch"
"${pkgname%-git}.install")
sha512sums=('SKIP'
- 'e79bc76448f3a310eaab825d412d85d46f77dad5372a6d48f649281ed2734f48db0f42b232add39e33434ce581042c784e10324903c8c234c0f18eb72ed1e8dd'
+ 'be85a1a6c032c6b881667fdf7ff864e91cdccaa44a8a081732acb2b1e284d12f7dbfd2c0d0536abc2a52181b57dbf6d76a2be80a8fbc69d731a3878d9cc88422'
'5265612afd40cb757e7d6550ca902f9c02c558e7d03607a181df923374efdf9eff85296c216db7c96d9987eb1fe0834a7eb90de7dcd988c9f7443dc69b9469b1')
pkgver() {