From 33aef7433ca6fa14565809f21422398f0409892f Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Sun, 9 Sep 2018 11:06:26 +0200
Subject: [PATCH 01/16] Logging in working again.

---
 client/src/auth/index.js              |  2 +-
 client/src/components/LoggedInUser.js |  3 +++
 client/src/components/NavBar.js       | 15 ++-------------
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/client/src/auth/index.js b/client/src/auth/index.js
index e7d84336c..a8528584d 100644
--- a/client/src/auth/index.js
+++ b/client/src/auth/index.js
@@ -128,7 +128,7 @@ class Auth {
       })
 
       console.log('signinOrCreateAccount auth: ', await data)
-      setItem('user', data.data.authenticate.authId)
+      setItem('user', JSON.stringify(data.data.authenticate))
       if (window.location.href.includes(`callback`)) {
         window.location.href = '/'
       } else {
diff --git a/client/src/components/LoggedInUser.js b/client/src/components/LoggedInUser.js
index 71c3e6ab4..196618322 100644
--- a/client/src/components/LoggedInUser.js
+++ b/client/src/components/LoggedInUser.js
@@ -11,6 +11,9 @@ class LoggedInUser extends Component {
 
     const user = this.props.data.userByAuthId;
 
+    console.log('loggedInUser');
+    console.log(user);
+
     if(user){
 
       console.log(user.firstName);
diff --git a/client/src/components/NavBar.js b/client/src/components/NavBar.js
index b590ef192..dca0cce59 100644
--- a/client/src/components/NavBar.js
+++ b/client/src/components/NavBar.js
@@ -49,24 +49,13 @@ class NavBar extends Component {
   }
 
   componentDidMount() {
-    /*
-    this._asyncRequest = window.localStorage.getItem('user').then(
-      response => {
-        this._asyncRequest = null;
-        let user = JSON.parse(response)
-        if (user) {
-          const authId = user.sub;
-          this.setState({ authId: authId });
-        }
-      }
-    );
-    */
+
     const userStored = localStorage.getItem('user');
     console.log(userStored);
 
     if (userStored !== null && userStored !== undefined && userStored !== 'undefined') {
       const user = JSON.parse(userStored);
-      const authId = user.sub;
+      const authId = user.authId;
       this.setState({ authId: authId });
     }
   }

From 5858ec16249104cfd2a9d0c95d910b7b7ef30983 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Sun, 9 Sep 2018 11:09:28 +0200
Subject: [PATCH 02/16] Refactoring file name to Auth

---
 client/src/App.js                     | 2 +-
 client/src/auth/{index.js => Auth.js} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename client/src/auth/{index.js => Auth.js} (100%)

diff --git a/client/src/App.js b/client/src/App.js
index 0d9c6428a..03c3cd676 100644
--- a/client/src/App.js
+++ b/client/src/App.js
@@ -24,7 +24,7 @@ import Post from './components/Post';
 import Footer from './components/Footer';
 import Callback from './components/Callback';
 
-import Auth from './auth/index';
+import Auth from './auth/Auth';
 
 // Apollo Client Setup
 const httpLink = new HttpLink({ uri: 'http://localhost:4000/graphql', changeOrigin: true })
diff --git a/client/src/auth/index.js b/client/src/auth/Auth.js
similarity index 100%
rename from client/src/auth/index.js
rename to client/src/auth/Auth.js

From 67c1dba5d80f25fec71efb5200c56fac24a01deb Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Sun, 9 Sep 2018 11:23:46 +0200
Subject: [PATCH 03/16] Really logging out now.

---
 client/src/components/Logout.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/src/components/Logout.js b/client/src/components/Logout.js
index 4876ab330..0989985f7 100644
--- a/client/src/components/Logout.js
+++ b/client/src/components/Logout.js
@@ -1,9 +1,11 @@
 import React, { Component } from 'react';
 import {Redirect} from 'react-router';
+import {auth} from '../App';
 
 class Logout extends Component {
   render() {
-    window.localStorage.removeItem("user");
+    //window.localStorage.removeItem("user");
+    auth.logout();
 
     return <Redirect to='/' />
   }

From 4f4447f1424b817545146428af60daefa9e75a30 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Sun, 9 Sep 2018 11:36:02 +0200
Subject: [PATCH 04/16] Cleaninig sample code

---
 client/src/hoc/Rainbow.js | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 client/src/hoc/Rainbow.js

diff --git a/client/src/hoc/Rainbow.js b/client/src/hoc/Rainbow.js
deleted file mode 100644
index 9af9ca298..000000000
--- a/client/src/hoc/Rainbow.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from 'react'
-
-const Rainbow = (WrappedComponent) => {
-
-  const colours = ['red', 'pink', 'orange', 'blue', 'green', 'yellow'];
-  const randomColour = colours[Math.floor(Math.random() * 6)];
-  const className = randomColour + '-text';
-
-  return (props) => (
-    <div className={className}>
-      <WrappedComponent {...props} />
-    </div>  
-  )
-  
-}
-
-export default Rainbow

From 76da420e2afd070d6891b1f011c5e5a3f51a5a4a Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Sun, 9 Sep 2018 11:57:28 +0200
Subject: [PATCH 05/16] Saving relevant data to MongoDb

---
 server/schema/schema.js | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/server/schema/schema.js b/server/schema/schema.js
index c7e0c2326..104437fdc 100644
--- a/server/schema/schema.js
+++ b/server/schema/schema.js
@@ -133,17 +133,23 @@ const Mutation = new GraphQLObjectType({
       let userToken = null;
 
       return validateParseIdToken(idToken)
-      .then(result => {
-        console.log('validateParseIdToken', result);
-        const authId = result.sub;
-        const alias = result.nickname;
+      .then(authProviderResponse => {
+
+        console.log('validateParseIdToken', authProviderResponse);
+
+        const authId = authProviderResponse.sub;
+        const alias = authProviderResponse.nickname;
+        const email = authProviderResponse.email;
+        const emailVerified = authProviderResponse.email_verified;
 
         let user = new User({
-          alias: alias,
-          authId: authId,
+          alias: authId,
+          authId: alias,
+          email: email,
+          emailVerified: emailVerified,
           roleId: "1"
         });
-        console.log(authId, alias);
+
         user.save();
         return { authId, alias };
       })

From 4490041a8abc28d3ae1c03e1d2f7a3475b90996b Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Sun, 9 Sep 2018 19:46:24 +0200
Subject: [PATCH 06/16] No more promises except the needed ones

---
 client/src/components/LoggedInUser.js |   4 +-
 client/src/components/NavBar.js       |   4 +-
 server/app.js                         |  36 +++++-
 server/auth/TokenDecoder.js           |  91 +++++++++++++
 server/auth/directives.js             |  69 ----------
 server/schema/schema.js               | 176 +++++++++++++++++++-------
 6 files changed, 258 insertions(+), 122 deletions(-)
 create mode 100644 server/auth/TokenDecoder.js
 delete mode 100644 server/auth/directives.js

diff --git a/client/src/components/LoggedInUser.js b/client/src/components/LoggedInUser.js
index 196618322..1405419f1 100644
--- a/client/src/components/LoggedInUser.js
+++ b/client/src/components/LoggedInUser.js
@@ -11,8 +11,8 @@ class LoggedInUser extends Component {
 
     const user = this.props.data.userByAuthId;
 
-    console.log('loggedInUser');
-    console.log(user);
+    console.log('loggedInUser data', this.props.data);
+    console.log('loggedInUser', user);
 
     if(user){
 
diff --git a/client/src/components/NavBar.js b/client/src/components/NavBar.js
index dca0cce59..c89223a71 100644
--- a/client/src/components/NavBar.js
+++ b/client/src/components/NavBar.js
@@ -55,7 +55,9 @@ class NavBar extends Component {
 
     if (userStored !== null && userStored !== undefined && userStored !== 'undefined') {
       const user = JSON.parse(userStored);
-      const authId = user.authId;
+      const authId = user.sub;
+      console.log("user", user);
+      console.log("authid", authId);
       this.setState({ authId: authId });
     }
   }
diff --git a/server/app.js b/server/app.js
index d97f8fc1d..f60c91372 100644
--- a/server/app.js
+++ b/server/app.js
@@ -1,3 +1,35 @@
+/* Debugging */
+
+global.INFO_LOG = true;
+global.ERROR_LOG = true;
+
+/* Callbacks default responses. */
+
+global.DEFAULT_OK_RESPONSE = {
+    result: "Ok",
+    message: "Operation Succeeded"
+};
+
+global.DEFAULT_FAIL_RESPONSE = {
+    result: "Fail",
+    message: "Operation Failed"
+};
+
+global.DEFAULT_RETRY_RESPONSE = {
+    result: "Retry",
+    message: "Retry Later"
+};
+
+global.CUSTOM_OK_RESPONSE = {
+    result: "Ok, but check Message",
+    message: "Custom Message"
+};
+
+global.CUSTOM_FAIL_RESPONSE = {
+    result: "Fail Because",
+    message: "Custom Message"
+};
+
 const express = require('express');
 const graphqlHTTP = require('express-graphql');
 const schema = require('./schema/schema');
@@ -19,6 +51,8 @@ mongoose.connection.once('open', () => {
   console.log('Connected to database');
 })
 
+/* Here we bind all requests to this endpoint to be procecced by the GraphQL Library. */
+
 app.get('/graphql', graphqlHTTP({
   schema,
   graphiql: true
@@ -39,8 +73,6 @@ app.post('/graphql', checkJwt, (err, req, res, next) => {
 
 app.post('/graphql', (req, res, done) => getUser(req, res, done));
 
-
-
 app.listen(4000,() => {
   console.log('Now listening for requests on port 4000');
 });
diff --git a/server/auth/TokenDecoder.js b/server/auth/TokenDecoder.js
new file mode 100644
index 000000000..870d3d555
--- /dev/null
+++ b/server/auth/TokenDecoder.js
@@ -0,0 +1,91 @@
+const MODULE_NAME = "TokenDecoder";
+
+/*
+   JSON Web Token (JWT) is a compact, URL-safe means of representing
+   claims to be transferred between two parties.  The claims in a JWT
+   are encoded as a JSON object that is used as the payload of a JSON
+   Web Signature (JWS) structure or as the plaintext of a JSON Web
+   Encryption (JWE) structure, enabling the claims to be digitally
+   signed or integrity protected with a Message Authentication Code
+   (MAC) and/or encrypted.
+*/
+
+const JSONWebToken = require('jsonwebtoken'); // A library to deal with JSON Web Tokens.
+const webTokenLibrary = require('jwks-rsa');   // A library to retrieve RSA signing keys from a JWKS (JSON Web Key Set) endpoint.
+
+const AUTH_CONFIG = require('./Auth0');       // Config where we have our secrets.
+
+const decoder = webTokenLibrary({
+  cache: true,
+  rateLimit: true,
+  jwksRequestsPerMinute: 1,
+  jwksUri: `https://${AUTH_CONFIG.domain}/.well-known/jwks.json`
+})
+
+function decodeToken (token, callBackFunction) {
+
+  try{
+
+    if (global.INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> decodeToken -> Entering function."); }
+
+    const decoded = JSONWebToken.decode(token, { complete: true });
+    const header = decoded.header;
+    const payload = decoded.payload;
+
+    if (
+      header === null ||
+      header.kid === null ||
+      payload === null
+    ) {
+        if (global.ERROR_LOG === true) { console.log ("[ERROR] " + MODULE_NAME + " -> decodeToken -> Invalid Token. "); }
+        if (global.ERROR_LOG === true) { console.log ("[ERROR] " + MODULE_NAME + " -> decodeToken -> token = " + token); }
+        callBackFunction(global.DEFAULT_FAIL_RESPONSE);
+        return;
+    }
+
+    decoder.getSigningKey(header.kid, onKeyReady);
+
+    function onKeyReady(err, key) {
+
+      if (global.INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> decodeToken -> onKeyReady -> Entering function."); }
+
+      if (err) {
+
+        if (global.ERROR_LOG === true) { console.log ("[ERROR] " + MODULE_NAME + " -> decodeToken -> onKeyReady -> Error getting the key. "); }
+        if (global.ERROR_LOG === true) { console.log ("[ERROR] " + MODULE_NAME + " -> decodeToken -> onKeyReady -> key = " + key); }
+        if (global.ERROR_LOG === true) { console.log ("[ERROR] " + MODULE_NAME + " -> decodeToken -> onKeyReady -> err = " + err); }
+        callBackFunction(global.DEFAULT_FAIL_RESPONSE);
+        return;
+      }
+
+      JSONWebToken.verify(
+        token,
+        key.publicKey,
+        { algorithms: ['RS256'] },
+        onVerified);
+
+        function onVerified(err, decoded) {
+
+          if (global.INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> decodeToken -> onKeyReady -> onVerified -> Entering function."); }
+
+          if (err) {
+
+            if (global.ERROR_LOG === true) { console.log ("[ERROR] " + MODULE_NAME + " -> decodeToken -> onKeyReady -> onVerified -> Error verifying. "); }
+            if (global.ERROR_LOG === true) { console.log ("[ERROR] " + MODULE_NAME + " -> decodeToken -> onKeyReady -> onVerified -> decoded = " + decoded); }
+            if (global.ERROR_LOG === true) { console.log ("[ERROR] " + MODULE_NAME + " -> decodeToken -> onKeyReady -> onVerified -> err = " + err); }
+            callBackFunction(global.DEFAULT_FAIL_RESPONSE);
+            return;
+          }
+
+          callBackFunction(global.DEFAULT_OK_RESPONSE, decoded);
+        }
+    }
+  } catch(err) {
+
+    if (global.ERROR_LOG === true) { console.log("[ERROR] " + MODULE_NAME + " -> decodeToken -> err = " + err); }
+    callBackFunction(global.DEFAULT_FAIL_RESPONSE);
+
+  }
+}
+
+module.exports = decodeToken;
diff --git a/server/auth/directives.js b/server/auth/directives.js
deleted file mode 100644
index 8111ab2cd..000000000
--- a/server/auth/directives.js
+++ /dev/null
@@ -1,69 +0,0 @@
-const _get = require('lodash.get')
-const validateParseIdToken = require('./validate-auth0-token')
-const createUser  = require('./index')
-
-const userLocationOnContext = 'request.user'
-const bearerAccessToken = 'request.headers.authorization'
-
-const ctxUser = ctx => _get(ctx, userLocationOnContext)
-const ctxToken = ctx => _get(ctx, bearerAccessToken)
-
-const isLoggedIn = async ctx => {
-    let user = ctxUser(ctx, userLocationOnContext)
-    let token = ctxToken(ctx, bearerAccessToken)
-    let userToken
-
-    if (!user && token) {
-      let scheme, credentials
-      const tokenParts = token.split(' ')
-      if (tokenParts.length === 2) {
-        scheme = tokenParts[0]
-        credentials = tokenParts[1]
-      }
-
-     if (/^Bearer$/i.test(scheme)) {
-       token = credentials
-       //verify token
-       try {
-         userToken = await validateParseIdToken(token)
-         const auth0id = userToken.sub
-
-         user = await ctx.db.query.user({ where: { auth0id } })
-
-         if (!user) {
-           user = await createUser(ctx, userToken)
-         }
-       } catch (err) {
-         userToken = false
-       }
-     }
-    }
-
-    if (!user) {
-      throw new Error(`Not logged in`)
-    }
-    return user
-}
-
-
-const isRequestingUserAlsoOwner = ({ ctx, userId, type, typeId }) =>
-  ctx.db.exists[type]({ id: typeId, owner: { auth0id: userId } })
-const isRequestingUser = ({ ctx, userId }) => ctx.db.exists.User({ auth0id: userId })
-
-const directiveResolvers = {
-  isAuthenticated: async (next, source, args, ctx) => {
-    let result = await isLoggedIn(ctx)
-    console.log('directive isAuthenticated: ', result)
-    return next(result)
-  },
-  hasRole: (next, source, { roles }, ctx) => {
-    const { role } = isLoggedIn(ctx)
-    console.log('directive hasRole: ', role)
-    if (roles.includes(role)) {
-      return next()
-    }
-    throw new Error(`Unauthorized, incorrect role`)
-  }
-}
-
-module.exports = { directiveResolvers }
diff --git a/server/schema/schema.js b/server/schema/schema.js
index 104437fdc..d1c188824 100644
--- a/server/schema/schema.js
+++ b/server/schema/schema.js
@@ -1,8 +1,10 @@
+const MODULE_NAME = "schema";
+
 const graphql = require('graphql');
 const _ = require('lodash');
 const User = require('../models/user');
 
-const validateParseIdToken = require('../auth/validate-auth0-token');
+const tokenDecoder = require('../auth/TokenDecoder');
 
 const {
   GraphQLObjectType,
@@ -79,19 +81,59 @@ const RootQuery = new GraphQLObjectType({
         resolve(parent,args) {
           // Code to get data from data source.
 
+          if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> RootQuery -> userByAuthId -> resolve -> Entering function."); }
+
           return new Promise((resolve, reject) => {
 
-          User.findOne({authId: args.authId}, (err, user) => {
-            if(err) reject(err);
-            else{
+            if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> RootQuery -> userByAuthId -> resolve -> Promise -> Entering function."); }
 
-              if (user.authId === args.authId && user.authId !== undefined) {
-                  return resolve(user);
-              } else {
-                return null;
+            if (args.authId === null || args.authId === undefined) {
+
+              if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> RootQuery -> userByAuthId -> resolve -> Promise -> User requested not specified."); }
+              if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> RootQuery -> userByAuthId -> resolve -> Promise -> args.authId = " + args.authId); }
+
+              reject({ error: "No user specified" });
+              return;
+            }
+
+            User.findOne({authId: args.authId}, onUserReceived)
+
+            function onUserReceived(err, user) {
+              if(err) {
+                if (ERROR_LOG === true) { console.log("[ERROR] " + MODULE_NAME + " -> RootQuery -> userByAuthId -> resolve -> Promise -> onUserReceived -> Database Error."); }
+                if (ERROR_LOG === true) { console.log("[ERROR] " + MODULE_NAME + " -> RootQuery -> userByAuthId -> resolve -> Promise -> onUserReceived -> err = " + err); }
+                reject(err);
+              }
+              else{
+
+                if (user === null) {
+
+                  if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> RootQuery -> userByAuthId -> resolve -> Promise -> onUserReceived -> User not found at Database."); }
+                  if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> RootQuery -> userByAuthId -> resolve -> Promise -> onUserReceived -> args.authId = " + args.authId); }
+
+                  resolve({});
+                  return;
+                }
+
+                if (user.authId === args.authId && user.authId !== undefined) {
+
+                  if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> RootQuery -> userByAuthId -> resolve -> Promise -> onUserReceived -> User found at Database."); }
+                  if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> RootQuery -> userByAuthId -> resolve -> Promise -> onUserReceived -> args.authId = " + args.authId); }
+
+                  resolve(user);
+                  return;
+
+                } else {
+
+                  if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> RootQuery -> userByAuthId -> resolve -> Promise -> onUserReceived -> User found at Database is not the user requested."); }
+                  if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> RootQuery -> userByAuthId -> resolve -> Promise -> onUserReceived -> args.authId = " + args.authId); }
+                  if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> RootQuery -> userByAuthId -> resolve -> Promise -> onUserReceived -> user.authId = " + user.authId); }
+
+                  resolve({});
+                  return;
+                }
               }
             }
-          })
         })
 
         }
@@ -125,51 +167,36 @@ const Mutation = new GraphQLObjectType({
   name: 'Mutation',
   fields: {
     authenticate: {
-    type: UserType,
-    args: {
-      idToken: {type: new GraphQLNonNull(GraphQLString)}
-    },
-    resolve(parent, { idToken }) {
-      let userToken = null;
-
-      return validateParseIdToken(idToken)
-      .then(authProviderResponse => {
-
-        console.log('validateParseIdToken', authProviderResponse);
-
-        const authId = authProviderResponse.sub;
-        const alias = authProviderResponse.nickname;
-        const email = authProviderResponse.email;
-        const emailVerified = authProviderResponse.email_verified;
-
-        let user = new User({
-          alias: authId,
-          authId: alias,
-          email: email,
-          emailVerified: emailVerified,
-          roleId: "1"
-        });
-
-        user.save();
-        return { authId, alias };
-      })
-      .catch(err => { return {error: err } })
-    }
-  },
-    addUser:{
       type: UserType,
       args: {
-        alias: {type: new GraphQLNonNull(GraphQLString)},
-        authId: {type: new GraphQLNonNull(GraphQLString)}
+        idToken: {type: new GraphQLNonNull(GraphQLString)}
       },
       resolve(parent, args) {
 
-        let user = new User({
-          alias: args.alias,
-          authId: args.authId,
-          roleId: "1"
+        if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> Mutation -> authenticate -> resolve -> Entering function."); }
+
+        /* In order to be able to wait for asyc calls to the database, and authorization authority, we need to return a promise to GraphQL. */
+
+        const promiseToGraphQL = new Promise((resolve, reject) => {
+
+          if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> Mutation -> authenticate -> resolve -> Promise -> Entering function."); }
+          authenticate(args.idToken, onAuthenticated);
+
+          function onAuthenticated(err, responseToGraphQL) {
+
+            if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> Mutation -> authenticate -> resolve -> Promise -> onAuthenticated -> Entering function."); }
+            if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> Mutation -> authenticate -> resolve -> Promise -> onAuthenticated -> responseToGraphQL = " + JSON.stringify(responseToGraphQL)); }
+
+            if (err.result !== global.DEFAULT_OK_RESPONSE.result) {
+              if (global.ERROR_LOG === true) { console.log("[ERROR] " + MODULE_NAME + " -> authenticate -> onValidated -> err.message = " + err.message); }
+              reject (responseToGraphQL);
+            } else {
+              resolve (responseToGraphQL);
+            }
+          }
         });
-        return user.save();
+
+        return promiseToGraphQL;
       }
     },
     updateUser:{
@@ -210,6 +237,59 @@ const Mutation = new GraphQLObjectType({
   }
 })
 
+function authenticate(encodedToken, callBackFunction) {
+
+try {
+
+    if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> authenticate -> Entering function."); }
+
+    let authId = "";
+    let alias = "";
+    let email = "";
+    let emailVerified = false;
+
+    tokenDecoder(encodedToken, onValidated);
+
+    function onValidated(err, decodedToken) {
+
+      if (global.INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> authenticate -> onValidated -> Entering function."); }
+
+      if (err.result !== global.DEFAULT_OK_RESPONSE.result) {
+        if (global.ERROR_LOG === true) { console.log("[ERROR] " + MODULE_NAME + " -> authenticate -> onValidated -> err.message = " + err.message); }
+        callBackFunction(global.DEFAULT_FAIL_RESPONSE, { error: err });
+        return;
+      }
+
+      authId = decodedToken.sub;
+      alias = decodedToken.nickname;
+      email = decodedToken.email;
+      emailVerified = decodedToken.email_verified;
+
+      /* The authenticated user is NOT at our module database. We need to add him. */
+
+       let newUser = new User({
+         alias: alias,
+         authId: authId,
+         email: email,
+         emailVerified: emailVerified,
+         roleId: "1"
+       });
+
+       if (global.INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> authenticate -> onValidated -> " + alias + " being added to the database"); }
+
+       newUser.save();
+
+       callBackFunction(global.DEFAULT_OK_RESPONSE, { authId, alias });
+
+    }
+  } catch(err) {
+
+    if (global.ERROR_LOG === true) { console.log("[ERROR] " + MODULE_NAME + " -> authenticate -> err.message = " + err.message); }
+    callBackFunction(global.DEFAULT_FAIL_RESPONSE, { error: err });
+
+  }
+}
+
 module.exports = new GraphQLSchema({
   query: RootQuery,
   mutation: Mutation

From 6f3c02cae0d3db39aadf04ad67e32be13c550480 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Sun, 9 Sep 2018 20:32:53 +0200
Subject: [PATCH 07/16] FindByAuthId function sent out of the schema const

---
 client/src/components/NavBar.js |   2 +-
 server/schema/schema.js         | 130 +++++++++++++++++++++-----------
 2 files changed, 85 insertions(+), 47 deletions(-)

diff --git a/client/src/components/NavBar.js b/client/src/components/NavBar.js
index c89223a71..7ce5477a9 100644
--- a/client/src/components/NavBar.js
+++ b/client/src/components/NavBar.js
@@ -55,7 +55,7 @@ class NavBar extends Component {
 
     if (userStored !== null && userStored !== undefined && userStored !== 'undefined') {
       const user = JSON.parse(userStored);
-      const authId = user.sub;
+      const authId = user.authId;
       console.log("user", user);
       console.log("authid", authId);
       this.setState({ authId: authId });
diff --git a/server/schema/schema.js b/server/schema/schema.js
index d1c188824..9029794df 100644
--- a/server/schema/schema.js
+++ b/server/schema/schema.js
@@ -79,62 +79,34 @@ const RootQuery = new GraphQLObjectType({
         type: UserType,
         args: {authId: {type: GraphQLString}},
         resolve(parent,args) {
-          // Code to get data from data source.
+          // Code to get data from data source. 
 
           if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> RootQuery -> userByAuthId -> resolve -> Entering function."); }
 
-          return new Promise((resolve, reject) => {
+          /* In order to be able to wait for asyc calls to the database, we need to return a promise to GraphQL. */
+
+          const promiseToGraphQL = new Promise((resolve, reject) => {
 
             if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> RootQuery -> userByAuthId -> resolve -> Promise -> Entering function."); }
+            if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> RootQuery -> userByAuthId -> resolve -> Promise -> args.authId = " + args.authId); }
 
-            if (args.authId === null || args.authId === undefined) {
+            findUserByAuthId(args.authId, onUserFound);
 
-              if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> RootQuery -> userByAuthId -> resolve -> Promise -> User requested not specified."); }
-              if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> RootQuery -> userByAuthId -> resolve -> Promise -> args.authId = " + args.authId); }
+            function onUserFound(err, responseToGraphQL) {
 
-              reject({ error: "No user specified" });
-              return;
-            }
+              if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> RootQuery -> userByAuthId -> resolve -> Promise -> onUserFound -> Entering function."); }
+              if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> RootQuery -> userByAuthId -> resolve -> Promise -> onUserFound -> responseToGraphQL = " + JSON.stringify(responseToGraphQL)); }
 
-            User.findOne({authId: args.authId}, onUserReceived)
-
-            function onUserReceived(err, user) {
-              if(err) {
-                if (ERROR_LOG === true) { console.log("[ERROR] " + MODULE_NAME + " -> RootQuery -> userByAuthId -> resolve -> Promise -> onUserReceived -> Database Error."); }
-                if (ERROR_LOG === true) { console.log("[ERROR] " + MODULE_NAME + " -> RootQuery -> userByAuthId -> resolve -> Promise -> onUserReceived -> err = " + err); }
-                reject(err);
-              }
-              else{
-
-                if (user === null) {
-
-                  if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> RootQuery -> userByAuthId -> resolve -> Promise -> onUserReceived -> User not found at Database."); }
-                  if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> RootQuery -> userByAuthId -> resolve -> Promise -> onUserReceived -> args.authId = " + args.authId); }
-
-                  resolve({});
-                  return;
-                }
-
-                if (user.authId === args.authId && user.authId !== undefined) {
-
-                  if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> RootQuery -> userByAuthId -> resolve -> Promise -> onUserReceived -> User found at Database."); }
-                  if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> RootQuery -> userByAuthId -> resolve -> Promise -> onUserReceived -> args.authId = " + args.authId); }
-
-                  resolve(user);
-                  return;
-
-                } else {
-
-                  if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> RootQuery -> userByAuthId -> resolve -> Promise -> onUserReceived -> User found at Database is not the user requested."); }
-                  if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> RootQuery -> userByAuthId -> resolve -> Promise -> onUserReceived -> args.authId = " + args.authId); }
-                  if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> RootQuery -> userByAuthId -> resolve -> Promise -> onUserReceived -> user.authId = " + user.authId); }
-
-                  resolve({});
-                  return;
-                }
+              if (err.result !== global.DEFAULT_OK_RESPONSE.result) {
+                if (global.ERROR_LOG === true) { console.log("[ERROR] " + MODULE_NAME + " -> RootQuery -> userByAuthId -> resolve -> Promise -> onUserFound -> err.message = " + err.message); }
+                reject (responseToGraphQL);
+              } else {
+                resolve (responseToGraphQL);
               }
             }
-        })
+          });
+
+          return promiseToGraphQL;
 
         }
       },
@@ -188,7 +160,7 @@ const Mutation = new GraphQLObjectType({
             if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> Mutation -> authenticate -> resolve -> Promise -> onAuthenticated -> responseToGraphQL = " + JSON.stringify(responseToGraphQL)); }
 
             if (err.result !== global.DEFAULT_OK_RESPONSE.result) {
-              if (global.ERROR_LOG === true) { console.log("[ERROR] " + MODULE_NAME + " -> authenticate -> onValidated -> err.message = " + err.message); }
+              if (global.ERROR_LOG === true) { console.log("[ERROR] " + MODULE_NAME + " -> Mutation -> authenticate -> resolve -> Promise -> onAuthenticated -> err.message = " + err.message); }
               reject (responseToGraphQL);
             } else {
               resolve (responseToGraphQL);
@@ -237,6 +209,72 @@ const Mutation = new GraphQLObjectType({
   }
 })
 
+
+function findUserByAuthId(authId, callBackFunction) {
+
+  try {
+
+    if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> findUserByAuthId -> Entering function."); }
+    if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> findUserByAuthId -> authId = " + authId); }
+
+    if (authId === null || authId === undefined) {
+
+      if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> findUserByAuthId -> User requested not specified."); }
+      if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> findUserByAuthId -> args.authId = " + authId); }
+
+      callBackFunction(global.DEFAULT_FAIL_RESPONSE, { error: "Bad Request" });
+      return;
+    }
+
+    User.findOne({authId: authId}, onUserReceived)
+
+    function onUserReceived(err, user) {
+
+      if(err) {
+        if (ERROR_LOG === true) { console.log("[ERROR] " + MODULE_NAME + " -> findUserByAuthId -> onUserReceived -> Database Error."); }
+        if (ERROR_LOG === true) { console.log("[ERROR] " + MODULE_NAME + " -> findUserByAuthId -> onUserReceived -> err = " + err); }
+        callBackFunction(global.DEFAULT_FAIL_RESPONSE, { error: err });
+      }
+      else{
+
+        if (user === null) {
+
+          if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> findUserByAuthId -> onUserReceived -> User not found at Database."); }
+          if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> findUserByAuthId -> onUserReceived -> args.authId = " + authId); }
+
+          callBackFunction(global.DEFAULT_FAIL_RESPONSE, { error: err });
+          return;
+        }
+
+        if (user.authId === authId && user.authId !== undefined) {
+
+          if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> findUserByAuthId -> onUserReceived -> User found at Database."); }
+          if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> findUserByAuthId -> onUserReceived -> args.authId = " + authId); }
+
+          callBackFunction(global.DEFAULT_OK_RESPONSE, user);
+          return;
+
+        } else {
+
+          if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> findUserByAuthId -> onUserReceived -> User found at Database is not the user requested."); }
+          if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> findUserByAuthId -> onUserReceived -> args.authId = " + authId); }
+          if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> findUserByAuthId -> onUserReceived -> user.authId = " + user.authId); }
+
+          callBackFunction(global.DEFAULT_FAIL_RESPONSE, { error: err });
+          return;
+        }
+      }
+    }
+  } catch(err) {
+
+    if (global.ERROR_LOG === true) { console.log("[ERROR] " + MODULE_NAME + " -> findUserByAuthId -> err.message = " + err.message); }
+    callBackFunction(global.DEFAULT_FAIL_RESPONSE, { error: err });
+
+  }
+}
+
+
+
 function authenticate(encodedToken, callBackFunction) {
 
 try {

From 64101169d45324f6dfc9557f776c8e8a13ad9d24 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Sun, 9 Sep 2018 21:07:54 +0200
Subject: [PATCH 08/16] No more duplication of recors at database

---
 client/src/components/NavBar.js | 11 ++++++-
 server/schema/schema.js         | 58 +++++++++++++++++++++++++--------
 2 files changed, 55 insertions(+), 14 deletions(-)

diff --git a/client/src/components/NavBar.js b/client/src/components/NavBar.js
index 7ce5477a9..5b02b375d 100644
--- a/client/src/components/NavBar.js
+++ b/client/src/components/NavBar.js
@@ -55,7 +55,16 @@ class NavBar extends Component {
 
     if (userStored !== null && userStored !== undefined && userStored !== 'undefined') {
       const user = JSON.parse(userStored);
-      const authId = user.authId;
+
+      /* 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;
+      }
+      
       console.log("user", user);
       console.log("authid", authId);
       this.setState({ authId: authId });
diff --git a/server/schema/schema.js b/server/schema/schema.js
index 9029794df..7e06a1a6c 100644
--- a/server/schema/schema.js
+++ b/server/schema/schema.js
@@ -79,7 +79,7 @@ const RootQuery = new GraphQLObjectType({
         type: UserType,
         args: {authId: {type: GraphQLString}},
         resolve(parent,args) {
-          // Code to get data from data source. 
+          // Code to get data from data source.
 
           if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> RootQuery -> userByAuthId -> resolve -> Entering function."); }
 
@@ -242,7 +242,12 @@ function findUserByAuthId(authId, callBackFunction) {
           if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> findUserByAuthId -> onUserReceived -> User not found at Database."); }
           if (INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> findUserByAuthId -> onUserReceived -> args.authId = " + authId); }
 
-          callBackFunction(global.DEFAULT_FAIL_RESPONSE, { error: err });
+          let customResponse = {
+              result: global.CUSTOM_OK_RESPONSE.result,
+              message: "User Not Found"
+          };
+
+          callBackFunction(customResponse, { error: customResponse.message });
           return;
         }
 
@@ -303,22 +308,49 @@ try {
       email = decodedToken.email;
       emailVerified = decodedToken.email_verified;
 
-      /* The authenticated user is NOT at our module database. We need to add him. */
+      findUserByAuthId(authId, onUserFound);
 
-       let newUser = new User({
-         alias: alias,
-         authId: authId,
-         email: email,
-         emailVerified: emailVerified,
-         roleId: "1"
-       });
+      function onUserFound(err, user){
 
-       if (global.INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> authenticate -> onValidated -> " + alias + " being added to the database"); }
+        if (global.INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> authenticate -> onValidated -> onUserFound -> Entering function."); }
 
-       newUser.save();
+        if (err.result === global.DEFAULT_FAIL_RESPONSE.result) {
+          if (global.ERROR_LOG === true) { console.log("[ERROR] " + MODULE_NAME + " -> authenticate -> onValidated -> onUserFound -> err.message = " + err.message); }
+          callBackFunction(global.DEFAULT_FAIL_RESPONSE, { error: err });
+          return;
+        }
 
-       callBackFunction(global.DEFAULT_OK_RESPONSE, { authId, alias });
+        if (err.result === global.DEFAULT_OK_RESPONSE.result) {
+          if (global.INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> authenticate -> onValidated -> onUserFound -> User already exists at database"); }
+          callBackFunction(global.DEFAULT_OK_RESPONSE, { authId: authId, alias: user.alias });
+          return;
+        }
 
+        if (
+          err.result === global.CUSTOM_OK_RESPONSE.result &&
+          err.message === "User Not Found"
+        ) {
+
+          if (global.INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> authenticate -> onValidated -> onUserFound -> User does not exist at database"); }
+
+          /* The authenticated user is NOT at our module database. We need to add him. */
+
+           let newUser = new User({
+             alias: alias,
+             authId: authId,
+             email: email,
+             emailVerified: emailVerified,
+             roleId: "1"
+           });
+
+           if (global.INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> authenticate -> onValidated -> onUserFound -> " + alias + " being added to the database"); }
+
+           newUser.save();
+
+           callBackFunction(global.DEFAULT_OK_RESPONSE, { authId, alias });
+
+        }
+      }
     }
   } catch(err) {
 

From 307b77535df4c87ca8b6271ad288d8d9f4f49886 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Mon, 10 Sep 2018 11:29:46 +0200
Subject: [PATCH 09/16] code cleaning

---
 client/src/auth/Auth.js               |   2 --
 client/src/components/LoggedInUser.js |   7 -------
 client/src/components/NavBar.js       |   5 +----
 client/src/index.js                   |   7 -------
 client/src/pokeball.png               | Bin 16150 -> 0 bytes
 client/src/reducers/rootReducer.js    |  15 ---------------
 6 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 client/src/pokeball.png
 delete mode 100644 client/src/reducers/rootReducer.js

diff --git a/client/src/auth/Auth.js b/client/src/auth/Auth.js
index a8528584d..b221ae134 100644
--- a/client/src/auth/Auth.js
+++ b/client/src/auth/Auth.js
@@ -8,8 +8,6 @@ import { client } from '../App'
 
 import { AUTH_CONFIG } from './Auth0' // create by renaming Auth0.sample.js to Auth0.js and setting vars
 
-console.log(process.env.AUTH0_CLIENTID)
-
 const AUTHENTICATE = gql`
   mutation authenticate($idToken: String!) {
     authenticate(idToken: $idToken) {
diff --git a/client/src/components/LoggedInUser.js b/client/src/components/LoggedInUser.js
index 1405419f1..fbbfa8269 100644
--- a/client/src/components/LoggedInUser.js
+++ b/client/src/components/LoggedInUser.js
@@ -11,15 +11,8 @@ class LoggedInUser extends Component {
 
     const user = this.props.data.userByAuthId;
 
-    console.log('loggedInUser data', this.props.data);
-    console.log('loggedInUser', user);
-
     if(user){
 
-      console.log(user.firstName);
-      console.log(user.lastName );
-      console.log(user.alias);
-
       let displayName = "No Display Name";
 
       if (
diff --git a/client/src/components/NavBar.js b/client/src/components/NavBar.js
index 5b02b375d..8d210e23b 100644
--- a/client/src/components/NavBar.js
+++ b/client/src/components/NavBar.js
@@ -51,7 +51,6 @@ class NavBar extends Component {
   componentDidMount() {
 
     const userStored = localStorage.getItem('user');
-    console.log(userStored);
 
     if (userStored !== null && userStored !== undefined && userStored !== 'undefined') {
       const user = JSON.parse(userStored);
@@ -64,9 +63,7 @@ class NavBar extends Component {
       } else {
         authId = user.authId;
       }
-      
-      console.log("user", user);
-      console.log("authid", authId);
+
       this.setState({ authId: authId });
     }
   }
diff --git a/client/src/index.js b/client/src/index.js
index 9c47566b0..395b74997 100644
--- a/client/src/index.js
+++ b/client/src/index.js
@@ -2,12 +2,5 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import './index.css';
 import App from './App';
-//import {createStore} from 'redux';
-//import {Provider} from 'reaxt-redux';
-//import rootReducer from './reducers/rootReducer';
-
-//const store = createStore(rootReducer);
-
-//ReactDOM.render(<Provider store={store}<App /></Provider>, document.getElementById('root'));
 
 ReactDOM.render(<App />, document.getElementById('root'));
diff --git a/client/src/pokeball.png b/client/src/pokeball.png
deleted file mode 100644
index f5eff9cffcf87e8692b99f2adea46e2894b491d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16150
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

diff --git a/client/src/reducers/rootReducer.js b/client/src/reducers/rootReducer.js
deleted file mode 100644
index 7017b8baa..000000000
--- a/client/src/reducers/rootReducer.js
+++ /dev/null
@@ -1,15 +0,0 @@
-const initState = {
-  user: {}
-}
-
-const rootReducer = (state = initState, action) => {
-
-  if(action.type === 'USER_LOGS_IN'){
-   return {
-     user: action.user
-   }
-  }
-  return state;
-}
-
-export default rootReducer

From dcfaae63a61e1e77db1a13245feef82f3c5589da Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Mon, 10 Sep 2018 11:31:43 +0200
Subject: [PATCH 10/16] More code cleaning

---
 client/src/components/Home.js | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/client/src/components/Home.js b/client/src/components/Home.js
index 7768b4449..482c767b7 100644
--- a/client/src/components/Home.js
+++ b/client/src/components/Home.js
@@ -7,8 +7,6 @@ import React, { Component } from 'react'
 // Images
 
 import PortraitImage from '../img/portrait.jpg'
-import CityImage from '../img/city.jpg'
-import NatureImage from '../img/nature.jpg'
 
 class Home extends Component {
 
@@ -27,24 +25,6 @@ class Home extends Component {
             <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum at lacus congue, suscipit elit nec, tincidunt orci.</p>
           </div>
         </div>
-        <div className="row">
-          <div className="col s12 l4 offset-l1 push-l7">
-              <img src={CityImage} alt="" className="responsive-img materialboxed"></img>
-          </div>
-          <div className="col s12 l6 offset-l1 pull-l5 right-align">
-            <h2 className="indigo-text text-darken-4">Title 2</h2>
-            <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum at lacus congue, suscipit elit nec, tincidunt orci.</p>
-          </div>
-        </div>
-        <div className="row">
-          <div className="col s12 l4">
-              <img src={NatureImage} alt="" className="responsive-img materialboxed"></img>
-          </div>
-          <div className="col s12 l6 offset-l1">
-            <h2 className="indigo-text text-darken-4">Title 3</h2>
-            <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum at lacus congue, suscipit elit nec, tincidunt orci.</p>
-          </div>
-        </div>
       </section>
 
 

From fa5b24ca78acdeb962e8d8fc27a4de3514f6e16e Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Mon, 10 Sep 2018 11:46:35 +0200
Subject: [PATCH 11/16] AddUser component deleted

---
 README.md                         |  4 +--
 client/src/components/AddUser.js  | 53 -------------------------------
 client/src/components/UserTabs.js | 18 ++---------
 3 files changed, 5 insertions(+), 70 deletions(-)
 delete mode 100644 client/src/components/AddUser.js

diff --git a/README.md b/README.md
index da26c4ad5..a8790edfb 100644
--- a/README.md
+++ b/README.md
@@ -20,9 +20,9 @@ App.js
 |    |    |
 |    |    |- UserTabs
 |    |    |    |
-|    |    |    |- Tab 1 - AddUser
+|    |    |    |- Tab 1 - UserUpdate
 |    |    |    |
-|    |    |    |- Tab 2 - UpdateUser
+|    |    |    |- Tab 2 - ManageImages
 |    |
 |    |- Browse
 |    |    |
diff --git a/client/src/components/AddUser.js b/client/src/components/AddUser.js
deleted file mode 100644
index 5d40d75c8..000000000
--- a/client/src/components/AddUser.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import React, { Component } from 'react';
-import {graphql, compose} from 'react-apollo';
-import {getRolesQuery, addUserMutation, getUsersQuery} from '../queries/queries';
-
-import AddUserNextButton from './AddUserNextButton';
-
-class AddUser extends Component {
-  constructor(props){
-  super(props);
-  this.state = {
-      alias: '',
-      authId: '1'
-    };
-  }
-
-    submitForm(e){
-
-      e.preventDefault();
-      this.props.addUserMutation({
-        variables: {
-          alias: this.state.alias,
-          authId: this.state.authId
-        },
-        refetchQueries: [{ query: getUsersQuery}] // This allow us to re run whatever queries are necesary after the mutation.
-      });
-      this.props.onAdded();
-    }
-
-    render(){
-        return(
-          <div>
-              <form onSubmit={this.submitForm.bind(this)}>
-                <p>Choose an Alias that will identify you anonimously across the whole Advanced Algos ecosystem. Choose it carefully, since the the Alias can not be changed later.</p>
-                <div >
-                  <div >
-                    <input id="alias" type="text" onChange={ (e) => this.setState({ alias:e.target.value})}/>
-                    <label htmlFor="alias">Alias</label>
-                  </div>
-                </div>
-                <div className="row">
-                    <AddUserNextButton/>
-
-                </div>
-              </form>
-            </div>
-        );
-    }
-}
-
-export default compose(
-  graphql(getRolesQuery, {name: "getRolesQuery"}),
-  graphql(addUserMutation, {name: "addUserMutation"})
-) (AddUser); // This technique binds more than one query to a single component.
diff --git a/client/src/components/UserTabs.js b/client/src/components/UserTabs.js
index ef6989956..fd9a649a0 100644
--- a/client/src/components/UserTabs.js
+++ b/client/src/components/UserTabs.js
@@ -11,7 +11,6 @@ import Typography from '@material-ui/core/Typography';
 
 // Components
 
-import AddUser from './AddUser';
 import UpdateUser from './UpdateUser';
 
 function TabContainer(props) {
@@ -36,23 +35,16 @@ const styles = theme => ({
 
 class UserTabs extends React.Component {
   state = {
-    value: 0,
-    cureateDisabled: "false"
+    value: 0
   };
 
   handleChange = (event, value) => {
     this.setState({ value });
   };
 
-  updateUser = () => {
-    this.setState({ value: 1, cureateDisabled: "true" });
-  };
-
   render() {
     const { classes } = this.props;
     const { value } = this.state;
-    const { createDisabled } = this.state;
-
 
     return (
       <div className={classes.root}>
@@ -65,16 +57,12 @@ class UserTabs extends React.Component {
             indicatorColor="primary"
             textColor="primary"
           >
-          <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>
         </AppBar>
-        {value === 0 && <TabContainer><AddUser onAdded={this.updateUser}/></TabContainer>}
-        {value === 1 && <TabContainer><UpdateUser/></TabContainer>}
-        {value === 2 && <TabContainer>Item Three</TabContainer>}
-
+        {value === 0 && <TabContainer><UpdateUser/></TabContainer>}
+        {value === 1 && <TabContainer>Item Three</TabContainer>}
       </div>
     );
   }

From 1470dfe9d03ce48248ce85e265f3b12a48ee6c93 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Mon, 10 Sep 2018 11:48:46 +0200
Subject: [PATCH 12/16] User Update refactored

---
 client/src/components/UserTabs.js                      | 4 ++--
 client/src/components/{UpdateUser.js => UserUpdate.js} | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename client/src/components/{UpdateUser.js => UserUpdate.js} (98%)

diff --git a/client/src/components/UserTabs.js b/client/src/components/UserTabs.js
index fd9a649a0..dfadabfe1 100644
--- a/client/src/components/UserTabs.js
+++ b/client/src/components/UserTabs.js
@@ -11,7 +11,7 @@ import Typography from '@material-ui/core/Typography';
 
 // Components
 
-import UpdateUser from './UpdateUser';
+import UserUpdate from './UserUpdate';
 
 function TabContainer(props) {
   return (
@@ -61,7 +61,7 @@ class UserTabs extends React.Component {
             <Tab label="Manage Images" icon={<ImageIcon />} />
           </Tabs>
         </AppBar>
-        {value === 0 && <TabContainer><UpdateUser/></TabContainer>}
+        {value === 0 && <TabContainer><UserUpdate/></TabContainer>}
         {value === 1 && <TabContainer>Item Three</TabContainer>}
       </div>
     );
diff --git a/client/src/components/UpdateUser.js b/client/src/components/UserUpdate.js
similarity index 98%
rename from client/src/components/UpdateUser.js
rename to client/src/components/UserUpdate.js
index c8f430738..e3b45c9ed 100644
--- a/client/src/components/UpdateUser.js
+++ b/client/src/components/UserUpdate.js
@@ -3,7 +3,7 @@ import ReactDOM from 'react-dom';
 import {graphql, compose} from 'react-apollo';
 import {getRolesQuery, updateUserMutation, getUsersQuery} from '../queries/queries';
 
-class UpdateUser extends Component {
+class UserUpdate extends Component {
 
     constructor(props){
     super(props);
@@ -188,4 +188,4 @@ class UpdateUser extends Component {
 export default compose(
   graphql(getRolesQuery, {name: "getRolesQuery"}),
   graphql(updateUserMutation, {name: "updateUserMutation"})
-) (UpdateUser); // This technique binds more than one query to a single component.
+) (UserUpdate); // This technique binds more than one query to a single component.

From 56a445d23c1e2a494c2c8e909ce2eb1003b0b636 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Mon, 10 Sep 2018 11:53:06 +0200
Subject: [PATCH 13/16] Form cleaning

---
 client/src/components/UserTabs.js   |  1 -
 client/src/components/UserUpdate.js | 48 ++++++++++++++---------------
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/client/src/components/UserTabs.js b/client/src/components/UserTabs.js
index dfadabfe1..0636365b7 100644
--- a/client/src/components/UserTabs.js
+++ b/client/src/components/UserTabs.js
@@ -4,7 +4,6 @@ import { withStyles } from '@material-ui/core/styles';
 import AppBar from '@material-ui/core/AppBar';
 import Tabs from '@material-ui/core/Tabs';
 import Tab from '@material-ui/core/Tab';
-import AddIcon from '@material-ui/icons/Add';
 import UpdateIcon from '@material-ui/icons/Create';
 import ImageIcon from '@material-ui/icons/Wallpaper';
 import Typography from '@material-ui/core/Typography';
diff --git a/client/src/components/UserUpdate.js b/client/src/components/UserUpdate.js
index e3b45c9ed..c0e832424 100644
--- a/client/src/components/UserUpdate.js
+++ b/client/src/components/UserUpdate.js
@@ -116,65 +116,65 @@ class UserUpdate extends Component {
 
     render(){
         return(
-          <div className="row">
-              <form className="col s12" onSubmit={this.submitForm.bind(this)}>
+          <div>
+              <form onSubmit={this.submitForm.bind(this)}>
                 <p>Complete your profile with the following optional information. Providing your real name might help other users trust you more.</p>
-                <div className="row">
-                  <div className="input-field col s6">
-                    <input id="firstName" type="text" className="validate" onChange={ (e) => this.setState({ firstName:e.target.value})}/>
+                <div>
+                  <div>
+                    <input id="firstName" type="text" onChange={ (e) => this.setState({ firstName:e.target.value})}/>
                     <label htmlFor="firstName">First Name</label>
                   </div>
                 </div>
-                <div className="row">
-                  <div className="input-field col s6">
-                    <input id="middleName" type="text" className="validate" onChange={ (e) => this.setState({ middleName:e.target.value})}/>
+                <div>
+                  <div>
+                    <input id="middleName" type="text" onChange={ (e) => this.setState({ middleName:e.target.value})}/>
                     <label htmlFor="middleName">Middle Name</label>
                   </div>
                 </div>
-                <div className="row">
-                  <div className="input-field col s6">
-                    <input id="last_name" type="text" className="validate" onChange={ (e) => this.setState({ lastName:e.target.value})}/>
+                <div>
+                  <div>
+                    <input id="last_name" type="text" onChange={ (e) => this.setState({ lastName:e.target.value})}/>
                     <label htmlFor="last_name">Last Name</label>
                   </div>
                 </div>
-                <div className="row">
-                  <div className="input-field col s6">
-                    <input id="email" type="text" className="validate" onChange={ (e) => this.setState({ email:e.target.value})}/>
+                <div>
+                  <div>
+                    <input id="email" type="text" onChange={ (e) => this.setState({ email:e.target.value})}/>
                     <label htmlFor="email">email</label>
                   </div>
                 </div>
-                <div className="row">
-                  <div className="input-field col s12">
+                <div>
+                  <div>
                     <input id="emailVerified" type="checkbox" disabled/>
                     <label htmlFor="emailVerified">Email Verified</label>
                   </div>
                 </div>
-                <div className="row">
-                  <div className="input-field col s12">
+                <div>
+                  <div>
                     <input id="isDeveloper" type="checkbox" ref="id2" onChange={this.handleCheckBoxes.bind(this)}/>
                     <label htmlFor="isDeveloper">Developer</label>
                   </div>
                 </div>
-                <div className="row">
-                  <div className="input-field col s12">
+                <div>
+                  <div>
                     <input id="isTrader" type="checkbox" ref="id3" onChange={this.handleCheckBoxes.bind(this)}/>
                     <label htmlFor="isTrader">Trader</label>
                   </div>
                 </div>
-                <div className="row">
-                  <div className="input-field col s12">
+                <div>
+                  <div>
                     <input id="isDataAnalyst" type="checkbox" ref="id4" onChange={this.handleCheckBoxes.bind(this)}/>
                     <label htmlFor="isDataAnalyst">Data Analyst</label>
                   </div>
                 </div>
-                <div className="row">
+                <div>
                     <select id="role" ref="select" onChange={this.handleSelect.bind(this)}>
                         { this.displayRoles() }
                     </select>
                     <label htmlFor="role">Current Role:</label>
                 </div>
 
-                <div className="row">
+                <div>
                     <button>Update</button>
                 </div>
               </form>

From ee9792674c4314900c9660e4b86907aff81a844b Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Mon, 10 Sep 2018 12:13:25 +0200
Subject: [PATCH 14/16] modularizing globals and sessions

---
 server/app.js                                 | 33 ++-----------------
 .../{TokenDecoder.js => token-decoder.js}     |  2 +-
 server/globals.js                             | 31 +++++++++++++++++
 server/schema/schema.js                       |  2 +-
 server/sessions.js                            | 16 +++++++++
 5 files changed, 52 insertions(+), 32 deletions(-)
 rename server/auth/{TokenDecoder.js => token-decoder.js} (98%)
 create mode 100644 server/globals.js
 create mode 100644 server/sessions.js

diff --git a/server/app.js b/server/app.js
index f60c91372..aa7b6c3e3 100644
--- a/server/app.js
+++ b/server/app.js
@@ -1,35 +1,8 @@
-/* Debugging */
 
-global.INFO_LOG = true;
-global.ERROR_LOG = true;
-
-/* Callbacks default responses. */
-
-global.DEFAULT_OK_RESPONSE = {
-    result: "Ok",
-    message: "Operation Succeeded"
-};
-
-global.DEFAULT_FAIL_RESPONSE = {
-    result: "Fail",
-    message: "Operation Failed"
-};
-
-global.DEFAULT_RETRY_RESPONSE = {
-    result: "Retry",
-    message: "Retry Later"
-};
-
-global.CUSTOM_OK_RESPONSE = {
-    result: "Ok, but check Message",
-    message: "Custom Message"
-};
-
-global.CUSTOM_FAIL_RESPONSE = {
-    result: "Fail Because",
-    message: "Custom Message"
-};
+/* This module imports */
 
+const globals = require('./globals');
+const sessions = require('./sessions');
 const express = require('express');
 const graphqlHTTP = require('express-graphql');
 const schema = require('./schema/schema');
diff --git a/server/auth/TokenDecoder.js b/server/auth/token-decoder.js
similarity index 98%
rename from server/auth/TokenDecoder.js
rename to server/auth/token-decoder.js
index 870d3d555..ea10fb110 100644
--- a/server/auth/TokenDecoder.js
+++ b/server/auth/token-decoder.js
@@ -1,4 +1,4 @@
-const MODULE_NAME = "TokenDecoder";
+const MODULE_NAME = "token-decoder";
 
 /*
    JSON Web Token (JWT) is a compact, URL-safe means of representing
diff --git a/server/globals.js b/server/globals.js
new file mode 100644
index 000000000..22a40b8da
--- /dev/null
+++ b/server/globals.js
@@ -0,0 +1,31 @@
+/* Debugging */
+
+global.INFO_LOG = true;
+global.ERROR_LOG = true;
+
+/* Callbacks default responses. */
+
+global.DEFAULT_OK_RESPONSE = {
+    result: "Ok",
+    message: "Operation Succeeded"
+};
+
+global.DEFAULT_FAIL_RESPONSE = {
+    result: "Fail",
+    message: "Operation Failed"
+};
+
+global.DEFAULT_RETRY_RESPONSE = {
+    result: "Retry",
+    message: "Retry Later"
+};
+
+global.CUSTOM_OK_RESPONSE = {
+    result: "Ok, but check Message",
+    message: "Custom Message"
+};
+
+global.CUSTOM_FAIL_RESPONSE = {
+    result: "Fail Because",
+    message: "Custom Message"
+};
diff --git a/server/schema/schema.js b/server/schema/schema.js
index 7e06a1a6c..d73ce3227 100644
--- a/server/schema/schema.js
+++ b/server/schema/schema.js
@@ -4,7 +4,7 @@ const graphql = require('graphql');
 const _ = require('lodash');
 const User = require('../models/user');
 
-const tokenDecoder = require('../auth/TokenDecoder');
+const tokenDecoder = require('../auth/token-decoder');
 
 const {
   GraphQLObjectType,
diff --git a/server/sessions.js b/server/sessions.js
new file mode 100644
index 000000000..9ba7d9aef
--- /dev/null
+++ b/server/sessions.js
@@ -0,0 +1,16 @@
+/*
+
+Global in-memory Sessions
+
+Here, we are going to store some information associated to the logged in user, after it was
+succesfully authenticated. This will prevent cheating, since we will use the in-Session
+user-id for any transaction belonging to the user instead of whatever user id it provides
+from the client app.
+
+The key to access the in-Session information will allways be the authenticatioin token received
+at the authentication transaction. This token should always come at the header of each
+transactional functionality supported by this server module.
+
+*/
+
+global.Sessions = new Map();

From fbd3ac5d8b02ec4ffdc6fa559e45d7ce0ea77675 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Mon, 10 Sep 2018 12:55:20 +0200
Subject: [PATCH 15/16] Session creation implemented

---
 server/schema/schema.js | 53 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 50 insertions(+), 3 deletions(-)

diff --git a/server/schema/schema.js b/server/schema/schema.js
index d73ce3227..75a35857c 100644
--- a/server/schema/schema.js
+++ b/server/schema/schema.js
@@ -303,6 +303,13 @@ try {
         return;
       }
 
+      /*
+
+      Ok, the user was correctly authenticated. Next we need to know if this logged in user
+      has already been added to this module's database or not yet.
+
+      */
+
       authId = decodedToken.sub;
       alias = decodedToken.nickname;
       email = decodedToken.email;
@@ -322,6 +329,18 @@ try {
 
         if (err.result === global.DEFAULT_OK_RESPONSE.result) {
           if (global.INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> authenticate -> onValidated -> onUserFound -> User already exists at database"); }
+
+          if (global.INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> authenticate -> onValidated -> onUserFound -> Existing User: " + JSON.stringify(user)); }
+
+          /*
+
+          Here we save the user id of the logged in user at the server Sessions map, from there it will
+          be used to validate any further transaction comming from this same user.
+
+          */
+
+          global.Sessions.set(encodedToken, user.id);
+
           callBackFunction(global.DEFAULT_OK_RESPONSE, { authId: authId, alias: user.alias });
           return;
         }
@@ -333,7 +352,13 @@ try {
 
           if (global.INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> authenticate -> onValidated -> onUserFound -> User does not exist at database"); }
 
-          /* The authenticated user is NOT at our module database. We need to add him. */
+          /*
+
+          The authenticated user is NOT at our module database. We need to add him.
+          We will take from the authentication provider the basic information it knows about the logged in users
+          and save it as an initial set of data, which can later be modified.
+
+          */
 
            let newUser = new User({
              alias: alias,
@@ -345,10 +370,32 @@ try {
 
            if (global.INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> authenticate -> onValidated -> onUserFound -> " + alias + " being added to the database"); }
 
-           newUser.save();
+           newUser.save(onSaved);
 
-           callBackFunction(global.DEFAULT_OK_RESPONSE, { authId, alias });
+           function onSaved(err, savedUser) {
 
+             if (global.INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> authenticate -> onValidated -> onUserFound -> onSaved -> Entering function."); }
+
+             if (err) {
+               if (global.ERROR_LOG === true) { console.log("[ERROR] " + MODULE_NAME + " -> authenticate -> onValidated -> onUserFound -> onSaved -> err = " + err); }
+               callBackFunction(global.DEFAULT_FAIL_RESPONSE, { error: err });
+               return;
+             }
+
+             if (global.INFO_LOG === true) { console.log("[INFO] " + MODULE_NAME + " -> authenticate -> onValidated -> onUserFound -> onSaved -> Saved User: " + JSON.stringify(savedUser)); }
+
+             /*
+
+             Here we save the user id of the logged in user at the server Sessions map, from there it will
+             be used to validate any further transaction comming from this same user.
+
+             */
+
+             global.Sessions.set(encodedToken, savedUser.id);
+
+             callBackFunction(global.DEFAULT_OK_RESPONSE, { authId, alias });
+
+           }
         }
       }
     }

From e0bd92fadc7faefea9f22748684bfe74fcc31f75 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Mon, 10 Sep 2018 16:34:40 +0200
Subject: [PATCH 16/16] UI improvements, UserImages component created

---
 client/src/components/About.js            |  6 +++---
 client/src/components/Footer.js           |  1 -
 client/src/components/LoggedInUser.js     |  2 +-
 client/src/components/LoggedInUserMenu.js |  7 ++++++-
 client/src/components/UserImages.js       | 14 ++++++++++++++
 client/src/components/UserTabs.js         |  3 ++-
 client/src/components/UserUpdate.js       |  1 +
 7 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100644 client/src/components/UserImages.js

diff --git a/client/src/components/About.js b/client/src/components/About.js
index 5283ad55d..34b02a317 100644
--- a/client/src/components/About.js
+++ b/client/src/components/About.js
@@ -3,9 +3,9 @@ import React from 'react'
 const About = () => {
   return (
     <div>
-      <div className="container">
-        <h4 className="center">About</h4>
-        <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Recusandae repudiandae repellat illo magni eligendi cupiditate voluptates eius nam voluptate. Incidunt nihil ullam quae quia officia quaerat, deserunt eligendi explicabo totam?</p>
+      <div>
+        <h4>About</h4>
+        <p>This Module was developed by the AATeam. Contributions are welcomed.</p>
       </div>
     </div>
   )
diff --git a/client/src/components/Footer.js b/client/src/components/Footer.js
index df47f5326..5a2b475d7 100644
--- a/client/src/components/Footer.js
+++ b/client/src/components/Footer.js
@@ -14,7 +14,6 @@ const Footer = () => {
             <h5 className="white-text">Links</h5>
             <ul className="right hide-on-med-and-down">
               <li><NavLink exact to="/">Home</NavLink></li>
-              <li><NavLink to='/user'>Profile</NavLink></li>
               <li><NavLink to='/browse'>Browse</NavLink></li>
               <li><NavLink to='/search'>Search</NavLink></li>
               <li><NavLink to='/contact'>Contact</NavLink></li>
diff --git a/client/src/components/LoggedInUser.js b/client/src/components/LoggedInUser.js
index fbbfa8269..7b6137d6d 100644
--- a/client/src/components/LoggedInUser.js
+++ b/client/src/components/LoggedInUser.js
@@ -34,7 +34,7 @@ class LoggedInUser extends Component {
 
       return(
           <div>
-              <p><LoggedInUserMenu menuLabel={ displayName }/></p>
+              <p><LoggedInUserMenu menuLabel={ displayName } user={ this.props.data.userByAuthId }/></p>
           </div>
       );
 
diff --git a/client/src/components/LoggedInUserMenu.js b/client/src/components/LoggedInUserMenu.js
index 803dde8de..248d6ec86 100644
--- a/client/src/components/LoggedInUserMenu.js
+++ b/client/src/components/LoggedInUserMenu.js
@@ -19,11 +19,16 @@ class LoggedInUserMenu extends Component {
   constructor(props){
     super(props);
     this.state = {
-      property: 'value'
+      user: {}
     }
   }
 
+  componentDidMount(){
+    this.setState({user: this.props.user});
+  }
+
   render() {
+
     return (
       <WithState>
         {({ anchorEl, updateAnchorEl }) => {
diff --git a/client/src/components/UserImages.js b/client/src/components/UserImages.js
new file mode 100644
index 000000000..08ba7c5e3
--- /dev/null
+++ b/client/src/components/UserImages.js
@@ -0,0 +1,14 @@
+import React from 'react'
+
+const UserImages = () => {
+  return (
+    <div>
+      <div>
+        <h4>Images Manager</h4>
+        <p>This functionality has not been developed yet. Please visit this section later.</p>
+      </div>
+    </div>
+  )
+}
+
+export default UserImages
diff --git a/client/src/components/UserTabs.js b/client/src/components/UserTabs.js
index 0636365b7..67055b9e1 100644
--- a/client/src/components/UserTabs.js
+++ b/client/src/components/UserTabs.js
@@ -11,6 +11,7 @@ import Typography from '@material-ui/core/Typography';
 // Components
 
 import UserUpdate from './UserUpdate';
+import UserImages from './UserImages';
 
 function TabContainer(props) {
   return (
@@ -61,7 +62,7 @@ class UserTabs extends React.Component {
           </Tabs>
         </AppBar>
         {value === 0 && <TabContainer><UserUpdate/></TabContainer>}
-        {value === 1 && <TabContainer>Item Three</TabContainer>}
+        {value === 1 && <TabContainer><UserImages/></TabContainer>}
       </div>
     );
   }
diff --git a/client/src/components/UserUpdate.js b/client/src/components/UserUpdate.js
index c0e832424..7e1e8a7c9 100644
--- a/client/src/components/UserUpdate.js
+++ b/client/src/components/UserUpdate.js
@@ -115,6 +115,7 @@ class UserUpdate extends Component {
     }
 
     render(){
+      console.log("user at render", this.props);
         return(
           <div>
               <form onSubmit={this.submitForm.bind(this)}>