Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-26 12:25:20 +01:00
Code Issues Projects Releases Wiki Activity

rename enc user key setter in crypto service

Browse Source
This commit is contained in:
Jacob Fink 2023-07-07 09:39:37 -04:00
parent 7a25c376ce
commit 0f97a89a87
No known key found for this signature in database
GPG Key ID: C2F7ACF05859D008
11 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/common/src/auth/login-strategies/password-login.strategy.spec.ts
View File

@ -143,7 +143,7 @@ describe("PasswordLogInStrategy", () => {
expect(cryptoService.setMasterKey).toHaveBeenCalledWith(masterKey);
expect(cryptoService.setPasswordHash).toHaveBeenCalledWith(localHashedPassword);
expect(cryptoService.setUserKeyMasterKey).toHaveBeenCalledWith(tokenResponse.key);
expect(cryptoService.setMasterKeyEncryptedUserKey).toHaveBeenCalledWith(tokenResponse.key);
expect(cryptoService.setUserKey).toHaveBeenCalledWith(userKey);
expect(cryptoService.setPrivateKey).toHaveBeenCalledWith(tokenResponse.privateKey);
});

2
libs/common/src/auth/login-strategies/password-login.strategy.ts
View File

@ -147,7 +147,7 @@ export class PasswordLogInStrategy extends LogInStrategy {
}
protected override async setUserKey(response: IdentityTokenResponse): Promise<void> {
await this.cryptoService.setUserKeyMasterKey(response.key);
await this.cryptoService.setMasterKeyEncryptedUserKey(response.key);
const masterKey = await this.cryptoService.getMasterKey();
if (masterKey) {

2
libs/common/src/auth/login-strategies/passwordless-login.strategy.spec.ts
View File

@ -94,7 +94,7 @@ describe("SsoLogInStrategy", () => {
expect(cryptoService.setMasterKey).toHaveBeenCalledWith(masterKey);
expect(cryptoService.setPasswordHash).toHaveBeenCalledWith(localPasswordHash);
expect(cryptoService.setUserKeyMasterKey).toHaveBeenCalledWith(tokenResponse.key);
expect(cryptoService.setMasterKeyEncryptedUserKey).toHaveBeenCalledWith(tokenResponse.key);
expect(cryptoService.setUserKey).toHaveBeenCalledWith(userKey);
expect(cryptoService.setPrivateKey).toHaveBeenCalledWith(tokenResponse.privateKey);
});

2
libs/common/src/auth/login-strategies/passwordless-login.strategy.ts
View File

@ -85,7 +85,7 @@ export class PasswordlessLogInStrategy extends LogInStrategy {
}
protected override async setUserKey(response: IdentityTokenResponse): Promise<void> {
await this.cryptoService.setUserKeyMasterKey(response.key);
await this.cryptoService.setMasterKeyEncryptedUserKey(response.key);
const masterKey = await this.cryptoService.getMasterKey();
if (masterKey) {

2
libs/common/src/auth/login-strategies/sso-login.strategy.ts
View File

@ -83,7 +83,7 @@ export class SsoLogInStrategy extends LogInStrategy {
const newSsoUser = tokenResponse.key == null;
if (!newSsoUser) {
await this.cryptoService.setUserKeyMasterKey(tokenResponse.key);
await this.cryptoService.setMasterKeyEncryptedUserKey(tokenResponse.key);
if (tokenResponse.keyConnectorUrl != null) {
const masterKey = await this.cryptoService.getMasterKey();

2
libs/common/src/auth/login-strategies/user-api-login.strategy.spec.ts
View File

@ -114,7 +114,7 @@ describe("UserApiLogInStrategy", () => {
await apiLogInStrategy.logIn(credentials);
expect(cryptoService.setUserKeyMasterKey).toHaveBeenCalledWith(tokenResponse.key);
expect(cryptoService.setMasterKeyEncryptedUserKey).toHaveBeenCalledWith(tokenResponse.key);
expect(cryptoService.setPrivateKey).toHaveBeenCalledWith(tokenResponse.privateKey);
});

2
libs/common/src/auth/login-strategies/user-api-login.strategy.ts
View File

@ -64,7 +64,7 @@ export class UserApiLogInStrategy extends LogInStrategy {
}
protected override async setUserKey(response: IdentityTokenResponse): Promise<void> {
await this.cryptoService.setUserKeyMasterKey(response.key);
await this.cryptoService.setMasterKeyEncryptedUserKey(response.key);
if (response.apiUseKeyConnector) {
const masterKey = await this.cryptoService.getMasterKey();

2
libs/common/src/auth/services/key-connector.service.ts
View File

@ -99,7 +99,7 @@ export class KeyConnectorService implements KeyConnectorServiceAbstraction {
const userKey = await this.cryptoService.makeUserKey(masterKey);
await this.cryptoService.setUserKey(userKey[0]);
await this.cryptoService.setUserKeyMasterKey(userKey[1].encryptedString);
await this.cryptoService.setMasterKeyEncryptedUserKey(userKey[1].encryptedString);
const [pubKey, privKey] = await this.cryptoService.makeKeyPair();

2
libs/common/src/platform/abstractions/crypto.service.ts
View File

@ -90,7 +90,7 @@ export abstract class CryptoService {
* @param userKeyMasterKey The master key encrypted user key to set
* @param userId The desired user
*/
setUserKeyMasterKey: (UserKeyMasterKey: string, userId?: string) => Promise<void>;
setMasterKeyEncryptedUserKey: (UserKeyMasterKey: string, userId?: string) => Promise<void>;
/**
* Sets the user's master key
* @param key The user's master key to set

2
libs/common/src/platform/services/crypto.service.ts
View File

@ -134,7 +134,7 @@ export class CryptoService implements CryptoServiceAbstraction {
}
}
async setUserKeyMasterKey(userKeyMasterKey: string, userId?: string): Promise<void> {
async setMasterKeyEncryptedUserKey(userKeyMasterKey: string, userId?: string): Promise<void> {
await this.stateService.setUserKeyMasterKey(userKeyMasterKey, { userId: userId });
}

2
libs/common/src/vault/services/sync/sync.service.ts
View File

@ -303,7 +303,7 @@ export class SyncService implements SyncServiceAbstraction {
throw new Error("Stamp has changed");
}
await this.cryptoService.setUserKeyMasterKey(response.key);
await this.cryptoService.setMasterKeyEncryptedUserKey(response.key);
await this.cryptoService.setPrivateKey(response.privateKey);
await this.cryptoService.setProviderKeys(response.providers);
await this.cryptoService.setOrgKeys(response.organizations, response.providerOrganizations);