Auth0 client integration ready

This commit is contained in:
Luis Fernando Molina committed 2018-09-06 20:34:06 +02:00
1 parent 3f9423e91d
commit eca2e6deff
12 files changed
+614 -10

No files matched your search

+1 -1
View File
@@ -1,4 +1,4 @@
client/node_modules/*
server/node_modules/*
client/src/auth/auth0.js
+230 -2
View File
@@ -465,6 +465,14 @@
"zen-observable-ts": "0.8.9"
}
},
"apollo-link-context": {
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/apollo-link-context/-/apollo-link-context-1.0.8.tgz",
"integrity": "sha512-wgDwBbWqHblf7W0DD2b80kXLtSAfvbXnsxSrli0GuF77VwxjLChijiHinW5bjurzZvP8YRMNhitmrrF5ia7NsA==",
"requires": {
"apollo-link": "1.2.2"
}
},
"apollo-link-dedup": {
"version": "1.0.9",
"resolved": "https://registry.npmjs.org/apollo-link-dedup/-/apollo-link-dedup-1.0.9.tgz",
@@ -704,6 +712,120 @@
"resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
"integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="
},
"auth0-js": {
"version": "9.7.3",
"resolved": "https://registry.npmjs.org/auth0-js/-/auth0-js-9.7.3.tgz",
"integrity": "sha512-iZAqoN4EbsNCS/3VkFPNb4glTyj8hq57T7gcUF+XH8Rua7hBTUzpb101K9zqcdUIBilIdF9XBLCTJ4JGgZ/oFA==",
"requires": {
"base64-js": "1.3.0",
"idtoken-verifier": "1.2.0",
"js-cookie": "2.2.0",
"qs": "6.5.2",
"superagent": "3.8.3",
"url-join": "1.1.0",
"winchan": "0.2.0"
}
},
"auth0-lock": {
"version": "11.9.0",
"resolved": "https://registry.npmjs.org/auth0-lock/-/auth0-lock-11.9.0.tgz",
"integrity": "sha512-t+YlMHOJPtfhK7DWO2oEevfb8A1+BiB6bhBlqMbsLa6ayz5YOfRd+Dtr0YRP5nvmCE4rRYyNE2ZG39A4rH4/WQ==",
"requires": {
"auth0-js": "9.7.3",
"auth0-password-policies": "github:auth0/auth0-password-policies#0b3da9b369b122a8b294d496143abfd33311e6b2",
"blueimp-md5": "2.3.1",
"fbjs": "0.3.2",
"immutable": "3.8.2",
"jsonp": "0.2.1",
"password-sheriff": "1.1.0",
"prop-types": "15.6.2",
"react": "15.6.2",
"react-dom": "15.6.2",
"react-transition-group": "2.4.0",
"trim": "0.0.1",
"url-join": "1.1.0"
},
"dependencies": {
"fbjs": {
"version": "0.3.2",
"resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.3.2.tgz",
"integrity": "sha1-AzpUBZUIS13jUJpAXQbxoqjlufs=",
"requires": {
"core-js": "1.2.7",
"loose-envify": "1.4.0",
"promise": "7.3.1",
"ua-parser-js": "0.7.18",
"whatwg-fetch": "0.9.0"
}
},
"react": {
"version": "15.6.2",
"resolved": "https://registry.npmjs.org/react/-/react-15.6.2.tgz",
"integrity": "sha1-26BDSrQ5z+gvEI8PURZjkIF5qnI=",
"requires": {
"create-react-class": "15.6.3",
"fbjs": "0.8.17",
"loose-envify": "1.4.0",
"object-assign": "4.1.1",
"prop-types": "15.6.2"
},
"dependencies": {
"fbjs": {
"version": "0.8.17",
"resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz",
"integrity": "sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=",
"requires": {
"core-js": "1.2.7",
"isomorphic-fetch": "2.2.1",
"loose-envify": "1.4.0",
"object-assign": "4.1.1",
"promise": "7.3.1",
"setimmediate": "1.0.5",
"ua-parser-js": "0.7.18"
}
}
}
},
"react-dom": {
"version": "15.6.2",
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-15.6.2.tgz",
"integrity": "sha1-Qc+t9pO3V/rycIRDodH9WgK+9zA=",
"requires": {
"fbjs": "0.8.17",
"loose-envify": "1.4.0",
"object-assign": "4.1.1",
"prop-types": "15.6.2"
},
"dependencies": {
"fbjs": {
"version": "0.8.17",
"resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz",
"integrity": "sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=",
"requires": {
"core-js": "1.2.7",
"isomorphic-fetch": "2.2.1",
"loose-envify": "1.4.0",
"object-assign": "4.1.1",
"promise": "7.3.1",
"setimmediate": "1.0.5",
"ua-parser-js": "0.7.18"
}
}
}
},
"whatwg-fetch": {
"version": "0.9.0",
"resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-0.9.0.tgz",
"integrity": "sha1-DjaExsuZlbQ+/J3wPkw2XZX9nMA="
}
}
},
"auth0-password-policies": {
"version": "github:auth0/auth0-password-policies#0b3da9b369b122a8b294d496143abfd33311e6b2",
"requires": {
"password-sheriff": "1.1.0"
}
},
"autoprefixer": {
"version": "7.1.6",
"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.1.6.tgz",
@@ -1651,6 +1773,11 @@
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
"integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="
},
"blueimp-md5": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.3.1.tgz",
"integrity": "sha1-mSpnN3M7naHt1kFVDcOsqy6c/Fo="
},
"bn.js": {
"version": "4.11.8",
"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
@@ -2678,6 +2805,11 @@
"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
"integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
},
"cookiejar": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz",
"integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA=="
},
"copy-descriptor": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
@@ -2764,6 +2896,16 @@
"sha.js": "2.4.11"
}
},
"create-react-class": {
"version": "15.6.3",
"resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.6.3.tgz",
"integrity": "sha512-M+/3Q6E6DLO6Yx3OwrWjwHBnvfXXYA7W+dFjt/ZDBemHO1DDZhsalX/NUtnTYclN6GfnBDRh4qRHjcDHmlJBJg==",
"requires": {
"fbjs": "0.8.17",
"loose-envify": "1.4.0",
"object-assign": "4.1.1"
}
},
"cross-spawn": {
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
@@ -2792,6 +2934,11 @@
"randomfill": "1.0.4"
}
},
"crypto-js": {
"version": "3.1.9-1",
"resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.9-1.tgz",
"integrity": "sha1-/aGedh/Ad+Af+/3G6f38WeiAbNg="
},
"crypto-random-string": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
@@ -4337,6 +4484,11 @@
"mime-types": "2.1.20"
}
},
"formidable": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz",
"integrity": "sha512-Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg=="
},
"forwarded": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
@@ -5454,6 +5606,18 @@
"postcss": "6.0.23"
}
},
"idtoken-verifier": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/idtoken-verifier/-/idtoken-verifier-1.2.0.tgz",
"integrity": "sha512-8jmmFHwdPz8L73zGNAXHHOV9yXNC+Z0TUBN5rafpoaFaLFltlIFr1JkQa3FYAETP23eSsulVw0sBiwrE8jqbUg==",
"requires": {
"base64-js": "1.3.0",
"crypto-js": "3.1.9-1",
"jsbn": "0.1.1",
"superagent": "3.8.3",
"url-join": "1.1.0"
}
},
"ieee754": {
"version": "1.1.12",
"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz",
@@ -5464,6 +5628,11 @@
"resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
"integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug=="
},
"immutable": {
"version": "3.8.2",
"resolved": "https://registry.npmjs.org/immutable/-/immutable-3.8.2.tgz",
"integrity": "sha1-wkOZUUVbs5kT2vKBN28VMOEErfM="
},
"import-lazy": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
@@ -6345,6 +6514,11 @@
"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.9.tgz",
"integrity": "sha512-xcinL3AuDJk7VSzsHgb9DvvIXayBbadtMZ4HFPx8rUszbW1MuNMlwYVC4zzCZ6e1sqZpnNS5ZFYOhXqA39T7LQ=="
},
"js-cookie": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-2.2.0.tgz",
"integrity": "sha1-Gywnmm7s44ChIWi5JIUmWzWx7/s="
},
"js-tokens": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -6362,8 +6536,7 @@
"jsbn": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
"optional": true
"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
},
"jsdom": {
"version": "9.12.0",
@@ -6459,6 +6632,14 @@
"resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
"integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
},
"jsonp": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/jsonp/-/jsonp-0.2.1.tgz",
"integrity": "sha1-pltPoPEL2nGaBUQep7lMVfPhW64=",
"requires": {
"debug": "2.6.9"
}
},
"jsprim": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
@@ -7684,6 +7865,11 @@
"resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
"integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
},
"password-sheriff": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/password-sheriff/-/password-sheriff-1.1.0.tgz",
"integrity": "sha1-/bPD2EWgo8kt5CKyrZNGzginFBM="
},
"path-browserify": {
"version": "0.0.0",
"resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
@@ -10503,6 +10689,33 @@
"schema-utils": "0.3.0"
}
},
"superagent": {
"version": "3.8.3",
"resolved": "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz",
"integrity": "sha512-GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA==",
"requires": {
"component-emitter": "1.2.1",
"cookiejar": "2.1.2",
"debug": "3.1.0",
"extend": "3.0.2",
"form-data": "2.3.2",
"formidable": "1.2.1",
"methods": "1.1.2",
"mime": "1.6.0",
"qs": "6.5.2",
"readable-stream": "2.3.6"
},
"dependencies": {
"debug": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
"requires": {
"ms": "2.0.0"
}
}
}
},
"supports-color": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -10777,6 +10990,11 @@
"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
"integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
},
"trim": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz",
"integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0="
},
"trim-newlines": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
@@ -11065,6 +11283,11 @@
}
}
},
"url-join": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/url-join/-/url-join-1.1.0.tgz",
"integrity": "sha1-dBxsL0WWxIMNZxhGCSDQySIC3Hg="
},
"url-loader": {
"version": "0.6.2",
"resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.6.2.tgz",
@@ -11750,6 +11973,11 @@
"string-width": "2.1.1"
}
},
"winchan": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/winchan/-/winchan-0.2.0.tgz",
"integrity": "sha1-OGMCjn+XSw2hQS8oQXukJJcqvZQ="
},
"window-size": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
+4
View File
@@ -6,6 +6,10 @@
"@material-ui/core": "^3.0.2",
"@material-ui/icons": "^3.0.1",
"apollo-boost": "^0.1.15",
"apollo-link": "^1.2.2",
"apollo-link-context": "^1.0.8",
"apollo-link-http": "^1.5.4",
"auth0-lock": "^11.9.0",
"graphql": "^14.0.0",
"react": "^16.4.2",
"react-apollo": "^2.1.11",
+32 -1
View File
@@ -1,6 +1,9 @@
import React, { Component } from 'react';
import ApolloClient from 'apollo-boost';
import {ApolloProvider} from 'react-apollo';
import { ApolloLink } from 'apollo-link';
import { HttpLink } from 'apollo-link-http'
import { setContext } from 'apollo-link-context';
import { Route, BrowserRouter, Switch } from 'react-router-dom'
@@ -16,13 +19,37 @@ import About from './components/About'
import Contact from './components/Contact'
import Post from './components/Post'
import Footer from './components/Footer'
import Callback from './components/Callback'
import Auth from './auth/index'
/*
const httpLink = new HttpLink({ uri: 'http://localhost:4000/graphql', changeOrigin: true })
// Apollo Client Setup
const client = new ApolloClient({
const authLink = setContext((_, { headers }) => {
// get the authentication token from local storage if it exists
const token = localStorage.getItem('access_token')
// return the headers to the context so httpLink can read them
return {
headers: {
...headers,
Authorization: token ? `Bearer ${token}` : ``
}
}
})
export const client = new ApolloClient({
link: httpLink
})
*/
export const client = new ApolloClient({
uri:'http://localhost:4000/graphql'
})
export const auth = new Auth(result => console.log('auth result', result), client);
class App extends Component {
render() {
@@ -40,6 +67,10 @@ class App extends Component {
<Route path='/about' component={About} />
<Route path='/contact' component={Contact} />
<Route path='/:post_id' component={Post} />
<Route path='/callback' render={(props) => {
auth.handleAuthentication(props)
return <Callback {...props} />
}}/>
</Switch>
<Footer/>
</div>
+211
View File
@@ -0,0 +1,211 @@
import Auth0Lock from 'auth0-lock'
import gql from 'graphql-tag'
import { getItem, setItem, removeItem } from './local-storage'
import { validObject, deleteCookie } from './js-helpers'
import { client } from '../App'
import { AUTH_CONFIG } from './Auth0'
console.log(process.env.AUTH0_CLIENTID)
const AUTHENTICATE = gql`
mutation authenticate($idToken: String!) {
authenticate(idToken: $idToken) {
id
nickname
auth0id
profile {
email
avatar
}
}
}
`
const lock = new Auth0Lock(AUTH_CONFIG.clientId, AUTH_CONFIG.domain, {
oidcConformant: true,
autoclose: true,
auth: {
sso: true,
redirectUrl: window.location.origin + '/callback',
responseType: 'token id_token',
audience: `${AUTH_CONFIG.api_audience}`,
params: {
scope: `openid profile email user_metadata app_metadata picture`
}
}
})
class Auth {
constructor (cb, apolloClient) {
this.handleAuthentication()
// binds functions to keep this context
this.apolloClient = apolloClient
this.cb = cb.bind(this)
this.login = this.login.bind(this)
this.logout = this.logout.bind(this)
this.isAuthenticated = this.isAuthenticated.bind(this)
this.checkSession = this.checkSession.bind(this)
}
login () {
// Call the show method to display the widget.
lock.show()
}
handleAuthentication () {
// Add a callback for Lock's `authenticated` event
lock.on('authenticated', this.setSession.bind(this))
// Add a callback for Lock's `authorization_error` event
lock.on('authorization_error', err => {
console.log(err)
const data = { status: `error`, errMessage: err.error }
this.cb(data)
})
}
checkSession () {
return new Promise((resolve, reject) => {
// Add a callback for Lock's `authenticated` event
lock.checkSession(
{
responseType: 'token id_token',
audience: AUTH_CONFIG.api_audience,
scope:
'openid email profile read:teams write:teams read:member write:member',
connection: 'github',
prompt: 'none'
},
function (err, authResult) {
if (!err) {
resolve(authResult)
} else {
reject(err)
}
}
)
})
}
setSession (authResult) {
console.log('setSession')
if (authResult && authResult.accessToken && authResult.idToken) {
// Set the time that the access token will expire at
let expiresAt = JSON.stringify(
authResult.expiresIn * 1000 + new Date().getTime()
)
setItem('access_token', authResult.accessToken)
setItem('id_token', authResult.idToken)
setItem('expires_at', expiresAt)
const data = {
status: `success`,
accessToken: authResult.accessToken,
idToken: authResult.idToken,
expiresAt
}
console.log('setSession idTokenPayload: ', authResult.idTokenPayload)
this.signinOrCreateAccount({ ...data })
this.cb(data)
console.log(authResult.idTokenPayload)
setItem('user', JSON.stringify(authResult.idTokenPayload))
if (window.location.href.includes(`callback`)) {
window.location.href = '/'
}
return true
}
}
async signinOrCreateAccount ({ accessToken, idToken, expiresAt }) {
console.log(
'signinOrCreateAccount: ',
client,
this.apolloClient,
accessToken,
idToken,
expiresAt
)
try {
const data = await client.mutate({
mutation: AUTHENTICATE,
variables: { idToken }
})
console.log('signinOrCreateAccount auth: ', await data)
setItem('user', data.data.authenticate.auth0id)
if (window.location.href.includes(`callback`)) {
window.location.href = '/'
} else {
window.location.reload()
}
return data
} catch (err) {
return console.log('Sign in or create account error: ', err)
}
}
logout () {
// Clear access token and ID token from local storage
removeItem('access_token')
removeItem('id_token')
removeItem('expires_at')
removeItem('user')
removeItem('auth0.ssodata')
window.localStorage.clear()
deleteCookie('ajs_anonymous_id')
deleteCookie('ajs_user_id')
deleteCookie('current_tenant')
lock.logout({ returnTo: AUTH_CONFIG.logoutUrl })
console.log('logout')
}
async isAuthenticated () {
// check session and run Auth0 SS0
const getUser = await getItem('user')
let user = JSON.parse(getUser)
if (validObject(user, 'exp') && new Date().getTime() < (user.exp * 1000)) {
console.log('handleAuth.user exp: ', user, window.location.href)
return user
}
const checkSSO = await this.checkSession()
.then(result => {
console.log('handleAuth.checksessions: ', result)
setItem('user', result.idTokenPayload.sub)
// user confirmed, log into client
this.setSession(result)
return result.idTokenPayload
})
.catch(err => {
console.log('handleAuth.checksessions err: ', err)
if (err.error === 'login_required') {
// return this.login()
}
return err
})
if (
(window.location.href.includes(`manage`) ||
window.location.href.includes(`profile`)) &&
!user
) {
window.location.href = '/'
}
if (/manage|profile|create|dashboard/.test(window.location.href) && !user) {
this.login()
}
console.log('handleAuth.isAuthenticated 2: ', checkSSO, user)
if (validObject(checkSSO, 'error')) {
return false
} else {
return checkSSO
}
}
}
export default Auth
+60
View File
@@ -0,0 +1,60 @@
export function isDefined (d) {
return d !== null && typeof d !== 'undefined'
}
export function isNotDefined (d) {
return !isDefined(d)
}
export const isArray = Array.isArray
export function isObject (d) {
return isDefined(d) && typeof d === 'object' && !Array.isArray(d)
}
export function isEmpty (obj) {
for (var key in obj) {
if (obj.hasOwnProperty(key)) return false
}
return true
}
export function validObject (object, ...keys) {
return keys.reduce((a, b) => (a || { })[b], object) !== undefined
}
export function mergeDeep (target, ...sources) {
if (!sources.length) return target
const source = sources.shift()
if (isObject(target) && isObject(source)) {
for (const key in source) {
if (isObject(source[key])) {
if (!target[key]) Object.assign(target, { [key]: {} })
mergeDeep(target[key], source[key])
} else {
Object.assign(target, { [key]: source[key] })
}
}
}
return mergeDeep(target, ...sources)
}
export function deleteCookie (c) {
document.cookie.split(';').forEach(function (c) { document.cookie = c.replace(/^ +/, '').replace(/=.*/, '=;expires=' + new Date().toUTCString() + ';path=/') })
}
export function slugify (string) {
const a = 'àáäâãåèéëêìíïîòóöôùúüûñçßÿœæŕśńṕẃǵǹḿǘẍźḧ·/_,:;'
const b = 'aaaaaaeeeeiiiioooouuuuncsyoarsnpwgnmuxzh------'
const p = new RegExp(a.split('').join('|'), 'g')
return string.toString().toLowerCase()
.replace(/\s+/g, '-') // Replace spaces with -
.replace(p, c => b.charAt(a.indexOf(c))) // Replace special characters
.replace(/&/g, '-and-') // Replace & with 'and'
.replace(/[^\w-]+/g, '') // Remove all non-word characters
.replace(/--+/g, '-') // Replace multiple - with single -
.replace(/^-+/, '') // Trim - from start of text
.replace(/-+$/, '') // Trim - from end of text
}
+35
View File
@@ -0,0 +1,35 @@
const getStateFromStorage = version => {
const localState = JSON.parse(window.localStorage.getItem('aa-team'))
try {
if (localState !== undefined && localState !== null) {
if (
localState.appVersion !== undefined &&
localState.appVersion !== null
) {
if (localState.appVersion === version) {
return localState
}
}
} else {
throw new Error()
}
} catch (error) {
return false
}
}
const storeStateInStorage = state =>
window.localStorage.setItem('aa-team', JSON.stringify(state))
const getItem = async name => window.localStorage.getItem(name)
const setItem = async (name, value) => window.localStorage.setItem(name, value)
const removeItem = async name => window.localStorage.removeItem(name)
export {
getStateFromStorage,
storeStateInStorage,
getItem,
setItem,
removeItem
}
+13
View File
@@ -0,0 +1,13 @@
import React, { Component } from 'react'
class Callback extends Component {
render() {
return (
<div>
Authenticating...
</div>
)
}
}
export default Callback
+4 -2
View File
@@ -1,13 +1,14 @@
import React, { Component } from 'react';
import {graphql} from 'react-apollo';
import {getUserByAuthIdQuery} from '../queries/queries';
import {auth} from '../App';
class LoggedInUser extends Component {
displayLoggedInUser(){
const user = this.props.data.userByAuthId;
console.log(this.props);
if(user){
if (user.firstName) {
return(
@@ -24,7 +25,8 @@ class LoggedInUser extends Component {
}
} else {
return( <div>Login / Sign up</div> );
console.log(auth);
return( <div onClick={() => auth.login()}>Login / Sign up</div> );
}
}
@@ -62,7 +62,7 @@ function ButtonAppBar(props) {
<IconButton className={classes.menuButton} color="inherit" title="About this Module" component={AboutLink}><AboutIcon /></IconButton>
<IconButton className={classes.menuButton} color="inherit" title="Go to another Module" component={AboutLink}><ModulesIcon /></IconButton>
<LoggedInUser authId="2"/>
<LoggedInUser authId="999"/>
</Toolbar>
</AppBar>
</div>
@@ -37,6 +37,7 @@ const styles = theme => ({
class ProfileTabs extends React.Component {
state = {
value: 0,
cureateDisabled: "false"
};
handleChange = (event, value) => {
@@ -44,12 +45,14 @@ class ProfileTabs extends React.Component {
};
updateUser = () => {
this.setState({ value: 1 });
this.setState({ value: 1, cureateDisabled: "true" });
};
render() {
const { classes } = this.props;
const { value } = this.state;
const { createDisabled } = this.state;
console.log(createDisabled);
return (
<div className={classes.root}>
@@ -62,7 +65,8 @@ class ProfileTabs extends React.Component {
indicatorColor="primary"
textColor="primary"
>
<Tab label="Create Profile" icon={<AddIcon />} />
<Tab label="Create Profile" icon={<AddIcon />} />
<Tab disabled={createDisabled} label="Create Profile" icon={<AddIcon />} />
<Tab label="Update Profile" icon={<UpdateIcon />} />
<Tab label="Manage Images" icon={<ImageIcon />} />
</Tabs>
+17 -1
View File
@@ -73,7 +73,23 @@ const RootQuery = new GraphQLObjectType({
args: {authId: {type: GraphQLString}},
resolve(parent,args) {
// Code to get data from data source.
return User.findOne({authId: args.authId});
return new Promise((resolve, reject) => {
User.findOne({authId: args.authId}, (err, user) => {
if(err) reject(err);
else{
if (user.authId === args.authId && user.authId !== undefined) {
console.log(user );
console.log(user.authId );
console.log(args.authId );
return resolve(user);
} else {
return null;
}
}
})
})
}
},
role: {