Merge branch 'msal-react-useAccount-hook' of https://github.com/Azure…

…AD/microsoft-authentication-library-for-js into msal-react-unit-tests
jitendraP-ashutec · Oct 30, 2020 · 4ceb146 · 4ceb146
2 parents e277a9c + 9797ffe
commit 4ceb146
Show file tree

Hide file tree

Showing 41 changed files with 476 additions and 119 deletions.
diff --git a/change/@azure-msal-browser-2020-10-23-16-09-46-browser-cdn-sri-script.json b/change/@azure-msal-browser-2020-10-23-16-09-46-browser-cdn-sri-script.json
diff --git a/change/@azure-msal-browser-2020-10-26-17-41-17-custom-storage-v2-rework.json b/change/@azure-msal-browser-2020-10-26-17-41-17-custom-storage-v2-rework.json
diff --git a/change/@azure-msal-browser-2020-10-26-18-16-36-handleredirectpromise-hash.json b/change/@azure-msal-browser-2020-10-26-18-16-36-handleredirectpromise-hash.json
diff --git a/change/@azure-msal-browser-2020-10-27-11-19-17-history-replace-state-function.json b/change/@azure-msal-browser-2020-10-27-11-19-17-history-replace-state-function.json
diff --git a/change/@azure-msal-browser-2020-10-28-17-06-48-msal-browser-set-logger.json b/change/@azure-msal-browser-2020-10-28-17-06-48-msal-browser-set-logger.json
diff --git a/change/@azure-msal-browser-2020-10-29-11-53-19-handle-redirect-event.json b/change/@azure-msal-browser-2020-10-29-11-53-19-handle-redirect-event.json
diff --git a/change/@azure-msal-node-2020-10-29-13-30-16-msal-node-set-logger.json b/change/@azure-msal-node-2020-10-29-13-30-16-msal-node-set-logger.json
@@ -0,0 +1,8 @@
+{
+  "type": "prerelease",
+  "comment": "Add getLogger and setLogger to msal-node (#2520)",
+  "packageName": "@azure/msal-node",
+  "email": "[email protected]",
+  "dependentChangeType": "none",
+  "date": "2020-10-29T20:30:16.899Z"
+}
diff --git a/change/msal-2020-10-27-11-19-17-history-replace-state-function.json b/change/msal-2020-10-27-11-19-17-history-replace-state-function.json
diff --git a/change/msal-2020-10-27-13-59-12-core-cdn-sri.json b/change/msal-2020-10-27-13-59-12-core-cdn-sri.json
diff --git a/change/msal-node-on-behal-of-web-app-2020-09-25-16-09-03-eslint-import-header.json b/change/msal-node-on-behal-of-web-app-2020-09-25-16-09-03-eslint-import-header.json
diff --git a/lib/msal-angular/package.json b/lib/msal-angular/package.json
@@ -35,7 +35,7 @@
   "peerDependencies": {
     "@angular/common": ">= 6.0.0",
     "@angular/core": ">= 6.0.0",
-    "msal": "^1.4.2",
+    "msal": "^1.4.3",
     "rxjs": "^6.0.0"
   },
   "devDependencies": {
@@ -78,7 +78,7 @@
     "karma-spec-reporter": "0.0.32",
     "karma-verbose-reporter": "0.0.6",
     "karma-webpack": "^3.0.0",
-    "msal": "^1.4.2",
+    "msal": "^1.4.3",
     "ng-packagr": "^9.0.2",
     "phantomjs-polyfill": "0.0.2",
     "reflect-metadata": "^0.1.3",

diff --git a/lib/msal-angularjs/package.json b/lib/msal-angularjs/package.json
@@ -24,7 +24,7 @@
     "node": ">=0.8.0"
   },
   "dependencies": {
-    "msal": "1.4.2"
+    "msal": "1.4.3"
   },
   "devDependencies": {
     "angular": "^1.7.0",

diff --git a/lib/msal-browser/CHANGELOG.json b/lib/msal-browser/CHANGELOG.json
@@ -1,6 +1,70 @@
 {
   "name": "@azure/msal-browser",
   "entries": [
+    {
+      "date": "Fri, 30 Oct 2020 00:52:19 GMT",
+      "tag": "@azure/msal-browser_v2.5.1",
+      "version": "2.5.1",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Restore string to cacheLocation type (#2523)",
+            "author": "[email protected]",
+            "commit": "7f45b2d37f6784f25aa454f599d0cb7f81463b5c",
+            "package": "@azure/msal-browser"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Thu, 29 Oct 2020 20:36:48 GMT",
+      "tag": "@azure/msal-browser_v2.5.0",
+      "version": "2.5.0",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Add handleRedirect End Event (#2518)",
+            "author": "[email protected]",
+            "commit": "22369204b53bbd7b791d83f5b9476661eebdeda5",
+            "package": "@azure/msal-browser"
+          },
+          {
+            "comment": "Ensure history.replaceState is a function",
+            "author": "[email protected]",
+            "commit": "77143b3994fb16313324fb91799e38a462bac1c1",
+            "package": "@azure/msal-browser"
+          },
+          {
+            "comment": "Allow hash to be passed into handleRedirectPromise, reset non-msal after processing",
+            "author": "[email protected]",
+            "commit": "689c9df7a9fe3f9dabb7cdd604a84707fd216154",
+            "package": "@azure/msal-browser"
+          }
+        ],
+        "minor": [
+          {
+            "comment": "Add getLogger and setLogger to msal-browser (#2513)",
+            "author": "[email protected]",
+            "commit": "664b02b2c8075ef0a5fd3880ce38117523ed3e74",
+            "package": "@azure/msal-browser"
+          },
+          {
+            "comment": "Adding memory storage option for cache location (#2481)",
+            "author": "[email protected]",
+            "commit": "f07cef165707ffa46827069a0d0d202eb0313312",
+            "package": "@azure/msal-browser"
+          }
+        ],
+        "none": [
+          {
+            "comment": "Add script to automate generation and updating of browser SRI hashes",
+            "author": "[email protected]",
+            "commit": "894453a2e68a9570ba6984da6f692ed05188ae8f",
+            "package": "@azure/msal-browser"
+          }
+        ]
+      }
+    },
     {
       "date": "Mon, 26 Oct 2020 21:00:29 GMT",
       "tag": "@azure/msal-browser_v2.4.1",

diff --git a/lib/msal-browser/README.md b/lib/msal-browser/README.md
@@ -58,7 +58,7 @@ npm install @azure/msal-browser
 
 <!-- CDN_LATEST -->
 ```html
-<script type="text/javascript" src="https://alcdn.msauth.net/browser/2.4.1/js/msal-browser.min.js"></script>
+<script type="text/javascript" src="https://alcdn.msauth.net/browser/2.5.1/js/msal-browser.min.js"></script>
 ```
 
 See [here](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-browser/docs/cdn-usage.md) for more info on how to use this package from the Microsoft CDN.

diff --git a/lib/msal-browser/changelog.md b/lib/msal-browser/changelog.md
@@ -1,9 +1,32 @@
 # Change Log - @azure/msal-browser
 
-This log was last generated on Mon, 26 Oct 2020 21:00:29 GMT and should not be manually modified.
+This log was last generated on Fri, 30 Oct 2020 00:52:19 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 2.5.1
+
+Fri, 30 Oct 2020 00:52:19 GMT
+
+### Patches
+
+- Restore string to cacheLocation type (#2523) ([email protected])
+
+## 2.5.0
+
+Thu, 29 Oct 2020 20:36:48 GMT
+
+### Minor changes
+
+- Add getLogger and setLogger to msal-browser (#2513) ([email protected])
+- Adding memory storage option for cache location (#2481) ([email protected])
+
+### Patches
+
+- Add handleRedirect End Event (#2518) ([email protected])
+- Ensure history.replaceState is a function ([email protected])
+- Allow hash to be passed into handleRedirectPromise, reset non-msal after processing ([email protected])
+
 ## 2.4.1
 
 Mon, 26 Oct 2020 21:00:29 GMT

diff --git a/lib/msal-browser/docs/cdn-usage.md b/lib/msal-browser/docs/cdn-usage.md
@@ -16,7 +16,7 @@ In addition to npm, `msal` can be consumed from Microsoft-hosted CDNs.
 
 <!-- CDN_LATEST -->
 ```html
-<script type="text/javascript" src="https://alcdn.msauth.net/browser/2.4.1/js/msal-browser.min.js"></script>
+<script type="text/javascript" src="https://alcdn.msauth.net/browser/2.5.1/js/msal-browser.min.js"></script>
 ```
 
 ## Unminified builds
@@ -84,6 +84,10 @@ It is highly recommended to use SRI Hashes with CDN builds of MSAL.js to help se
 <!-- SRI_TABLE_START -->
 Version      | Build               | SRI Hash
 ------------ | ------------------- | ---------------------------
+2.5.1        | msal-browser.js     | `sha384-MFZe/UOLz61FRpO06noy2uBkJEZUaxccyYYwrSrwBOEY59Fi0GxyRzPiiZKLvvkC`
+2.5.1        | msal-browser.min.js | `sha384-/cOXpDxWc4bzFZUDf49Sp31Im+bSjki6UxTPadEDitHw0277qGX5teCOdieziPZh`
+2.5.0        | msal-browser.js     | `sha384-JtZbGQvK0HbNDG42cgeg3XxEllLbMW8aAiSCXoLdW7iJhkdC7v4Kzqvl4LWOSiFF`
+2.5.0        | msal-browser.min.js | `sha384-+sjqS/ee1BeZqojCMFh8gGTbZ0ATgrA/rEIANI0l0Y6QdA+MDwmXLhj3JGvHueL7`
 2.4.1        | msal-browser.js     | `sha384-4Equw/X3Wp2XPnMSCbe2OQQRE/8MzlwepR53zKGbAz/6eO//yRXOcn3LKf1MnBWS`
 2.4.1        | msal-browser.min.js | `sha384-vazVaX5+cCJf+t0Dzdb8CxX9jLLvWuSZqEI2lBSMeLUBPQovS4IlwFQI6epI2tJD`
 2.4.0        | msal-browser.js     | `sha384-Bz0kggjHC0kxcxxtRzWgjaF0JGsmHuO1atz26xKETeu5WgdarvGmr9Pr/f/pKtrq`

diff --git a/lib/msal-browser/package.json b/lib/msal-browser/package.json
@@ -10,7 +10,7 @@
     "type": "git",
     "url": "https://github.com/AzureAD/microsoft-authentication-library-for-js.git"
   },
-  "version": "2.4.1",
+  "version": "2.5.1",
   "description": "Microsoft Authentication Library for js",
   "keywords": [
     "implicit",
@@ -34,7 +34,7 @@
     "dist"
   ],
   "scripts": {
-    "cdn": "npm run cdn:upload && npm run cdn:sri",
+    "cdn": "npm run build:all && npm run cdn:upload && npm run cdn:sri",
     "cdn:upload": "node ./cdn-upload.js",
     "cdn:sri": "node ./cdn-sri.js",
     "clean": "shx rm -rf dist lib",

diff --git a/lib/msal-browser/src/cache/BrowserCacheManager.ts b/lib/msal-browser/src/cache/BrowserCacheManager.ts
@@ -49,7 +49,7 @@ export class BrowserCacheManager extends CacheManager {
      * Returns a window storage class implementing the IWindowStorage interface that corresponds to the configured cacheLocation.
      * @param cacheLocation 
      */
-    private setupBrowserStorage(cacheLocation: BrowserCacheLocation): IWindowStorage {
+    private setupBrowserStorage(cacheLocation: BrowserCacheLocation | string): IWindowStorage {
         switch (cacheLocation) {
             case BrowserCacheLocation.LocalStorage:
             case BrowserCacheLocation.SessionStorage:

diff --git a/lib/msal-browser/src/config/Configuration.ts b/lib/msal-browser/src/config/Configuration.ts
@@ -44,7 +44,7 @@ export type BrowserAuthOptions = {
  * - storeAuthStateInCookie   - If set, MSAL store's the auth request state required for validation of the auth flows in the browser cookies. By default this flag is set to false.
  */
 export type CacheOptions = {
-    cacheLocation?: BrowserCacheLocation;
+    cacheLocation?: BrowserCacheLocation | string;
     storeAuthStateInCookie?: boolean;
 };
 

diff --git a/lib/msal-core/CHANGELOG.json b/lib/msal-core/CHANGELOG.json
@@ -1,6 +1,35 @@
 {
   "name": "msal",
   "entries": [
+    {
+      "date": "Thu, 29 Oct 2020 20:36:48 GMT",
+      "tag": "msal_v1.4.3",
+      "version": "1.4.3",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Fix ID token matching logic to ignore non-JSON cache keys (#2510)",
+            "author": "[email protected]",
+            "commit": "93d2d668a60f9cff09e7c6b048831fb8b9d1bd18",
+            "package": "msal"
+          },
+          {
+            "comment": "Ensure history.replaceState is a function",
+            "author": "[email protected]",
+            "commit": "77143b3994fb16313324fb91799e38a462bac1c1",
+            "package": "msal"
+          }
+        ],
+        "none": [
+          {
+            "comment": "Add SRI script for core",
+            "author": "[email protected]",
+            "commit": "63a305f340f2dc1738c85268d56563a471c98a57",
+            "package": "msal"
+          }
+        ]
+      }
+    },
     {
       "date": "Mon, 26 Oct 2020 21:00:29 GMT",
       "tag": "msal_v1.4.2",

diff --git a/lib/msal-core/README.md b/lib/msal-core/README.md
@@ -20,7 +20,7 @@ MSAL for JavaScript enables client-side JavaScript web applications, running in
 
 <!-- CDN_LATEST -->
 ```html
-<script type="text/javascript" src="https://alcdn.msauth.net/lib/1.4.2/js/msal.min.js"></script>
+<script type="text/javascript" src="https://alcdn.msauth.net/lib/1.4.3/js/msal.min.js"></script>
 ```
 
 [Complete details and best practices](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-core/docs/cdn.md) for CDN usage are available in our documentation.

diff --git a/lib/msal-core/changelog.md b/lib/msal-core/changelog.md
@@ -1,9 +1,18 @@
 # Change Log - msal
 
-This log was last generated on Tue, 20 Oct 2020 23:47:28 GMT and should not be manually modified.
+This log was last generated on Thu, 29 Oct 2020 20:36:48 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 1.4.3
+
+Thu, 29 Oct 2020 20:36:48 GMT
+
+### Patches
+
+- Fix ID token matching logic to ignore non-JSON cache keys (#2510) ([email protected])
+- Ensure history.replaceState is a function ([email protected])
+
 ## 1.4.2
 
 Tue, 20 Oct 2020 23:47:28 GMT

diff --git a/lib/msal-core/docs/cdn.md b/lib/msal-core/docs/cdn.md
@@ -16,7 +16,7 @@ In addition to npm, `msal` can be consumed from Microsoft-hosted CDNs.
 
 <!-- CDN_LATEST -->
 ```html
-<script type="text/javascript" src="https://alcdn.msauth.net/lib/1.4.2/js/msal.min.js"></script>
+<script type="text/javascript" src="https://alcdn.msauth.net/lib/1.4.3/js/msal.min.js"></script>
 ```
 
 ## Unminified builds
@@ -84,6 +84,8 @@ It is highly recommended to use SRI Hashes with CDN builds of MSAL.js to help se
 <!-- SRI_TABLE_START -->
 Version | Build       | SRI Hash
 --------| ----------- | ---------------------------
+1.4.3   | msal.js     | `sha384-Ndf/mI4t2fY6agloHXTqPi2l/W+GbkqmaurLsLFcr7tVUEmroJ7KtBhEFYmZe9RJ`
+1.4.3   | msal.min.js | `sha384-9q4FGZujTyJtNV91J580pC2zLGhqIVQ83YzDgM7DBQpeR5gBjgKPVJ50coTKP+sw`
 1.4.2   | msal.js     | `sha384-67878C1OfZkWiSmJMKaQsXCZPQtvEcM884jw9pi3b4DQ/MvuDjU7F1DEj2uqi8cr`
 1.4.2   | msal.min.js | `sha384-BRQRaUeLqQOYFElnECTT4f6N2tlxW/NBv/ZUkevFIaFLfn1fmVO8Tey/Dq7YFVDY`
 1.4.1   | msal.js     | `sha384-gsG3jdkq/qz+9oOnTog79fNfocY/PJ9mvoXEbRB9y9SzP5RmGPGAl/FlCWRELZDR`

diff --git a/lib/msal-core/package.json b/lib/msal-core/package.json
@@ -10,7 +10,7 @@
     "type": "git",
     "url": "https://github.com/AzureAD/microsoft-authentication-library-for-js.git"
   },
-  "version": "1.4.2",
+  "version": "1.4.3",
   "description": "Microsoft Authentication Library for js",
   "keywords": [
     "implicit",
@@ -27,7 +27,7 @@
     "node": ">=0.8.0"
   },
   "scripts": {
-    "cdn": "npm run cdn:upload && npm run cdn:sri",
+    "cdn": "npm run build && npm run cdn:upload && npm run cdn:sri",
     "cdn:upload": "node ./cdn-upload.js",
     "cdn:sri": "node ./cdn-sri.js",
     "clean": "shx rm -rf dist lib-commonjs lib-es6",