Merge pull request #418 from SujanSanjula96/patch-1

Fix returning identityProviderMappedUserRoles in federated user logins in SAML apps
wso2-extensions · Feb 10, 2024 · bad6dff · bad6dff
2 parents 8c03d31 + c66557f
commit bad6dff
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/...ava/org/wso2/carbon/identity/sso/saml/builders/assertion/DefaultSAMLAssertionBuilder.java b/...ava/org/wso2/carbon/identity/sso/saml/builders/assertion/DefaultSAMLAssertionBuilder.java
@@ -55,6 +55,7 @@
 import org.opensaml.core.xml.schema.XSString;
 import org.opensaml.core.xml.schema.impl.XSStringBuilder;
 import org.wso2.carbon.identity.application.authentication.framework.model.AuthenticationContextProperty;
+import org.wso2.carbon.identity.application.authentication.framework.util.FrameworkConstants;
 import org.wso2.carbon.identity.application.common.util.IdentityApplicationConstants;
 import org.wso2.carbon.identity.base.IdentityConstants;
 import org.wso2.carbon.identity.base.IdentityException;
@@ -342,6 +343,7 @@ protected AttributeStatement buildAttributeStatement(Map<String, String> claims)
  userAttributeSeparator = claimSeparator;
  }
  claims.remove(IdentityCoreConstants.MULTI_ATTRIBUTE_SEPARATOR);
+ claims.remove(FrameworkConstants.IDP_MAPPED_USER_ROLES);
 
  AttributeStatement attStmt = new AttributeStatementBuilder().buildObject();
  Iterator<Map.Entry<String, String>> iterator = claims.entrySet().iterator();

diff --git a/pom.xml b/pom.xml
@@ -457,7 +457,7 @@
  <properties>
  <carbon.kernel.version>4.9.23</carbon.kernel.version>
  <carbon.kernel.feature.version>4.9.0</carbon.kernel.feature.version>
- <carbon.identity.framework.version>5.25.507</carbon.identity.framework.version>
+ <carbon.identity.framework.version>7.0.40</carbon.identity.framework.version>
  <carbon.identity.framework.imp.pkg.version.range>[5.25.260, 8.0.0)
  </carbon.identity.framework.imp.pkg.version.range>
  <carbon.identity.organization.management.core.version>1.0.0</carbon.identity.organization.management.core.version>