adding route for sign up and such

packages/desktop/src/components/ProtectedRoute/index.tsx

@@ -1,6 +1,7 @@
 import { Route, useNavigate } from "react-router-dom";
 
 import { STORE_ITEMS } from "../../electron/store";
+import { nirvanaApi } from "../../controller/nirvanaApi";
 import { useEffect } from "react";
 import { useGetUserDetails } from "../../controller/index";
 
@@ -9,18 +10,18 @@ export default function ProtectedRoute({ ...children }) {
 
   useEffect(() => {
     // console.log(window.electronAPI.store.get(STORE_ITEMS.AUTH_TOKENS));
+    // nirvanaApi.getUserDetails();
   }, []);
 
   const navigate = useNavigate();
 
   if (isLoading) return <span>please wait while we authenticate you</span>;
 
-  if (isError) {
-    // toast.error("Please sign in first!");
-    navigate("/login");
-
-    return <span>you are not allowed here!</span>;
-  }
+  useEffect(() => {
+    if (isError) {
+      navigate("/login");
+    }
+  }, [isError]);
 
   // if we can successfully get user details, we are good to continue
 

packages/desktop/src/controller/index.tsx

@@ -6,7 +6,7 @@ export enum Querytypes {
 }
 
 export function useGetUserDetails() {
-  return useQuery(Querytypes.GET_USER_DETAILS, nirvanaApi.getUserDetails, {
-    retry: true,
-  });
+  return useQuery(Querytypes.GET_USER_DETAILS, () =>
+    nirvanaApi.getUserDetails()
+  );
 }

packages/desktop/src/controller/nirvanaApi.ts

@@ -4,38 +4,49 @@ import { User } from "@nirvana/core/models";
 
 // export const localHost = process.env.REACT_APP_API_DOMAIN;
 
-export const localHost = "http://localhost:5000";
+export const localHost = "http://localhost:5000/api";
 
 class NirvanaApi {
   // auth token from google that our backend will use
   private _authToken?: string;
 
-  setPrivateToken(_googleIdToken: string) {
+  setGoogleIdToken(_googleIdToken: string) {
     this._authToken = _googleIdToken;
   }
 
-  async fetch<T>(options: AxiosRequestConfig, privateRoute = false) {
+  async fetch(url: string, method: string, privateRoute = false) {
     // use the auth token if it's a private route
     // error if no auth token and it's a private route
     // throw error and show message on anything that is an error from the backend
-    if (privateRoute && this._authToken) {
-      return await axios.request<T>({
-        ...options,
-        headers: { Authorization: this._authToken },
-      });
-    }
 
-    return axios.request<T>(options);
+    try {
+      const fullUrl = localHost + url;
+
+      var res;
+      if (privateRoute && this._authToken) {
+        res = await fetch(fullUrl, {
+          method: method,
+          headers: { Authorization: this._authToken },
+        });
+      } else {
+        res = await fetch(fullUrl);
+      }
+
+      return await res.json();
+    } catch (error) {
+      console.log(error);
+
+      throw Error(error);
+    }
   }
 
-  async getUserDetails(): Promise<AxiosResponse<User>> {
-    return await this.fetch<User>(
-      {
+  async getUserDetails(): Promise<User> {
+    return await (
+      await fetch(localHost + `/users`, {
         method: "GET",
-        url: localHost + `/users`,
-      },
-      true
-    );
+        headers: { Authorization: this._authToken },
+      })
+    ).json();
   }
 }
 

packages/desktop/src/index.ts

@@ -23,10 +23,11 @@ export let browserWindow: BrowserWindow;
 const createWindow = (): void => {
   // Create the browser window.
   browserWindow = new BrowserWindow({
-    height: 600,
-    width: 800,
+    height: 900,
+    width: 900,
     webPreferences: {
       preload: MAIN_WINDOW_PRELOAD_WEBPACK_ENTRY,
+      sandbox: true,
     },
   });
 

packages/desktop/src/nirvanaApp.tsx

@@ -4,6 +4,7 @@ import { QueryClient, QueryClientProvider } from "react-query";
 import Home from "./pages/Home";
 import Login from "./pages/Login";
 import ProtectedRoute from "./components/ProtectedRoute";
+import { ReactQueryDevtools } from "react-query/devtools";
 import testConnection from "@nirvana/core";
 
 testConnection();
@@ -32,6 +33,8 @@ function NirvanaApp() {
             </Routes>
           </div>
         </HashRouter>
+
+        <ReactQueryDevtools initialIsOpen={false} />
       </QueryClientProvider>
     </>
   );

packages/desktop/src/pages/Login/index.tsx

@@ -3,6 +3,7 @@ import { useEffect, useState } from "react";
 import Channels from "../../electron/constants";
 import { CircularProgress } from "@mui/material";
 import Logo from "../../components/Logo";
+import { nirvanaApi } from "../../controller/nirvanaApi";
 import { useNavigate } from "react-router-dom";
 
 export default function Login() {
@@ -19,8 +20,11 @@ export default function Login() {
     window.electronAPI.auth.receiveTokens(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;
 
+      nirvanaApi.setGoogleIdToken(id_token);
+
       // home should handle this user now that they have signed in with google
       navigate("/home");
     });