From 5683298debac0cdf5e9209998c026b9062be0fd0 Mon Sep 17 00:00:00 2001
From: Anoop M D <anoop.md1421@gmail.com>
Date: Tue, 8 Mar 2022 02:22:21 +0530
Subject: [PATCH] refactor: Auth

---
 renderer/.env.prod                      |  5 +++++
 renderer/api/auth.js                    | 13 +++++++++++++
 renderer/api/base.js                    |  2 +-
 renderer/api/identity.js                | 13 -------------
 renderer/pageComponents/Login/index.js  |  6 +++---
 renderer/pageComponents/SignUp/index.js |  8 ++++----
 renderer/providers/Auth/index.js        |  6 +++---
 7 files changed, 29 insertions(+), 24 deletions(-)
 create mode 100644 renderer/.env.prod
 create mode 100644 renderer/api/auth.js
 delete mode 100644 renderer/api/identity.js

diff --git a/renderer/.env.prod b/renderer/.env.prod
new file mode 100644
index 000000000..99056e482
--- /dev/null
+++ b/renderer/.env.prod
@@ -0,0 +1,5 @@
+ENV=production
+
+NEXT_PUBLIC_ENV=prod
+
+NEXT_PUBLIC_GRAFNODE_SERVER_API=https://ada.grafnode.com/api
\ No newline at end of file
diff --git a/renderer/api/auth.js b/renderer/api/auth.js
new file mode 100644
index 000000000..077a04028
--- /dev/null
+++ b/renderer/api/auth.js
@@ -0,0 +1,13 @@
+import { get, post, put } from './base';
+
+const AuthApi = {
+  whoami: () =>get('auth/v1/user/whoami'),
+  signup: (params) =>post('auth/v1/user/signup', params),
+  login: (params) =>post('auth/v1/user/login', params),
+  signout: () => post('auth/v1/user/logout'),
+  getProfile: () =>get('auth/v1/user/profile'),
+  updateProfile: (params) =>put('auth/v1/user/profile', params),
+  updateUsername: (params) =>put('auth/v1/user/username', params)
+};
+
+export default AuthApi;
\ No newline at end of file
diff --git a/renderer/api/base.js b/renderer/api/base.js
index b3e599581..85a02cd35 100644
--- a/renderer/api/base.js
+++ b/renderer/api/base.js
@@ -1,7 +1,7 @@
 import axios from "axios";
 
 const apiClient = axios.create({
-  baseURL: process.env.NEXT_PUBLIC_API
+  baseURL: process.env.NEXT_PUBLIC_GRAFNODE_SERVER_API
 });
 
 apiClient.interceptors.request.use((config) => {
diff --git a/renderer/api/identity.js b/renderer/api/identity.js
deleted file mode 100644
index 53431d539..000000000
--- a/renderer/api/identity.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { get, post, put } from './base';
-
-const IdentityApi = {
-  whoami: () =>get('v1/user/whoami'),
-  signup: (params) =>post('v1/user/register', params),
-  login: (params) =>post('v1/user/login', params),
-  signout: () => post('v1/user/logout'),
-  getProfile: () =>get('v1/user/profile'),
-  updateProfile: (params) =>put('v1/user/profile', params),
-  updateUsername: (params) =>put('v1/user/username', params)
-};
-
-export default IdentityApi;
\ No newline at end of file
diff --git a/renderer/pageComponents/Login/index.js b/renderer/pageComponents/Login/index.js
index 53093d3cd..0b531e0a2 100644
--- a/renderer/pageComponents/Login/index.js
+++ b/renderer/pageComponents/Login/index.js
@@ -3,7 +3,7 @@ import * as Yup from 'yup';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
 import { useAuth } from 'providers/Auth';
-import IdentityApi from 'api/identity';
+import AuthApi from 'api/auth';
 import { useFormik } from 'formik';
 import StyledWrapper from './StyledWrapper';
 
@@ -31,7 +31,7 @@ const Login = () => {
      }),
      onSubmit: (values, { resetForm }) => {
       setLoggingIn(true);
-      IdentityApi
+      AuthApi
         .login({
           email: values.email,
           password: values.password
@@ -54,7 +54,7 @@ const Login = () => {
   };
 
   if(currentUser) {
-    router.push('/home');
+    router.push('/');
     return null;
   };
 
diff --git a/renderer/pageComponents/SignUp/index.js b/renderer/pageComponents/SignUp/index.js
index 04511cb6c..cdac16385 100644
--- a/renderer/pageComponents/SignUp/index.js
+++ b/renderer/pageComponents/SignUp/index.js
@@ -1,7 +1,7 @@
 import React, { useState } from "react";
 import Link from 'next/link';
 import StyledWrapper from './StyledWrapper';
-import IdentityApi from 'api/identity';
+import AuthApi from 'api/auth';
 import { useFormik } from 'formik';
 import * as Yup from 'yup';
 import { useRouter } from 'next/router';
@@ -39,7 +39,7 @@ const SignUp = () => {
     }),
     onSubmit: (values, { resetForm }) => {
       setSigningUp(true);
-      IdentityApi
+      AuthApi
         .signup({
           name: values.name,
           email: values.email,
@@ -54,7 +54,7 @@ const SignUp = () => {
         .catch((error) => {
           setSigningUp(false);
           setErrorSigningUp(true);
-          setErrorMsg(error.message)
+          setErrorMsg(error.message || 'An error occured during signup')
         });
       setSigningUp(false);
     },
@@ -162,7 +162,7 @@ const SignUp = () => {
               </div>
             ) : 
               <div>
-                {errorSigningUp && errorMsg.length ? (
+                {errorSigningUp ? (
                   <div className="field-error error-msg mb-2 text-red-500 ml-1 mt-1">{errorMsg}</div>
                 ) : null}
                 <div className="text-center pt-4">
diff --git a/renderer/providers/Auth/index.js b/renderer/providers/Auth/index.js
index 33f3258a9..b0c5a77b5 100644
--- a/renderer/providers/Auth/index.js
+++ b/renderer/providers/Auth/index.js
@@ -1,6 +1,6 @@
 import React, { useEffect, useReducer } from 'react';
 import { useRouter } from 'next/router';
-import IdentityApi from 'api/identity';
+import AuthApi from 'api/auth';
 import reducer from './reducer';
 
 const AuthContext = React.createContext();
@@ -16,7 +16,7 @@ export const AuthProvider = props => {
   const [state, dispatch] = useReducer(reducer, initialState);
   
   useEffect(() => {
-    IdentityApi
+    AuthApi
       .whoami()
       .then((response) => {
         let data = response.data;
@@ -39,7 +39,7 @@ export const AuthProvider = props => {
 
   useEffect(() => {
     if(state.lastStateTransition === 'LOGIN_SUCCESS') {
-      router.push('/home');
+      router.push('/');
     }
     if(state.lastStateTransition === 'WHOAMI_ERROR') {
       // Todo: decide action