From c988143921aff0aa27f5ddad715e08bee829fe7f Mon Sep 17 00:00:00 2001
From: Ruidy Nemausat <ruidy.nemausat@gmail.com>
Date: Sat, 16 May 2020 13:40:07 +0200
Subject: [PATCH] add isActive field to dev, checks for user existance on sign
 up to not overwrite inactive profiles

---
 src/components/NavBar.tsx    |  8 +++++---
 src/pages/SignIn.tsx         |  7 ++++---
 src/pages/SignUp.tsx         | 28 +++++++++++++++++++++++-----
 src/router/PrivateRoute.tsx  |  4 +++-
 src/store/firebase/config.ts |  2 +-
 src/store/index.ts           |  6 ++----
 6 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/src/components/NavBar.tsx b/src/components/NavBar.tsx
index 606b0ff..e2eddc5 100644
--- a/src/components/NavBar.tsx
+++ b/src/components/NavBar.tsx
@@ -10,8 +10,9 @@ import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
 import {faCode, faSignOutAlt, faUser} from '@fortawesome/free-solid-svg-icons';
 // Typing
 import User from '../models/User';
+import Dev from '../models/Dev';
 
-interface IProps extends WithFirebaseProps<User> {
+interface IProps extends Dev, WithFirebaseProps<User> {
   isEmpty: boolean;
   isLoaded: boolean;
 }
@@ -19,7 +20,7 @@ interface IProps extends WithFirebaseProps<User> {
 /**
  * Main Navbar serves navigation Routes.
  */
-const NavBar: FC<IProps> = ({firebase, isEmpty, isLoaded}) => {
+const NavBar: FC<IProps> = ({firebase, isEmpty, isLoaded, isActive}) => {
   const publicLinks = (
     <ul data-testid="publicLinks">
       <li>
@@ -72,7 +73,8 @@ const NavBar: FC<IProps> = ({firebase, isEmpty, isLoaded}) => {
   );
 
   /** Display appropriated links after loading given authenticated prop */
-  const RenderLinks = isLoaded && !isEmpty ? privateLinks : publicLinks;
+  const RenderLinks =
+    isLoaded && !isEmpty && isActive ? privateLinks : publicLinks;
 
   return (
     <nav className="navbar bg-dark">
diff --git a/src/pages/SignIn.tsx b/src/pages/SignIn.tsx
index d4b0a17..02bf606 100644
--- a/src/pages/SignIn.tsx
+++ b/src/pages/SignIn.tsx
@@ -13,13 +13,14 @@ import Alert from '../components/Alert';
 import User from '../models/User';
 // Form
 import useForm from '../hooks';
+import Dev from '../models/Dev';
 
 interface InitFormData {
   email: string;
   password: string;
 }
 
-interface IProps extends WithFirebaseProps<User> {
+interface IProps extends Dev, WithFirebaseProps<User> {
   isEmpty: boolean;
   isLoaded: boolean;
 }
@@ -27,7 +28,7 @@ interface IProps extends WithFirebaseProps<User> {
 /**
  * Sign in form
  */
-const SignIn: FC<IProps> = ({firebase, isEmpty, isLoaded}) => {
+const SignIn: FC<IProps> = ({firebase, isEmpty, isLoaded, isActive}) => {
   const [error, setError] = useState<any>(null);
 
   // handle form data
@@ -57,7 +58,7 @@ const SignIn: FC<IProps> = ({firebase, isEmpty, isLoaded}) => {
     firebase.login({provider: 'google', type: 'popup'});
 
   // redirect to dashboard if connected
-  if (isLoaded && !isEmpty) {
+  if (isLoaded && !isEmpty && isActive) {
     return <Redirect to={Routes.DASHBOARD} />;
   }
 
diff --git a/src/pages/SignUp.tsx b/src/pages/SignUp.tsx
index 1ec1a8b..c5d6ea3 100644
--- a/src/pages/SignUp.tsx
+++ b/src/pages/SignUp.tsx
@@ -12,10 +12,10 @@ import Alert from '../components/Alert';
 import Header from '../components/Header';
 // Form
 import useForm from '../hooks';
-import {blankDev} from '../models/Dev';
+import Dev, {blankDev} from '../models/Dev';
 
 // extends withFirebaseProps type to ad profile info
-interface IProps extends WithFirebaseProps<User> {
+interface IProps extends Dev, WithFirebaseProps<User> {
   isEmpty: boolean;
   isLoaded: boolean;
 }
@@ -30,7 +30,7 @@ interface InitFormData {
 /**
  * Sign up form recieves firebase from withFirebase HOC
  */
-const SignUp: FC<IProps> = ({firebase, isEmpty, isLoaded}) => {
+const SignUp: FC<IProps> = ({firebase, isEmpty, isLoaded, isActive}) => {
   const [error, setError] = useState<any>(null);
 
   // handle form data
@@ -66,11 +66,29 @@ const SignUp: FC<IProps> = ({firebase, isEmpty, isLoaded}) => {
   const loginWithGoogle = () =>
     firebase
       .login({provider: 'google', type: 'popup'})
-      .then(() => firebase.updateProfile(blankDev, {useSet: true, merge: true}))
+      .then(() => {
+        // updateProfile only if user does not already exists in db
+        const email = firebase.auth().currentUser?.email;
+        let exists: boolean = false;
+        firebase
+          .firestore()
+          .collection('users/')
+          .where('email', '==', email)
+          .get()
+          .then(docs =>
+            docs.forEach(doc => {
+              exists = doc.data().isActive !== undefined;
+            }),
+          )
+          .then(() => {
+            if (!exists)
+              firebase.updateProfile(blankDev, {useSet: true, merge: true});
+          });
+      })
       .catch(err => setError(err));
 
   // redirect to dashboard if connected
-  if (isLoaded && !isEmpty) {
+  if (isLoaded && !isEmpty && isActive) {
     return <Redirect to={Routes.DASHBOARD} />;
   }
 
diff --git a/src/router/PrivateRoute.tsx b/src/router/PrivateRoute.tsx
index 924e3f7..546fa06 100644
--- a/src/router/PrivateRoute.tsx
+++ b/src/router/PrivateRoute.tsx
@@ -23,13 +23,15 @@ const PrivateRoute: FC<IProps> = ({
   ...rest
 }) => {
   const auth = useSelector((state: RootState) => state.firebase.auth);
+  const profile = useSelector((state: RootState) => state.firebase.profile);
+  const isActive = profile.isActive;
   return (
     <Route
       exact={exact}
       path={path}
       {...rest}
       render={({location, ...rest}) =>
-        isLoaded(auth) && !isEmpty(auth) ? (
+        isLoaded(auth) && !isEmpty(auth) && isActive ? (
           <Component {...rest} />
         ) : (
           <Redirect
diff --git a/src/store/firebase/config.ts b/src/store/firebase/config.ts
index da9e6d4..712f17a 100644
--- a/src/store/firebase/config.ts
+++ b/src/store/firebase/config.ts
@@ -19,7 +19,7 @@ const rrfProps = {
   createFirestoreInstance,
 };
 
-// Firestore SChema
+// Firestore Schema
 export interface Schema {
   devs: Dev;
 }
diff --git a/src/store/index.ts b/src/store/index.ts
index 69e7991..56d75b7 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -1,16 +1,14 @@
 // Redux
 import {configureStore} from '@reduxjs/toolkit';
-// import authReducer from './auth/';
 // Firebase
 import {firebaseReducer, FirebaseReducer} from 'react-redux-firebase';
 import {firestoreReducer} from 'redux-firestore';
 // Typing
-import User from '../models/User';
 import {Schema} from './firebase/config';
+import Dev from '../models/Dev';
 
 const store = configureStore({
   reducer: {
-    // auth: authReducer,
     firebase: firebaseReducer,
     firestore: firestoreReducer,
   },
@@ -18,7 +16,7 @@ const store = configureStore({
 
 // State type
 export interface RootState {
-  firebase: FirebaseReducer.Reducer<User, Schema>;
+  firebase: FirebaseReducer.Reducer<Dev, Schema>;
 }
 
 export default store;