Skip to content

[MINOR] use non-deprecated authenticate methods #5852

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
macfarla merged 2 commits into from
Sep 7, 2023
Merged

[MINOR] use non-deprecated authenticate methods #5852

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89fe7b3
use non-deprecated authenticate methods
macfarla Sep 6, 2023
4150d86
Merge branch 'main' into auth-update-deprecated-calls
macfarla Sep 7, 2023
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
11 changes: 8 additions & 3 deletions ...rg/hyperledger/besu/ethereum/api/jsonrpc/authentication/DefaultAuthenticationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@
import io.vertx.ext.auth.JWTOptions;
import io.vertx.ext.auth.User;
import io.vertx.ext.auth.authentication.AuthenticationProvider;
import io.vertx.ext.auth.authentication.Credentials;
import io.vertx.ext.auth.authentication.TokenCredentials;
import io.vertx.ext.auth.authentication.UsernamePasswordCredentials;
import io.vertx.ext.auth.jwt.JWTAuth;
import io.vertx.ext.auth.jwt.JWTAuthOptions;
import io.vertx.ext.web.RoutingContext;
Expand Down Expand Up @@ -166,7 +169,7 @@ public void handleLogin(final RoutingContext routingContext) {

private void login(
final RoutingContext routingContext, final AuthenticationProvider credentialAuthProvider) {
final JsonObject requestBody = routingContext.getBodyAsJson();
final JsonObject requestBody = routingContext.body().asJsonObject();

if (requestBody == null) {
routingContext
Expand All @@ -181,8 +184,10 @@ private void login(
final JsonObject authParams = new JsonObject();
authParams.put(USERNAME, requestBody.getValue(USERNAME));
authParams.put("password", requestBody.getValue("password"));
final Credentials credentials = new UsernamePasswordCredentials(authParams);

credentialAuthProvider.authenticate(
authParams,
credentials,
r -> {
if (r.failed()) {
routingContext
Expand Down Expand Up @@ -227,7 +232,7 @@ public void authenticate(final String token, final Handler<Optional<User>> handl
try {
getJwtAuthProvider()
.authenticate(
new JsonObject().put("token", token),
new TokenCredentials(new JsonObject().put("token", token)),
r -> {
if (r.succeeded()) {
final Optional<User> user = Optional.ofNullable(r.result());
Expand Down