x

src/main/java/com/egolm/sso/oauth/OAuthApi.java

@@ -343,28 +343,19 @@ public interface OAuthApi {
 	 */
 	default String doPost(String url, Map<String, String> headers, JSONObject data) {
 		try {
+			String jsonData = data == null ? "" : data.toString();
 			logger.debug("oauth post url: " + url);
 			logger.debug("oauth post headers: " + JSON.toJSONString(headers));
-			logger.debug("oauth post data: " + data.toJSONString());
+			logger.debug("oauth post data: " + jsonData);
 			OAuthToken token = this.getOAuthToken();
 			if(System.currentTimeMillis() - token.getCreateMillis() > ((token.getExpiresIn()-5) * 1000)) {
 				this.refreshOAuthToken();
 				token = this.getOAuthToken();
 			}
-			String accept = "application/json";
-			String requestId = ("" + System.currentTimeMillis());
-			String countryCode = System.getProperty("X-SE-IFW-CountryCode");
-			String languageCode = System.getProperty("X-SE-IFW-LanguageCode");
-			String applicationName = System.getProperty("X-SE-IFW-ApplicationName");
-			headers.put("Accept", accept);
-			headers.put("X-SE-IFW-RequestId", requestId);
-			headers.put("X-SE-IFW-CountryCode", countryCode);
-			headers.put("X-SE-IFW-LanguageCode", languageCode);
-			headers.put("X-SE-IFW-ApplicationName", applicationName);
 			OAuthClient oAuthClient = new OAuthClient(new URLConnectionClient());
 			String accessToken = token.getAccessToken();
 			OAuthClientRequest clientRequest = new OAuthBearerClientRequest(url).setAccessToken(accessToken).buildQueryMessage();
-			clientRequest.setBody(data.toString());
+			clientRequest.setBody(jsonData);
 			clientRequest.setHeaders(headers);
 			OAuthResourceResponse resourceResponse = oAuthClient.resource(clientRequest, "POST", OAuthResourceResponse.class);
 			String resBody = resourceResponse.getBody();