From 98da328b4752af6abbb06fe8cf2aacbe60c8aedb Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 3 Oct 2018 13:06:33 +0200 Subject: [PATCH 1/3] Login by Auth0 email implemented --- client/src/components/LoggedInUser.js | 5 ++++- client/src/components/LoggedInUserMenu.js | 21 ++++++++++++++++++++- client/src/img/email.png | Bin 0 -> 472 bytes server/schema/schema.js | 5 ++++- 4 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 client/src/img/email.png diff --git a/client/src/components/LoggedInUser.js b/client/src/components/LoggedInUser.js index 8c06db481..656b66927 100644 --- a/client/src/components/LoggedInUser.js +++ b/client/src/components/LoggedInUser.js @@ -30,9 +30,12 @@ class LoggedInUser extends Component { user.lastName !== '' ) { displayName = user.firstName + ' ' + user.lastName } + let authArray = this.props.authId.split('|') + let identityProvider = authArray[0] + return (
-

+

) } else { diff --git a/client/src/components/LoggedInUserMenu.js b/client/src/components/LoggedInUserMenu.js index 0f5032229..692af39ff 100644 --- a/client/src/components/LoggedInUserMenu.js +++ b/client/src/components/LoggedInUserMenu.js @@ -13,6 +13,7 @@ import MenuItem from '@material-ui/core/MenuItem' // Images import GithubLogo from '../img/github-head-negative.png' +import EmailIcon from '../img/email.png' import ProfileIcon from '@material-ui/icons/Person' import LogoutIcon from '@material-ui/icons/DirectionsWalk' @@ -39,6 +40,24 @@ class LoggedInUserMenu extends Component { } } + displayIdentityProvider () { + const { classes } = this.props + switch (this.props.identityProvider) { + case 'github': + return ( + Github + ) + break + case 'auth0': + return ( + Auth0 + ) + break + default: + + } + } + render () { const { classes } = this.props return ( @@ -59,7 +78,7 @@ class LoggedInUserMenu extends Component { }} color='inherit' > - Github + {this.displayIdentityProvider()} {this.props.menuLabel} diff --git a/client/src/img/email.png b/client/src/img/email.png new file mode 100644 index 0000000000000000000000000000000000000000..93b2edf0c9a4514dc08a87c9479df944e63f57da GIT binary patch literal 472 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8JTQDqT?Ea~4hLa$s}7S8+4*Lu22@77hk5t%xkR-b*V*&V*@++H;GUd02ENZ$_T z2?Ea3rp{1xmX>5W+ad6%h4XgMiMH%24nafi=0A;}na}JgQRM#;xa+I;rA1#`S2w(L zyfEFk_<8;MU~!fSMw|A{xZ$;Uuk1B8Mw{9GEju1)7IevJESdZH@bZX;PXa5e3dNlY zUH4B8;r=pt&i|f2L9#FS9U`-xo;AxwH!qtezOlsFEjU%>XU+A$ZvPZt2n*_N`LOTw zEN5VFsg}4#l%yn*gQu&X%Q~loCIGF^vP1v? literal 0 HcmV?d00001 diff --git a/server/schema/schema.js b/server/schema/schema.js index b85a5b5a6..1ef24b2ae 100644 --- a/server/schema/schema.js +++ b/server/schema/schema.js @@ -425,7 +425,10 @@ function authenticate (encodedToken, callBackFunction) { let authArray = authId.split('|') let socialAccountProvider = authArray[0] - if (socialAccountProvider !== 'github') { + if ( + socialAccountProvider !== 'github' && + socialAccountProvider !== 'auth0' + ) { if (global.ERROR_LOG === true) { console.log('[ERROR] ' + MODULE_NAME + ' -> authenticate -> onValidated -> onUserFound -> Social Account Provider not Supoorted. ') } if (global.ERROR_LOG === true) { console.log('[ERROR] ' + MODULE_NAME + ' -> authenticate -> onValidated -> onUserFound -> socialAccountProvider = ' + socialAccountProvider) } From c0a4ead100cda608f2c68e9ee8d951c1ed9c38b4 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 3 Oct 2018 13:24:34 +0200 Subject: [PATCH 2/3] Auth0 Provider integrated at profile sheet --- client/src/components/ProfileSheet.js | 33 +++++++++++++++++++++++--- client/src/img/auth0-logo.png | Bin 0 -> 7493 bytes 2 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 client/src/img/auth0-logo.png diff --git a/client/src/components/ProfileSheet.js b/client/src/components/ProfileSheet.js index 20510a91b..f0f42299a 100644 --- a/client/src/components/ProfileSheet.js +++ b/client/src/components/ProfileSheet.js @@ -22,6 +22,7 @@ import Typography from '@material-ui/core/Typography' // Images import GithubLogo from '../img/github-logo.png' +import Auth0Logo from '../img/auth0-logo.png' import AALogo from '../img/aa-logo.png' const styles = theme => ({ @@ -240,13 +241,16 @@ class ProfileSheet extends Component { componentWillMount () { if (this.defaultValuesSet === false) { + let authUserData = localStorage.getItem('authUser') let userData = localStorage.getItem('loggedInUser') - if (userData === 'undefined') { return } + if (userData === 'undefined' || authUserData === 'undefined') { return } let user = JSON.parse(userData) this.defaultValuesSet = true + let authUser = JSON.parse(authUserData) + /* To avoid console warning, we need to take care of the fields that are null. */ if (user.firstName === null) { user.firstName = '' } @@ -268,11 +272,34 @@ class ProfileSheet extends Component { isDeveloper: user.isDeveloper, isTrader: user.isTrader, isDataAnalyst: user.isDataAnalyst, - roleId: user.role.id + roleId: user.role.id, + authId: authUser.authId }) } } + displayIdentityProvider () { + const { classes } = this.props + + let authArray = this.state.authId.split('|') + let identityProvider = authArray[0] + + switch (identityProvider) { + case 'github': + return ( + Github + ) + break + case 'auth0': + return ( + Auth0 + ) + break + default: + + } + } + render () { const { classes } = this.props return ( @@ -288,7 +315,7 @@ class ProfileSheet extends Component { - Github + {this.displayIdentityProvider()} diff --git a/client/src/img/auth0-logo.png b/client/src/img/auth0-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..ba4c727240894f69ff5b506f7065e0b2520a1609 GIT binary patch literal 7493 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 literal 0 HcmV?d00001 From 8b2dc0b52e945373dc16e2f8c4c6af21b962682d Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 3 Oct 2018 14:01:02 +0200 Subject: [PATCH 3/3] Login BUG fixed, both Github and Auth0 logins working well. --- client/src/auth/Auth.js | 5 +++- client/src/components/Home.js | 12 +------- client/src/components/NavBar.js | 15 ++-------- client/src/components/ProfileSheet.js | 41 ++++++++++++++------------- client/src/views/footer/index.js | 30 +++++++++++++------- 5 files changed, 48 insertions(+), 55 deletions(-) diff --git a/client/src/auth/Auth.js b/client/src/auth/Auth.js index 44488c4ef..4a62b8251 100644 --- a/client/src/auth/Auth.js +++ b/client/src/auth/Auth.js @@ -101,8 +101,9 @@ class Auth { this.signinOrCreateAccount({ ...data }) this.cb(data) - console.log(authResult.idTokenPayload) + console.log('idTokenPayload', authResult.idTokenPayload) setItem('authUser', JSON.stringify(authResult.idTokenPayload)) + setItem('authId', authResult.idTokenPayload.sub) if (window.location.href.includes(`callback`)) { window.location.href = '/' } @@ -127,6 +128,7 @@ class Auth { console.log('signinOrCreateAccount auth: ', await data) setItem('authUser', JSON.stringify(data.data.authenticate)) + setItem('authId', data.data.authenticate.authId) if (window.location.href.includes(`callback`)) { window.location.href = '/' } else { @@ -169,6 +171,7 @@ class Auth { .then(result => { console.log('handleAuth.checksessions: ', result) setItem('authUser', result.idTokenPayload.sub) + setItem('authId', result.idTokenPayload.sub) // user confirmed, log into client this.setSession(result) return result.idTokenPayload diff --git a/client/src/components/Home.js b/client/src/components/Home.js index 71dfc717b..9d3e35e6e 100644 --- a/client/src/components/Home.js +++ b/client/src/components/Home.js @@ -90,17 +90,7 @@ class Home extends Component { Currently you can use the Browse section to list all registered users. At the Search page you can searh for users by name. Clicking on View Profile you can see some more info about that user. You can signup with your Github account and manage your profile information while logged in. While loggedin, you can edit your profile info, define your referrer and view your descendants. You will find all features under develpment with a dialog indicating it is not ready. - - What is next? - - - The major features for the 3rd sprint are: - -
    -
  • 1. Managing profile images.
    • -
  • 2. Making sure that Auth0 integration server side is working well.
    • -
  • 3. Making sure that mutations can not be impersonated.
    • -
+ diff --git a/client/src/components/NavBar.js b/client/src/components/NavBar.js index 1853c20c2..ebd5ae5dd 100644 --- a/client/src/components/NavBar.js +++ b/client/src/components/NavBar.js @@ -56,20 +56,9 @@ class NavBar extends Component { } componentDidMount () { - const userStored = localStorage.getItem('authUser') - - if (userStored !== null && userStored !== undefined && userStored !== 'undefined') { - const user = JSON.parse(userStored) - - /* For some reason, the result of GraphQL some times varies, that is why I had to do the following hack. */ - - let authId - if (user.authId === undefined) { - authId = user.sub - } else { - authId = user.authId - } + const authId = localStorage.getItem('authId') + if (authId !== null && authId !== undefined && authId !== 'undefined') { this.setState({ authId: authId }) } } diff --git a/client/src/components/ProfileSheet.js b/client/src/components/ProfileSheet.js index f0f42299a..3e4b99539 100644 --- a/client/src/components/ProfileSheet.js +++ b/client/src/components/ProfileSheet.js @@ -241,16 +241,14 @@ class ProfileSheet extends Component { componentWillMount () { if (this.defaultValuesSet === false) { - let authUserData = localStorage.getItem('authUser') + let authId = localStorage.getItem('authId') let userData = localStorage.getItem('loggedInUser') - if (userData === 'undefined' || authUserData === 'undefined') { return } + if (userData === 'undefined') { return } let user = JSON.parse(userData) this.defaultValuesSet = true - let authUser = JSON.parse(authUserData) - /* To avoid console warning, we need to take care of the fields that are null. */ if (user.firstName === null) { user.firstName = '' } @@ -273,30 +271,33 @@ class ProfileSheet extends Component { isTrader: user.isTrader, isDataAnalyst: user.isDataAnalyst, roleId: user.role.id, - authId: authUser.authId + authId: authId }) } } displayIdentityProvider () { const { classes } = this.props + let authId = this.state.authId + console.log('state', this.state) + if (authId !== undefined) { + let authArray = this.state.authId.split('|') + let identityProvider = authArray[0] - let authArray = this.state.authId.split('|') - let identityProvider = authArray[0] - - switch (identityProvider) { - case 'github': - return ( - Github - ) - break - case 'auth0': - return ( - Auth0 - ) - break - default: + switch (identityProvider) { + case 'github': + return ( + Github + ) + break + case 'auth0': + return ( + Auth0 + ) + break + default: + } } } diff --git a/client/src/views/footer/index.js b/client/src/views/footer/index.js index 94fb59e20..dc9fd728f 100644 --- a/client/src/views/footer/index.js +++ b/client/src/views/footer/index.js @@ -58,7 +58,17 @@ const Footer = ({ classes }) => { - Users + Browse + + + + + Search + + + + + Contact @@ -68,15 +78,11 @@ const Footer = ({ classes }) => { - - + + Support - + { Documentation - + Telegram - +