iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactoring.

This commit is contained in:
EZZEDDINE.ELHAZATI 2019-07-23 13:26:23 +01:00
parent e314cddbe6
commit b6b90f556a
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/api/TokenEndpoint.java
View File

@ -18,7 +18,6 @@ import javax.ws.rs.core.Response;
import java.util.Arrays; import java.util.Arrays;
import java.util.Base64; import java.util.Base64;
import java.util.List; import java.util.List;
import java.util.Objects;
@Path("token") @Path("token")
public class TokenEndpoint { public class TokenEndpoint {
@ -39,28 +38,26 @@ public class TokenEndpoint {
//Check grant_type params //Check grant_type params
String grantType = params.getFirst("grant_type"); String grantType = params.getFirst("grant_type");
Objects.requireNonNull(grantType, "grant_type params is required"); if (grantType == null || grantType.isEmpty())
if (!supportedGrantTypes.contains(grantType)) { return responseError("Invalid_request", "grant_type is required", Response.Status.BAD_REQUEST);
JsonObject error = Json.createObjectBuilder()
.add("error", "unsupported_grant_type")
.add("error_description", "grant type should be one of :" + supportedGrantTypes)
.build();
return Response.status(Response.Status.BAD_REQUEST)
.entity(error).build();
if (!supportedGrantTypes.contains(grantType)) {
return responseError("unsupported_grant_type", "grant_type should be one of :" + supportedGrantTypes, Response.Status.BAD_REQUEST);
} }
//Client Authentication //Client Authentication
String[] clientCredentials = extract(authHeader); String[] clientCredentials = extract(authHeader);
if (clientCredentials.length != 2) {
return responseError("Invalid_request", "Bad Credentials client_id/client_secret", Response.Status.BAD_REQUEST);
}
String clientId = clientCredentials[0]; String clientId = clientCredentials[0];
String clientSecret = clientCredentials[1];
Client client = appDataRepository.getClient(clientId); Client client = appDataRepository.getClient(clientId);
if (client == null || clientSecret == null || !clientSecret.equals(client.getClientSecret())) { if (client == null) {
JsonObject error = Json.createObjectBuilder() return responseError("Invalid_request", "Invalid client_id", Response.Status.BAD_REQUEST);
.add("error", "invalid_client") }
.build(); String clientSecret = clientCredentials[1];
return Response.status(Response.Status.UNAUTHORIZED) if (!clientSecret.equals(client.getClientSecret())) {
.entity(error).build(); return responseError("Invalid_request", "Invalid client_secret", Response.Status.UNAUTHORIZED);
} }
AuthorizationGrantTypeHandler authorizationGrantTypeHandler = authorizationGrantTypeHandlers.select(NamedLiteral.of(grantType)).get(); AuthorizationGrantTypeHandler authorizationGrantTypeHandler = authorizationGrantTypeHandlers.select(NamedLiteral.of(grantType)).get();
@ -68,7 +65,7 @@ public class TokenEndpoint {
try { try {
tokenResponse = authorizationGrantTypeHandler.createAccessToken(clientId, params); tokenResponse = authorizationGrantTypeHandler.createAccessToken(clientId, params);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); return responseError("Invalid_request", "Can't get token", Response.Status.INTERNAL_SERVER_ERROR);
} }
return Response.ok(tokenResponse) return Response.ok(tokenResponse)
@ -81,6 +78,15 @@ public class TokenEndpoint {
if (authHeader != null && authHeader.startsWith("Basic ")) { if (authHeader != null && authHeader.startsWith("Basic ")) {
return new String(Base64.getDecoder().decode(authHeader.substring(6))).split(":"); return new String(Base64.getDecoder().decode(authHeader.substring(6))).split(":");
} }
return null; return new String[]{};
}
private Response responseError(String error, String errorDescription, Response.Status status) {
JsonObject errorResponse = Json.createObjectBuilder()
.add("error", error)
.add("error_description", errorDescription)
.build();
return Response.status(status)
.entity(errorResponse).build();
} }
} }