- replaces adal references by msal

Author: baywet

constants.js

@@ -1,4 +1,4 @@
-exports.adalConfiguration = {
+exports.msalConfiguration = {
   authority: 'https://login.microsoftonline.com/common',
   clientID: 'ENTER_YOUR_CLIENT_ID',
   clientSecret: 'ENTER_YOUR_SECRET',

helpers/authHelper.js

@@ -1,6 +1,6 @@
-import { AuthenticationContext } from 'adal-node';
+import * as msal from '@azure/msal-node';
 
-import { adalConfiguration } from '../constants';
+import { msalConfiguration } from '../constants';
 
 const resource = 'https://graph.microsoft.com/';
 
@@ -9,10 +9,10 @@ const resource = 'https://graph.microsoft.com/';
  * @return {string} a fully formed uri with which authentication can be completed.
  */
 export function getAuthUrl() {
-  return adalConfiguration.authority + '/oauth2/authorize'
-    + '?client_id=' + adalConfiguration.clientID
+  return msalConfiguration.authority + '/oauth2/authorize'
+    + '?client_id=' + msalConfiguration.clientID
     + '&response_type=code'
-    + '&redirect_uri=' + adalConfiguration.redirectUri;
+    + '&redirect_uri=' + msalConfiguration.redirectUri;
 }
 
 /**
@@ -21,14 +21,14 @@ export function getAuthUrl() {
  * @param {AcquireTokenCallback} callback The callback function.
  */
 export function getTokenFromCode(code) {
-  const authContext = new AuthenticationContext(adalConfiguration.authority);
+  const authContext = new msal.AuthenticationContext(msalConfiguration.authority);
   return new Promise((resolve, reject) => {
     authContext.acquireTokenWithAuthorizationCode(
       code,
-      adalConfiguration.redirectUri,
+      msalConfiguration.redirectUri,
       resource,
-      adalConfiguration.clientID,
-      adalConfiguration.clientSecret,
+      msalConfiguration.clientID,
+      msalConfiguration.clientSecret,
       (err, token) => {
         if (err) {
           reject(err);
@@ -41,9 +41,9 @@ export function getTokenFromCode(code) {
 }
 
 export function getAppOnlyToken() {
-  const authContext = new AuthenticationContext(adalConfiguration.authority.replace('common', adalConfiguration.tenantID));
+  const authContext = new AuthenticationContext(msalConfiguration.authority.replace('common', msalConfiguration.tenantID));
   return new Promise((resolve, reject) => {
-    authContext.acquireTokenWithClientCredentials(resource, adalConfiguration.clientID, adalConfiguration.clientSecret, (err, token) => {
+    authContext.acquireTokenWithClientCredentials(resource, msalConfiguration.clientID, msalConfiguration.clientSecret, (err, token) => {
       if (err) {
         reject(err);
       } else {

routes/listen.js

@@ -5,7 +5,7 @@ import escape from 'escape-html';
 import { ioServer } from '../helpers/socketHelper';
 import { SubscriptionManagementService } from '../helpers/requestHelper';
 import { getSubscription } from '../helpers/dbHelper';
-import { subscriptionConfiguration, certificateConfiguration, adalConfiguration } from '../constants';
+import { subscriptionConfiguration, certificateConfiguration, msalConfiguration } from '../constants';
 import { decryptSymetricKey, decryptPayload, verifySignature } from '../helpers/certificateHelper';
 import { isTokenValid } from '../helpers/tokenHelper';
 
@@ -43,7 +43,7 @@ listenRouter.post('/', async (req, res, next) => {
     // if we're receiving notifications with resource data we have to validate the origin of the request by validating the tokens
     let areTokensValid = true;
     if (req.body.validationTokens) {
-      const validationResults = await Promise.all(req.body.validationTokens.map((x) => isTokenValid(x, adalConfiguration.clientID, adalConfiguration.tenantID)));
+      const validationResults = await Promise.all(req.body.validationTokens.map((x) => isTokenValid(x, msalConfiguration.clientID, msalConfiguration.tenantID)));
       areTokensValid = validationResults.reduce((x, y) => x && y);
     }
 

tests/confTest.js

@@ -1,12 +1,12 @@
 var assert = require('assert');
 var conf = require('../constants');
 
-describe('ADAL', function () { // eslint-disable-line no-undef
+describe('MSAL', function () { // eslint-disable-line no-undef
   it( // eslint-disable-line no-undef
     'Checking clientID, clientSecret and tenantID in constants.js',
     function () {
       assert(
-        isADALConfigured(conf.adalConfiguration),
+        isMSALConfigured(conf.msalConfiguration),
         '\nRegister clientID. clientSecret, tenantID in file constants.js.\n'
         + 'You don\'t have them? Get them by using the Office 365 app registration tool\n'
         + 'http://dev.office.com/app-registration\n'
@@ -32,7 +32,7 @@ describe('NotificationURL', function () { // eslint-disable-line no-undef
   });
 });
 
-function isADALConfigured(configuration) {
+function isMSALConfigured(configuration) {
   var clientIDConfigured = typeof (configuration.clientID) !== 'undefined'
     && configuration.clientID !== null
     && configuration.clientID !== ''