Fix username attributes for sso login

Aiven-Open · Aug 22, 2024 · bcd7651 · bcd7651
1 parent 0ef3f69
commit bcd7651
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/core/src/main/java/io/aiven/klaw/auth/KwAuthenticationSuccessHandler.java b/core/src/main/java/io/aiven/klaw/auth/KwAuthenticationSuccessHandler.java
@@ -31,7 +31,7 @@ public class KwAuthenticationSuccessHandler extends SavedRequestAwareAuthenticat
   @Value("${klaw.ad.username.attribute:preferred_username}")
   private String preferredUsernameAttribute;
 
-  @Value("${klaw.ad.email.attribute:preferred_username}")
+  @Value("${klaw.ad.email.attribute:email}")
   private String emailAttribute;
 
   @Autowired HandleDbRequestsJdbc handleDbRequests;

diff --git a/core/src/main/java/io/aiven/klaw/controller/ResourceClientController.java b/core/src/main/java/io/aiven/klaw/controller/ResourceClientController.java
@@ -33,7 +33,7 @@ public class ResourceClientController {
   @Value("${klaw.ad.username.attribute:preferred_username}")
   private String preferredUsernameAttribute;
 
-  @Value("${klaw.ad.email.attribute:preferred_username}")
+  @Value("${klaw.ad.email.attribute:email}")
   private String emailAttribute;
 
   private static final String authorizationRequestBaseUri = "oauth2/authorize-client";

diff --git a/core/src/main/java/io/aiven/klaw/service/MailUtils.java b/core/src/main/java/io/aiven/klaw/service/MailUtils.java
@@ -44,7 +44,7 @@ public class MailUtils {
   @Value("${klaw.ad.username.attribute:preferred_username}")
   private String preferredUsernameAttribute;
 
-  @Value("${klaw.ad.email.attribute:preferred_username}")
+  @Value("${klaw.ad.email.attribute:email}")
   private String emailAttribute;
 
   private static final String TOPIC_REQ_KEY = "klaw.mail.topicrequest.content";