From a74a8bfa9d15a75ac996b96931e73611f6f83a3b Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Thu, 25 Feb 2021 12:41:29 +0100
Subject: [PATCH] fix storage in chat

---
 src/app/pages/agenda/agenda.page.ts |  4 ----
 src/app/pages/chat/chat.page.ts     |  1 -
 src/app/pages/login/login.page.ts   |  2 +-
 src/app/services/auth.service.ts    |  6 +++---
 src/app/services/storage.service.ts | 23 ++++++++++++++---------
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index 2f0df4169..f40ef1584 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -55,7 +55,6 @@ export class AgendaPage implements OnInit {
   showCalendar: boolean;
   calendarHeight: string;
 
-
   // for timeline
   events: CalendarEvent[] = [];
   // timeline filter
@@ -97,8 +96,6 @@ export class AgendaPage implements OnInit {
   startTime: Date;
   endTime: Date;
 
-
-
   constructor( 
     private alertCtrl: AlertController,
     @Inject(LOCALE_ID) private locale: string,
@@ -280,7 +277,6 @@ export class AgendaPage implements OnInit {
         //
       }
       
-      
     }, timeout);
   }
 
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index 6c1e9e12e..845d2d270 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -54,7 +54,6 @@ export class ChatPage implements OnInit {
     this.authService.userData$.subscribe((res:any)=>{
       this.loggedUser=res;
       console.log(this.loggedUser);
-      
     });
     this.load();
   }
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index 539a0a898..697c9f9e7 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -70,7 +70,7 @@ export class LoginPage implements OnInit {
     }
     this.authService.loginChat(postData).subscribe((res: any) => {
       console.log(res.data);
-      //this.storageService.store(AuthConnstants.AUTH, res.data);
+      this.storageService.store(AuthConnstants.AUTH, res.data);
       console.log('Login to Rocket chat OK');
     }, (error: any) => {
       console.log('Network error');
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index 4ffdd5f1f..64000e982 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -62,7 +62,7 @@ export class AuthService {
       if (result)
         {
           this.ValidatedUser = user;
-          //this.storageService.store(AuthConnstants.USER, response);
+          this.storageService.store(AuthConnstants.USER, response);
         }
       return result;
     }
@@ -80,9 +80,9 @@ export class AuthService {
 
     //Get user data from RocketChat | global object
     getUserData(){
-      /* this.storageService.get(AuthConnstants.AUTH).then(res=>{
+      this.storageService.get(AuthConnstants.AUTH).then(res=>{
         this.userData$.next(res);
-      }); */
+      });
     }
     //Get user Id | global object
     getUserId(){
diff --git a/src/app/services/storage.service.ts b/src/app/services/storage.service.ts
index e65b0037a..2ec3db7e7 100644
--- a/src/app/services/storage.service.ts
+++ b/src/app/services/storage.service.ts
@@ -1,21 +1,26 @@
 import { Injectable } from '@angular/core';
+import { Storage } from '@ionic/storage';
 /* import { Plugins } from '@capacitor/core';
 const { Storage } = Plugins; */
 @Injectable({
   providedIn: 'root'
   })
   export class StorageService {
-  constructor() {}
+  constructor(private storage:Storage,) {}
 
-  /* // Store the value
-  async store(storageKey: string, value: any) {
-  const encryptedValue = btoa(escape(JSON.stringify(value)));
-  await Storage.set({
-  key: storageKey,
-  value: encryptedValue
-  });
+  // Store the value
+  async store(key: string, value: any){
+    const encryptedValue = btoa(escape(JSON.stringify(value)));
+    await this.storage.set(key, encryptedValue);
   }
-
+  // Get the value
+  async get(key: string) {
+    const ret = await this.storage.get(key).then((val) => {
+      return val;
+    });
+    return JSON.parse(unescape(atob(ret)));
+    }
+/* 
   // Get the value
   async get(storageKey: string) {
   const ret = await Storage.get({ key: storageKey });