hide unavailable 2FA mechanisms and billing section

3 files changed, 33 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 27c9596fdef7..acff3b857923 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.7.1.r16.g62b01294
+	pkgver = v2.8.0.r3.ga48cc2a7
 	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.patch
 	source = bitwarden_rs-vault.install
 	sha512sums = SKIP
-	sha512sums = 3d676568a96ba08e5b5df31743472686f073c7677c470819a7a2decae86e5a85be032e573ff114024039138945633dd26bbc70faf212196b6dd065fc0cb0760d
+	sha512sums = 743d234780c9fe18e14d933f3315cb3248876b0bfc7932586f9c8b83288c95afd864391866357b87806e24e643370d3f57b2e0c8579bbe6364eece13e71c72e9
 	sha512sums = 5265612afd40cb757e7d6550ca902f9c02c558e7d03607a181df923374efdf9eff85296c216db7c96d9987eb1fe0834a7eb90de7dcd988c9f7443dc69b9469b1
 
 pkgname = bitwarden_rs-vault-git
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 cf78dddb5adb..b1a8d7c290d5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Markus Richter <mqus at disroot dot org>
 
 pkgname=bitwarden_rs-vault-git
-pkgver=v2.7.1.r16.g62b01294
+pkgver=v2.8.0.r3.ga48cc2a7
 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.patch"
 	"${pkgname%-git}.install")
 sha512sums=('SKIP'
-            '3d676568a96ba08e5b5df31743472686f073c7677c470819a7a2decae86e5a85be032e573ff114024039138945633dd26bbc70faf212196b6dd065fc0cb0760d'
+            '743d234780c9fe18e14d933f3315cb3248876b0bfc7932586f9c8b83288c95afd864391866357b87806e24e643370d3f57b2e0c8579bbe6364eece13e71c72e9'
             '5265612afd40cb757e7d6550ca902f9c02c558e7d03607a181df923374efdf9eff85296c216db7c96d9987eb1fe0834a7eb90de7dcd988c9f7443dc69b9469b1')
 
 pkgver() {
@@ -30,7 +30,7 @@ pkgver() {
 prepare() {
 	#patch paths
 	cd "$srcdir/web"
-	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" 
 }
 
 build() {