Merge branch 'dev' into node-broker-tests

AzureAD · Apr 20, 2023 · 39c4d55 · 39c4d55
2 parents 72f3d1c + 4f26fba
commit 39c4d55
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 9 deletions.
diff --git a/change/@azure-msal-common-92b7da9a-b20b-4d76-9b47-96c5160333de.json b/change/@azure-msal-common-92b7da9a-b20b-4d76-9b47-96c5160333de.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "`removeAccount` does not throw if account does not exist in cache #5911",
+  "packageName": "@azure/msal-common",
+  "email": "thomas.norling@microsoft.com",
+  "dependentChangeType": "patch"
+}
diff --git a/change/@azure-msal-node-e3a7afee-3776-4ab2-856c-80f283f134a8.json b/change/@azure-msal-node-e3a7afee-3776-4ab2-856c-80f283f134a8.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Remove `null` from `acquireTokenSilent` return type #5912",
+  "packageName": "@azure/msal-node",
+  "email": "thomas.norling@microsoft.com",
+  "dependentChangeType": "patch"
+}
diff --git a/lib/msal-common/src/cache/CacheManager.ts b/lib/msal-common/src/cache/CacheManager.ts
@@ -709,7 +709,7 @@ export abstract class CacheManager implements ICacheManager {
     async removeAccount(accountKey: string): Promise<void> {
         const account = this.getAccount(accountKey);
         if (!account) {
-            throw ClientAuthError.createNoAccountFoundError();
+            return;
         }
         await this.removeAccountContext(account);
         this.removeItem(accountKey);

diff --git a/lib/msal-common/test/client/AuthorizationCodeClient.spec.ts b/lib/msal-common/test/client/AuthorizationCodeClient.spec.ts
@@ -3112,7 +3112,7 @@ describe("AuthorizationCodeClient unit tests", () => {
             );
         });
 
-        it.skip("includes the requestId in the result when received in server response", async () => {
+        it("includes the requestId in the result when received in server response", async () => {
             sinon
                 .stub(
                     Authority.prototype,
@@ -3179,7 +3179,7 @@ describe("AuthorizationCodeClient unit tests", () => {
             );
         });
 
-        it.skip("does not include the requestId in the result when none in server response", async () => {
+        it("does not include the requestId in the result when none in server response", async () => {
             sinon
                 .stub(
                     Authority.prototype,
@@ -3243,7 +3243,7 @@ describe("AuthorizationCodeClient unit tests", () => {
             expect(authenticationResult.requestId).toEqual("");
         });
 
-        it.skip("includes the http version in Authorization code client measurement(AT) when received in server response", async () => {
+        it("includes the http version in Authorization code client measurement(AT) when received in server response", async () => {
             sinon
                 .stub(
                     Authority.prototype,
@@ -3320,7 +3320,7 @@ describe("AuthorizationCodeClient unit tests", () => {
             });
         });
 
-        it.skip("does not add http version to the measurement when not received in server response", async () => {
+        it("does not add http version to the measurement when not received in server response", async () => {
             sinon
                 .stub(
                     Authority.prototype,

diff --git a/lib/msal-node/src/client/ClientApplication.ts b/lib/msal-node/src/client/ClientApplication.ts
@@ -255,7 +255,7 @@ export abstract class ClientApplication {
      */
     async acquireTokenSilent(
         request: SilentFlowRequest
-    ): Promise<AuthenticationResult | null> {
+    ): Promise<AuthenticationResult> {
         const validRequest: CommonSilentFlowRequest = {
             ...request,
             ...(await this.initializeBaseRequest(request)),

diff --git a/lib/msal-node/src/client/IPublicClientApplication.ts b/lib/msal-node/src/client/IPublicClientApplication.ts
@@ -35,7 +35,7 @@ export interface IPublicClientApplication {
     /** Acquires a token silently when a user specifies the account the token is requested for */
     acquireTokenSilent(
         request: SilentFlowRequest
-    ): Promise<AuthenticationResult | null>;
+    ): Promise<AuthenticationResult>;
 
     /** Acquires a token by exchanging the refresh token provided for a new set of tokens */
     acquireTokenByRefreshToken(

diff --git a/lib/msal-node/src/client/PublicClientApplication.ts b/lib/msal-node/src/client/PublicClientApplication.ts
@@ -215,7 +215,7 @@ export class PublicClientApplication
      */
     async acquireTokenSilent(
         request: SilentFlowRequest
-    ): Promise<AuthenticationResult | null> {
+    ): Promise<AuthenticationResult> {
         const correlationId =
             request.correlationId || this.cryptoProvider.createNewGuid();
         this.logger.trace("acquireTokenSilent called", correlationId);

diff --git a/samples/msal-angular-v3-samples/README.md b/samples/msal-angular-v3-samples/README.md
@@ -2,7 +2,7 @@
 
 ### Current available samples for `@azure/msal-angular`:
 
-* [Angular 15](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/samples/msal-angular-v2-samples/angular15-sample-app)
+* [Angular 15](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/samples/msal-angular-v3-samples/angular15-sample-app)
     * Consenting to scopes: This sample consents to scopes upfront. See our [configuration doc](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/lib/msal-angular/docs/v2-docs/configuration.md) for more information.
     * `MsalRedirectComponent`: This sample uses the `MsalRedirectComponent` to handle redirects. See our doc on [redirects](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-angular/docs/v2-docs/redirects.md) for more information.
     * `PathLocationStrategy`: This sample uses the `PathLocationStrategy` for routing. See [Angular docs](https://angular.io/guide/router#locationstrategy-and-browser-url-styles) for more details.