Pr Feedback

Author: sgonzalezMSFT

src/main/java/com/microsoft/aad/msal4j/ServiceExceptionClassification.java renamed to src/main/java/com/microsoft/aad/msal4j/InteractionRequiredExceptionReason.java

@@ -7,7 +7,7 @@
  * Details about the cause of an {@link MsalInteractionRequiredException}, giving a hint about the
  * user can expect when they go through interactive authentication
  */
-public enum ServiceExceptionClassification {
+public enum InteractionRequiredExceptionReason {
 
     /**
      * No further details are provided. It is possible that the user will be able to resolve the issue
@@ -47,18 +47,19 @@ public enum ServiceExceptionClassification {
 
     private String error;
 
-    ServiceExceptionClassification(String error){
+    InteractionRequiredExceptionReason(String error){
         this.error = error;
     }
 
-    static ServiceExceptionClassification fromSubErrorString(String subError){
+    static InteractionRequiredExceptionReason fromSubErrorString(String subError){
         if(StringHelper.isBlank(subError)){
             return NONE;
         }
 
-        for(ServiceExceptionClassification classification: ServiceExceptionClassification.values()){
-            if(classification.error.equalsIgnoreCase(subError)){
-                return classification;
+        for(InteractionRequiredExceptionReason reason:
+                InteractionRequiredExceptionReason.values()){
+            if(reason.error.equalsIgnoreCase(subError)){
+                return reason;
             }
         }
         return NONE;

src/main/java/com/microsoft/aad/msal4j/MsalClientException.java

@@ -1,25 +1,5 @@
-// Copyright (c) Microsoft Corporation.
-// All rights reserved.
-//
-// This code is licensed under the MIT License.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files(the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions :
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.aad.msal4j;
 

src/main/java/com/microsoft/aad/msal4j/MsalInteractionRequiredException.java

@@ -16,12 +16,12 @@
 public class MsalInteractionRequiredException extends MsalServiceException{
 
     /**
-     * Classification of the conditional access error, enabling you to do more actions or inform the
+     * Reason for the MsalInteractionRequiredException, enabling you to do more actions or inform the
      * user depending on your scenario.
      */
     @Accessors(fluent = true)
     @Getter
-    private ServiceExceptionClassification classification;
+    private InteractionRequiredExceptionReason reason;
 
     /**
      * Initializes a new instance of the exception class
@@ -33,6 +33,6 @@ public MsalInteractionRequiredException(
             Map<String,List<String>> headerMap) {
         super(errorResponse, headerMap);
 
-        classification = ServiceExceptionClassification.fromSubErrorString(errorResponse.subError);
+        reason = InteractionRequiredExceptionReason.fromSubErrorString(errorResponse.subError);
     }
 }

src/main/java/com/microsoft/aad/msal4j/MsalServiceException.java

@@ -1,25 +1,5 @@
-// Copyright (c) Microsoft Corporation.
-// All rights reserved.
-//
-// This code is licensed under the MIT License.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files(the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions :
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.microsoft.aad.msal4j;
 

src/main/java/com/microsoft/aad/msal4j/MsalServiceExceptionFactory.java

@@ -30,6 +30,9 @@ static MsalServiceException fromHttpResponse(HTTPResponse httpResponse){
         errorResponse.statusCode(httpResponse.getStatusCode());
         errorResponse.statusMessage(httpResponse.getStatusMessage());
 
+
+        boolean bool = errorResponse.error().equalsIgnoreCase(AuthenticationErrorCode.INVALID_GRANT);
+
         if(errorResponse.error() != null &&
                 errorResponse.error().equalsIgnoreCase(AuthenticationErrorCode.INVALID_GRANT)) {
 

src/main/java/com/microsoft/aad/msal4j/TokenRequest.java

@@ -6,13 +6,9 @@
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.Arrays;
 import java.util.Date;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import com.nimbusds.oauth2.sdk.ParseException;
 import com.nimbusds.oauth2.sdk.SerializeException;

src/test/java/com/microsoft/aad/msal4j/TokenRequestTest.java

@@ -28,25 +28,25 @@
 public class TokenRequestTest extends AbstractMsalTests {
 
     @Test
-    public void executeOAuthRequest_SCBadRequestErrorInteractionRequired_AuthenticationServiceException()
+    public void executeOAuthRequest_SCBadRequestErrorInvalidGrant_InteractionRequiredException()
             throws SerializeException, ParseException, MsalException,
             IOException, URISyntaxException {
 
         TokenRequest request = createMockedTokenRequest();
 
-        OAuthHttpRequest msalOAuthHttpRequest = PowerMock
-                .createMock(OAuthHttpRequest.class);
+        OAuthHttpRequest msalOAuthHttpRequest = PowerMock.createMock(OAuthHttpRequest.class);
 
         HTTPResponse httpResponse = new HTTPResponse(HTTPResponse.SC_BAD_REQUEST);
 
         String claims = "{\\\"access_token\\\":{\\\"polids\\\":{\\\"essential\\\":true,\\\"values\\\":[\\\"5ce770ea-8690-4747-aa73-c5b3cd509cd4\\\"]}}}";
 
-        String content = "{\"error\":\"interaction_required\"," +
-                "\"error_description\":\"AADSTS50076: description\\r\\nCorrelation ID: 3a...5a\\r\\nTimestamp:2017-07-15 02:35:05Z\"," +
+        String content = "{\"error\":\"invalid_grant\"," +
+                "\"error_description\":\"AADSTS65001: description\\r\\nCorrelation ID: 3a...5a\\r\\nTimestamp:2017-07-15 02:35:05Z\"," +
                 "\"error_codes\":[50076]," +
                 "\"timestamp\":\"2017-07-15 02:35:05Z\"," +
                 "\"trace_id\":\"0788...000\"," +
                 "\"correlation_id\":\"3a...95a\"," +
+                "\"suberror\":\"basic_action\"," +
                 "\"claims\":\"" + claims + "\"}";
         httpResponse.setContent(content);
         httpResponse.setContentType(CommonContentTypes.APPLICATION_JSON);
@@ -59,20 +59,22 @@ public void executeOAuthRequest_SCBadRequestErrorInteractionRequired_Authenticat
         try {
             request.executeOauthRequestAndProcessResponse();
             Assert.fail("Expected MsalServiceException was not thrown");
-        } catch (MsalServiceException ex) {
+        } catch (MsalInteractionRequiredException ex) {
             Assert.assertEquals(claims.replace("\\", ""), ex.claims());
+            Assert.assertEquals(ex.reason(), InteractionRequiredExceptionReason.BASIC_ACTION);
         }
         PowerMock.verifyAll();
     }
 
     @Test
-    public void executeOAuthRequest_SCBadRequestErrorInvalidGrant_InteractionRequiredException()
+    public void executeOAuthRequest_SCBadRequestErrorInvalidGrant_SubErrorFilteredServiceExceptionThrown()
             throws SerializeException, ParseException, MsalException,
             IOException, URISyntaxException {
 
         TokenRequest request = createMockedTokenRequest();
 
-        OAuthHttpRequest msalOAuthHttpRequest = PowerMock.createMock(OAuthHttpRequest.class);
+        OAuthHttpRequest msalOAuthHttpRequest = PowerMock
+                .createMock(OAuthHttpRequest.class);
 
         HTTPResponse httpResponse = new HTTPResponse(HTTPResponse.SC_BAD_REQUEST);
 
@@ -84,7 +86,7 @@ public void executeOAuthRequest_SCBadRequestErrorInvalidGrant_InteractionRequire
                 "\"timestamp\":\"2017-07-15 02:35:05Z\"," +
                 "\"trace_id\":\"0788...000\"," +
                 "\"correlation_id\":\"3a...95a\"," +
-                "\"suberror\":\"basic_action\"," +
+                "\"suberror\":\"client_mismatch\"," +
                 "\"claims\":\"" + claims + "\"}";
         httpResponse.setContent(content);
         httpResponse.setContentType(CommonContentTypes.APPLICATION_JSON);
@@ -97,9 +99,9 @@ public void executeOAuthRequest_SCBadRequestErrorInvalidGrant_InteractionRequire
         try {
             request.executeOauthRequestAndProcessResponse();
             Assert.fail("Expected MsalServiceException was not thrown");
-        } catch (MsalInteractionRequiredException ex) {
+        } catch (MsalServiceException ex) {
             Assert.assertEquals(claims.replace("\\", ""), ex.claims());
-            Assert.assertEquals(ex.classification(), ServiceExceptionClassification.BASIC_ACTION);
+            Assert.assertTrue(!(ex instanceof MsalInteractionRequiredException));
         }
         PowerMock.verifyAll();
     }
@@ -127,7 +129,7 @@ private TokenRequest createMockedTokenRequest() throws URISyntaxException, Malfo
 
         return PowerMock.createPartialMock(
                 TokenRequest.class, new String[]{"toOauthHttpRequest"},
-                new URL("http://login.windows.net"),
+                new AADAuthority(new URL(TestConstants.ORGANIZATIONS_AUTHORITY)),
                 acr,
                 serviceBundle);
     }