Merge pull request #17 from burashka/master

Move code to ES2017

Author: jasonjoh

authHelper.js

@@ -1,57 +1,50 @@
 // Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE.txt in the project root for license information.
-var credentials = {
+const credentials = {
   client: {
-    id: 'YOUR APP ID HERE',
-    secret: 'YOUR APP PASSWORD HERE',
+	  id: 'YOUR APP ID HERE',
+	  secret: 'YOUR APP PASSWORD HERE',
   },
   auth: {
     tokenHost: 'https://login.microsoftonline.com',
     authorizePath: 'common/oauth2/v2.0/authorize',
     tokenPath: 'common/oauth2/v2.0/token'
   }
 };
-var oauth2 = require('simple-oauth2').create(credentials);
+const oauth2 = require('simple-oauth2').create(credentials);
 
-var redirectUri = 'http://localhost:8000/authorize';
+const redirectUri = 'http://localhost:8000/authorize';
 
 // The scopes the app requires
-var scopes = [ 'openid',
+const scopes = [ 'openid',
                'offline_access',
                'User.Read',
                'Mail.Read',
                'Calendars.Read',
                'Contacts.Read' ];
 
 function getAuthUrl() {
-  var returnVal = oauth2.authorizationCode.authorizeURL({
+  const returnVal = oauth2.authorizationCode.authorizeURL({
     redirect_uri: redirectUri,
     scope: scopes.join(' ')
   });
   console.log('Generated auth url: ' + returnVal);
   return returnVal;
 }
 
-function getTokenFromCode(auth_code, callback, response) {
-  var token;
-  oauth2.authorizationCode.getToken({
-    code: auth_code,
-    redirect_uri: redirectUri,
-    scope: scopes.join(' ')
-    }, function (error, result) {
-      if (error) {
-        console.log('Access token error: ', error.message);
-        callback(response, error, null);
-      } else {
-        token = oauth2.accessToken.create(result);
-        console.log('Token created: ', token.token);
-        callback(response, null, token);
-      }
-    });
+async function getTokenFromCode(auth_code) {
+	let result = await oauth2.authorizationCode.getToken({
+		code: auth_code,
+		redirect_uri: redirectUri,
+		scope: scopes.join(' ')
+	});
+
+	const token = oauth2.accessToken.create(result);
+	console.log('Token created: ', token.token);
+	return token;
 }
 
-function refreshAccessToken(refreshToken, callback) {
-  var tokenObj = oauth2.accessToken.create({refresh_token: refreshToken});
-  tokenObj.refresh(callback);
+function refreshAccessToken(refreshToken) {
+	return oauth2.accessToken.create({refresh_token: refreshToken}).refresh();
 }
 
 exports.getAuthUrl = getAuthUrl;