From 884e2b777ed9466909e522ca4080efb3bf155031 Mon Sep 17 00:00:00 2001
From: Ryan Chenkie <ryanchenkie@gmail.com>
Date: Wed, 17 May 2017 11:53:26 -0400
Subject: [PATCH] use access token

---
 src/client.js                 |   4 +-
 src/services/Authorisation.js | 105 +++++++++++++++++++---------------
 2 files changed, 61 insertions(+), 48 deletions(-)

diff --git a/src/client.js b/src/client.js
index 6f52eb3..cfef514 100644
--- a/src/client.js
+++ b/src/client.js
@@ -15,12 +15,12 @@ const networkInterface = createNetworkInterface({
 
 networkInterface.use([{
   applyMiddleware(req, next) {
-    if (localStorage.getItem('auth0IdToken')) {
+    if (localStorage.getItem('auth0AccessToken')) {
       if (!req.options.headers) {
         req.options.headers = {}
       }
       req.options.headers.authorization =
-        `Bearer ${localStorage.getItem('auth0IdToken')}`
+        `Bearer ${localStorage.getItem('auth0AccessToken')}`
     }
     next()
   },
diff --git a/src/services/Authorisation.js b/src/services/Authorisation.js
index cec3954..cf370b2 100644
--- a/src/services/Authorisation.js
+++ b/src/services/Authorisation.js
@@ -1,119 +1,132 @@
-import Auth0Lock from 'auth0-lock'
-import { EventEmitter } from 'events'
+import Auth0Lock from 'auth0-lock';
+import { EventEmitter } from 'events';
 
-const CLIENT_ID = 'Rwy4qqy5uEbGyLEGJBI1VOeDVSqDUTz0'
-const DOMAIN = 'public.eu.auth0.com'
+const CLIENT_ID = 'Rwy4qqy5uEbGyLEGJBI1VOeDVSqDUTz0';
+const DOMAIN = 'public.eu.auth0.com';
+const API_URL = 'api.handsup';
 
 export default class Authorisation extends EventEmitter {
-
   constructor() {
-    super()
+    super();
     this.lock = new Auth0Lock(CLIENT_ID, DOMAIN, {
+      oidcConformant: true,
+      autoClose: true,
       theme: {
         logo: 'https://upload.wikimedia.org/wikipedia/commons/thumb/0/02/Emoji_u1f64c.svg/2000px-Emoji_u1f64c.svg.png',
-        primaryColor: '#31324F',
+        primaryColor: '#31324F'
       },
       auth: {
-        responseType: 'id_token',
+        redirectUrl: 'http://localhost:3000',
+        responseType: 'token id_token',
+        audience: API_URL,
         params: { scope: 'openid email' },
-        redirect: false,
-      },
-    })
-    this.lock.on('authenticated', this.doAuthentication.bind(this))
+        redirect: false
+      }
+    });
+    this.lock.on('authenticated', this.doAuthentication.bind(this));
     if (this.setMaxListeners) {
-      this.setMaxListeners(10000)
+      this.setMaxListeners(10000);
     }
   }
 
   get auth0IdToken() {
-    return localStorage.getItem('auth0IdToken')
+    return localStorage.getItem('auth0IdToken');
   }
   set auth0IdToken(value) {
     if (value) {
-      localStorage.setItem('auth0IdToken', value)
+      localStorage.setItem('auth0IdToken', value);
+    } else {
+      localStorage.removeItem('auth0IdToken');
+    }
+  }
+  get auth0AccessToken() {
+    return localStorage.getItem('auth0AccessToken');
+  }
+  set auth0AccessToken(value) {
+    if (value) {
+      localStorage.setItem('auth0AccessToken', value);
     } else {
-      localStorage.removeItem('auth0IdToken')
+      localStorage.removeItem('auth0AccessToken');
     }
   }
 
   get profile() {
-    return JSON.parse(localStorage.getItem('profile'))
+    return JSON.parse(localStorage.getItem('profile'));
   }
   set profile(value) {
     if (value) {
-      localStorage.setItem('profile', JSON.stringify(value))
+      localStorage.setItem('profile', JSON.stringify(value));
     } else {
-      localStorage.removeItem('profile')
+      localStorage.removeItem('profile');
     }
-    this.emit('profile-updated', value)
+    this.emit('profile-updated', value);
   }
 
   get userId() {
-    return JSON.parse(localStorage.getItem('userId'))
+    return JSON.parse(localStorage.getItem('userId'));
   }
   set userId(value) {
     if (value) {
-      localStorage.setItem('userId', JSON.stringify(value))
+      localStorage.setItem('userId', JSON.stringify(value));
     } else {
-      localStorage.removeItem('userId')
+      localStorage.removeItem('userId');
     }
-    this.emit('user-id-updated', value)
+    this.emit('user-id-updated', value);
   }
 
   get role() {
-    return JSON.parse(localStorage.getItem('role'))
+    return JSON.parse(localStorage.getItem('role'));
   }
   set role(value) {
     if (value) {
-      localStorage.setItem('role', JSON.stringify(value))
+      localStorage.setItem('role', JSON.stringify(value));
     } else {
-      localStorage.removeItem('role')
+      localStorage.removeItem('role');
     }
   }
 
   get flagged() {
-    return JSON.parse(localStorage.getItem('flagged'))
+    return JSON.parse(localStorage.getItem('flagged'));
   }
   set flagged(value) {
     if (value) {
-      localStorage.setItem('flagged', JSON.stringify(value))
+      localStorage.setItem('flagged', JSON.stringify(value));
       // we logout the user if flagged
-      this.logout()
+      this.logout();
     } else {
-      localStorage.removeItem('flagged')
+      localStorage.removeItem('flagged');
     }
   }
 
   authenticate() {
-    this.lock.show()
+    this.lock.show();
   }
 
   doAuthentication(authResult) {
     // flagged users can't login
+    this.auth0IdToken = authResult.idToken;
+    this.auth0AccessToken = authResult.accessToken;
     if (!this.profile) {
-      this.auth0IdToken = authResult.idToken
-      this.lock.getProfile(authResult.idToken, (error, profile) => {
+      this.lock.getUserInfo(authResult.accessToken, (error, profile) => {
         if (error) {
-          console.error('Error loading the User Profile', error)
-          this.auth0IdToken = null
-          this.profile = null
+          console.error('Error loading the User Profile', error);
+          this.profile = null;
         } else {
-          this.profile = profile
-          location.href = '/'
+          this.profile = profile;
+          location.href = '/';
         }
-      })
+      });
     }
   }
 
   logout(client) {
     if (client) {
       // clear apollo client cache
-      client.resetStore()
+      client.resetStore();
     }
-    this.auth0IdToken = null
-    this.profile = null
-    this.userId = null
-    this.role = null
-    this.flagged = null
+    this.profile = null;
+    this.userId = null;
+    this.role = null;
+    this.flagged = null;
   }
 }