From a46a6e2ff4b88d440994958b59a810bcdb78e0a6 Mon Sep 17 00:00:00 2001 From: Aaron Coburn Date: Thu, 25 May 2023 16:45:11 -0400 Subject: [PATCH] JCL-366: Remove use of deprecated authenticate --- .../client/openid/OpenIdAuthenticationProvider.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/openid/src/main/java/com/inrupt/client/openid/OpenIdAuthenticationProvider.java b/openid/src/main/java/com/inrupt/client/openid/OpenIdAuthenticationProvider.java index e36fe4fab2b..4494619ad46 100644 --- a/openid/src/main/java/com/inrupt/client/openid/OpenIdAuthenticationProvider.java +++ b/openid/src/main/java/com/inrupt/client/openid/OpenIdAuthenticationProvider.java @@ -27,7 +27,6 @@ import com.inrupt.client.auth.Session; import com.inrupt.client.spi.AuthenticationProvider; -import java.util.Optional; import java.util.Set; import java.util.TreeSet; import java.util.concurrent.CompletableFuture; @@ -111,13 +110,8 @@ public int getPriority() { @Override public CompletionStage authenticate(final Session session, final Request request, final Set algorithms) { - final Optional> token = session - .getCredential(OpenIdSession.ID_TOKEN, request.uri()) - .map(CompletableFuture::completedFuture); - return token - .orElseGet(() -> session.authenticate(request, algorithms) - .thenApply(credential -> credential - .orElseThrow(() -> new OpenIdException("Unable to perform OpenID authentication")))); + return CompletableFuture.completedFuture(session + .getCredential(OpenIdSession.ID_TOKEN, request.uri()).orElse(null)); } } }