From dd63fb722b0eb1acbabce2bb17f7fa4df04b42e6 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Mon, 22 Jan 2024 15:29:39 -0500 Subject: [PATCH] lookup by username --- .../providers/oauth2/OAuth2LoginBackingBean.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2LoginBackingBean.java b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2LoginBackingBean.java index 4e02adb4e80..1b4a8242790 100644 --- a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2LoginBackingBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2LoginBackingBean.java @@ -126,7 +126,10 @@ public void exchangeCodeForToken() throws IOException { AuthenticatedUser dvUser = authenticationSvc.lookupUser(idtf); if (dvUser == null) { - dvUser = authenticationSvc.getAuthenticatedUserByEmail(oauthUser.getUsername()); + dvUser = authenticationSvc.getAuthenticatedUser(oauthUser.getUsername()); + if(dvUser==null) { + dvUser = authenticationSvc.getAuthenticatedUserByEmail(oauthUser.getUsername()); + } if (dvUser != null) { logger.fine("cli_id " + idp.getClientId()); logger.fine("id " + idp.getId());