bitwarden/jslib
1
0
Fork 0
mirror of https://github.com/bitwarden/jslib synced 2025-12-06 00:03:29 +00:00
Code Issues Releases Wiki Activity

Add null check to electronStorageService.Save (#461)

Browse Source 
* Add default value for ForcePasswordReset

* Add null check to electronStorageService instead

* Add default value to ForcePasswordReset

* Update electron/src/services/electronStorage.service.ts

* Fix indention issue from GH suggestion

Co-authored-by: Oscar Hinton <oscar@oscarhinton.com>
This commit is contained in:
Thomas Rittson
2021-08-21 00:01:50 +10:00
committed by GitHub
parent f1f5d1a7f2
commit 358260596b
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/models/response/profileResponse.ts
View File

@@ -33,7 +33,7 @@ export class ProfileResponse extends BaseResponse {
this.key = this.getResponseProperty('Key'); this.key = this.getResponseProperty('Key');
this.privateKey = this.getResponseProperty('PrivateKey'); this.privateKey = this.getResponseProperty('PrivateKey');
this.securityStamp = this.getResponseProperty('SecurityStamp'); this.securityStamp = this.getResponseProperty('SecurityStamp');
this.forcePasswordReset = this.getResponseProperty('ForcePasswordReset'); this.forcePasswordReset = this.getResponseProperty('ForcePasswordReset') ?? false;
const organizations = this.getResponseProperty('Organizations'); const organizations = this.getResponseProperty('Organizations');
if (organizations != null) { if (organizations != null) {

3
electron/src/services/electronStorage.service.ts
View File

@@ -46,6 +46,9 @@ export class ElectronStorageService implements StorageService {
} }
save(key: string, obj: any): Promise<any> { save(key: string, obj: any): Promise<any> {
if (obj == null) {
return Promise.resolve();
}
if (obj instanceof Set) { if (obj instanceof Set) {
obj = Array.from(obj); obj = Array.from(obj);
} }