2.8.0

Hide billing and unavailable 2FA-Methods

Upstream (vault) Changelog:
	- JSON import/export option
	- Display 2FA status for org users
	- New importers
	- Bug fixes

3 files changed, 40 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fbae619eee4a..de304a49cbcb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = bitwarden_rs-vault
 	pkgdesc = Integrates the Vault Web-Interface into bitwarden_rs.
-	pkgver = 2.7.1
+	pkgver = 2.8.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.7.1.tar.gz
-	source = https://github.com/bitwarden/jslib/archive/27566c3fd5a1040112278c7ad0a50c6b8d45e3e4.tar.gz
+	source = https://github.com/bitwarden/web/archive/v2.8.0.tar.gz
+	source = https://github.com/bitwarden/jslib/archive/fc5fcb905fe465e99e85540f6b645c0f11b6704d.tar.gz
 	source = 0001-Set-Vault-BaseURL.patch
 	source = bitwarden_rs-vault.install
-	sha512sums = 071b4c8808d4539fe0c454656163536e8c42ba8c0fe42d1c483f7aac5b6697dedbade95b9f50028d1fc9cf63949236e55b0f003160af10509e7a61b0f11ec9c6
-	sha512sums = 3c123e0106e95fb05703bce49c6328256cf3a466650948a808abdf7aa241d9a51edbc1a8d03ae5dfa9cc293e1f717bfd0c1d82b61c2c5ae96b6c773fdfcb7e0c
-	sha512sums = 3d676568a96ba08e5b5df31743472686f073c7677c470819a7a2decae86e5a85be032e573ff114024039138945633dd26bbc70faf212196b6dd065fc0cb0760d
+	sha512sums = bb7dba7775c2822a11b22159d6e4c2493638fff1287d34797cbc618d237f4b9e37e78943efe9c1f4bc4215cf51acd3d530b227b4e4b66072c0e77d03bdd7c434
+	sha512sums = 6a5c020a0758f3f63862a1813df817b7672f8d7760f1fb76fb34e32221a1ba0ecca141b4df2e8c9ed1d0c91a0ae25ff467e8788baa926a7d592ddb086a513fa7
+	sha512sums = 743d234780c9fe18e14d933f3315cb3248876b0bfc7932586f9c8b83288c95afd864391866357b87806e24e643370d3f57b2e0c8579bbe6364eece13e71c72e9
 	sha512sums = 5265612afd40cb757e7d6550ca902f9c02c558e7d03607a181df923374efdf9eff85296c216db7c96d9987eb1fe0834a7eb90de7dcd988c9f7443dc69b9469b1
 
 pkgname = bitwarden_rs-vault
diff --git a/0001-Set-Vault-BaseURL.patch b/0001-Set-Vault-BaseURL.patch
index f05b7763ff35..9e25e48ab8d8 100644
--- a/0001-Set-Vault-BaseURL.patch
+++ b/0001-Set-Vault-BaseURL.patch
@@ -1,3 +1,4 @@
+index 90aad7df..95ceff61 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,
@@ -25,3 +26,30 @@
          apiService.setUrls({
              base: isDev ? null : window.location.origin,
              api: isDev ? 'http://localhost:4000' : null,
+index 5c114af5..70e7cb12 100644
+--- a/src/scss/styles.scss
++++ b/src/scss/styles.scss
+@@ -1,5 +1,23 @@
+ @import "../css/webfonts.css";
+ 
++/**** START Bitwarden_RS CHANGES ****/
++/* Hide any link pointing to billing */
++a[href$="/settings/billing"] {display: none !important; }
++
++/* Hide Two-Factor menu in Organization settings */
++app-org-settings a[href$="/settings/two-factor"] { display: none !important; }
++
++/* Hide 2FA Duo button */
++ul.list-group.list-group-2fa > li:nth-child(3) button { display: none !important; }
++
++/* Hide 2FA Email button */
++ul.list-group.list-group-2fa > li:nth-child(5) button { display: none !important; }
++
++/* Hide organization plans */
++app-create-organization > form > div.form-check { display: none !important; }
++app-create-organization > form > h2.mt-5 { display: none !important; }
++/**** END Bitwarden_RS CHANGES ****/
++
+ $primary: #3c8dbc;
+ $primary-accent: #286090;
+ $secondary: #ced4da;
diff --git a/PKGBUILD b/PKGBUILD
index d2a29c513602..9166a34d5d75 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Markus Richter <mqus at disroot dot org>
 
-_jslib_commit="27566c3fd5a1040112278c7ad0a50c6b8d45e3e4"
+_jslib_commit="fc5fcb905fe465e99e85540f6b645c0f11b6704d"
 pkgname=bitwarden_rs-vault
-pkgver=2.7.1
+pkgver=2.8.0
 pkgrel=1
 pkgdesc="Integrates the Vault Web-Interface into bitwarden_rs."
 arch=('any')
@@ -16,16 +16,16 @@ 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=('071b4c8808d4539fe0c454656163536e8c42ba8c0fe42d1c483f7aac5b6697dedbade95b9f50028d1fc9cf63949236e55b0f003160af10509e7a61b0f11ec9c6'
-            '3c123e0106e95fb05703bce49c6328256cf3a466650948a808abdf7aa241d9a51edbc1a8d03ae5dfa9cc293e1f717bfd0c1d82b61c2c5ae96b6c773fdfcb7e0c'
-            '3d676568a96ba08e5b5df31743472686f073c7677c470819a7a2decae86e5a85be032e573ff114024039138945633dd26bbc70faf212196b6dd065fc0cb0760d'
+sha512sums=('bb7dba7775c2822a11b22159d6e4c2493638fff1287d34797cbc618d237f4b9e37e78943efe9c1f4bc4215cf51acd3d530b227b4e4b66072c0e77d03bdd7c434'
+            '6a5c020a0758f3f63862a1813df817b7672f8d7760f1fb76fb34e32221a1ba0ecca141b4df2e8c9ed1d0c91a0ae25ff467e8788baa926a7d592ddb086a513fa7'
+            '743d234780c9fe18e14d933f3315cb3248876b0bfc7932586f9c8b83288c95afd864391866357b87806e24e643370d3f57b2e0c8579bbe6364eece13e71c72e9'
             '5265612afd40cb757e7d6550ca902f9c02c558e7d03607a181df923374efdf9eff85296c216db7c96d9987eb1fe0834a7eb90de7dcd988c9f7443dc69b9469b1')
 
 
 prepare() {
 	#patch paths
 	cd "$srcdir/web-$pkgver"
-	patch -N -i "$srcdir/0001-Set-Vault-BaseURL.patch" "src/app/services/services.module.ts"
+	patch -N -p1 -i "$srcdir/0001-Set-Vault-BaseURL.patch" 
 	#simulate git-submodules
 	rmdir jslib
 	ln -s "../jslib-${_jslib_commit}" jslib