(sling-org-apache-sling-auth-oauth-client) branch master updated: SLING-12876 - rename idpNameInUserId to idpNameInPrincipals (#33)

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-auth-oauth-client.git


The following commit(s) were added to refs/heads/master by this push:
     new ad9973e  SLING-12876 - rename idpNameInUserId to idpNameInPrincipals 
(#33)
ad9973e is described below

commit ad9973ee8de2c9b0c84c5a68977e29b5ad583d02
Author: Nicola Scendoni <nscend...@adobe.com>
AuthorDate: Thu Oct 23 18:09:43 2025 +0200

    SLING-12876 - rename idpNameInUserId to idpNameInPrincipals (#33)
---
 .../auth/oauth_client/impl/SlingUserInfoProcessorImpl.java | 14 ++++++++------
 .../oauth_client/impl/SlingUserInfoProcessorImplTest.java  |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/auth/oauth_client/impl/SlingUserInfoProcessorImpl.java
 
b/src/main/java/org/apache/sling/auth/oauth_client/impl/SlingUserInfoProcessorImpl.java
index bf7ce8c..f93e0d6 100644
--- 
a/src/main/java/org/apache/sling/auth/oauth_client/impl/SlingUserInfoProcessorImpl.java
+++ 
b/src/main/java/org/apache/sling/auth/oauth_client/impl/SlingUserInfoProcessorImpl.java
@@ -71,8 +71,10 @@ public class SlingUserInfoProcessorImpl implements 
UserInfoProcessor {
         @AttributeDefinition(name = "connection", description = "OIDC 
Connection Name")
         String connection();
 
-        @AttributeDefinition(name = "idpNameInUserId", description = "Add a 
suffix with the idp in the username")
-        boolean idpNameInUserId() default false;
+        @AttributeDefinition(
+                name = "idpNameInPrincipals",
+                description = "Add a suffix with the idp in the username and 
to the groups created by this processor")
+        boolean idpNameInPrincipals() default false;
     }
 
     private static final Logger logger = 
LoggerFactory.getLogger(SlingUserInfoProcessorImpl.class);
@@ -83,7 +85,7 @@ public class SlingUserInfoProcessorImpl implements 
UserInfoProcessor {
     private final boolean groupsInIdToken;
     private final String groupsClaimName;
     private final String connection;
-    private final boolean idpNameInUserId;
+    private final boolean idpNameInPrincipals;
 
     @Activate
     public SlingUserInfoProcessorImpl(
@@ -97,7 +99,7 @@ public class SlingUserInfoProcessorImpl implements 
UserInfoProcessor {
             throw new IllegalArgumentException("Connection name must not be 
null or empty");
         }
         this.connection = config.connection();
-        this.idpNameInUserId = config.idpNameInUserId();
+        this.idpNameInPrincipals = config.idpNameInPrincipals();
     }
 
     @Override
@@ -114,7 +116,7 @@ public class SlingUserInfoProcessorImpl implements 
UserInfoProcessor {
 
         // Create AuthenticationInfo object
         OidcAuthCredentials credentials =
-                new OidcAuthCredentials(oidcSubject + (idpNameInUserId ? ";" + 
idp : ""), idp);
+                new OidcAuthCredentials(oidcSubject + (idpNameInPrincipals ? 
";" + idp : ""), idp);
         credentials.setAttribute(".token", "");
 
         if (userInfo != null) {
@@ -184,7 +186,7 @@ public class SlingUserInfoProcessorImpl implements 
UserInfoProcessor {
 
     @NotNull
     private String getGroupName(@NotNull String idp, Object group) {
-        return group.toString() + (idpNameInUserId ? ";" + idp : "");
+        return group.toString() + (idpNameInPrincipals ? ";" + idp : "");
     }
 
     private static @Nullable UserInfo parseUserInfo(@Nullable String 
stringUserInfo) {
diff --git 
a/src/test/java/org/apache/sling/auth/oauth_client/impl/SlingUserInfoProcessorImplTest.java
 
b/src/test/java/org/apache/sling/auth/oauth_client/impl/SlingUserInfoProcessorImplTest.java
index 47bea98..cb45f4d 100644
--- 
a/src/test/java/org/apache/sling/auth/oauth_client/impl/SlingUserInfoProcessorImplTest.java
+++ 
b/src/test/java/org/apache/sling/auth/oauth_client/impl/SlingUserInfoProcessorImplTest.java
@@ -161,7 +161,7 @@ class SlingUserInfoProcessorImplTest {
                         "groupsInIdToken", true,
                         "storeAccessToken", false,
                         "storeRefreshToken", false,
-                        "idpNameInUserId", true,
+                        "idpNameInPrincipals", true,
                         "groupsClaimName", "groups",
                         "connection", "test"))
                 .to(SlingUserInfoProcessorImpl.Config.class);