From 9613e2b2cf16ce1d410de036e176b0d0bc0b0788 Mon Sep 17 00:00:00 2001
From: talksik <patel.arjun50@gmail.com>
Date: Thu, 17 Mar 2022 23:24:05 -0400
Subject: [PATCH] adding api changes to error properly

---
 packages/desktop/src/controller/nirvanaApi.ts | 16 ++++-------
 packages/desktop/src/electron/preload.ts      |  4 +--
 packages/desktop/src/pages/Login/index.tsx    | 27 ++++++++++---------
 3 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/packages/desktop/src/controller/nirvanaApi.ts b/packages/desktop/src/controller/nirvanaApi.ts
index 73cd5de..4aed334 100644
--- a/packages/desktop/src/controller/nirvanaApi.ts
+++ b/packages/desktop/src/controller/nirvanaApi.ts
@@ -42,19 +42,13 @@ class NirvanaApi {
 
   user = {
     async getUserDetails(): Promise<User> {
-      return await (
-        await fetch(localHost + `/users`, {
-          method: "GET",
-          headers: { Authorization: this._authToken },
-        })
-      ).json();
+      return await axios.get(localHost + `/users`, {
+        headers: { Authorization: this._authToken },
+      });
     },
     async createUser(accessToken: string) {
-      return await fetch(
-        localHost + `/users/create?access_token=${accessToken}`,
-        {
-          method: "POST",
-        }
+      return await axios.post(
+        localHost + `/users/create?access_token=${accessToken}`
       );
     },
   };
diff --git a/packages/desktop/src/electron/preload.ts b/packages/desktop/src/electron/preload.ts
index 81a89a9..982a439 100644
--- a/packages/desktop/src/electron/preload.ts
+++ b/packages/desktop/src/electron/preload.ts
@@ -7,8 +7,8 @@ const electronAPI = {
     initiateLogin() {
       ipcRenderer.send(Channels.ACTIVATE_LOG_IN);
     },
-    receiveTokens(callback: any) {
-      ipcRenderer.on(Channels.AUTH_TOKENS, callback);
+    receiveTokens(channel: Channels, func: any) {
+      ipcRenderer.on(channel, (event, ...args) => func(...args));
     },
   },
   batteryApi: {},
diff --git a/packages/desktop/src/pages/Login/index.tsx b/packages/desktop/src/pages/Login/index.tsx
index b3b2f09..d66710a 100644
--- a/packages/desktop/src/pages/Login/index.tsx
+++ b/packages/desktop/src/pages/Login/index.tsx
@@ -22,22 +22,25 @@ export default function Login() {
   };
 
   useEffect(() => {
-    window.electronAPI.auth.receiveTokens(async (tokens: any) => {
-      console.log(tokens);
+    window.electronAPI.auth.receiveTokens(
+      Channels.AUTH_TOKENS,
+      async (tokens: any) => {
+        console.log(tokens);
 
-      // todo: implement refresh token procedure in api layer by sending refresh_token and such
-      const { access_token, id_token, refresh_token } = tokens;
+        // todo: implement refresh token procedure in api layer by sending refresh_token and such
+        const { access_token, id_token, refresh_token } = tokens;
 
-      nirvanaApi.setGoogleIdToken(id_token);
+        nirvanaApi.setGoogleIdToken(id_token);
 
-      // create user if on sign up page
-      if (isSignUp) {
-        await mutateAsync(access_token);
+        // create user if on sign up page
+        if (isSignUp) {
+          await mutateAsync(access_token);
+        }
+
+        // now can go to home and get authenticated regardless of type of user
+        navigate("/home");
       }
-
-      // now can go to home and get authenticated regardless of type of user
-      navigate("/home");
-    });
+    );
 
     // todo: figure out how to clean up with the preload api
     // return () => {