From 358260596bc92c0076ff45901749a31f92a6b836 Mon Sep 17 00:00:00 2001 From: Thomas Rittson <31796059+eliykat@users.noreply.github.com> Date: Sat, 21 Aug 2021 00:01:50 +1000 Subject: [PATCH] Add null check to electronStorageService.Save (#461) * 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 --- common/src/models/response/profileResponse.ts | 2 +- electron/src/services/electronStorage.service.ts | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/common/src/models/response/profileResponse.ts b/common/src/models/response/profileResponse.ts index 3185cffbef2..1c6e64faeef 100644 --- a/common/src/models/response/profileResponse.ts +++ b/common/src/models/response/profileResponse.ts @@ -33,7 +33,7 @@ export class ProfileResponse extends BaseResponse { this.key = this.getResponseProperty('Key'); this.privateKey = this.getResponseProperty('PrivateKey'); this.securityStamp = this.getResponseProperty('SecurityStamp'); - this.forcePasswordReset = this.getResponseProperty('ForcePasswordReset'); + this.forcePasswordReset = this.getResponseProperty('ForcePasswordReset') ?? false; const organizations = this.getResponseProperty('Organizations'); if (organizations != null) { diff --git a/electron/src/services/electronStorage.service.ts b/electron/src/services/electronStorage.service.ts index 5bf8d26cbb6..529067dc7b8 100644 --- a/electron/src/services/electronStorage.service.ts +++ b/electron/src/services/electronStorage.service.ts @@ -46,6 +46,9 @@ export class ElectronStorageService implements StorageService { } save(key: string, obj: any): Promise { + if (obj == null) { + return Promise.resolve(); + } if (obj instanceof Set) { obj = Array.from(obj); }