Accepting request 1187843 from devel:languages:nodejs

OBS-URL: https://build.opensuse.org/request/show/1187843 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bitwarden?expand=0&rev=28
2024-07-16 20:04:26 +00:00 · 2024-07-16 20:04:26 +00:00 · cb1098533d
commit cb1098533d
parent 093c016152 381d9976c3
12 changed files with 147 additions and 128 deletions
--- a/4
+++ b/4
@ -2,8 +2,8 @@
 	<service name="obs_scm" mode="manual">
 		<param name="scm">git</param>
 		<param name="url">https://github.com/bitwarden/clients.git</param>
-		<param name="revision">desktop-v2024.6.2</param>
-		<param name="version">2024.6.2</param>
+		<param name="revision">desktop-v2024.7.0</param>
+		<param name="version">2024.7.0</param>
 		<param name="filename">bitwarden</param>
 		<param name="exclude">bitwarden_license/*</param>
   <!-- The code in bitwarden_license MUST NOT be included in published tarballs as it is non-redistributable! -->
--- a/argon2-binary-path.patch
+++ b/argon2-binary-path.patch
@ -1,25 +0,0 @@
-Remove dependency on node-pre-gyp which brings a lot of garbage
-
--- bitwarden/node_modules/argon2/argon2.js.old	2023-02-18 17:54:54.041287237 +0100
-+++ bitwarden/node_modules/argon2/argon2.js	2023-02-18 19:49:49.145206908 +0100
-@@ -3,9 +3,8 @@
- const { randomBytes, timingSafeEqual } = require("crypto");
- const path = require("path");
- const { promisify } = require("util");
-const binary = require("@mapbox/node-pre-gyp");
- 
-const bindingPath = binary.find(path.resolve(__dirname, "./package.json"));
-+const bindingPath = "./lib/binding/napi-v3/argon2.node"
- const { hash: _hash } = require(bindingPath);
- 
- const { deserialize, serialize } = require("@phc/format");
--- bitwarden/node_modules/argon2/package.json.old	2023-02-18 17:54:54.141337239 +0100
-+++ bitwarden/node_modules/argon2/package.json	2023-02-18 19:51:32.473209049 +0100
-@@ -46,7 +46,6 @@
-   },
-   "homepage": "https://github.com/ranisalt/node-argon2#readme",
-   "dependencies": {
-    "@mapbox/node-pre-gyp": "^1.0.11",
-     "@phc/format": "^1.0.0",
-     "node-addon-api": "^7.0.0"
-   },
--- a/bitwarden-2024.6.2.obscpio
+++ b/bitwarden-2024.6.2.obscpio
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:935ad4966f10fcfbdac1784f248f800c7c4bb17834a67dcdd5b9b0e3061db518
-size 37969933
--- a/bitwarden-2024.7.0.obscpio
+++ b/bitwarden-2024.7.0.obscpio
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1436703e869d9c2735117e4f65948f707281f0eee0c8e287516da11516e9baa8
+size 39058445
--- a/bitwarden.changes
+++ b/bitwarden.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jul 15 19:48:10 UTC 2024 - Bruno Pitrus <brunopitrus@hotmail.com>
+
+- New upstream release 2024.7.0
+  * Deprecated setting for approving logins. Desktop now receives login requests by default.
+- Drop no longer needed argon2-binary-path.patch
+
 -------------------------------------------------------------------
 Wed Jun 19 12:45:54 UTC 2024 - Bruno Pitrus <brunopitrus@hotmail.com>

--- a/bitwarden.obsinfo
+++ b/bitwarden.obsinfo
@ -1,4 +1,4 @@
 name: bitwarden
-version: 2024.6.2
-mtime: 1718738891
-commit: 71aa34653b927a93e7bf60d497c34e7bb6984b99
+version: 2024.7.0
+mtime: 1720547381
+commit: 5b411894969020e7b0b07b1177687493f1fe2ca0
--- a/bitwarden.spec
+++ b/bitwarden.spec
@ -17,8 +17,11 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #

+#not running the tests on OBS — extremely flaky
+%bcond_with test_rust
+
 Name:       bitwarden
-Version:    2024.6.2
+Version:    2024.7.0
 Release:    0
 Summary:    A secure and free password manager for all of your devices
 Group:      Productivity/Security
@ -56,7 +59,6 @@ Patch1:    fix-desktop-file.patch
 Patch3:    do-not-install-font-privately.patch
 Patch4:    desktop_native-rust-arch.patch
 Patch5:    remove-argon2-browser.patch
-Patch6:    argon2-binary-path.patch
 Patch7:    bug-reporting-url.patch
 Patch8:    no-sourcemaps.patch

@ -101,6 +103,16 @@ BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: pkgconfig(libsecret-1)
 BuildRequires: pkgconfig(wayland-protocols)

+#For tests
+%if %{with test_rust}
+BuildRequires:  gnome-keyring
+%if 0%{?fedora}
+BuildRequires:  dbus-daemon
+%else
+BuildRequires:  dbus-service
+%endif
+%endif
+
 Requires: (google-opensans-fonts or open-sans-fonts)
 Requires: nodejs-electron%{_isa}

@ -175,7 +187,7 @@ auditable='auditable -vv'

 cd apps/desktop
 pushd desktop_native
-cargo -vv $auditable rustc --offline --release --lib --crate-type cdylib
+cargo -vv $auditable rustc --offline --release --package desktop_napi --lib --crate-type cdylib
 popd

 npm run build
@ -183,11 +195,12 @@ npm run clean:dist

 #copy this manually instead of using electron-builder. there's few enough dependencies.
 cd build
-mkdir -pv node_modules/@bitwarden/desktop-native
-cp -plv ../desktop_native/{package.json,index.js} -t node_modules/@bitwarden/desktop-native
-cp -plvT ../desktop_native/target/release/*.so node_modules/@bitwarden/desktop-native/desktop_native.node
+mkdir -pv node_modules/@bitwarden/desktop-napi
+cp -plv ../desktop_native/napi/{package.json,index.js} -t node_modules/@bitwarden/desktop-napi
+cp -plvT ../desktop_native/target/release/*.so node_modules/@bitwarden/desktop-napi/desktop_napi.node
 rm -fv ../../../node_modules/argon2/build-tmp-napi-v3/node_gyp_bins/python3
 cp -plvr ../../../node_modules/argon2 -t node_modules/
+cp -plvr ../../../node_modules/node-gyp-build -t node_modules/
 cp -plvr '../../../node_modules/@phc' -t node_modules/


@ -217,6 +230,7 @@ find -name '*.h' -type f -print -delete
 find -name '*.gyp' -type f -print -delete
 find -name '*.gypi' -type f -print -delete
 find -name '*.ts' -type f -print -delete
+find -name '*.cts' -type f -print -delete
 find -name build-tmp-napi-v3  -print0 |xargs -r0 -- rm -rvf --
 find -name src -print0 |xargs -r0 -- rm -rvf --
 find -name Makefile -type f -print -delete
@ -257,6 +271,28 @@ find . -type d -empty -print -delete
 %check
 %electron_check_native

+#Rust tests
+%if %{with test_rust}
+%ifarch %ix86
+export RUSTC_BOOTSTRAP=1
+%endif
+export RUSTC_LOG='rustc_codegen_ssa::back::link=info'
+export RUSTFLAGS="%{build_rustflags} --verbose -Cstrip=none"
+export CARGO_TERM_VERBOSE=true
+export CFLAGS="%{optflags} -fpic -fno-semantic-interposition -fvisibility=hidden"
+export CXXFLAGS="%{optflags} -fpic -fno-semantic-interposition -fvisibility=hidden"
+export LDFLAGS="%{?build_ldflags}"
+export MAKEFLAGS="%{_smp_mflags}"
+%if 0%{?suse_version}
+auditable='auditable -vv'
+%endif
+cd apps/desktop
+pushd desktop_native
+# see .github/workflows/test.yml
+export XDG_CONFIG_HOME=$(mktemp -d)
+
+dbus-run-session sh -c ' echo '' | gnome-keyring-daemon --unlock && echo '' | gnome-keyring-daemon --start && exec cargo -vv '"$auditable"' test --release --no-fail-fast --workspace -- --test-threads=1'
+%endif

 %files
 %defattr(-,root,root)
--- a/desktop_native-rust-arch.patch
+++ b/desktop_native-rust-arch.patch
@ -1,8 +1,8 @@
 Replace wrong path to Rust native module with something we actually control (we aren't using the napi-rs script which is awful).
 I have no idea wtf musl is even doing there, as Electron is officially supported only on GNU systems.

--- clients-web-v2022.9.0/apps/desktop/desktop_native/index.js.old	2022-09-06 22:59:02.000000000 +0200
-+++ clients-web-v2022.9.0/apps/desktop/desktop_native/index.js	2022-09-07 19:32:01.916393462 +0200
+--- clients/apps/desktop/desktop_native/napi/index.js.orig	2024-07-15 19:10:33.919215714 +0200
+++ clients/apps/desktop/desktop_native/napi/index.js	2024-07-15 19:33:23.753781579 +0200
@@ -1,203 +1,7 @@
 -const { existsSync, readFileSync } = require('fs')
 -const { join } = require('path')
@ -31,24 +31,24 @@ I have no idea wtf musl is even doing there, as Electron is officially supported
 -  case 'android':
 -    switch (arch) {
 -      case 'arm64':
-        localFileExisted = existsSync(join(__dirname, 'desktop_native.android-arm64.node'))
+-        localFileExisted = existsSync(join(__dirname, 'desktop_napi.android-arm64.node'))
 -        try {
 -          if (localFileExisted) {
-            nativeBinding = require('./desktop_native.android-arm64.node')
+-            nativeBinding = require('./desktop_napi.android-arm64.node')
 -          } else {
-            nativeBinding = require('@bitwarden/desktop-native-android-arm64')
+-            nativeBinding = require('@bitwarden/desktop-napi-android-arm64')
 -          }
 -        } catch (e) {
 -          loadError = e
 -        }
 -        break
 -      case 'arm':
-        localFileExisted = existsSync(join(__dirname, 'desktop_native.android-arm-eabi.node'))
+-        localFileExisted = existsSync(join(__dirname, 'desktop_napi.android-arm-eabi.node'))
 -        try {
 -          if (localFileExisted) {
-            nativeBinding = require('./desktop_native.android-arm-eabi.node')
+-            nativeBinding = require('./desktop_napi.android-arm-eabi.node')
 -          } else {
-            nativeBinding = require('@bitwarden/desktop-native-android-arm-eabi')
+-            nativeBinding = require('@bitwarden/desktop-napi-android-arm-eabi')
 -          }
 -        } catch (e) {
 -          loadError = e
@ -62,13 +62,13 @@ I have no idea wtf musl is even doing there, as Electron is officially supported
 -    switch (arch) {
 -      case 'x64':
 -        localFileExisted = existsSync(
-          join(__dirname, 'desktop_native.win32-x64-msvc.node')
+-          join(__dirname, 'desktop_napi.win32-x64-msvc.node')
 -        )
 -        try {
 -          if (localFileExisted) {
-            nativeBinding = require('./desktop_native.win32-x64-msvc.node')
+-            nativeBinding = require('./desktop_napi.win32-x64-msvc.node')
 -          } else {
-            nativeBinding = require('@bitwarden/desktop-native-win32-x64-msvc')
+-            nativeBinding = require('@bitwarden/desktop-napi-win32-x64-msvc')
 -          }
 -        } catch (e) {
 -          loadError = e
@ -76,13 +76,13 @@ I have no idea wtf musl is even doing there, as Electron is officially supported
 -        break
 -      case 'ia32':
 -        localFileExisted = existsSync(
-          join(__dirname, 'desktop_native.win32-ia32-msvc.node')
+-          join(__dirname, 'desktop_napi.win32-ia32-msvc.node')
 -        )
 -        try {
 -          if (localFileExisted) {
-            nativeBinding = require('./desktop_native.win32-ia32-msvc.node')
+-            nativeBinding = require('./desktop_napi.win32-ia32-msvc.node')
 -          } else {
-            nativeBinding = require('@bitwarden/desktop-native-win32-ia32-msvc')
+-            nativeBinding = require('@bitwarden/desktop-napi-win32-ia32-msvc')
 -          }
 -        } catch (e) {
 -          loadError = e
@ -90,13 +90,13 @@ I have no idea wtf musl is even doing there, as Electron is officially supported
 -        break
 -      case 'arm64':
 -        localFileExisted = existsSync(
-          join(__dirname, 'desktop_native.win32-arm64-msvc.node')
+-          join(__dirname, 'desktop_napi.win32-arm64-msvc.node')
 -        )
 -        try {
 -          if (localFileExisted) {
-            nativeBinding = require('./desktop_native.win32-arm64-msvc.node')
+-            nativeBinding = require('./desktop_napi.win32-arm64-msvc.node')
 -          } else {
-            nativeBinding = require('@bitwarden/desktop-native-win32-arm64-msvc')
+-            nativeBinding = require('@bitwarden/desktop-napi-win32-arm64-msvc')
 -          }
 -        } catch (e) {
 -          loadError = e
@ -109,12 +109,12 @@ I have no idea wtf musl is even doing there, as Electron is officially supported
 -  case 'darwin':
 -    switch (arch) {
 -      case 'x64':
-        localFileExisted = existsSync(join(__dirname, 'desktop_native.darwin-x64.node'))
+-        localFileExisted = existsSync(join(__dirname, 'desktop_napi.darwin-x64.node'))
 -        try {
 -          if (localFileExisted) {
-            nativeBinding = require('./desktop_native.darwin-x64.node')
+-            nativeBinding = require('./desktop_napi.darwin-x64.node')
 -          } else {
-            nativeBinding = require('@bitwarden/desktop-native-darwin-x64')
+-            nativeBinding = require('@bitwarden/desktop-napi-darwin-x64')
 -          }
 -        } catch (e) {
 -          loadError = e
@ -122,13 +122,13 @@ I have no idea wtf musl is even doing there, as Electron is officially supported
 -        break
 -      case 'arm64':
 -        localFileExisted = existsSync(
-          join(__dirname, 'desktop_native.darwin-arm64.node')
+-          join(__dirname, 'desktop_napi.darwin-arm64.node')
 -        )
 -        try {
 -          if (localFileExisted) {
-            nativeBinding = require('./desktop_native.darwin-arm64.node')
+-            nativeBinding = require('./desktop_napi.darwin-arm64.node')
 -          } else {
-            nativeBinding = require('@bitwarden/desktop-native-darwin-arm64')
+-            nativeBinding = require('@bitwarden/desktop-napi-darwin-arm64')
 -          }
 -        } catch (e) {
 -          loadError = e
@ -142,12 +142,12 @@ I have no idea wtf musl is even doing there, as Electron is officially supported
 -    if (arch !== 'x64') {
 -      throw new Error(`Unsupported architecture on FreeBSD: ${arch}`)
 -    }
-    localFileExisted = existsSync(join(__dirname, 'desktop_native.freebsd-x64.node'))
+-    localFileExisted = existsSync(join(__dirname, 'desktop_napi.freebsd-x64.node'))
 -    try {
 -      if (localFileExisted) {
-        nativeBinding = require('./desktop_native.freebsd-x64.node')
+-        nativeBinding = require('./desktop_napi.freebsd-x64.node')
 -      } else {
-        nativeBinding = require('@bitwarden/desktop-native-freebsd-x64')
+-        nativeBinding = require('@bitwarden/desktop-napi-freebsd-x64')
 -      }
 -    } catch (e) {
 -      loadError = e
@ -157,13 +157,13 @@ I have no idea wtf musl is even doing there, as Electron is officially supported
 -    switch (arch) {
 -      case 'x64':
 -        localFileExisted = existsSync(
-          join(__dirname, 'desktop_native.linux-x64-musl.node')
+-          join(__dirname, 'desktop_napi.linux-x64-musl.node')
 -        )
 -        try {
 -          if (localFileExisted) {
-            nativeBinding = require('./desktop_native.linux-x64-musl.node')
+-            nativeBinding = require('./desktop_napi.linux-x64-musl.node')
 -          } else {
-            nativeBinding = require('@bitwarden/desktop-native-linux-x64-musl')
+-            nativeBinding = require('@bitwarden/desktop-napi-linux-x64-musl')
 -          }
 -        } catch (e) {
 -          loadError = e
@ -171,13 +171,13 @@ I have no idea wtf musl is even doing there, as Electron is officially supported
 -        break
 -      case 'arm64':
 -        localFileExisted = existsSync(
-          join(__dirname, 'desktop_native.linux-arm64-musl.node')
+-          join(__dirname, 'desktop_napi.linux-arm64-musl.node')
 -        )
 -        try {
 -          if (localFileExisted) {
-            nativeBinding = require('./desktop_native.linux-arm64-musl.node')
+-            nativeBinding = require('./desktop_napi.linux-arm64-musl.node')
 -          } else {
-            nativeBinding = require('@bitwarden/desktop-native-linux-arm64-musl')
+-            nativeBinding = require('@bitwarden/desktop-napi-linux-arm64-musl')
 -          }
 -        } catch (e) {
 -          loadError = e
@ -185,13 +185,13 @@ I have no idea wtf musl is even doing there, as Electron is officially supported
 -        break
 -      case 'arm':
 -        localFileExisted = existsSync(
-          join(__dirname, 'desktop_native.linux-arm-gnueabihf.node')
+-          join(__dirname, 'desktop_napi.linux-arm-gnueabihf.node')
 -        )
 -        try {
 -          if (localFileExisted) {
-            nativeBinding = require('./desktop_native.linux-arm-gnueabihf.node')
+-            nativeBinding = require('./desktop_napi.linux-arm-gnueabihf.node')
 -          } else {
-            nativeBinding = require('@bitwarden/desktop-native-linux-arm-gnueabihf')
+-            nativeBinding = require('@bitwarden/desktop-napi-linux-arm-gnueabihf')
 -          }
 -        } catch (e) {
 -          loadError = e
@ -204,7 +204,7 @@ I have no idea wtf musl is even doing there, as Electron is officially supported
 -  default:
 -    throw new Error(`Unsupported OS: ${platform}, architecture: ${arch}`)
 -}
-+nativeBinding = require('./desktop_native.node')
+nativeBinding = require('./desktop_napi.node')
 
 if (!nativeBinding) {
   if (loadError) {
--- a/node-vendor.tar.zst
+++ b/node-vendor.tar.zst
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:97e25a9bfd7e2ab5f8916d4f80ff428a9339b1b8d13a0f10ade6776c63430108
-size 35491111
+oid sha256:e62a4c3b236e6a23d648a2916ac0ffdb90ba07dbe213ed3bca32177e96d6b922
+size 35282555
--- a/remove-unnecessary-deps.patch
+++ b/remove-unnecessary-deps.patch
@ -1,7 +1,7 @@
@types/semver and path-browserify is normally included transitively by storybook which we delete, adding it here explicitely because it is needed for build

--- clients/package.json.orig	2024-03-07 21:37:44.692428174 +0100
-+++ clients/package.json	2024-03-07 21:40:28.774422025 +0100
+--- clients/package.json.orig	2024-07-15 19:10:38.711610685 +0200
+++ clients/package.json	2024-07-15 19:25:13.322024338 +0200
@@ -13,7 +13,6 @@
   },
   "homepage": "https://bitwarden.com",
@ -19,34 +19,33 @@
   },
   "workspaces": [
     "apps/*",
-@@ -35,121 +34,45 @@
+@@ -35,120 +34,44 @@
   ],
   "devDependencies": {
-     "@angular-devkit/build-angular": "16.2.11",
+     "@angular-devkit/build-angular": "16.2.14",
 -    "@angular-eslint/eslint-plugin": "16.3.1",
 -    "@angular-eslint/eslint-plugin-template": "16.3.1",
 -    "@angular-eslint/template-parser": "16.3.1",
-    "@angular/cli": "16.2.11",
+-    "@angular/cli": "16.2.14",
     "@angular/compiler-cli": "16.2.12",
 -    "@angular/elements": "16.2.12",
 -    "@babel/core": "^7.24.6",
     "@babel/preset-env": "^7.24.6",
-    "@compodoc/compodoc": "1.1.23",
+-    "@compodoc/compodoc": "1.1.25",
 -    "@electron/notarize": "2.3.0",
 -    "@electron/rebuild": "3.6.0",
-     "@ngtools/webpack": "16.2.11",
-    "@storybook/addon-a11y": "7.6.17",
-    "@storybook/addon-actions": "7.6.17",
+     "@ngtools/webpack": "16.2.14",
+-    "@storybook/addon-a11y": "7.6.19",
+-    "@storybook/addon-actions": "7.6.19",
 -    "@storybook/addon-designs": "7.0.9",
-    "@storybook/addon-essentials": "7.6.17",
-    "@storybook/addon-interactions": "7.6.17",
-    "@storybook/addon-links": "7.6.17",
-    "@storybook/angular": "7.6.17",
+-    "@storybook/addon-essentials": "7.6.19",
+-    "@storybook/addon-interactions": "7.6.19",
+-    "@storybook/addon-links": "7.6.19",
+-    "@storybook/angular": "7.6.19",
 -    "@storybook/jest": "0.2.3",
 -    "@storybook/testing-library": "0.2.2",
 -    "@types/argon2-browser": "1.18.1",
 -    "@types/chrome": "0.0.262",
-     "@types/duo_web_sdk": "2.7.1",
 -    "@types/firefox-webext-browser": "111.0.5",
 -    "@types/inquirer": "8.2.10",
     "@types/jest": "29.5.12",
@ -59,7 +58,7 @@
 -    "@types/koa-json": "2.0.23",
 -    "@types/lowdb": "1.0.15",
     "@types/lunr": "2.3.7",
-     "@types/node": "18.19.29",
+     "@types/node": "20.14.8",
 -    "@types/node-fetch": "2.6.4",
     "@types/node-forge": "1.3.11",
     "@types/node-ipc": "9.2.3",
@ -69,8 +68,8 @@
 -    "@types/retry": "0.12.5",
 +    "@types/semver": "^7.3.4",
     "@types/zxcvbn": "4.4.4",
-    "@typescript-eslint/eslint-plugin": "7.8.0",
-    "@typescript-eslint/parser": "7.8.0",
+-    "@typescript-eslint/eslint-plugin": "7.13.1",
+-    "@typescript-eslint/parser": "7.13.1",
 -    "@webcomponents/custom-elements": "1.6.0",
 -    "@yao-pkg/pkg": "^5.11.5",
     "autoprefixer": "10.4.19",
@ -82,7 +81,7 @@
     "copy-webpack-plugin": "12.0.2",
     "cross-env": "7.0.3",
     "css-loader": "6.10.0",
-     "electron": "29.4.2",
+     "electron": "30.1.2",
 -    "electron-builder": "24.13.3",
     "electron-log": "5.0.1",
 -    "electron-reload": "2.0.0-alpha.1",
@ -95,7 +94,7 @@
 -    "eslint-plugin-rxjs": "5.0.3",
 -    "eslint-plugin-rxjs-angular": "2.0.1",
 -    "eslint-plugin-storybook": "0.8.0",
-    "eslint-plugin-tailwindcss": "3.15.1",
+-    "eslint-plugin-tailwindcss": "3.17.4",
 -    "gulp": "4.0.2",
 -    "gulp-filter": "9.0.1",
 -    "gulp-if": "3.0.0",
@ -108,8 +107,8 @@
 -    "husky": "9.0.11",
 -    "jest-junit": "16.0.0",
     "jest-mock-extended": "3.0.7",
-    "jest-preset-angular": "14.0.4",
-    "lint-staged": "15.2.2",
+-    "jest-preset-angular": "14.1.1",
+-    "lint-staged": "15.2.7",
     "mini-css-extract-plugin": "2.8.1",
     "node-ipc": "9.2.1",
 +    "path-browserify": "^1.0.1",
@ -124,11 +123,11 @@
 -    "remark-gfm": "3.0.1",
     "rimraf": "5.0.7",
     "sass": "1.74.1",
-     "sass-loader": "13.3.3",
-    "storybook": "7.6.17",
+     "sass-loader": "14.2.1",
+-    "storybook": "7.6.19",
 -    "style-loader": "3.3.4",
 -    "tailwindcss": "3.4.3",
-    "ts-jest": "29.1.2",
+-    "ts-jest": "29.1.5",
     "ts-loader": "9.5.1",
     "tsconfig-paths-webpack-plugin": "4.1.0",
 -    "type-fest": "2.19.0",
@ -136,7 +135,7 @@
     "url": "0.11.3",
 -    "util": "0.12.5",
 -    "wait-on": "7.2.0",
-     "webpack": "5.89.0",
+     "webpack": "5.92.0",
 -    "webpack-cli": "5.1.4",
 -    "webpack-dev-server": "5.0.4",
 -    "webpack-node-externals": "3.0.0"
@ -144,7 +143,7 @@
   },
   "dependencies": {
     "@angular/animations": "16.2.12",
-@@ -158,56 +84,29 @@
+@@ -160,55 +83,28 @@
     "@angular/platform-browser": "16.2.12",
     "@angular/platform-browser-dynamic": "16.2.12",
     "@angular/router": "16.2.12",
@ -153,7 +152,7 @@
     "@microsoft/signalr": "8.0.0",
     "@microsoft/signalr-protocol-msgpack": "8.0.0",
     "@ng-select/ng-select": "11.2.0",
-     "argon2": "0.31.0",
+     "argon2": "0.40.1",
 -    "argon2-browser": "1.18.0",
     "big-integer": "1.6.51",
 -    "bootstrap": "4.6.0",
@ -163,7 +162,6 @@
 -    "chalk": "4.1.2",
     "commander": "11.1.0",
 -    "core-js": "3.36.1",
-     "duo_web_sdk": "github:duosecurity/duo_web_sdk",
 -    "form-data": "4.0.0",
 -    "https-proxy-agent": "7.0.2",
 -    "inquirer": "8.2.6",
@ -191,8 +189,8 @@
 -    "qrious": "4.0.2",
     "rxjs": "7.8.1",
 -    "tabbable": "6.2.0",
-     "tldts": "6.1.22",
-     "utf-8-validate": "6.0.3",
+     "tldts": "6.1.29",
+     "utf-8-validate": "6.0.4",
     "zone.js": "0.13.3",
     "zxcvbn": "4.4.2"
   },
@ -201,8 +199,8 @@
     "@storybook/angular": {
       "zone.js": "$zone.js"
     },
--- a/apps/desktop/desktop_native/package.json
-+++ b/apps/desktop/desktop_native/package.json
+--- clients/apps/desktop/desktop_native/napi/package.json.orig	2024-07-15 19:10:33.919215714 +0200
+++ clients/apps/desktop/desktop_native/napi/package.json	2024-07-15 19:25:13.322024338 +0200
@@ -10,9 +10,6 @@
   },
   "author": "",
@ -211,5 +209,5 @@
 -    "@napi-rs/cli": "2.16.2"
 -  },
   "napi": {
-     "name": "desktop_native",
+     "name": "desktop_napi",
     "triples": {
--- a/system-libargon2.patch
+++ b/system-libargon2.patch
@ -1,15 +1,15 @@
--- bitwarden/node_modules/argon2/binding.gyp.old	2023-02-18 10:39:01.221224062 +0100
-+++ bitwarden/node_modules/argon2/binding.gyp	2023-02-18 10:54:05.873323234 +0100
-@@ -13,7 +13,7 @@
+--- clients/node_modules/argon2/binding.gyp.orig	2024-07-15 19:27:24.157408387 +0200
+++ clients/node_modules/argon2/binding.gyp	2024-07-15 19:40:42.806528404 +0200
+@@ -20,7 +20,7 @@
       "Release": {
         "target_conditions": [
           ["OS != 'win'", {
-            "cflags+": ["-fdata-sections", "-ffunction-sections", "-fvisibility=hidden"],
+-            "cflags+": ["-fdata-sections", "-ffunction-sections", "-flto", "-fvisibility=hidden"],
 +            "cflags+": ["-fvisibility=hidden"],
             "ldflags+": ["-Wl,--gc-sections"]
           }]
         ],
-@@ -22,26 +22,7 @@
+@@ -29,26 +29,7 @@
     }
   },
   "targets": [
@ -17,10 +17,10 @@
 -      "target_name": "libargon2",
 -      "sources": [
 -        "argon2/src/argon2.c",
-        "argon2/src/core.c",
 -        "argon2/src/blake2/blake2b.c",
-        "argon2/src/thread.c",
+-        "argon2/src/core.c",
 -        "argon2/src/encoding.c",
+-        "argon2/src/thread.c"
 -      ],
 -      "cflags+": ["-Wno-type-limits"],
 -      "conditions": [
@ -34,13 +34,17 @@
 -      "type": "static_library"
 -    }, {
 +{
-       "target_name": "<(module_name)",
-       "xcode_settings": {
-         "GCC_ENABLE_CPP_EXCEPTIONS": "YES",
-@@ -57,7 +38,12 @@
+       "target_name": "argon2",
+       "defines+": [
+         "NAPI_VERSION=<(napi_build_version)",
+@@ -58,10 +39,15 @@
+       "sources": [
+         "argon2_node.cpp"
       ],
+-      "cflags_cc+": ["-Wall", "-Wextra", "-Wconversion", "-Wformat", "-Wnon-virtual-dtor", "-pedantic", "-Werror"],
+      "cflags_cc+": ["-Wall", "-Wextra", "-Wconversion", "-Wformat", "-Wnon-virtual-dtor", "-pedantic"],
       "cflags_cc!": ["-fno-exceptions"],
-       "include_dirs": ["<!@(node -p \"require('node-addon-api').include\")"],
+       "include_dirs": ["<!(node -p \"require('node-addon-api').include_dir\")"],
 -      "dependencies": ["libargon2"],
 +      "cflags": [
 +        "<!@(pkg-config libargon2 --cflags)",
@ -51,10 +55,9 @@
       "configurations": {
         "Debug": {
           "conditions": [
--- bitwarden/node_modules/argon2/argon2_node.cpp.old	2023-02-18 10:39:00.524876063 +0100
-+++ bitwarden/node_modules/argon2/argon2_node.cpp	2023-02-18 10:58:23.321982987 +0100
-@@ -1,5 +1,5 @@
- 
+--- clients/node_modules/argon2/argon2_node.cpp.orig	2024-07-15 19:27:24.130728388 +0200
+++ clients/node_modules/argon2/argon2_node.cpp	2024-07-15 19:42:24.944237666 +0200
+@@ -1,4 +1,4 @@
 -#include "argon2/include/argon2.h"
 +#include <argon2.h>
 #include <cassert>
--- a/vendor.tar.zst
+++ b/vendor.tar.zst
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:92e30dc10988acf4d59bda2812af2140f1a6433b6b9aea7791de51520d44ed66
-size 6262264
+oid sha256:1ddb736e0349bffdc037ced7a9e55cf4eccb3aa849769fdac2632f031c254900
+size 6823360