added patch to ensure a correct baseurl. Source: https://github.com/dani-garcia/bitwarden_rs/blob/beta/docker/set-vault-baseurl.patch

3 files changed, 29 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5d91498ce83d..8059e6ee13d0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = bitwarden_rs-vault-git
 	pkgdesc = Integrates the Vault Web-Interface into bitwarden_rs.
-	pkgver = v1.27.0.r355.g3544c96
+	pkgver = v2.1.1.r0.ge7c6fbf
 	pkgrel = 1
 	url = https://github.com/bitwarden/web
 	install = bitwarden_rs-vault.install
@@ -11,8 +11,10 @@ pkgbase = bitwarden_rs-vault-git
 	provides = bitwarden_rs-vault
 	conflicts = bitwarden_rs-vault
 	source = git+https://github.com/bitwarden/web.git
+	source = 0001-Set-Vault-BaseURL.patch
 	source = bitwarden_rs-vault.install
 	sha512sums = SKIP
+	sha512sums = ac3252b4a023c1caa703d8c4c881033719676b0a5ea040f44be6c6a8b5df5ca188ba4be9adc6b8cd010cbcdd453ba89e8d71013b161ce6a261e9503e534fbf33
 	sha512sums = 5265612afd40cb757e7d6550ca902f9c02c558e7d03607a181df923374efdf9eff85296c216db7c96d9987eb1fe0834a7eb90de7dcd988c9f7443dc69b9469b1
 
 pkgname = bitwarden_rs-vault-git
diff --git a/0001-Set-Vault-BaseURL.patch b/0001-Set-Vault-BaseURL.patch
new file mode 100644
index 000000000000..104395aa14dc
--- /dev/null
+++ b/0001-Set-Vault-BaseURL.patch
@@ -0,0 +1,15 @@
+--- a/src/app/services/services.module.ts
++++ b/src/app/services/services.module.ts
+@@ -119,10 +119,8 @@
+ export function initFactory(): Function {
+     return async () => {
+         await (storageService as HtmlStorageService).init();
+-        const isDev = platformUtilsService.isDev();
+-        if (!isDev && platformUtilsService.isSelfHost()) {
+-            environmentService.baseUrl = window.location.origin;
+-        }
++        const isDev = false;
++        environmentService.baseUrl = window.location.origin;
+         await apiService.setUrls({
+             base: isDev ? null : window.location.origin,
+             api: isDev ? 'http://localhost:4000' : null,
diff --git a/PKGBUILD b/PKGBUILD
index e192f626ec5d..e6f0246b24fe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Markus Richter <mqus at disroot dot org>
 
 pkgname=bitwarden_rs-vault-git
-pkgver=v1.27.0.r355.g3544c96
-pkgrel=1
+pkgver=v2.1.1.r0.ge7c6fbf
+pkgrel=2
 pkgdesc="Integrates the Vault Web-Interface into bitwarden_rs."
 arch=('any')
 url="https://github.com/bitwarden/web"
@@ -13,8 +13,10 @@ conflicts=("bitwarden_rs-vault")
 provides=('bitwarden_rs-vault') 
 install=bitwarden_rs-vault.install
 source=("git+https://github.com/bitwarden/web.git"
+	"0001-Set-Vault-BaseURL.patch"
 	"${pkgname%-git}.install")
 sha512sums=('SKIP'
+            'ac3252b4a023c1caa703d8c4c881033719676b0a5ea040f44be6c6a8b5df5ca188ba4be9adc6b8cd010cbcdd453ba89e8d71013b161ce6a261e9503e534fbf33'
             '5265612afd40cb757e7d6550ca902f9c02c558e7d03607a181df923374efdf9eff85296c216db7c96d9987eb1fe0834a7eb90de7dcd988c9f7443dc69b9469b1')
 
 pkgver() {
@@ -25,6 +27,13 @@ pkgver() {
         )
 }
 
+prepare() {
+	#patch paths
+	cd "$srcdir/web"
+	patch -N -i "$srcdir/0001-Set-Vault-BaseURL.patch" "src/app/services/services.module.ts"
+
+}
+
 build() {
 	#build vault webinterface
 	cd "$srcdir/web"