From 32edddb11bcc204628fbdaddf3b0d0e86530f6f8 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Wed, 08 Jun 2016 15:18:05 +0000
Subject: [PATCH] OPENDJ-2955 Use i18n in rest2ldap
---
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Rfc7662AccessTokenResolver.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Rfc7662AccessTokenResolver.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Rfc7662AccessTokenResolver.java
index 4277291..9c22fb7 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Rfc7662AccessTokenResolver.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Rfc7662AccessTokenResolver.java
@@ -15,7 +15,9 @@
*/
package org.forgerock.opendj.rest2ldap.authz;
+import static org.forgerock.opendj.rest2ldap.Rest2ldapMessages.*;
import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.forgerock.opendj.rest2ldap.authz.Utils.newAccessTokenException;
import static org.forgerock.util.Reject.checkNotNull;
import java.io.IOException;
@@ -99,19 +101,18 @@
public AccessTokenInfo apply(final Response response) throws AccessTokenException {
final Status status = response.getStatus();
if (!Status.OK.equals(status)) {
- throw new AccessTokenException(
- "Authorization server returned an error: " + status, response.getCause());
+ throw newAccessTokenException(
+ ERR_OAUTH2_RFC7662_RETURNED_ERROR.get(status), response.getCause());
}
try (final Entity entity = response.getEntity()) {
final JsonValue jsonResponse = asJson(entity);
if (!jsonResponse.get(RFC_7662_RESPONSE_ACTIVE_FIELD).defaultTo(Boolean.FALSE).asBoolean()) {
- throw new AccessTokenException(
- "Access token returned by authorization server is not currently active");
+ throw newAccessTokenException(ERR_OAUTH2_RFC7662_TOKEN_NOT_ACTIVE.get());
}
return buildAccessTokenFromJson(jsonResponse, tokenSent);
} catch (final JsonValueException e) {
- throw new AccessTokenException("Invalid or malformed access token: " + e.getMessage(), e);
+ throw newAccessTokenException(ERR_OAUTH2_RFC7662_INVALID_JSON_TOKEN.get(e.getMessage()), e);
}
}
};
@@ -129,7 +130,7 @@
return new JsonValue(entity.getJson());
} catch (final IOException e) {
// Do not use Entity.toString(), we probably don't want to fully output the content here
- throw new AccessTokenException("Cannot read response content as JSON", e);
+ throw newAccessTokenException(ERR_OAUTH2_RFC7662_CANNOT_READ_RESPONSE.get(), e);
}
}
}
--
Gitblit v1.10.0