From cee8701b3ff34bd894ef50faa69e96ba4ec63468 Mon Sep 17 00:00:00 2001 From: Piranavan Shanmugavadivelu Date: Tue, 1 Oct 2019 21:03:25 +0530 Subject: [PATCH 1/4] AuthService created --- client/src/components/ItemDisplayComp.js | 8 ++++---- client/src/components/LoginFormComp.js | 2 ++ client/src/components/services/AuthServices.js | 12 ++++++++++++ package-lock.json | 6 +++--- 4 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 client/src/components/services/AuthServices.js diff --git a/client/src/components/ItemDisplayComp.js b/client/src/components/ItemDisplayComp.js index 2284fe6..581e75e 100644 --- a/client/src/components/ItemDisplayComp.js +++ b/client/src/components/ItemDisplayComp.js @@ -14,10 +14,10 @@ class ItemDisplayComp extends React.Component { var self = this; axios .get("api/items") - .then(function(response) { + .then(function (response) { self.setState({ items: response.data }); }) - .catch(function(error) { + .catch(function (error) { console.log(error); }); } @@ -38,7 +38,7 @@ class ItemDisplayComp extends React.Component { href={"/#/viewItem/" + item._id + "/#"} className="card-img-top-new" > - +
{item.name}
@@ -52,7 +52,7 @@ class ItemDisplayComp extends React.Component {

- diff --git a/client/src/components/LoginFormComp.js b/client/src/components/LoginFormComp.js index b3d28f4..377b793 100644 --- a/client/src/components/LoginFormComp.js +++ b/client/src/components/LoginFormComp.js @@ -1,6 +1,7 @@ import React, { Component } from "react"; import axios from "axios"; import Facebook from "./Facebook"; +import authService from "./services/AuthServices"; class LoginFormComp extends Component { constructor(props) { @@ -20,6 +21,7 @@ class LoginFormComp extends Component { .post("/api/auth/login", this.state) .then(res => { console.log(res); + authService.setAuthDetail(res.data) sessionStorage.setItem( "user", JSON.stringify({ jwtToken: res.data.token, userId: res.data.userId, name:res.data.name }) diff --git a/client/src/components/services/AuthServices.js b/client/src/components/services/AuthServices.js new file mode 100644 index 0000000..8e6bee4 --- /dev/null +++ b/client/src/components/services/AuthServices.js @@ -0,0 +1,12 @@ + +class AuthService { + + setAuthDetail(data) { + sessionStorage.setItem('token', data.token); + sessionStorage.setItem('id', data.user.id); + sessionStorage.setItem('name',data.user.username) + } + +} +const authService = new AuthService(); +export default authService; \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 14de017..9d9530b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -709,9 +709,9 @@ } }, "lodash": { - "version": "4.17.11", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", - "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==" + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" }, "lodash.includes": { "version": "4.3.0", From 71086f2d5b3d29dc661eec806f2b6e03aeaec1d1 Mon Sep 17 00:00:00 2001 From: Piranavan Shanmugavadivelu Date: Tue, 1 Oct 2019 21:07:16 +0530 Subject: [PATCH 2/4] get AuthToken Added --- client/src/components/services/AuthServices.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/client/src/components/services/AuthServices.js b/client/src/components/services/AuthServices.js index 8e6bee4..10cfa7f 100644 --- a/client/src/components/services/AuthServices.js +++ b/client/src/components/services/AuthServices.js @@ -6,7 +6,10 @@ class AuthService { sessionStorage.setItem('id', data.user.id); sessionStorage.setItem('name',data.user.username) } - + getAuthToken() { + const token = sessionStorage.getItem('token'); + return token; + } } const authService = new AuthService(); export default authService; \ No newline at end of file From f52c56509e8b2adf375f386cafb10821b5cd43b6 Mon Sep 17 00:00:00 2001 From: Piranavan Shanmugavadivelu Date: Tue, 1 Oct 2019 21:25:37 +0530 Subject: [PATCH 3/4] get Logged user details --- client/src/components/services/AuthServices.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/client/src/components/services/AuthServices.js b/client/src/components/services/AuthServices.js index 10cfa7f..83ff044 100644 --- a/client/src/components/services/AuthServices.js +++ b/client/src/components/services/AuthServices.js @@ -10,6 +10,11 @@ class AuthService { const token = sessionStorage.getItem('token'); return token; } + getLoggedUser(){ + const id = sessionStorage.getItem('id'); + const name = sessionStorage.getItem('name'); + return {Id:id,Name:name}; + } } const authService = new AuthService(); export default authService; \ No newline at end of file From 881a1e3bcf6c466eccb67f67cfd6f20fea7160af Mon Sep 17 00:00:00 2001 From: Piranavan Shanmugavadivelu Date: Fri, 11 Oct 2019 22:22:51 +0530 Subject: [PATCH 4/4] bind edited as arrow function --- client/src/components/LoginFormComp.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/client/src/components/LoginFormComp.js b/client/src/components/LoginFormComp.js index 377b793..fe0be15 100644 --- a/client/src/components/LoginFormComp.js +++ b/client/src/components/LoginFormComp.js @@ -7,15 +7,13 @@ class LoginFormComp extends Component { constructor(props) { super(props); this.state = {}; - this.onValuChange = this.onValuChange.bind(this); - this.onSubmit = this.onSubmit.bind(this); } - onValuChange(e) { + onValuChange=(e)=> { this.setState({ [e.target.name]: e.target.value }); } - onSubmit(e) { + onSubmit=(e)=> { e.preventDefault(); axios .post("/api/auth/login", this.state)