mirror of
https://github.com/bitwarden/browser
synced 2025-12-18 01:03:35 +00:00
* feat: update sdk service abstraction with documentation and new `userClient$` function * feat: add uninitialized user client with cache * feat: initialize user crypto * feat: initialize org keys * fix: org crypto not initializing properly * feat: avoid creating clients unnecessarily * chore: remove dev print/subscription * fix: clean up cache * chore: update sdk version * feat: implement clean-up logic (#11504) * chore: bump sdk version to fix build issues * chore: bump sdk version to fix build issues * fix: missing constructor parameters * refactor: simplify free() and delete() calls * refactor: use a named function for client creation * fix: client never freeing after refactor * fix: broken impl and race condition in tests
247 lines
8.1 KiB
TypeScript
247 lines
8.1 KiB
TypeScript
import {
|
|
combineLatest,
|
|
concatMap,
|
|
firstValueFrom,
|
|
Observable,
|
|
shareReplay,
|
|
map,
|
|
distinctUntilChanged,
|
|
tap,
|
|
switchMap,
|
|
} from "rxjs";
|
|
|
|
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";
|
|
import { AccountInfo, AccountService } from "../../../auth/abstractions/account.service";
|
|
import { KdfConfigService } from "../../../auth/abstractions/kdf-config.service";
|
|
import { KdfConfig } from "../../../auth/models/domain/kdf-config";
|
|
import { DeviceType } from "../../../enums/device-type.enum";
|
|
import { OrganizationId, UserId } from "../../../types/guid";
|
|
import { UserKey } from "../../../types/key";
|
|
import { CryptoService } from "../../abstractions/crypto.service";
|
|
import { Environment, EnvironmentService } from "../../abstractions/environment.service";
|
|
import { PlatformUtilsService } from "../../abstractions/platform-utils.service";
|
|
import { SdkClientFactory } from "../../abstractions/sdk/sdk-client-factory";
|
|
import { SdkService } from "../../abstractions/sdk/sdk.service";
|
|
import { KdfType } from "../../enums";
|
|
import { compareValues } from "../../misc/compare-values";
|
|
import { EncryptedString } from "../../models/domain/enc-string";
|
|
|
|
export class DefaultSdkService implements SdkService {
|
|
private sdkClientCache = new Map<UserId, Observable<BitwardenClient>>();
|
|
|
|
client$ = this.environmentService.environment$.pipe(
|
|
concatMap(async (env) => {
|
|
const settings = this.toSettings(env);
|
|
return await this.sdkClientFactory.createSdkClient(settings, LogLevel.Info);
|
|
}),
|
|
shareReplay({ refCount: true, bufferSize: 1 }),
|
|
);
|
|
|
|
supported$ = this.client$.pipe(
|
|
concatMap(async (client) => {
|
|
return client.echo("bitwarden wasm!") === "bitwarden wasm!";
|
|
}),
|
|
);
|
|
|
|
constructor(
|
|
private sdkClientFactory: SdkClientFactory,
|
|
private environmentService: EnvironmentService,
|
|
private platformUtilsService: PlatformUtilsService,
|
|
private accountService: AccountService,
|
|
private kdfConfigService: KdfConfigService,
|
|
private cryptoService: CryptoService,
|
|
private apiService: ApiService, // Yes we shouldn't import ApiService, but it's temporary
|
|
private userAgent: string = null,
|
|
) {}
|
|
|
|
userClient$(userId: UserId): Observable<BitwardenClient | undefined> {
|
|
// TODO: Figure out what happens when the user logs out
|
|
if (this.sdkClientCache.has(userId)) {
|
|
return this.sdkClientCache.get(userId);
|
|
}
|
|
|
|
const account$ = this.accountService.accounts$.pipe(
|
|
map((accounts) => accounts[userId]),
|
|
distinctUntilChanged(),
|
|
);
|
|
const kdfParams$ = this.kdfConfigService.getKdfConfig$(userId).pipe(distinctUntilChanged());
|
|
const privateKey$ = this.cryptoService
|
|
.userEncryptedPrivateKey$(userId)
|
|
.pipe(distinctUntilChanged());
|
|
const userKey$ = this.cryptoService.userKey$(userId).pipe(distinctUntilChanged());
|
|
const orgKeys$ = this.cryptoService.encryptedOrgKeys$(userId).pipe(
|
|
distinctUntilChanged(compareValues), // The upstream observable emits different objects with the same values
|
|
);
|
|
|
|
const client$ = combineLatest([
|
|
this.environmentService.environment$,
|
|
account$,
|
|
kdfParams$,
|
|
privateKey$,
|
|
userKey$,
|
|
orgKeys$,
|
|
]).pipe(
|
|
// 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;
|
|
|
|
const createAndInitializeClient = async () => {
|
|
if (privateKey == null || userKey == null || orgKeys == null) {
|
|
return undefined;
|
|
}
|
|
|
|
const settings = this.toSettings(env);
|
|
client = await this.sdkClientFactory.createSdkClient(settings, LogLevel.Info);
|
|
|
|
await this.initializeClient(client, account, kdfParams, privateKey, userKey, orgKeys);
|
|
|
|
return client;
|
|
};
|
|
|
|
createAndInitializeClient()
|
|
.then((c) => {
|
|
client = c;
|
|
subscriber.next(c);
|
|
})
|
|
.catch((e) => {
|
|
subscriber.error(e);
|
|
});
|
|
|
|
return () => client?.free();
|
|
});
|
|
}),
|
|
tap({
|
|
finalize: () => this.sdkClientCache.delete(userId),
|
|
}),
|
|
shareReplay({ refCount: true, bufferSize: 1 }),
|
|
);
|
|
|
|
this.sdkClientCache.set(userId, client$);
|
|
return client$;
|
|
}
|
|
|
|
async failedToInitialize(): Promise<void> {
|
|
// Only log on cloud instances
|
|
if (
|
|
this.platformUtilsService.isDev() ||
|
|
!(await firstValueFrom(this.environmentService.environment$)).isCloud
|
|
) {
|
|
return;
|
|
}
|
|
|
|
return this.apiService.send("POST", "/wasm-debug", null, false, false, null, (headers) => {
|
|
headers.append("SDK-Version", "1.0.0");
|
|
});
|
|
}
|
|
|
|
private async initializeClient(
|
|
client: BitwardenClient,
|
|
account: AccountInfo,
|
|
kdfParams: KdfConfig,
|
|
privateKey: EncryptedString,
|
|
userKey: UserKey,
|
|
orgKeys: Record<OrganizationId, EncryptedOrganizationKeyData>,
|
|
) {
|
|
await client.crypto().initialize_user_crypto({
|
|
email: account.email,
|
|
method: { decryptedKey: { decrypted_user_key: userKey.keyB64 } },
|
|
kdfParams:
|
|
kdfParams.kdfType === KdfType.PBKDF2_SHA256
|
|
? {
|
|
pBKDF2: { iterations: kdfParams.iterations },
|
|
}
|
|
: {
|
|
argon2id: {
|
|
iterations: kdfParams.iterations,
|
|
memory: kdfParams.memory,
|
|
parallelism: kdfParams.parallelism,
|
|
},
|
|
},
|
|
privateKey,
|
|
});
|
|
await client.crypto().initialize_org_crypto({
|
|
organizationKeys: new Map(
|
|
Object.entries(orgKeys)
|
|
.filter(([_, v]) => v.type === "organization")
|
|
.map(([k, v]) => [k, v.key]),
|
|
),
|
|
});
|
|
}
|
|
|
|
private toSettings(env: Environment): ClientSettings {
|
|
return {
|
|
apiUrl: env.getApiUrl(),
|
|
identityUrl: env.getIdentityUrl(),
|
|
deviceType: this.toDevice(this.platformUtilsService.getDevice()),
|
|
userAgent: this.userAgent ?? navigator.userAgent,
|
|
};
|
|
}
|
|
|
|
private toDevice(device: DeviceType): SdkDeviceType {
|
|
switch (device) {
|
|
case DeviceType.Android:
|
|
return "Android";
|
|
case DeviceType.iOS:
|
|
return "iOS";
|
|
case DeviceType.ChromeExtension:
|
|
return "ChromeExtension";
|
|
case DeviceType.FirefoxExtension:
|
|
return "FirefoxExtension";
|
|
case DeviceType.OperaExtension:
|
|
return "OperaExtension";
|
|
case DeviceType.EdgeExtension:
|
|
return "EdgeExtension";
|
|
case DeviceType.WindowsDesktop:
|
|
return "WindowsDesktop";
|
|
case DeviceType.MacOsDesktop:
|
|
return "MacOsDesktop";
|
|
case DeviceType.LinuxDesktop:
|
|
return "LinuxDesktop";
|
|
case DeviceType.ChromeBrowser:
|
|
return "ChromeBrowser";
|
|
case DeviceType.FirefoxBrowser:
|
|
return "FirefoxBrowser";
|
|
case DeviceType.OperaBrowser:
|
|
return "OperaBrowser";
|
|
case DeviceType.EdgeBrowser:
|
|
return "EdgeBrowser";
|
|
case DeviceType.IEBrowser:
|
|
return "IEBrowser";
|
|
case DeviceType.UnknownBrowser:
|
|
return "UnknownBrowser";
|
|
case DeviceType.AndroidAmazon:
|
|
return "AndroidAmazon";
|
|
case DeviceType.UWP:
|
|
return "UWP";
|
|
case DeviceType.SafariBrowser:
|
|
return "SafariBrowser";
|
|
case DeviceType.VivaldiBrowser:
|
|
return "VivaldiBrowser";
|
|
case DeviceType.VivaldiExtension:
|
|
return "VivaldiExtension";
|
|
case DeviceType.SafariExtension:
|
|
return "SafariExtension";
|
|
case DeviceType.Server:
|
|
return "Server";
|
|
case DeviceType.WindowsCLI:
|
|
return "WindowsCLI";
|
|
case DeviceType.MacOsCLI:
|
|
return "MacOsCLI";
|
|
case DeviceType.LinuxCLI:
|
|
return "LinuxCLI";
|
|
default:
|
|
return "SDK";
|
|
}
|
|
}
|
|
}
|