Merge pull request #1641 from AzureAD/auth-sample-clean

clean up auth code sample a little

Author: DarylThayil

samples/msal-node-auth-code/index.js

@@ -2,16 +2,12 @@
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-
-//initialize express
 const express = require("express");
-const app = express();
-const port = 3000;
-app.get('/', (req, res) => redirectToAzureAd(req, res));
-app.get('/redirect', (req, res) =>  acquireToken(req, res));
+const msal = require('@azure/msal-node');
+
+const SERVER_PORT = process.env.PORT || 3000;
 
 // initialize msal public client application
-let msal = require('@azure/msal-node');
 const publicClientConfig = {
     auth: {
         clientId: "99cab759-2aab-420b-91d8-5e3d8d4f063b",
@@ -24,27 +20,27 @@ const publicClientConfig = {
         storeAuthStateInCookie: false // Set this to "true" if you are having issues on IE11 or Edge
     }
 };
-
 const pca = new msal.PublicClientApplication(publicClientConfig);
 
-app.listen(port, () => console.log(`Example app listening on port ${port}!`))
-
-function redirectToAzureAd(req, res){
+// Create Express App and Routes
+const app = express();
 
+app.get('/',  (req, res) => {
     const authCodeUrlParameters = {
         scopes: ["user.read"],
         redirectUri: ["http://localhost:3000/redirect"],
     };
 
+    // get url to sign user in and consent to scopes needed for application
     pca.getAuthCodeUrl(authCodeUrlParameters)
         .then((response) => {
             console.log(response);
             res.redirect(response);
         })
         .catch((error) => console.log(JSON.stringify(error)));
-}
+});
 
-function acquireToken(req, res){
+app.get('/redirect', (req, res) => {
     const tokenRequest = {
         code: req.query.code,
         redirectUri: "http://localhost:3000/redirect",
@@ -54,9 +50,11 @@ function acquireToken(req, res){
 
     pca.acquireTokenByCode(tokenRequest).then((response) => {
         console.log(JSON.stringify(response));
-        res.send(200);
+        res.status(200).json(response);
     }).catch((error) => {
-        res.send(500);
         console.log(JSON.stringify(error.response));
+        res.status(500).send(JSON.stringify(error.response));
     })
-}
+});
+
+app.listen(SERVER_PORT, () => console.log(`Msal Node Auth Code Sample app listening on port ${SERVER_PORT}!`))

samples/msal-node-auth-code/package.json

@@ -4,7 +4,9 @@
   "description": "sample app for msal-node",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "start": "node index.js",
+    "build:package": "cd ../../lib/msal-common && npm run build && cd ../msal-node && npm run build",
+    "start:build": "npm run build:package && npm start"
   },
   "author": "sameerag",
   "license": "MIT",

samples/msal-node-device-code/package.json

@@ -4,7 +4,9 @@
   "description": "Command line app that uses Oauth device code flow to get a token from Azure AD",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "start": "node index.js",
+    "build:package": "cd ../../lib/msal-common && npm run build && cd ../msal-node && npm run build",
+    "start:build": "npm run build:package && npm start"
   },
   "author": "",
   "license": "MIT",