Merge pull request #293 from sap-contributions/fix/sts-token-api

Fix STS Token API Response
eclipse-tractusx · May 2, 2024 · 6b1b541 · 6b1b541
2 parents b242a3d + 8eda499
commit 6b1b541
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/...in/java/org/eclipse/tractusx/managedidentitywallets/controller/SecureTokenController.java b/...in/java/org/eclipse/tractusx/managedidentitywallets/controller/SecureTokenController.java
@@ -139,7 +139,7 @@ private ResponseEntity<StsTokenResponse> processTokenRequest(SecureTokenRequest
                 .token(responseJwt.serialize())
                 .expiresAt(responseJwt.getJWTClaimsSet().getExpirationTime().getTime())
                 .build();
-        return ResponseEntity.status(HttpStatus.CREATED).body(response);
+        return ResponseEntity.status(HttpStatus.OK).body(response);
     }
 
     @ExceptionHandler({ UnsupportedGrantTypeException.class, InvalidSecureTokenRequestException.class, UnknownBusinessPartnerNumberException.class, InvalidIdpTokenResponseException.class })

diff --git a/src/main/java/org/eclipse/tractusx/managedidentitywallets/domain/StsTokenResponse.java b/src/main/java/org/eclipse/tractusx/managedidentitywallets/domain/StsTokenResponse.java
@@ -21,6 +21,7 @@
 
 package org.eclipse.tractusx.managedidentitywallets.domain;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -33,6 +34,9 @@
 @NoArgsConstructor
 @AllArgsConstructor
 public class StsTokenResponse {
+
+    @JsonProperty("access_token")
     private String token;
+
     private long expiresAt;
 }
diff --git a/...ava/org/eclipse/tractusx/managedidentitywallets/controller/SecureTokenControllerTest.java b/...ava/org/eclipse/tractusx/managedidentitywallets/controller/SecureTokenControllerTest.java
@@ -104,10 +104,10 @@ void tokenJSON() {
                 new ParameterizedTypeReference<>() {
                 }
         );
-        Assertions.assertEquals(response.getStatusCode(), HttpStatus.CREATED);
+        Assertions.assertEquals(response.getStatusCode(), HttpStatus.OK);
         Assertions.assertEquals(response.getHeaders().getContentType(), MediaType.APPLICATION_JSON);
         Assertions.assertNotNull(response.getBody());
-        Assertions.assertNotNull(response.getBody().getOrDefault("token", null));
+        Assertions.assertNotNull(response.getBody().getOrDefault("access_token", null));
         Assertions.assertNotNull(response.getBody().getOrDefault("expiresAt", null));
     }
 
@@ -127,10 +127,10 @@ void tokenFormUrlencoded() {
                 new ParameterizedTypeReference<>() {
                 }
         );
-        Assertions.assertEquals(response.getStatusCode(), HttpStatus.CREATED);
+        Assertions.assertEquals(response.getStatusCode(), HttpStatus.OK);
         Assertions.assertEquals(response.getHeaders().getContentType(), MediaType.APPLICATION_JSON);
         Assertions.assertNotNull(response.getBody());
-        Assertions.assertNotNull(response.getBody().getOrDefault("token", null));
+        Assertions.assertNotNull(response.getBody().getOrDefault("access_token", null));
         Assertions.assertNotNull(response.getBody().getOrDefault("expiresAt", null));
     }
 }