Merge branch 'dev' into msal-node-documentation-latest

Author: sameerag

lib/msal-node/src/client/ClientApplication.ts

@@ -133,8 +133,8 @@ export abstract class ClientApplication {
     /**
      * Gets the token cache for the application.
      */
-    getCacheManager(): TokenCache {
-        this.logger.info("getCacheManager called");
+    getTokenCache(): TokenCache {
+        this.logger.info("getTokenCache called");
         return this.tokenCache;
     }
 

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

@@ -44,7 +44,7 @@ const publicClientConfig = {
     }
 };
 const pca = new msal.PublicClientApplication(publicClientConfig);
-const msalCacheManager = pca.getCacheManager();
+const msalTokenCache = pca.getTokenCache();
 
 // Create Express App and Routes
 const app = express();
@@ -72,15 +72,15 @@ app.get('/redirect', (req, res) => {
     pca.acquireTokenByCode(tokenRequest).then((response) => {
         console.log("\nResponse: \n:", response);
         res.send(200);
-        return msalCacheManager.writeToPersistence();
+        return msalTokenCache.writeToPersistence();
     }).catch((error) => {
         console.log(error);
         res.status(500).send(error);
     });
 });
 
-msalCacheManager.readFromPersistence().then(() => {
+msalTokenCache.readFromPersistence().then(() => {
     app.listen(SERVER_PORT, () => console.log(`Msal Node Auth Code Sample app listening on port ${SERVER_PORT}!`))
-    console.log("Accounts: \n", msalCacheManager.getAllAccounts());
+    console.log("Accounts: \n", msalTokenCache.getAllAccounts());
 });
 

samples/msal-node-samples/silent-flow/index.js

@@ -61,7 +61,7 @@ const authCodeUrlParameters = {
 };
 
 const pca = new msal.PublicClientApplication(publicClientConfig);
-const msalCacheManager = pca.getCacheManager();
+const msalTokenCache = pca.getTokenCache();
 let accounts;
 
 /**
@@ -73,7 +73,7 @@ const app = express();
 app.engine('.hbs', exphbs({extname: '.hbs'}));
 app.set('view engine', '.hbs');
 
-/** 
+/**
  * App Routes
  */
 app.get('/', (req, res) => {
@@ -102,7 +102,7 @@ app.get('/redirect', (req, res) => {
         console.log("\nResponse: \n:", response);
         const templateParams = { showLoginButton: false, username: response.account.username, profile: false};
         res.render("graph", templateParams);
-        return msalCacheManager.writeToPersistence();
+        return msalTokenCache.writeToPersistence();
     }).catch((error) => {
         console.log(error);
         res.status(500).send(error);
@@ -112,7 +112,7 @@ app.get('/redirect', (req, res) => {
 // Initiates Acquire Token Silent flow
 app.get('/graphCall', (req, res) => {
     // get Accounts
-    accounts = msalCacheManager.getAllAccounts();
+    accounts = msalTokenCache.getAllAccounts();
     console.log("Accounts: ", accounts);
 
     // Build silent request
@@ -130,13 +130,13 @@ app.get('/graphCall', (req, res) => {
             // Call graph after successfully acquiring token
             graph.callMSGraph(graphConfig.graphMeEndpoint, response.accessToken, (response, endpoint) => {
                 // Successful silent request
-                templateParams = { 
-                    ...templateParams, 
+                templateParams = {
+                    ...templateParams,
                     username,
                     profile: JSON.stringify(response, null, 4)
                 };
-                res.render("graph", templateParams)
-                return msalCacheManager.writeToPersistence();
+                res.render("graph", templateParams);
+                return msalTokenCache.writeToPersistence();
             });
         })
         .catch((error) => {
@@ -146,7 +146,7 @@ app.get('/graphCall', (req, res) => {
         });
 });
 
-msalCacheManager.readFromPersistence().then(() => {
+msalTokenCache.readFromPersistence().then(() => {
     app.listen(SERVER_PORT, () => console.log(`Msal Node Auth Code Sample app listening on port ${SERVER_PORT}!`));
 });