SpringSocialMicrosoft#154 fixing javadoc

paulsmelser · Feb 13, 2018 · f8032bc · f8032bc
1 parent 5955c3d
commit f8032bc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/release-notes.md b/release-notes.md
@@ -1,6 +1,12 @@
 # Release Notes: Spring Social for Microsoft Partner Center
 
+## 6.2.1
+
+#### Bug Fixes
+1. Fixed AuthorizationTemplate to ensure failed rest calls get wrapped as ApiAuthorizationException.
+
 ## 6.2.0
+
 #### Added
 1. ServiceRequestOperations added to allow for creating and retrieving service requests through the API
 

diff --git a/src/main/java/org/springframework/social/partnercenter/security/AzureADAuthTemplate.java b/src/main/java/org/springframework/social/partnercenter/security/AzureADAuthTemplate.java
@@ -247,7 +247,11 @@ public boolean isSlf4jEnabled() {
 	protected AccessGrant postForAccessGrant(String accessTokenUrl, HttpHeaders headers, MultiValueMap<String, String> parameters) {
 		headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
 		HttpEntity<MultiValueMap<String, String>> request = new HttpEntity<>(parameters, headers);
-		return extractAccessGrant(getRestTemplate().postForObject(accessTokenUrl, request, Map.class));
+		try {
+			return extractAccessGrant(getRestTemplate().postForObject(accessTokenUrl, request, Map.class));
+		} catch (HttpStatusCodeException e) {
+			throw buildAuthFault(e);
+		}
 	}
 
 	/**
@@ -265,8 +269,11 @@ protected AccessGrant postForAccessGrant(String accessTokenUrl, HttpHeaders head
 	protected AccessGrant postForAccessGrant(String accessTokenUrl, MultiValueMap<String, String> parameters) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
-
-		return extractAccessGrant(getRestTemplate().postForObject(accessTokenUrl, new HttpEntity<>(parameters, headers), Map.class));
+		try {
+			return extractAccessGrant(getRestTemplate().postForObject(accessTokenUrl, new HttpEntity<>(parameters, headers), Map.class));
+		} catch (HttpStatusCodeException e) {
+			throw buildAuthFault(e);
+		}
 	}
 
 	private AzureADSecurityToken postForADToken(){