Compare commits
89 Commits
Author | SHA256 | Date | |
---|---|---|---|
c8891acdf4 | |||
e04adb52fe | |||
0c14e703c8 | |||
817f7eb1e6 | |||
1879290dda | |||
518ee7f49f | |||
373e10af3a | |||
ef9eeed95b | |||
245e5b030b | |||
6c2af2ebb3 | |||
4395097d0a | |||
06de2b2e21 | |||
b8041c0061 | |||
81ad61b130 | |||
2ebf1a20d8 | |||
cc71958096 | |||
97098ef571 | |||
bf1ae5a5b7 | |||
93ce5f5361 | |||
0f3025cf24 | |||
5f15f99fe2 | |||
aff0d8be92 | |||
203487db18 | |||
f4be295ede | |||
ef14054aaa | |||
9a435f975d | |||
85b33263f1 | |||
cb1098533d | |||
381d9976c3 | |||
093c016152 | |||
6d18d45b37 | |||
ab401b8f19 | |||
e6d4c5c07a | |||
ee51c68d6b | |||
2dc18e14b6 | |||
58ff3794d2 | |||
25bdc8d104 | |||
ec0f56810a | |||
01775b4a27 | |||
73489982b4 | |||
de6fcde0f6 | |||
a9539965c2 | |||
3ef9eac4b9 | |||
7d335e2608 | |||
952723abfb | |||
de66c4f16e | |||
8aa3fff72f | |||
42bc00c433 | |||
7fe9f85694 | |||
235695b4f0 | |||
dc4362cf29 | |||
c30598b81a | |||
415cec4959 | |||
24c7f27303 | |||
04a79b9ef3 | |||
c56016a790 | |||
ea6223d35c | |||
f2e8b0e600 | |||
15404df60a | |||
a73cdd39e1 | |||
9507fc8256 | |||
41cb30ff25 | |||
7532c32ebc | |||
ee99ca0e14 | |||
3dd18a4328 | |||
6994966188 | |||
558ddff0e5 | |||
29cae5f217 | |||
7490891475 | |||
79a40b373f | |||
d37c23f722 | |||
7bdaf6f926 | |||
6d732fb125 | |||
8f5da224b7 | |||
f265219f31 | |||
0d8ae14831 | |||
aa0b39c73d | |||
ed930e60da | |||
bdb427cdae | |||
dd64bde7f9 | |||
6c66e5225f | |||
a78a211915 | |||
33c25af384 | |||
8a09d67a5d | |||
d981972cab | |||
8827cae0a6 | |||
e84e0d988f | |||
3f2101f6cf | |||
6ca83b2671 |
4
_service
4
_service
@@ -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-v2025.7.0</param>
|
||||
<param name="version">2025.7.0</param>
|
||||
<param name="revision">desktop-v2025.8.2</param>
|
||||
<param name="version">2025.8.2</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! -->
|
||||
|
@@ -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"
|
||||
},
|
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:318644bcf9ad44bc5d4d89cbb957c520142b387eb6cdaae35c51a9451d4006b7
|
||||
size 45144077
|
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:db27dca02155fc984e5664cc12b1c65f0415b14e7dc9fdd755a6c8b2adb76e02
|
||||
size 45144077
|
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b09328059ac14cdb496a3dd33921456c00a0d32ab9e598dd6e786f90c68503bd
|
||||
size 45497869
|
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:935ad4966f10fcfbdac1784f248f800c7c4bb17834a67dcdd5b9b0e3061db518
|
||||
size 37969933
|
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1436703e869d9c2735117e4f65948f707281f0eee0c8e287516da11516e9baa8
|
||||
size 39058445
|
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4e67c98c75ab6b7d7a512f7ad8917fac956d7ce37ee4ed688c927dba433f66bd
|
||||
size 40005133
|
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a425511c3fd8e9c41079df4bbe7afd8f9678ada7902f322c3f2aa20f3fbcdae7
|
||||
size 41812493
|
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:69fdfe866a500de39e5044fe31b392ede84ddd8786d8f70f3ae358a2230126a5
|
||||
size 41812493
|
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:467129673a0cdacf3baca394b03da71a026ca06bc5114cd9f5b6f56687862468
|
||||
size 42984461
|
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:29912fb71ed4ca82a99260a82e284d24923489ac9da6fee17906a8ae50be6836
|
||||
size 48538637
|
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:32fcf2437bd2097642ee7cf0d6861fd97859b2b3fd0bb5a25cac2f5a6f941e6e
|
||||
size 49445901
|
3
bitwarden-2025.8.2.obscpio
Normal file
3
bitwarden-2025.8.2.obscpio
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2fb6c96850cbb1b1ce30d32bf33870a0cb0ddd0f69a3ba6f90f2837976ff5d01
|
||||
size 49946125
|
@@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Aug 30 10:19:12 UTC 2025 - Bruno Pitrus <brunopitrus@hotmail.com>
|
||||
|
||||
- New upstream release 2025.8.2
|
||||
* Show website icons when viewing an item
|
||||
* Updated flow for assigning items to collections
|
||||
* Removed setting for requiring password or PIN on app-start when using biometric unlock.
|
||||
Password or PIN now always required on Linux
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 25 09:34:30 UTC 2025 - Bruno Pitrus <brunopitrus@hotmail.com>
|
||||
|
||||
|
@@ -1,4 +1,4 @@
|
||||
name: bitwarden
|
||||
version: 2025.7.0
|
||||
mtime: 1752853812
|
||||
commit: 62fe7ee44afed11aaa4cb1cd4e3185dea3799eec
|
||||
version: 2025.8.2
|
||||
mtime: 1756400486
|
||||
commit: 5b1e500544260610dad315bdb45a87566e85f9fa
|
||||
|
@@ -20,11 +20,11 @@
|
||||
#not running the tests on OBS — extremely flaky
|
||||
%bcond_with test_rust
|
||||
|
||||
%global sdk_internal_req_version 0.2.0~main.225
|
||||
%global sdk_internal_req_version 0.2.0~main.242
|
||||
|
||||
|
||||
Name: bitwarden
|
||||
Version: 2025.7.0
|
||||
Version: 2025.8.2
|
||||
Release: 0
|
||||
Summary: A secure and free password manager for all of your devices
|
||||
Group: Productivity/Security
|
||||
@@ -136,7 +136,7 @@ test $(jq -cj '.version' node_modules/@bitwarden/sdk-internal/package.json | sed
|
||||
|
||||
|
||||
rm -rvf node_modules/@bitwarden/sdk-internal
|
||||
ln -svT {%{nodejs_sitelib},node_modules}/@bitwarden/sdk-internal
|
||||
cp -arvLT {%{nodejs_sitelib},node_modules}/@bitwarden/sdk-internal
|
||||
|
||||
#remove bundled font
|
||||
rm -v libs/angular/src/scss/webfonts/roboto.woff2
|
||||
@@ -225,8 +225,10 @@ cp -plv -t . ../desktop_native/target/release/desktop_proxy
|
||||
cd %{_builddir}/bitwarden-%{version}/apps/desktop
|
||||
mkdir -pv %{buildroot}%{_libdir}
|
||||
cp -ar build %{buildroot}%{_libdir}/%{name}
|
||||
cmp %{_datadir}/bitwarden/*.wasm %{buildroot}%{_libdir}/%{name}/*.wasm
|
||||
ln -svf %{_datadir}/bitwarden/*.wasm %{buildroot}%{_libdir}/%{name}/*.wasm
|
||||
for i in %{buildroot}%{_libdir}/%{name}/*.wasm; do
|
||||
cmp %{_datadir}/bitwarden/*.wasm "$i"
|
||||
ln -svf %{_datadir}/bitwarden/*.wasm "$i"
|
||||
done
|
||||
for i in 16 32 64 128 256 512 1024
|
||||
do
|
||||
install -pvDm644 resources/icons/${i}x${i}.png "%{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png"
|
||||
|
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8e62ee1659f6325677411aa7c8b99d84c328a705fda82370489a4920f646ffbb
|
||||
size 35111893
|
@@ -1,49 +0,0 @@
|
||||
#!/bin/sh -eux
|
||||
|
||||
# dnf install curl gzip jq npm patch tar wget
|
||||
|
||||
PKGDIR="$(pwd)"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
cd clients
|
||||
|
||||
|
||||
|
||||
#These patches touch NPM's files
|
||||
patch --verbose -p1 -b < $PKGDIR/remove-unnecessary-deps.patch
|
||||
|
||||
#remove unnecessary / non-free source
|
||||
rm -rf apps/browser apps/cli apps/web bitwarden_license
|
||||
|
||||
npm ci --verbose --ignore-scripts
|
||||
|
||||
echo ">>>>>> Remove argon2 vendor"
|
||||
rm -rf node_modules/argon2/argon2
|
||||
|
||||
echo ">>>>>> Remove non-free binaries"
|
||||
find . -type f -name "*.wasm" -print -delete
|
||||
find . -type f -name "*.jar" -print -delete
|
||||
find . -type f -name "*.exe" -print -delete
|
||||
find . -type f -name "*.node" -print -delete
|
||||
find . -type f -name "*.dll" -print -delete
|
||||
find . -type f -name "*.dylib" -print -delete
|
||||
find . -type f -name "*.so" -print -delete
|
||||
find . -type f -name "*.o" -print -delete
|
||||
find . -type f -name "*.a" -print -delete
|
||||
|
||||
#We use sponge to avoid a race condition between find and rm
|
||||
find -type f | sponge | xargs -P$(nproc) -- sh -c 'file -S "$@" | grep -v '\'' .*script'\'' | grep '\'' .*executable'\'' | tee /dev/stderr | sed '\''s/: .*//'\'' | xargs rm -fv'
|
||||
|
||||
|
||||
# Remove empty directories
|
||||
echo ">>>>>> Remove empty directories"
|
||||
find . -type d -empty -print -delete
|
||||
|
||||
|
||||
echo ">>>>>> Create tarball"
|
||||
ZSTD_CLEVEL=19 ZSTD_NBTHREADS=$(nproc) tar --zstd --sort=name -vvScf "${PKGDIR}/node-vendor.tar.zst" node_modules
|
||||
|
@@ -1,65 +0,0 @@
|
||||
Remove dependency on argon-browser2 which should be dead code after https://github.com/bitwarden/clients/commit/996823169a5134da56c0e08f6e83a01e64164774
|
||||
We used to path this to use node_modules/argon2 but cannot anymore due to sandbox now being enabled; fortunately, upstream at the same time moved the crypto to main process.
|
||||
Therefore the WASM implementation in web-crypto-function should be dead code now and can be removed because we do not want to compile WASM.
|
||||
|
||||
--- clients/apps/desktop/webpack.renderer.js.orig 2024-10-17 19:47:51.805420136 +0200
|
||||
+++ clients/apps/desktop/webpack.renderer.js 2024-10-17 21:00:08.105664818 +0200
|
||||
@@ -41,11 +41,6 @@ const common = {
|
||||
},
|
||||
type: "asset/resource",
|
||||
},
|
||||
- {
|
||||
- test: /argon2(-simd)?\.wasm$/,
|
||||
- loader: "base64-loader",
|
||||
- type: "javascript/auto",
|
||||
- },
|
||||
],
|
||||
},
|
||||
plugins: [],
|
||||
@@ -142,11 +137,6 @@ const renderer = {
|
||||
test: /[\/\\]@angular[\/\\].+\.js$/,
|
||||
parser: { system: true },
|
||||
},
|
||||
- {
|
||||
- test: /argon2(-simd)?\.wasm$/,
|
||||
- loader: "base64-loader",
|
||||
- type: "javascript/auto",
|
||||
- },
|
||||
],
|
||||
noParse: /argon2(-simd)?\.wasm$/,
|
||||
},
|
||||
--- clients/libs/common/src/key-management/crypto/services/web-crypto-function.service.ts.orig 2025-06-15 16:07:54.524856763 +0200
|
||||
+++ clients/libs/common/src/key-management/crypto/services/web-crypto-function.service.ts 2025-06-15 16:28:32.588820320 +0200
|
||||
@@ -1,4 +1,3 @@
|
||||
-import * as argon2 from "argon2-browser";
|
||||
import * as forge from "node-forge";
|
||||
|
||||
import { EncryptionType } from "../../../platform/enums";
|
||||
@@ -62,24 +61,9 @@ export class WebCryptoFunctionService im
|
||||
memory: number,
|
||||
parallelism: number,
|
||||
): Promise<Uint8Array> {
|
||||
- if (!this.wasmSupported) {
|
||||
- throw "Webassembly support is required for the Argon2 KDF feature.";
|
||||
- }
|
||||
-
|
||||
- const passwordArr = new Uint8Array(this.toBuf(password));
|
||||
- const saltArr = new Uint8Array(this.toBuf(salt));
|
||||
-
|
||||
- const result = await argon2.hash({
|
||||
- pass: passwordArr,
|
||||
- salt: saltArr,
|
||||
- time: iterations,
|
||||
- mem: memory,
|
||||
- parallelism: parallelism,
|
||||
- hashLen: 32,
|
||||
- type: argon2.ArgonType.Argon2id,
|
||||
- });
|
||||
- argon2.unloadRuntime();
|
||||
- return result.hash;
|
||||
+ const err="This should be unreachable dead code. If you're seeing this message, please report a bug to openSUSE maintainers because we must have made a mistake when patching."
|
||||
+ alert(err)
|
||||
+ throw err
|
||||
}
|
||||
|
||||
async hkdf(
|
@@ -1,193 +0,0 @@
|
||||
https://github.com/bitwarden/sdk-internal might be now free software
|
||||
but we currently don't want to build it as it's a huge WASM blob that is not currently used for anything.
|
||||
This patch will be removed once some _actual_ JS functionality gets migrated to wasm
|
||||
|
||||
--- bitwarden-2024.10.0/apps/desktop/config/base.json.orig 2024-10-17 21:45:41.000000000 +0200
|
||||
+++ bitwarden-2024.10.0/apps/desktop/config/base.json 2024-10-25 21:36:08.368540114 +0200
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"flags": {
|
||||
- "sdk": true
|
||||
+ "sdk": false
|
||||
},
|
||||
"devFlags": {}
|
||||
}
|
||||
--- clients-desktop-v2024.11.0/apps/desktop/src/app/services/services.module.ts.orig 2024-11-14 21:24:33.955145852 +0100
|
||||
+++ clients-desktop-v2024.11.0/apps/desktop/src/app/services/services.module.ts 2024-11-14 21:39:37.686804726 +0100
|
||||
@@ -72,7 +72,6 @@ import { Message, MessageListener, Messa
|
||||
import { SubjectMessageSender } from "@bitwarden/common/platform/messaging/internal";
|
||||
import { TaskSchedulerService } from "@bitwarden/common/platform/scheduling";
|
||||
import { MemoryStorageService } from "@bitwarden/common/platform/services/memory-storage.service";
|
||||
-import { DefaultSdkClientFactory } from "@bitwarden/common/platform/services/sdk/default-sdk-client-factory";
|
||||
import { NoopSdkClientFactory } from "@bitwarden/common/platform/services/sdk/noop-sdk-client-factory";
|
||||
import { SystemService } from "@bitwarden/common/platform/services/system.service";
|
||||
import { GlobalStateProvider, StateProvider } from "@bitwarden/common/platform/state";
|
||||
@@ -344,7 +343,7 @@ const safeProviders: SafeProvider[] = [
|
||||
}),
|
||||
safeProvider({
|
||||
provide: SdkClientFactory,
|
||||
- useClass: flagEnabled("sdk") ? DefaultSdkClientFactory : NoopSdkClientFactory,
|
||||
+ useClass: NoopSdkClientFactory,
|
||||
deps: [],
|
||||
}),
|
||||
safeProvider({
|
||||
--- clients-desktop-v2024.11.0/libs/common/src/platform/abstractions/sdk/sdk.service.ts.orig 2024-11-14 21:24:34.402035860 +0100
|
||||
+++ clients-desktop-v2024.11.0/libs/common/src/platform/abstractions/sdk/sdk.service.ts 2024-11-14 21:40:54.838696107 +0100
|
||||
@@ -1,6 +1,5 @@
|
||||
import { Observable } from "rxjs";
|
||||
|
||||
-import { BitwardenClient } from "@bitwarden/sdk-internal";
|
||||
|
||||
import { UserId } from "../../../types/guid";
|
||||
|
||||
@@ -14,7 +13,7 @@ export abstract class SdkService {
|
||||
* Retrieve a client initialized without a user.
|
||||
* This client can only be used for operations that don't require a user context.
|
||||
*/
|
||||
- client$: Observable<BitwardenClient | undefined>;
|
||||
+ client$: Observable<any>;
|
||||
|
||||
/**
|
||||
* Retrieve a client initialized for a specific user.
|
||||
@@ -27,7 +26,7 @@ export abstract class SdkService {
|
||||
*
|
||||
* @param userId
|
||||
*/
|
||||
- abstract userClient$(userId: UserId): Observable<BitwardenClient>;
|
||||
+ abstract userClient$(userId: UserId): Observable<any>;
|
||||
|
||||
abstract failedToInitialize(category: string, error?: Error): Promise<void>;
|
||||
}
|
||||
--- bitwarden-2024.10.0/libs/common/src/platform/abstractions/sdk/sdk-client-factory.ts.orig 2024-10-17 21:45:41.000000000 +0200
|
||||
+++ bitwarden-2024.10.0/libs/common/src/platform/abstractions/sdk/sdk-client-factory.ts 2024-10-25 21:32:14.591461794 +0200
|
||||
@@ -1,10 +1,9 @@
|
||||
-import type { BitwardenClient } from "@bitwarden/sdk-internal";
|
||||
|
||||
/**
|
||||
* Factory for creating SDK clients.
|
||||
*/
|
||||
export abstract class SdkClientFactory {
|
||||
abstract createSdkClient(
|
||||
- ...args: ConstructorParameters<typeof BitwardenClient>
|
||||
- ): Promise<BitwardenClient>;
|
||||
+ ...args: ConstructorParameters<any>
|
||||
+ ): Promise<any>;
|
||||
}
|
||||
--- bitwarden-2024.10.0/libs/common/src/platform/services/sdk/noop-sdk-client-factory.ts.orig 2024-10-17 21:45:41.000000000 +0200
|
||||
+++ bitwarden-2024.10.0/libs/common/src/platform/services/sdk/noop-sdk-client-factory.ts 2024-10-25 21:41:45.940577943 +0200
|
||||
@@ -1,4 +1,3 @@
|
||||
-import type { BitwardenClient } from "@bitwarden/sdk-internal";
|
||||
|
||||
import { SdkClientFactory } from "../../abstractions/sdk/sdk-client-factory";
|
||||
|
||||
@@ -9,8 +8,8 @@ import { SdkClientFactory } from "../../
|
||||
*/
|
||||
export class NoopSdkClientFactory implements SdkClientFactory {
|
||||
createSdkClient(
|
||||
- ...args: ConstructorParameters<typeof BitwardenClient>
|
||||
- ): Promise<BitwardenClient> {
|
||||
+ ...args: ConstructorParameters<any>
|
||||
+ ): Promise<any> {
|
||||
return Promise.reject(new Error("SDK not available"));
|
||||
}
|
||||
}
|
||||
--- clients/libs/common/src/platform/services/sdk/default-sdk.service.ts.orig 2024-12-12 18:52:12.448979879 +0100
|
||||
+++ clients/libs/common/src/platform/services/sdk/default-sdk.service.ts 2024-12-12 19:08:41.399904218 +0100
|
||||
@@ -12,12 +12,6 @@ import {
|
||||
} from "rxjs";
|
||||
|
||||
import { KeyService, KdfConfigService, KdfConfig, KdfType } from "@bitwarden/key-management";
|
||||
-import {
|
||||
- BitwardenClient,
|
||||
- ClientSettings,
|
||||
- LogLevel,
|
||||
- DeviceType as SdkDeviceType,
|
||||
-} from "@bitwarden/sdk-internal";
|
||||
|
||||
import { ApiService } from "../../../abstractions/api.service";
|
||||
import { EncryptedOrganizationKeyData } from "../../../admin-console/models/data/encrypted-organization-key.data";
|
||||
@@ -33,10 +27,10 @@ import { compareValues } from "../../mis
|
||||
import { EncryptedString } from "../../models/domain/enc-string";
|
||||
|
||||
export class RecoverableSDKError extends Error {
|
||||
- sdk: BitwardenClient;
|
||||
+ sdk: any;
|
||||
timeout: number;
|
||||
|
||||
- constructor(sdk: BitwardenClient, timeout: number) {
|
||||
+ constructor(sdk: any, timeout: number) {
|
||||
super(`SDK took ${timeout}s to initialize`);
|
||||
|
||||
this.sdk = sdk;
|
||||
@@ -45,13 +39,13 @@ export class RecoverableSDKError extends
|
||||
}
|
||||
|
||||
export class DefaultSdkService implements SdkService {
|
||||
- private sdkClientCache = new Map<UserId, Observable<BitwardenClient>>();
|
||||
+ private sdkClientCache = new Map<UserId, Observable<any>>();
|
||||
|
||||
client$ = this.environmentService.environment$.pipe(
|
||||
concatMap(async (env) => {
|
||||
const settings = this.toSettings(env);
|
||||
try {
|
||||
- return await this.sdkClientFactory.createSdkClient(settings, LogLevel.Info);
|
||||
+ return await this.sdkClientFactory.createSdkClient(settings, 'unused');
|
||||
} catch (e) {
|
||||
if (e instanceof RecoverableSDKError) {
|
||||
await this.failedToInitialize("sdk", e);
|
||||
@@ -85,7 +79,7 @@ export class DefaultSdkService implement
|
||||
private userAgent: string = null,
|
||||
) {}
|
||||
|
||||
- userClient$(userId: UserId): Observable<BitwardenClient | undefined> {
|
||||
+ userClient$(userId: UserId): Observable<any> {
|
||||
// TODO: Figure out what happens when the user logs out
|
||||
if (this.sdkClientCache.has(userId)) {
|
||||
return this.sdkClientCache.get(userId);
|
||||
@@ -115,8 +109,8 @@ export class DefaultSdkService implement
|
||||
// switchMap is required to allow the clean-up logic to be executed when `combineLatest` emits a new value.
|
||||
switchMap(([env, account, kdfParams, privateKey, userKey, orgKeys]) => {
|
||||
// Create our own observable to be able to implement clean-up logic
|
||||
- return new Observable<BitwardenClient>((subscriber) => {
|
||||
- let client: BitwardenClient;
|
||||
+ return new Observable<any>((subscriber) => {
|
||||
+ let client: any;
|
||||
|
||||
const createAndInitializeClient = async () => {
|
||||
if (privateKey == null || userKey == null) {
|
||||
@@ -124,7 +118,7 @@ export class DefaultSdkService implement
|
||||
}
|
||||
|
||||
const settings = this.toSettings(env);
|
||||
- client = await this.sdkClientFactory.createSdkClient(settings, LogLevel.Info);
|
||||
+ client = await this.sdkClientFactory.createSdkClient(settings, 'unused');
|
||||
|
||||
await this.initializeClient(client, account, kdfParams, privateKey, userKey, orgKeys);
|
||||
|
||||
@@ -179,7 +173,7 @@ export class DefaultSdkService implement
|
||||
}
|
||||
|
||||
private async initializeClient(
|
||||
- client: BitwardenClient,
|
||||
+ client: any,
|
||||
account: AccountInfo,
|
||||
kdfParams: KdfConfig,
|
||||
privateKey: EncryptedString,
|
||||
@@ -215,7 +209,7 @@ export class DefaultSdkService implement
|
||||
});
|
||||
}
|
||||
|
||||
- private toSettings(env: Environment): ClientSettings {
|
||||
+ private toSettings(env: Environment): any {
|
||||
return {
|
||||
apiUrl: env.getApiUrl(),
|
||||
identityUrl: env.getIdentityUrl(),
|
||||
@@ -224,7 +218,7 @@ export class DefaultSdkService implement
|
||||
};
|
||||
}
|
||||
|
||||
- private toDevice(device: DeviceType): SdkDeviceType {
|
||||
+ private toDevice(device: DeviceType): any {
|
||||
switch (device) {
|
||||
case DeviceType.Android:
|
||||
return "Android";
|
@@ -60,7 +60,7 @@
|
||||
- "@typescript-eslint/rule-tester": "8.31.0",
|
||||
- "@typescript-eslint/utils": "8.31.0",
|
||||
- "@webcomponents/custom-elements": "1.6.0",
|
||||
- "@yao-pkg/pkg": "5.16.1",
|
||||
- "@yao-pkg/pkg": "6.5.1",
|
||||
- "angular-eslint": "19.6.0",
|
||||
"autoprefixer": "10.4.21",
|
||||
- "axe-playwright": "2.1.0",
|
||||
@@ -68,7 +68,7 @@
|
||||
- "base64-loader": "1.0.0",
|
||||
- "browserslist": "4.23.2",
|
||||
- "chromatic": "13.1.2",
|
||||
"concurrently": "9.1.2",
|
||||
"concurrently": "9.2.0",
|
||||
"copy-webpack-plugin": "13.0.0",
|
||||
"cross-env": "7.0.3",
|
||||
"css-loader": "7.1.2",
|
||||
@@ -101,7 +101,7 @@
|
||||
+ "path-browserify": "^1.0.1",
|
||||
"postcss": "8.5.3",
|
||||
"postcss-loader": "8.1.1",
|
||||
- "prettier": "3.5.3",
|
||||
- "prettier": "3.6.2",
|
||||
- "prettier-plugin-tailwindcss": "0.6.11",
|
||||
- "process": "0.11.10",
|
||||
- "remark-gfm": "4.0.1",
|
||||
@@ -132,7 +132,7 @@
|
||||
@@ -161,51 +87,22 @@
|
||||
"@angular/platform-browser-dynamic": "19.2.14",
|
||||
"@angular/router": "19.2.14",
|
||||
"@bitwarden/sdk-internal": "0.2.0-main.225",
|
||||
"@bitwarden/sdk-internal": "0.2.0-main.242",
|
||||
- "@electron/fuses": "1.8.0",
|
||||
- "@emotion/css": "11.13.5",
|
||||
- "@koa/multer": "4.0.0",
|
||||
@@ -151,8 +151,8 @@
|
||||
- "bufferutil": "4.0.9",
|
||||
- "chalk": "4.1.2",
|
||||
"commander": "11.1.0",
|
||||
"core-js": "3.42.0",
|
||||
- "form-data": "4.0.2",
|
||||
"core-js": "3.44.0",
|
||||
- "form-data": "4.0.4",
|
||||
- "https-proxy-agent": "7.0.6",
|
||||
- "inquirer": "8.2.6",
|
||||
- "jsdom": "26.1.0",
|
||||
|
@@ -1,65 +0,0 @@
|
||||
--- vendor/node_modules/argon2/binding.gyp.orig 2024-11-14 21:31:38.677408520 +0100
|
||||
+++ vendor/node_modules/argon2/binding.gyp 2024-11-14 21:51:57.719983077 +0100
|
||||
@@ -20,7 +20,7 @@
|
||||
"Release": {
|
||||
"target_conditions": [
|
||||
["OS != 'win'", {
|
||||
- "cflags+": ["-fdata-sections", "-ffunction-sections", "-fvisibility=hidden"],
|
||||
+ "cflags+": ["-fvisibility=hidden"],
|
||||
"ldflags+": ["-Wl,--gc-sections"]
|
||||
}]
|
||||
],
|
||||
@@ -29,26 +29,7 @@
|
||||
}
|
||||
},
|
||||
"targets": [
|
||||
- {
|
||||
- "target_name": "libargon2",
|
||||
- "sources": [
|
||||
- "argon2/src/argon2.c",
|
||||
- "argon2/src/blake2/blake2b.c",
|
||||
- "argon2/src/core.c",
|
||||
- "argon2/src/encoding.c",
|
||||
- "argon2/src/thread.c"
|
||||
- ],
|
||||
- "cflags+": ["-Wno-type-limits"],
|
||||
- "conditions": [
|
||||
- ["target_arch == 'ia32' or target_arch == 'x64'", {
|
||||
- "cflags+": ["-msse", "-msse2"],
|
||||
- "sources+": ["argon2/src/opt.c"]
|
||||
- }, {
|
||||
- "sources+": ["argon2/src/ref.c"]
|
||||
- }]
|
||||
- ],
|
||||
- "type": "static_library"
|
||||
- }, {
|
||||
+{
|
||||
"target_name": "argon2",
|
||||
"defines+": [
|
||||
"NAPI_VERSION=<(napi_build_version)",
|
||||
@@ -58,10 +39,15 @@
|
||||
"sources": [
|
||||
"argon2.cpp"
|
||||
],
|
||||
- "cflags_cc+": ["-Wall", "-Wextra", "-Wformat", "-Wnon-virtual-dtor", "-pedantic", "-Werror"],
|
||||
+ "cflags_cc+": ["-Wall", "-Wextra", "-Wformat", "-Wnon-virtual-dtor", "-pedantic"],
|
||||
"cflags_cc!": ["-fno-exceptions"],
|
||||
"include_dirs": ["<!(node -p \"require('node-addon-api').include_dir\")"],
|
||||
- "dependencies": ["libargon2"],
|
||||
+ "cflags": [
|
||||
+ "<!@(pkg-config libargon2 --cflags)",
|
||||
+ ],
|
||||
+ "libraries": [
|
||||
+ "<!@(pkg-config libargon2 --libs)",
|
||||
+ ],
|
||||
"configurations": {
|
||||
"Debug": {
|
||||
"conditions": [
|
||||
--- vendor/node_modules/argon2/argon2.cpp.orig 2024-11-14 21:31:38.537338517 +0100
|
||||
+++ vendor/node_modules/argon2/argon2.cpp 2024-11-14 21:56:26.220837915 +0100
|
||||
@@ -1,4 +1,4 @@
|
||||
-#include "argon2/include/argon2.h"
|
||||
+#include <argon2.h>
|
||||
|
||||
#include <napi.h>
|
||||
#include <string>
|
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5cd8fdb627c91e19a8e764172f768b47e3061c4480f8d5cca1b8c96e79590ae1
|
||||
size 44109919
|
||||
oid sha256:48496dabbcd87fae453907bcd158e9ba70d2b05360afa39ec8a64fa1f1177c52
|
||||
size 43982803
|
||||
|
Reference in New Issue
Block a user