From a6afca9a1a22a3fcb14c0b631997572b4a1b920b Mon Sep 17 00:00:00 2001 From: Sajith Ekanayaka Date: Fri, 3 Aug 2018 10:05:13 +0530 Subject: [PATCH 1/7] Initial commit --- .gitignore | 23 ++++++ LICENSE | 201 +++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 1 + 3 files changed, 225 insertions(+) create mode 100644 .gitignore create mode 100644 LICENSE create mode 100644 README.md diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..a1c2a238a --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..261eeb9e9 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/README.md b/README.md new file mode 100644 index 000000000..5a84aadcc --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# wso2-user-store-listener \ No newline at end of file From fc489f21756a7aaeefa0abb36c4a295bad0c2721 Mon Sep 17 00:00:00 2001 From: Sajith Ekanayaka Date: Fri, 3 Aug 2018 10:14:48 +0530 Subject: [PATCH 2/7] Initial sample from https://svn.wso2.org/repos/wso2/people/asela/user-mgt/custom-listener/ --- org.soasecurity.user.mgt.custom.extension.iml | 98 +++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 org.soasecurity.user.mgt.custom.extension.iml diff --git a/org.soasecurity.user.mgt.custom.extension.iml b/org.soasecurity.user.mgt.custom.extension.iml new file mode 100644 index 000000000..2f9f6f75f --- /dev/null +++ b/org.soasecurity.user.mgt.custom.extension.iml @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 04c2bad50cf53a8150e8f56bf48b454aba320a2b Mon Sep 17 00:00:00 2001 From: Sajith Ekanayaka Date: Fri, 3 Aug 2018 10:14:48 +0530 Subject: [PATCH 3/7] Initial sample from https://svn.wso2.org/repos/wso2/people/asela/user-mgt/custom-listener/ --- .gitignore | 2 + org.soasecurity.user.mgt.custom.extension.iml | 98 +++++++++++++++++++ pom.xml | 87 ++++++++++++++++ .../extension/MyUserMgtCustomExtension.java | 57 +++++++++++ .../CustomExtensionServiceComponent.java | 52 ++++++++++ 5 files changed, 296 insertions(+) create mode 100644 org.soasecurity.user.mgt.custom.extension.iml create mode 100644 pom.xml create mode 100644 src/main/java/org/soasecurity/user/mgt/custom/extension/MyUserMgtCustomExtension.java create mode 100644 src/main/java/org/soasecurity/user/mgt/custom/extension/internal/CustomExtensionServiceComponent.java diff --git a/.gitignore b/.gitignore index a1c2a238a..27d44eaa9 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,5 @@ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* + +.idea \ No newline at end of file diff --git a/org.soasecurity.user.mgt.custom.extension.iml b/org.soasecurity.user.mgt.custom.extension.iml new file mode 100644 index 000000000..2f9f6f75f --- /dev/null +++ b/org.soasecurity.user.mgt.custom.extension.iml @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 000000000..96f338f37 --- /dev/null +++ b/pom.xml @@ -0,0 +1,87 @@ + + + + + 4.0.0 + org.soasecurity + org.soasecurity.user.mgt.custom.extension + bundle + 1.0.0 + User Mgt Custom Extension + + + + org.wso2.carbon + org.wso2.carbon.core + 4.2.0 + + + commons-logging + commons-logging + 1.1.1 + + + + + + + + + org.apache.felix + maven-scr-plugin + 1.7.2 + + + generate-scr-scrdescriptor + + scr + + + + + + org.apache.felix + maven-bundle-plugin + 2.3.5 + true + + + ${project.artifactId} + ${project.artifactId} + ${project.artifactId}-${project.version} + + javax.servlet, + javax.servlet.http, + *;resolution:=optional + + + org.soasecurity.user.mgt.custom.extension.internal, + + + !org.soasecurity.user.mgt.custom.extension.internal, + org.soasecurity.user.mgt.custom.extension.* + + * + + + + + + + + + wso2-maven2-repository + http://dist.wso2.org/maven2 + + + + + + wso2-maven2-repository + http://dist.wso2.org/maven2 + + + + diff --git a/src/main/java/org/soasecurity/user/mgt/custom/extension/MyUserMgtCustomExtension.java b/src/main/java/org/soasecurity/user/mgt/custom/extension/MyUserMgtCustomExtension.java new file mode 100644 index 000000000..c0ae629af --- /dev/null +++ b/src/main/java/org/soasecurity/user/mgt/custom/extension/MyUserMgtCustomExtension.java @@ -0,0 +1,57 @@ +package org.soasecurity.user.mgt.custom.extension; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.wso2.carbon.user.core.UserStoreException; +import org.wso2.carbon.user.core.UserStoreManager; +import org.wso2.carbon.user.core.common.AbstractUserOperationEventListener; + +/** + * + */ +public class MyUserMgtCustomExtension extends AbstractUserOperationEventListener { + + private static Log log = LogFactory.getLog(MyUserMgtCustomExtension.class); + + @Override + public int getExecutionOrderId() { + return 9883; + } + + + @Override + public boolean doPreAuthenticate(String userName, Object credential, + UserStoreManager userStoreManager) throws UserStoreException { + + // just log + log.info("doPreAuthenticate method is called before authenticating with user store"); + + return true; + } + + @Override + public boolean doPostAuthenticate(String userName, boolean authenticated, UserStoreManager userStoreManager) throws UserStoreException { + + + // just log + log.info("doPreAuthenticate method is called after authenticating with user store"); + + // custom logic + + // check whether user is authenticated + if (authenticated) { + + // persist user attribute in to user store + // "http://wso2.org/claims/lastlogontime" is the claim uri which represent the LDAP attribute + // more detail about claim management from here http://soasecurity.org/2012/05/02/claim-management-with-wso2-identity-server/ + + userStoreManager.setUserClaimValue(userName, "http://wso2.org/claims/lastlogontime", + Long.toString(System.currentTimeMillis()), null); + + } + + return true; + + } + +} diff --git a/src/main/java/org/soasecurity/user/mgt/custom/extension/internal/CustomExtensionServiceComponent.java b/src/main/java/org/soasecurity/user/mgt/custom/extension/internal/CustomExtensionServiceComponent.java new file mode 100644 index 000000000..1e41ab668 --- /dev/null +++ b/src/main/java/org/soasecurity/user/mgt/custom/extension/internal/CustomExtensionServiceComponent.java @@ -0,0 +1,52 @@ +/* + * Copyright (c) WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.soasecurity.user.mgt.custom.extension.internal; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.osgi.framework.ServiceRegistration; +import org.osgi.service.component.ComponentContext; +import org.soasecurity.user.mgt.custom.extension.MyUserMgtCustomExtension; +import org.wso2.carbon.user.core.listener.UserOperationEventListener; + + +/** + * @scr.component name="org.soasecurity.user.mgt.custom.extension.internal.CustomExtensionServiceComponent" + * immediate="true" + */ + +public class CustomExtensionServiceComponent { + + private static Log log = LogFactory.getLog(CustomExtensionServiceComponent.class); + + private ServiceRegistration serviceRegistration = null; + + protected void activate(ComponentContext context) { + + MyUserMgtCustomExtension listener = new MyUserMgtCustomExtension(); + serviceRegistration = + context.getBundleContext().registerService(UserOperationEventListener.class.getName(), + listener, null); + + log.debug("My Custom bundle is de-activated"); + } + + + protected void deactivate(ComponentContext context) { + log.debug("My Custom bundle is de-activated"); + } +} From ca50e4d60821799783398d1653a15d17a31081a4 Mon Sep 17 00:00:00 2001 From: Sajith Ekanayaka Date: Fri, 3 Aug 2018 22:02:06 +0530 Subject: [PATCH 4/7] Modified the listener with a workaround for identity claims --- .../extension/MyUserMgtCustomExtension.java | 76 ++++++++++++++----- 1 file changed, 59 insertions(+), 17 deletions(-) diff --git a/src/main/java/org/soasecurity/user/mgt/custom/extension/MyUserMgtCustomExtension.java b/src/main/java/org/soasecurity/user/mgt/custom/extension/MyUserMgtCustomExtension.java index c0ae629af..46ca53bd2 100644 --- a/src/main/java/org/soasecurity/user/mgt/custom/extension/MyUserMgtCustomExtension.java +++ b/src/main/java/org/soasecurity/user/mgt/custom/extension/MyUserMgtCustomExtension.java @@ -5,7 +5,13 @@ import org.wso2.carbon.user.core.UserStoreException; import org.wso2.carbon.user.core.UserStoreManager; import org.wso2.carbon.user.core.common.AbstractUserOperationEventListener; +import org.wso2.carbon.user.core.claim.Claim; +import java.lang.Override; +import java.lang.String; + +import java.util.List; +import java.util.Map; /** * */ @@ -20,38 +26,74 @@ public int getExecutionOrderId() { @Override - public boolean doPreAuthenticate(String userName, Object credential, - UserStoreManager userStoreManager) throws UserStoreException { + public boolean doPostAuthenticate(String userName, boolean authenticated, UserStoreManager userStoreManager) throws UserStoreException { + + // check whether user is authenticated + if(authenticated){ + + log.info("=== doPostAuthenticate ==="); + log.info("User " + userName + " logged in at " + System.currentTimeMillis()); + log.info("=== /doPostAuthenticate ==="); - // just log - log.info("doPreAuthenticate method is called before authenticating with user store"); + } return true; } @Override - public boolean doPostAuthenticate(String userName, boolean authenticated, UserStoreManager userStoreManager) throws UserStoreException { + public boolean doPostAddUser(String userName, Object credential, String[] roleList, + Map claims, String profile, + UserStoreManager userStoreManager) + throws UserStoreException { - // just log - log.info("doPreAuthenticate method is called after authenticating with user store"); + log.info("=== doPostAddUser ==="); + log.info("User " + userName + " created at " + System.currentTimeMillis()); + log.info(credential.toString()); + log.info(" === "); + log.info(claims.toString()); + log.info("=== /doPostAddUser ==="); - // custom logic + return true; + } - // check whether user is authenticated - if (authenticated) { - // persist user attribute in to user store - // "http://wso2.org/claims/lastlogontime" is the claim uri which represent the LDAP attribute - // more detail about claim management from here http://soasecurity.org/2012/05/02/claim-management-with-wso2-identity-server/ + @Override + public boolean doPostSetUserClaimValues(String userName, Map claims, + String profileName, UserStoreManager userStoreManager) + throws UserStoreException { - userStoreManager.setUserClaimValue(userName, "http://wso2.org/claims/lastlogontime", - Long.toString(System.currentTimeMillis()), null); - } + log.info("=== doPostSetUserClaimValues ==="); - return true; + log.info("Username: " + userName); + log.info("Profile: " + profileName); + + log.info("NAME: " + userStoreManager.getUserClaimValue(userName, "http://wso2.org/claims/fullname", "default")); + log.info("EMAIL: " + userStoreManager.getUserClaimValue(userName, "http://wso2.org/claims/emailaddress", "default")); + + +// This doens't work for identity claims +// log.info("LOCKED: " + userStoreManager.getUserClaimValue(userName, "http://wso2.org/claims/identity/accountLocked", "default")); + +// Following is the workaround for above problem + + String[] claimNames = { + "http://wso2.org/claims/identity/accountLocked", + "http://wso2.org/claims/identity/emailVerified" + }; + Map claimValues = userStoreManager.getUserClaimValues(userName, claimNames, null); + + log.info("LOCKED: " + claimValues.get(claimNames[0])); + log.info("EmailVerified: " + claimValues.get(claimNames[1])); + + log.info(claims.toString()); + + log.info("=== /doPostSetUserClaimValues ==="); + + return true; } + } From 8557f5a3d4de67e3109bb569d5c4a1711c5e192a Mon Sep 17 00:00:00 2001 From: Sajith Ekanayaka Date: Fri, 3 Aug 2018 22:05:43 +0530 Subject: [PATCH 5/7] Update README.md --- README.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5a84aadcc..f449cdf76 100644 --- a/README.md +++ b/README.md @@ -1 +1,8 @@ -# wso2-user-store-listener \ No newline at end of file +# wso2-user-store-listener + +WSO2 Carbon User Stores provide the ability to customize user store operations by registering an event listener for these operations. The listeners are executed at a fixed point in the user store operation, and the users are free to create a listener which implements their desired logic to be executed at these fixed points. Listener is an extension to extend the user core functions. Any number of listeners can be plugged with the user core and they would be called one by one. By using a listener, you are not overriding the user store implementation, which is good since you are not customizing the existing implementations. + +This is a sample code provided in [1] with a workaround for a issue [2]. + +[1] https://docs.wso2.com/display/IS550/User+Store+Listeners +[2] https://github.com/wso2/carbon-kernel/issues/1826 From 9946fd689ebab55161c160d188ee6749bf4b7568 Mon Sep 17 00:00:00 2001 From: Sajith Ekanayaka Date: Fri, 3 Aug 2018 22:55:44 +0530 Subject: [PATCH 6/7] Delete org.soasecurity.user.mgt.custom.extension.iml --- org.soasecurity.user.mgt.custom.extension.iml | 98 ------------------- 1 file changed, 98 deletions(-) delete mode 100644 org.soasecurity.user.mgt.custom.extension.iml diff --git a/org.soasecurity.user.mgt.custom.extension.iml b/org.soasecurity.user.mgt.custom.extension.iml deleted file mode 100644 index 2f9f6f75f..000000000 --- a/org.soasecurity.user.mgt.custom.extension.iml +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 0ffec515649cb0913900cdb06226c039cb8597e3 Mon Sep 17 00:00:00 2001 From: Sajith Ekanayaka Date: Sat, 4 Aug 2018 12:45:29 +0530 Subject: [PATCH 7/7] Use profileName instead "default" or null --- .../mgt/custom/extension/MyUserMgtCustomExtension.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/soasecurity/user/mgt/custom/extension/MyUserMgtCustomExtension.java b/src/main/java/org/soasecurity/user/mgt/custom/extension/MyUserMgtCustomExtension.java index 46ca53bd2..d831e7fe7 100644 --- a/src/main/java/org/soasecurity/user/mgt/custom/extension/MyUserMgtCustomExtension.java +++ b/src/main/java/org/soasecurity/user/mgt/custom/extension/MyUserMgtCustomExtension.java @@ -69,12 +69,12 @@ public boolean doPostSetUserClaimValues(String userName, Map cla log.info("Username: " + userName); log.info("Profile: " + profileName); - log.info("NAME: " + userStoreManager.getUserClaimValue(userName, "http://wso2.org/claims/fullname", "default")); - log.info("EMAIL: " + userStoreManager.getUserClaimValue(userName, "http://wso2.org/claims/emailaddress", "default")); + log.info("NAME: " + userStoreManager.getUserClaimValue(userName, "http://wso2.org/claims/fullname", profileName)); + log.info("EMAIL: " + userStoreManager.getUserClaimValue(userName, "http://wso2.org/claims/emailaddress", profileName)); // This doens't work for identity claims -// log.info("LOCKED: " + userStoreManager.getUserClaimValue(userName, "http://wso2.org/claims/identity/accountLocked", "default")); +// log.info("LOCKED: " + userStoreManager.getUserClaimValue(userName, "http://wso2.org/claims/identity/accountLocked", profileName)); // Following is the workaround for above problem @@ -83,7 +83,7 @@ public boolean doPostSetUserClaimValues(String userName, Map cla "http://wso2.org/claims/identity/emailVerified" }; - Map claimValues = userStoreManager.getUserClaimValues(userName, claimNames, null); + Map claimValues = userStoreManager.getUserClaimValues(userName, claimNames, profileName); log.info("LOCKED: " + claimValues.get(claimNames[0])); log.info("EmailVerified: " + claimValues.get(claimNames[1]));