From 892d828db28268d50b2369fe4ff11fff28e786b3 Mon Sep 17 00:00:00 2001
From: Martin Vogel <martin.vogel@sinc.de>
Date: Wed, 22 Jun 2022 18:38:27 +0200
Subject: [PATCH] #414 Finalize vars and update named param
---
.../fitconnect/core/auth/DefaultOAuthService.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/core/src/main/java/de/fitko/fitconnect/core/auth/DefaultOAuthService.java b/core/src/main/java/de/fitko/fitconnect/core/auth/DefaultOAuthService.java
index 063ff619f..0b54e6408 100644
--- a/core/src/main/java/de/fitko/fitconnect/core/auth/DefaultOAuthService.java
+++ b/core/src/main/java/de/fitko/fitconnect/core/auth/DefaultOAuthService.java
@@ -3,7 +3,7 @@ package de.fitko.fitconnect.core.auth;
import com.google.inject.Inject;
import com.google.inject.name.Named;
import de.fitko.fitconnect.api.domain.auth.OAuthToken;
-import de.fitko.fitconnect.api.exceptions.internal.AuthenticationException;
+import de.fitko.fitconnect.api.exceptions.AuthenticationException;
import de.fitko.fitconnect.api.services.auth.OAuthService;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
@@ -25,26 +25,26 @@ public class DefaultOAuthService implements OAuthService {
private final String tokenUrl;
@Inject
- public DefaultOAuthService(final RestTemplate restTemplate, @Named("authTokenUrl") String tokenUrl) {
+ public DefaultOAuthService(final RestTemplate restTemplate, @Named("environment.authTokenUrl") final String tokenUrl) {
this.restTemplate = restTemplate;
this.tokenUrl = tokenUrl;
}
@Override
- public OAuthToken authenticate(String clientId, String clientSecret, String... scope) throws AuthenticationException {
+ public OAuthToken authenticate(final String clientId, final String clientSecret, final String... scope) throws AuthenticationException {
final String requestBody = buildRequestBody(clientId, clientSecret, scope);
return performTokenRequest(requestBody);
}
- private String buildRequestBody(String clientId, String clientSecret, String... scope) {
- var data = new HashMap<String, String>() {{
+ private String buildRequestBody(final String clientId, final String clientSecret, final String... scope) {
+ final var data = new HashMap<String, String>() {{
put("grant_type", "client_credentials");
put("client_id", clientId);
put("client_secret", clientSecret);
}};
- if(scope.length > 0){
+ if (scope.length > 0) {
data.put("scope", String.join(",", scope));
}
@@ -62,7 +62,7 @@ public class DefaultOAuthService implements OAuthService {
}
private HttpHeaders getHeaders() {
- var headers = new HttpHeaders();
+ final var headers = new HttpHeaders();
headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
headers.setAcceptCharset(List.of(StandardCharsets.UTF_8));
--
GitLab