From 9e4c86b8d9f323ee732af0cdba0bcae39af0b4ec Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 7 Sep 2018 11:38:00 +0200 Subject: [PATCH] Auth Id grabbing record from database --- client/src/components/LoggedInUser.js | 8 ++++++-- .../src/components/Material-UI/ButtonAppBar.js | 1 - server/schema/schema.js | 17 +++++++++++------ 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/client/src/components/LoggedInUser.js b/client/src/components/LoggedInUser.js index bf718f60c..120c62583 100644 --- a/client/src/components/LoggedInUser.js +++ b/client/src/components/LoggedInUser.js @@ -8,8 +8,12 @@ class LoggedInUser extends Component { displayLoggedInUser(){ const user = this.props.data.userByAuthId; + + console.log(this.props); - + console.log(this.props.data); + console.log(this.props.data.userByAuthId); + if(user){ if (user.firstName) { return( @@ -45,7 +49,7 @@ export default graphql(getUserByAuthIdQuery, { // What follows is the way to pas options: (props) => { return { variables: { - id: props.authId + authId: props.authId } } } diff --git a/client/src/components/Material-UI/ButtonAppBar.js b/client/src/components/Material-UI/ButtonAppBar.js index da37c5338..d0c9f0cd3 100644 --- a/client/src/components/Material-UI/ButtonAppBar.js +++ b/client/src/components/Material-UI/ButtonAppBar.js @@ -55,7 +55,6 @@ class ButtonAppBar extends Component { let user = JSON.parse(getUser) const authId = user.sub; - console.log(authId); this.setState({ authId: authId }); } diff --git a/server/schema/schema.js b/server/schema/schema.js index 86cca4ed9..aaa1f93bb 100644 --- a/server/schema/schema.js +++ b/server/schema/schema.js @@ -75,17 +75,22 @@ const RootQuery = new GraphQLObjectType({ // Code to get data from data source. return new Promise((resolve, reject) => { + + console.log('args.authId'); + console.log(args.authId); User.findOne({authId: args.authId}, (err, user) => { if(err) reject(err); else{ + console.log('user.authId'); + console.log(user.authId); + if (user.authId === args.authId && user.authId !== undefined) { - console.log(user ); - console.log(user.authId ); - console.log(args.authId ); + console.log(user); + console.log(user); return resolve(user); - } else { - return null; - } + } else { + return null; + } } }) })