Merge pull request #1751 from AzureAD/sagonzal/node-cache-merge

Update CacheManager. Update auth code sample.

Author: sangonzal

lib/msal-common/src/error/ClientAuthError.ts

@@ -106,6 +106,10 @@ export const ClientAuthErrorMessage = {
     DeviceCodeExpired: {
         code: "device_code_expired",
         desc: "Device code is expired."
+    },
+    CachePluginError: {
+        code: "no cache plugin set on CacheManager",
+        desc: "ICachePlugin needs to be set before using readFromStorage or writeFromStorage"
     }
 };
 
@@ -310,4 +314,11 @@ export class ClientAuthError extends AuthError {
     static createDeviceCodeExpiredError(): ClientAuthError {
         return new ClientAuthError(ClientAuthErrorMessage.DeviceCodeExpired.code, `${ClientAuthErrorMessage.DeviceCodeExpired.desc}`);
     }
+
+    /**
+     * Throws error if ICachePlugin not set on CacheManager
+     */
+    static createCachePluginError(): ClientAuthError {
+        return new ClientAuthError(ClientAuthErrorMessage.CachePluginError.code, `${ClientAuthErrorMessage.CachePluginError.desc}`);
+    }
 }

lib/msal-common/src/unifiedCache/utils/CacheTypes.ts

@@ -18,6 +18,7 @@ export type RefreshTokenCache = { [key: string]: RefreshTokenEntity };
 export type AppMetadataCache = { [key: string]: AppMetadataEntity };
 
 export type JsonCache = {
+    [key: string]: StringDict;
     Account?: StringDict;
     IdToken?: StringDict;
     AccessToken?: StringDict;

lib/msal-common/test/utils/StringConstants.ts

@@ -17,7 +17,7 @@ export const TEST_TOKENS = {
     SAMPLE_JWT_PAYLOAD: "eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ",
     SAMPLE_JWT_SIG: "SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c",
     SAMPLE_MALFORMED_JWT: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ",
-    CACHE_IDTOKEN: "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsIng1dCI6Imk2bEdrM0ZaenhSY1ViMkMzbkVRN3N5SEpsWSIsImtpZCI6Imk2bEdrM0ZaenhSY1ViMkMzbkVRN3N5SEpsWSJ9.eyJvaWQiOiAib2JqZWN0MTIzNCIsICJwcmVmZXJyZWRfdXNlcm5hbWUiOiAiSm9obiBEb2UiLCAic3ViIjogInN1YiJ9.D3H6pMUtQnoJAGq6AHd"
+    CACHE_IDTOKEN: "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsIng1dCI6Imk2bEdrM0ZaenhSY1ViMkMzbkVRN3N5SEpsWSIsImtpZCI6Imk2bEdrM0ZaenhSY1ViMkMzbkVRN3N5SEpsWSJ9.eyJvaWQiOiAib2JqZWN0MTIzNCIsICJwcmVmZXJyZWRfdXNlcm5hbWUiOiAiSm9obiBEb2UiLCAic3ViIjogInN1YiJ9.D3H6pMUtQnoJAGq6AHd",
 };
 
 // Test Expiration Vals
@@ -234,3 +234,4 @@ export const AUTHORIZATION_PENDING_RESPONSE = {
         error_uri: 'https://login.microsoftonline.com/error?code=70016'
     }
 };
+