From 9e9f72da3e2a31e58281a609a4703c7d3e9d9696 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Sun, 18 Jul 2021 20:52:01 +0100
Subject: [PATCH] Fix

---
 src/app/services/auth.service.ts    |  4 ++--
 src/app/store/localstore.service.ts | 17 ++++++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index b11cd78d1..26a46eda1 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -32,8 +32,8 @@ export class AuthService {
 
       this.headers = new HttpHeaders();
 
-      if (localstoreService.get('user', null) != null) {
-        this.ValidatedUser = localstoreService.get('user',{});
+      if (this.localstoreService.get('user', null) != null) {
+        this.ValidatedUser = this.localstoreService.get('user',{});
       }
 
       if (localStorage.getItem("userChat") != null) {
diff --git a/src/app/store/localstore.service.ts b/src/app/store/localstore.service.ts
index 68a7e24b0..4f4480d07 100644
--- a/src/app/store/localstore.service.ts
+++ b/src/app/store/localstore.service.ts
@@ -10,9 +10,12 @@ export class LocalstoreService {
 
   constructor() { }
 
+  getKey(keyName) {
+    return this.prefix + keyName
+  }
   get( keyName, safe) {
 
-    keyName = this.prefix + keyName
+    keyName = this.getKey(keyName)
 
     const ciphertext = localStorage.getItem(keyName) 
 
@@ -21,18 +24,18 @@ export class LocalstoreService {
     if(ciphertext) {
       const bytes   = AES.decrypt(ciphertext, hashKey)
       var decryptedData = bytes.toString(enc.Utf8);
-      if(typeof(decryptedData) != 'string') {
-        decryptedData = JSON.parse(decryptedData)
+      try {
+        return JSON.parse(decryptedData)
+      } catch {
+        return decryptedData;
       }
-      return decryptedData;
-    } else {
-      return  safe;
+
     }
   }
 
   set(keyName, value) {
     
-    keyName = this.prefix + keyName
+    keyName = this.getKey(keyName)
 
     if(typeof(value) != 'string') {
       value = JSON.stringify(value)