From e8124e7b218ae631be331fa60dd31a6d00621f17 Mon Sep 17 00:00:00 2001
From: Abhishek Raj Pandey <bhishek_rajpandey@yahoo.com>
Date: Wed, 28 Jul 2021 11:43:44 +0545
Subject: [PATCH 1/3] federated signin setup

---
 src/actions/userAction.js              |  8 ++++++++
 src/components/signInSignUp/SignIn.jsx | 12 ++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/actions/userAction.js b/src/actions/userAction.js
index a89269810..84e57fc25 100644
--- a/src/actions/userAction.js
+++ b/src/actions/userAction.js
@@ -137,6 +137,14 @@ export const register = (name, password) => async (dispatch) => {
   }
 }
 
+export const socialSignIn = (provider) => async (dispatch) => {
+  try {
+    Auth.federatedSignIn({ provider })
+  } catch (err){
+    console.log('err: ', err)
+  }
+}
+
 export const login = (name, password) => async (dispatch) => {
   let data = {}
   try {
diff --git a/src/components/signInSignUp/SignIn.jsx b/src/components/signInSignUp/SignIn.jsx
index 044b9826f..acfd779a6 100644
--- a/src/components/signInSignUp/SignIn.jsx
+++ b/src/components/signInSignUp/SignIn.jsx
@@ -3,7 +3,7 @@ import { Link, useHistory } from 'react-router-dom'
 import { useDispatch, useSelector } from 'react-redux'
 import { useForm } from 'react-hook-form'
 
-import { login } from '../../actions/userAction'
+import { login, socialSignIn } from '../../actions/userAction'
 import { USER_LOGIN_SUCCESS } from '../../constants/userConstants'
 import { SignInSignUpData } from './SignInSignUpData'
 
@@ -98,12 +98,12 @@ const SignIn = () => {
 
   const loginWithFacebook = (e) => {
     e.preventDefault()
-    // Auth.federatedSignIn({ provider: "Facebook" });
+    dispatch(socialSignIn('Facebook'))
   }
-
+  
   const loginWithGoogle = (e) => {
     e.preventDefault()
-    // Auth.federatedSignIn({ provider: "Google" });
+    dispatch(socialSignIn('Google'))
   }
 
   const onSubmit = ({ username, password }) => {
@@ -111,7 +111,7 @@ const SignIn = () => {
   }
 
   return (
-    <form className='sign' onSubmit={handleSubmit(onSubmit)}>
+    <form className='sign'>
       <h1 className='welcome'>Sign In</h1>
       <div className='container'>
         {error && <div className='error'>{error}</div>}
@@ -157,7 +157,7 @@ const SignIn = () => {
         </div>
 
         <div className='btnWrapper'>
-          <Button name='Sign In' />
+          <Button name='Sign In' onClick={handleSubmit(onSubmit)}/>
           <Link to='/forgot-password' className='fPassword green16px'>
             Forgot Password?
           </Link>

From 5b3cc2f26243affe24797e2127f36845e5d1e481 Mon Sep 17 00:00:00 2001
From: Abhishek Raj Pandey <bhishek_rajpandey@yahoo.com>
Date: Wed, 28 Jul 2021 18:28:00 +0545
Subject: [PATCH 2/3] Social login configuration

---
 src/App.jsx                                   |  2 +
 src/actions/userAction.js                     | 71 +++++++++++++++++--
 .../socialRedirect/SocialRedirect.jsx         | 19 +++++
 3 files changed, 85 insertions(+), 7 deletions(-)
 create mode 100644 src/components/socialRedirect/SocialRedirect.jsx

diff --git a/src/App.jsx b/src/App.jsx
index 2e71c6150..af45b24a3 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -11,6 +11,7 @@ import SignupScreen from './screens/signUp/SignupScreen'
 import CongratulationScreen from './screens/congratulation/CongratulationScreen'
 import Messenger from './screens/messenger/Messenger'
 import Library from './screens/library/Library'
+import SocialRedirect from './components/socialRedirect/SocialRedirect'
 import './App.css'
 import DashboardComponent from './screens/dashboard/MainDashboard'
 import Achievements from './screens/dashboard/Achievements'
@@ -58,6 +59,7 @@ function App () {
       <Router>
         <ScrollToTop>
           <Switch>
+            <Route component={SocialRedirect} path='/redirect' exact />
             <Route component={LoginScreen} path='/login' exact />
             <Route component={SignupScreen} path='/register' exact />
             <Route component={ForgotPassword} path='/forgot-password' />
diff --git a/src/actions/userAction.js b/src/actions/userAction.js
index 84e57fc25..c8e33abe6 100644
--- a/src/actions/userAction.js
+++ b/src/actions/userAction.js
@@ -91,8 +91,8 @@ if (process.env.REACT_APP_AUTH_METHOD === 'cognito') {
       oauth: {
         domain: process.env.REACT_APP_COGNITO_DOMAIN_NAME, // domain_name
         scope: ['phone', 'email', 'profile', 'openid', 'aws.cognito.signin.user.admin'],
-        redirectSignIn: process.env.FRONTEND_URL,
-        redirectSignOut: process.env.FRONTEND_URL,
+        redirectSignIn: process.env.REACT_APP_FRONTEND_URL,
+        redirectSignOut: process.env.REACT_APP_FRONTEND_URL,
         responseType: 'token' // or 'token', note that REFRESH token will only be generated when the responseType is code
       }
     }
@@ -137,12 +137,67 @@ export const register = (name, password) => async (dispatch) => {
   }
 }
 
-export const socialSignIn = (provider) => async (dispatch) => {
+export const socialSignIn = (provider) => (dispatch) => {
   try {
     Auth.federatedSignIn({ provider })
-  } catch (err){
-    console.log('err: ', err)
+  } catch (error) {
+    dispatch({
+      type: USER_LOGIN_FAIL,
+      payload: error.response && error.response.data.error ? error.response.data.error : error.message
+    })
+  }
+}
+
+export const socialSignInRedirect = (provider) => async (dispatch) => {
+  let data = {}
+  try {
+    dispatch({ type: USER_LOGIN_REQUEST })
+    const response = await Auth.currentAuthenticatedUser()
+    if (response) {
+      data = {
+        token: response?.signInUserSession?.idToken?.jwtToken || '',
+        id: response?.attributes?.sub || ''
+      }
+      window.localStorage.setItem('userInfo', JSON.stringify(data))
+      await postApi(dispatch, `${process.env.REACT_APP_API_BASE_URL}/api/users`, { id: data.id }, {
+        headers: {
+          Authorization: 'Bearer ' + data.token
+        }
+      })
+
+      await axios.put(`${process.env.REACT_APP_API_BASE_URL}/api/users/profile`, {
+        firstName: response.attributes.given_name,
+        lastName: response.attributes.family_name,
+        birthday: response.attributes.birthdate,
+        phone: response.attributes.phone_number,
+        email: response.attributes.email
+      },
+      {
+        headers: {
+          Authorization: 'Bearer ' + data.token
+        }
+      })
+
+      window.localStorage.setItem('userInfo', JSON.stringify(data))
+      dispatch({ type: USER_LOGIN_SUCCESS, payload: data })
+      await routingCommunityNews(dispatch, true)
+    } else {
+      window.location.href = '/login'
+      console.log('Not logged in')
+    }
+  } catch (error) {
+    dispatch({
+      type: USER_LOGIN_FAIL,
+      payload: error.response && error.response.data.error
+        ? error.response.data.error
+        : error.message
+    })
   }
+
+  // try {
+  // } catch (err){
+  //   console.log('err: ', err)
+  // }
 }
 
 export const login = (name, password) => async (dispatch) => {
@@ -221,7 +276,7 @@ export const checkAndUpdateToken = () => async (dispatch) => {
     }
   }).catch((data) => {
     return tokenFailure(dispatch, 'Unauthorized')
-    /*const message = data.response && data.response.data.name ? data.response.data.name : data.message
+    /* const message = data.response && data.response.data.name ? data.response.data.name : data.message
     if (message === 'TokenExpired') {
       if (process.env.REACT_APP_AUTH_METHOD === 'cognito') {
         Auth.currentSession().then((res) => {
@@ -250,7 +305,7 @@ export const checkAndUpdateToken = () => async (dispatch) => {
       }
     } else {
       return tokenFailure(dispatch, 'Unauthorized')
-    }*/
+    } */
   })
 }
 
@@ -264,6 +319,8 @@ const tokenFailure = (dispatch, message) => {
 
 export const getMyDetails = () => async (dispatch) => {
   try {
+    const response = await Auth.currentAuthenticatedUser()
+    console.log(response)
     dispatch({ type: USER_DETAILS_REQUEST })
     const { data } = await getApi(dispatch, `${process.env.REACT_APP_API_BASE_URL}/api/users/profile`)
     const userdata = {
diff --git a/src/components/socialRedirect/SocialRedirect.jsx b/src/components/socialRedirect/SocialRedirect.jsx
new file mode 100644
index 000000000..1d017cb9d
--- /dev/null
+++ b/src/components/socialRedirect/SocialRedirect.jsx
@@ -0,0 +1,19 @@
+import React, { useEffect } from 'react'
+import { useDispatch } from 'react-redux'
+import { socialSignInRedirect } from '../../actions/userAction'
+
+const SocialRedirect = () => {
+  const dispatch = useDispatch()
+
+  useEffect(() => {
+    dispatch(socialSignInRedirect())
+  }, [])
+
+  return (
+    <div>
+      Redirecting...
+    </div>
+  )
+}
+
+export default SocialRedirect

From f8ab6d506672fe796a5294ca9ffb424d08ef08b8 Mon Sep 17 00:00:00 2001
From: Abhishek Raj Pandey <bhishek_rajpandey@yahoo.com>
Date: Thu, 29 Jul 2021 12:41:10 +0545
Subject: [PATCH 3/3] redirect and logout setup

---
 src/App.jsx                                         |  6 +++---
 src/actions/userAction.js                           | 13 +++----------
 .../LoginRedirect.jsx}                              |  4 ++--
 src/components/signInSignUp/SignIn.jsx              | 11 +++++++++--
 4 files changed, 17 insertions(+), 17 deletions(-)
 rename src/components/{socialRedirect/SocialRedirect.jsx => loginRedirect/LoginRedirect.jsx} (83%)

diff --git a/src/App.jsx b/src/App.jsx
index af45b24a3..ef1ada2df 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -11,7 +11,7 @@ import SignupScreen from './screens/signUp/SignupScreen'
 import CongratulationScreen from './screens/congratulation/CongratulationScreen'
 import Messenger from './screens/messenger/Messenger'
 import Library from './screens/library/Library'
-import SocialRedirect from './components/socialRedirect/SocialRedirect'
+import LoginRedirect from './components/loginRedirect/LoginRedirect'
 import './App.css'
 import DashboardComponent from './screens/dashboard/MainDashboard'
 import Achievements from './screens/dashboard/Achievements'
@@ -59,12 +59,12 @@ function App () {
       <Router>
         <ScrollToTop>
           <Switch>
-            <Route component={SocialRedirect} path='/redirect' exact />
+            <Route component={LoginRedirect} path='/redirect' exact />
             <Route component={LoginScreen} path='/login' exact />
             <Route component={SignupScreen} path='/register' exact />
             <Route component={ForgotPassword} path='/forgot-password' />
+            <Route component={() => <Redirect to='/login' />} path='/' exact />
             <PrivateRoute component={UserVerification} path='/verification' exact />
-            <PrivateRoute component={() => <Redirect to='/login' />} path='/' exact />
             <PrivateRoute component={LogoutUser} path='/logout' exact />
             <PrivateRoute component={CongratulationScreen} path='/edit-information' exact />
             <PrivateRoute component={CalendarScreen} exact path='/calendar/my-events' />
diff --git a/src/actions/userAction.js b/src/actions/userAction.js
index c8e33abe6..317a93c5e 100644
--- a/src/actions/userAction.js
+++ b/src/actions/userAction.js
@@ -193,11 +193,6 @@ export const socialSignInRedirect = (provider) => async (dispatch) => {
         : error.message
     })
   }
-
-  // try {
-  // } catch (err){
-  //   console.log('err: ', err)
-  // }
 }
 
 export const login = (name, password) => async (dispatch) => {
@@ -422,11 +417,9 @@ export const searchUsers = (search) => async (dispatch) => {
 }
 
 export const logout = () => (dispatch) => {
-  Auth.signOut().then(() => {
-    window.localStorage.clear()
-    dispatch({ type: USER_LOGOUT })
-    document.location.href = '/login'
-  }).catch(err => console.log(err))
+  window.localStorage.clear()
+  dispatch({ type: USER_LOGOUT })
+  document.location.href = '/login'
 }
 
 export const confirmPin = (username, code) => async (dispatch) => {
diff --git a/src/components/socialRedirect/SocialRedirect.jsx b/src/components/loginRedirect/LoginRedirect.jsx
similarity index 83%
rename from src/components/socialRedirect/SocialRedirect.jsx
rename to src/components/loginRedirect/LoginRedirect.jsx
index 1d017cb9d..dc785f969 100644
--- a/src/components/socialRedirect/SocialRedirect.jsx
+++ b/src/components/loginRedirect/LoginRedirect.jsx
@@ -2,7 +2,7 @@ import React, { useEffect } from 'react'
 import { useDispatch } from 'react-redux'
 import { socialSignInRedirect } from '../../actions/userAction'
 
-const SocialRedirect = () => {
+const LoginRedirect = () => {
   const dispatch = useDispatch()
 
   useEffect(() => {
@@ -16,4 +16,4 @@ const SocialRedirect = () => {
   )
 }
 
-export default SocialRedirect
+export default LoginRedirect
diff --git a/src/components/signInSignUp/SignIn.jsx b/src/components/signInSignUp/SignIn.jsx
index acfd779a6..7b245e5f6 100644
--- a/src/components/signInSignUp/SignIn.jsx
+++ b/src/components/signInSignUp/SignIn.jsx
@@ -6,6 +6,7 @@ import { useForm } from 'react-hook-form'
 import { login, socialSignIn } from '../../actions/userAction'
 import { USER_LOGIN_SUCCESS } from '../../constants/userConstants'
 import { SignInSignUpData } from './SignInSignUpData'
+import { Auth } from 'aws-amplify'
 
 import Button from '../button/Button'
 import Checkbox from '../checkbox/Checkbox'
@@ -37,6 +38,12 @@ const SignIn = () => {
     setShowPassword(!showPassword)
   }
 
+  useEffect(async () => {
+    const response = await Auth.currentAuthenticatedUser()
+    console.log(response)
+    if (response) history.push('/redirect')
+  }, [])
+
   useEffect(() => {
     /* Hub.listen("auth", ({ payload: { event, data } }) => {
       console.log(event);
@@ -100,7 +107,7 @@ const SignIn = () => {
     e.preventDefault()
     dispatch(socialSignIn('Facebook'))
   }
-  
+
   const loginWithGoogle = (e) => {
     e.preventDefault()
     dispatch(socialSignIn('Google'))
@@ -157,7 +164,7 @@ const SignIn = () => {
         </div>
 
         <div className='btnWrapper'>
-          <Button name='Sign In' onClick={handleSubmit(onSubmit)}/>
+          <Button name='Sign In' onClick={handleSubmit(onSubmit)} />
           <Link to='/forgot-password' className='fPassword green16px'>
             Forgot Password?
           </Link>