From ddf727766641e43b1b4f904b76ddb4d5bf359c82 Mon Sep 17 00:00:00 2001 From: abhiram2600 Date: Wed, 17 Jun 2020 13:37:01 +0530 Subject: [PATCH] fixed login issue --- backend/validkeys.json | 2 +- react/src/helpers/DashboardRoutes.js | 14 +-- react/src/helpers/ProtectedRoute.js | 47 +++++----- react/src/modules/Auth/LandingPage.js | 1 + react/src/modules/Auth/Login.js | 124 ++++++++++++++------------ 5 files changed, 102 insertions(+), 86 deletions(-) diff --git a/backend/validkeys.json b/backend/validkeys.json index 5085066..3490410 100644 --- a/backend/validkeys.json +++ b/backend/validkeys.json @@ -1 +1 @@ -{"dummy":"dummyval","codingStudio":{"accessToken":"eyJhbGciOiJIUzI1NiJ9.Y29kaW5nU3R1ZGlv.GBhRWeGSZGxpkK6j9m3eX4f_WObnR0pYl9rMum45sFE","userType":"FORUM"},"17P61A0596":"eyJhbGciOiJIUzI1NiJ9.MTdQNjFBMDU5Ng.azCUBLRWn2091kJITCohCYQT3ukol-t2CDBcJkFGTf4","stumagz":{"accessToken":"eyJhbGciOiJIUzI1NiJ9.c3R1bWFneg.RjCpnTu611-dPJPSDP1iyOFjvnLRPn49JEn5tQhp2bw","userType":"FORUM"},"saikiran":{"accessToken":"eyJhbGciOiJIUzI1NiJ9.c2Fpa2lyYW4.dwns7EmnfJ-TZDOMvk1xl53zx75RD-kBlw87OD4cAFs","userType":"FORUM"},"Stutalk":{"accessToken":"eyJhbGciOiJIUzI1NiJ9.U3R1dGFsaw.jIS1zPQW-LpPqHFNJWpyoy0cUgSnSk0IdGUdcbmwoYk","userType":"FORUM"},"17p61a0584":{"accessToken":"eyJhbGciOiJIUzI1NiJ9.MTdwNjFhMDU4NA.xtokuKplZMtmJ_GKjK61QR5UZV9fLqNLtTA6LSQKDbs","userType":"FACULTY"},"STUTALK":{"accessToken":"eyJhbGciOiJIUzI1NiJ9.U1RVVEFMSw.wC24KmKQmiWiVJha_ATQHl1WqaOuLkrrcLosofswyqw","userType":"FORUM"},"IEEE":{"accessToken":"eyJhbGciOiJIUzI1NiJ9.SUVFRQ.yWyuU7C1-qXerxcOBV2x205uAIqwTqWrSCkDaWiiSpE","userType":"FORUM"},"STREETCAUSE":{"accessToken":"eyJhbGciOiJIUzI1NiJ9.U1RSRUVUQ0FVU0U.vPLRw-KYpZXqSD4bgrJb4_-ipsoMU0-H9SRlEq9VDoc","userType":"FORUM"},"CODINGSTUDIO":{"accessToken":"eyJhbGciOiJIUzI1NiJ9.Q09ESU5HU1RVRElP.xPXSKV8gyEmY1X4pcqorKxmDcGAkCPrSCRLS6JlqeTc","userType":"FORUM"}} \ No newline at end of file +{"dummy":"dummyval","codingStudio":{"accessToken":"eyJhbGciOiJIUzI1NiJ9.Y29kaW5nU3R1ZGlv.GBhRWeGSZGxpkK6j9m3eX4f_WObnR0pYl9rMum45sFE","userType":"FORUM"},"17P61A0596":"eyJhbGciOiJIUzI1NiJ9.MTdQNjFBMDU5Ng.azCUBLRWn2091kJITCohCYQT3ukol-t2CDBcJkFGTf4","stumagz":{"accessToken":"eyJhbGciOiJIUzI1NiJ9.c3R1bWFneg.RjCpnTu611-dPJPSDP1iyOFjvnLRPn49JEn5tQhp2bw","userType":"FORUM"},"saikiran":{"accessToken":"eyJhbGciOiJIUzI1NiJ9.c2Fpa2lyYW4.dwns7EmnfJ-TZDOMvk1xl53zx75RD-kBlw87OD4cAFs","userType":"FORUM"},"Stutalk":{"accessToken":"eyJhbGciOiJIUzI1NiJ9.U3R1dGFsaw.jIS1zPQW-LpPqHFNJWpyoy0cUgSnSk0IdGUdcbmwoYk","userType":"FORUM"},"17p61a0584":{"accessToken":"eyJhbGciOiJIUzI1NiJ9.MTdwNjFhMDU4NA.xtokuKplZMtmJ_GKjK61QR5UZV9fLqNLtTA6LSQKDbs","userType":"FACULTY"},"STUTALK":{"accessToken":"eyJhbGciOiJIUzI1NiJ9.U1RVVEFMSw.wC24KmKQmiWiVJha_ATQHl1WqaOuLkrrcLosofswyqw","userType":"FORUM"},"IEEE":{"accessToken":"eyJhbGciOiJIUzI1NiJ9.SUVFRQ.yWyuU7C1-qXerxcOBV2x205uAIqwTqWrSCkDaWiiSpE","userType":"FORUM"},"STREETCAUSE":{"accessToken":"eyJhbGciOiJIUzI1NiJ9.U1RSRUVUQ0FVU0U.vPLRw-KYpZXqSD4bgrJb4_-ipsoMU0-H9SRlEq9VDoc","userType":"FORUM"}} \ No newline at end of file diff --git a/react/src/helpers/DashboardRoutes.js b/react/src/helpers/DashboardRoutes.js index 6162246..08bc61d 100644 --- a/react/src/helpers/DashboardRoutes.js +++ b/react/src/helpers/DashboardRoutes.js @@ -44,14 +44,14 @@ const DashboardRoutes = () => { if (type == "FACULTY") return (
- + @@ -62,14 +62,14 @@ const DashboardRoutes = () => { return (
- + - - + +
diff --git a/react/src/helpers/ProtectedRoute.js b/react/src/helpers/ProtectedRoute.js index a42ec0c..06a0367 100644 --- a/react/src/helpers/ProtectedRoute.js +++ b/react/src/helpers/ProtectedRoute.js @@ -1,27 +1,28 @@ -import React from 'react'; -import {Route, Redirect} from 'react-router-dom'; +import React from "react"; +import { Route, Redirect } from "react-router-dom"; -export const ProtectedRoute = ({component:Component, ...rest}) => { - var user = JSON.parse(localStorage.getItem("user")); - console.log(user); +export function ProtectedRoute({ component: Component, ...rest }) { return ( - { - if(user!==null){ - return ; - } - else{ - return ; - } - } - }/> +
+ { + if (JSON.parse(localStorage.getItem("user"))) { + return ; + } else { + return ( + + ); + } + }} + /> +
); } diff --git a/react/src/modules/Auth/LandingPage.js b/react/src/modules/Auth/LandingPage.js index 03ab343..0a0d93c 100644 --- a/react/src/modules/Auth/LandingPage.js +++ b/react/src/modules/Auth/LandingPage.js @@ -13,6 +13,7 @@ const LandingPage = () => { e.preventDefault(); history.push("/"); }; + return (

diff --git a/react/src/modules/Auth/Login.js b/react/src/modules/Auth/Login.js index 9100810..328f97f 100644 --- a/react/src/modules/Auth/Login.js +++ b/react/src/modules/Auth/Login.js @@ -30,6 +30,18 @@ const Login = () => { console.log(err); }); }, []); + + const ss = (userName, accessToken, callback) => { + localStorage.setItem( + "user", + JSON.stringify({ + userName: userName, + accessToken: accessToken, + }) + ); + return callback(); + }; + const handleLogin = (e) => { e.preventDefault(); let un = value; @@ -48,14 +60,11 @@ const Login = () => { console.log("fdf"); let userName = res.data.message.split(" ")[1]; let accessToken = res.data.accessToken; - localStorage.setItem( - "user", - JSON.stringify({ - userName: userName, - accessToken: accessToken, - }) - ); - history.push("/dashboard"); + ss(userName, accessToken, () => { + history.push("/dashboard"); + }); //history.push("/dashboard")); + // localStorage.setItem("user", JSON.stringify(res.data)); + // history.push("/dashboard"); } else { let errors = res.data.err; setError(errors); @@ -69,24 +78,32 @@ const Login = () => { }; const userType = "FORUM"; return ( -
-
-

Forum login

-
-
-
-

Forum :

-
-
-
-

Password :

+
+ +

Forum login

+
+
+
+
+

Forum :

+
+
+ +
+
+
+
+

Password :

+
{ onChange={(e) => setPassword(e.target.value)} />
+
+
+ +
-
- -
-
-
- +
+ -

{error}

- - Go to Forum Registration Page - - - setModalShow(false)} - /> -
+

{error}

+ + Go to Forum Registration Page + + + setModalShow(false)} + /> +
); };