Skip to content

UaaException: include server error payload #1302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 18, 2025
Merged

UaaException: include server error payload #1302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...undry-client-reactor/src/main/java/org/cloudfoundry/reactor/util/ErrorPayloadMappers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,8 @@ public static ErrorPayloadMapper uaa(ObjectMapper objectMapper) {
String error = (String) map.get("error");
String errorDescription = (String) map.get("error_description");

return new UaaException(statusCode, error, errorDescription);
return new UaaException(
statusCode, error, errorDescription, payload);
}));
}

Expand Down
38 changes: 34 additions & 4 deletions ...y-client-reactor/src/test/java/org/cloudfoundry/reactor/util/ErrorPayloadMappersTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,11 +327,26 @@ void uaaClientError() throws IOException {
assertThat(t)
.isInstanceOf(UaaException.class)
.hasMessage("unauthorized: Bad credentials")
.extracting("statusCode", "error", "errorDescription")
.extracting(
"statusCode",
"error",
"errorDescription",
"payload")
.containsExactly(
BAD_REQUEST.code(),
"unauthorized",
"Bad credentials"))
"Bad credentials",
"{\n"
+ " \"error\": \"unauthorized\",\n"
+ " \"error_description\": \"Bad"
+ " credentials\",\n"
+ " \"extra_information\": {\n"
+ " \"some\": [\n"
+ " \"extra\",\n"
+ " \"information\"\n"
+ " ]\n"
+ " }\n"
+ "}\n"))
.verify(Duration.ofSeconds(1));
}

Expand Down Expand Up @@ -370,11 +385,26 @@ void uaaServerError() throws IOException {
assertThat(t)
.isInstanceOf(UaaException.class)
.hasMessage("unauthorized: Bad credentials")
.extracting("statusCode", "error", "errorDescription")
.extracting(
"statusCode",
"error",
"errorDescription",
"payload")
.containsExactly(
INTERNAL_SERVER_ERROR.code(),
"unauthorized",
"Bad credentials"))
"Bad credentials",
"{\n"
+ " \"error\": \"unauthorized\",\n"
+ " \"error_description\": \"Bad"
+ " credentials\",\n"
+ " \"extra_information\": {\n"
+ " \"some\": [\n"
+ " \"extra\",\n"
+ " \"information\"\n"
+ " ]\n"
+ " }\n"
+ "}\n"))
.verify(Duration.ofSeconds(1));
}

Expand Down
8 changes: 7 additions & 1 deletion cloudfoundry-client-reactor/src/test/resources/fixtures/uaa/error_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
{
"error": "unauthorized",
"error_description": "Bad credentials"
"error_description": "Bad credentials",
"extra_information": {
"some": [
"extra",
"information"
]
}
}
14 changes: 12 additions & 2 deletions cloudfoundry-client/src/main/java/org/cloudfoundry/uaa/UaaException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,26 @@
*/
public final class UaaException extends AbstractCloudFoundryException {

private static final long serialVersionUID = 2191208398880609800L;
private static final long serialVersionUID = -474523104186506972L;

private final String error;

private final String errorDescription;

private final String payload;

/**
* Creates a new instance
*
* @param statusCode the status code
* @param error the error
* @param errorDescription the error description
*/
public UaaException(Integer statusCode, String error, String errorDescription) {
public UaaException(Integer statusCode, String error, String errorDescription, String payload) {
super(statusCode, String.format("%s: %s", error, errorDescription));
this.error = error;
this.errorDescription = errorDescription;
this.payload = payload;
}

/**
Expand All @@ -55,4 +58,11 @@ public String getError() {
public String getErrorDescription() {
return this.errorDescription;
}

/**
* Returns the full error payload
*/
public String getPayload() {
return payload;
}
}
8 changes: 5 additions & 3 deletions cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/UaaExceptionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,12 @@ final class UaaExceptionTest {

@Test
void test() {
assertThat(new UaaException(-1, "test-error", "test-error-description"))
assertThat(
new UaaException(
-1, "test-error", "test-error-description", "some error payload"))
.hasNoCause()
.hasMessage("test-error: test-error-description")
.extracting("statusCode", "error", "errorDescription")
.containsExactly(-1, "test-error", "test-error-description");
.extracting("statusCode", "error", "errorDescription", "payload")
.containsExactly(-1, "test-error", "test-error-description", "some error payload");
}
}
7 changes: 6 additions & 1 deletion ...-operations/src/test/java/org/cloudfoundry/operations/useradmin/DefaultUserAdminTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,12 @@ private static void requestCreateUaaUserAlreadyExists(UaaClient uaaClient) {
.userName("test-username")
.build()))
.thenReturn(
Mono.error(new UaaException(409, "test-error", "test-error-description")));
Mono.error(
new UaaException(
409,
"test-error",
"test-error-description",
"some error payload")));
}

private static void requestCreateUser(CloudFoundryClient cloudFoundryClient) {
Expand Down