2.4.0

 -Passphrase generator
 -Multiple U2F key support
 -Purge org vault option
 -Bug fixes

3 files changed, 14 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 042ff905ce4f..6f1efa50467f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = bitwarden_rs-vault
 	pkgdesc = Integrates the Vault Web-Interface into bitwarden_rs.
-	pkgver = 2.3.0
+	pkgver = 2.4.0
 	pkgrel = 1
 	url = https://github.com/bitwarden/web
 	install = bitwarden_rs-vault.install
@@ -9,13 +9,13 @@ pkgbase = bitwarden_rs-vault
 	makedepends = npm
 	depends = bitwarden_rs
 	conflicts = bitwarden_rs-vault-git
-	source = https://github.com/bitwarden/web/archive/v2.3.0.tar.gz
-	source = https://github.com/bitwarden/jslib/archive/85587e06728aabd118f3cb6b06110be92202049b.tar.gz
+	source = https://github.com/bitwarden/web/archive/v2.4.0.tar.gz
+	source = https://github.com/bitwarden/jslib/archive/2f6426deb470b71838b51c52587929ac64d428bf.tar.gz
 	source = 0001-Set-Vault-BaseURL.patch
 	source = bitwarden_rs-vault.install
-	sha512sums = dbc8ef2ffd875258ed975221bc417a53f0b1316acaaa4f4ecd19c5342fefd4737a897a328fd8936dfe04d4c4bb26791863f0c6f990a65d38828d9082082b6471
-	sha512sums = bdd4ea0e1b8e5e81d304426fd2bd4d63f584f8628d79a85cb320c909b3b11bf02bb1ddc7c3deaef69f0746577f9a751af1f1c31586be891a95fe41fc22f05134
-	sha512sums = 9a9885298fceb8de737aae0e616158ed5c41a15acbfc723048ed8d509cb40d0e32048e12b9aeb4a6a4c67485ba08f0b8e52ba7cb4d8d2036ae4dc19e39431961
+	sha512sums = ccf560eb52e1864d0884e547efd81064d032e79f2eb154c4af673bac170f10128856d28a4f59c9520aafd0bb3f2ebb822349efc28aeae6d95a70ce66c61e3af5
+	sha512sums = d502a4cd3858a076275290369d0cce492ff0af5a1bc476002edb4b65523df605f2ce4e88411c09eb016b339f0a653aa2043783bd77b6be9082cc611eb8104f21
+	sha512sums = 3d676568a96ba08e5b5df31743472686f073c7677c470819a7a2decae86e5a85be032e573ff114024039138945633dd26bbc70faf212196b6dd065fc0cb0760d
 	sha512sums = 5265612afd40cb757e7d6550ca902f9c02c558e7d03607a181df923374efdf9eff85296c216db7c96d9987eb1fe0834a7eb90de7dcd988c9f7443dc69b9469b1
 
 pkgname = bitwarden_rs-vault
diff --git a/0001-Set-Vault-BaseURL.patch b/0001-Set-Vault-BaseURL.patch
index 073b7d80ed90..f05b7763ff35 100644
--- a/0001-Set-Vault-BaseURL.patch
+++ b/0001-Set-Vault-BaseURL.patch
@@ -1,7 +1,7 @@
 --- a/src/app/services/services.module.ts
 +++ b/src/app/services/services.module.ts
-@@ -120,20 +120,17 @@ const exportService = new ExportService(folderService, cipherService, apiService
- const importService = new ImportService(cipherService, folderService, apiService, i18nService, collectionService);
+@@ -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(),
@@ -22,7 +22,6 @@
 +        const isDev = false;
 +        environmentService.baseUrl = window.location.origin;
 +        environmentService.notificationsUrl = window.location.origin + '/notifications';
-+
-         await apiService.setUrls({
+         apiService.setUrls({
              base: isDev ? null : window.location.origin,
              api: isDev ? 'http://localhost:4000' : null,
diff --git a/PKGBUILD b/PKGBUILD
index 846846a18742..8ceb05f92543 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Markus Richter <mqus at disroot dot org>
 
-_jslib_commit="85587e06728aabd118f3cb6b06110be92202049b"
+_jslib_commit="2f6426deb470b71838b51c52587929ac64d428bf"
 pkgname=bitwarden_rs-vault
-pkgver=2.3.0
+pkgver=2.4.0
 pkgrel=1
 pkgdesc="Integrates the Vault Web-Interface into bitwarden_rs."
 arch=('any')
@@ -16,9 +16,9 @@ source=("https://github.com/bitwarden/web/archive/v$pkgver.tar.gz"
 	"https://github.com/bitwarden/jslib/archive/${_jslib_commit}.tar.gz"
 	"0001-Set-Vault-BaseURL.patch"
 	"$pkgname.install")
-sha512sums=('dbc8ef2ffd875258ed975221bc417a53f0b1316acaaa4f4ecd19c5342fefd4737a897a328fd8936dfe04d4c4bb26791863f0c6f990a65d38828d9082082b6471'
-            'bdd4ea0e1b8e5e81d304426fd2bd4d63f584f8628d79a85cb320c909b3b11bf02bb1ddc7c3deaef69f0746577f9a751af1f1c31586be891a95fe41fc22f05134'
-            '9a9885298fceb8de737aae0e616158ed5c41a15acbfc723048ed8d509cb40d0e32048e12b9aeb4a6a4c67485ba08f0b8e52ba7cb4d8d2036ae4dc19e39431961'
+sha512sums=('ccf560eb52e1864d0884e547efd81064d032e79f2eb154c4af673bac170f10128856d28a4f59c9520aafd0bb3f2ebb822349efc28aeae6d95a70ce66c61e3af5'
+            'd502a4cd3858a076275290369d0cce492ff0af5a1bc476002edb4b65523df605f2ce4e88411c09eb016b339f0a653aa2043783bd77b6be9082cc611eb8104f21'
+            '3d676568a96ba08e5b5df31743472686f073c7677c470819a7a2decae86e5a85be032e573ff114024039138945633dd26bbc70faf212196b6dd065fc0cb0760d'
             '5265612afd40cb757e7d6550ca902f9c02c558e7d03607a181df923374efdf9eff85296c216db7c96d9987eb1fe0834a7eb90de7dcd988c9f7443dc69b9469b1')