From 6e75d7752df059baabe93220d149e0a95f18c5f9 Mon Sep 17 00:00:00 2001 From: Madhavi Gayathri Date: Mon, 22 Apr 2024 14:38:37 +0530 Subject: [PATCH] Fix formatting and naming issues. --- .../custom-user-store-listener/.gitignore | 25 --- user-mgt/custom-user-store-listener/LICENSE | 201 ------------------ user-mgt/custom-user-store-listener/pom.xml | 166 +++++++++++---- .../listener/MyUserStoreCustomListener.java} | 43 ++-- .../CustomExtensionServiceComponent.java | 25 +-- 5 files changed, 164 insertions(+), 296 deletions(-) delete mode 100644 user-mgt/custom-user-store-listener/.gitignore delete mode 100644 user-mgt/custom-user-store-listener/LICENSE rename user-mgt/custom-user-store-listener/src/main/java/org/{soasecurity/user/mgt/custom/extension/MyUserMgtCustomExtension.java => wso2/custom/user/store/listener/MyUserStoreCustomListener.java} (67%) rename user-mgt/custom-user-store-listener/src/main/java/org/{soasecurity/user/mgt/custom/extension => wso2/custom/user/store/listener}/internal/CustomExtensionServiceComponent.java (61%) diff --git a/user-mgt/custom-user-store-listener/.gitignore b/user-mgt/custom-user-store-listener/.gitignore deleted file mode 100644 index 27d44eaa9..000000000 --- a/user-mgt/custom-user-store-listener/.gitignore +++ /dev/null @@ -1,25 +0,0 @@ -# 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* - -.idea \ No newline at end of file diff --git a/user-mgt/custom-user-store-listener/LICENSE b/user-mgt/custom-user-store-listener/LICENSE deleted file mode 100644 index 261eeb9e9..000000000 --- a/user-mgt/custom-user-store-listener/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - 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/user-mgt/custom-user-store-listener/pom.xml b/user-mgt/custom-user-store-listener/pom.xml index 96f338f37..03fdbc425 100644 --- a/user-mgt/custom-user-store-listener/pom.xml +++ b/user-mgt/custom-user-store-listener/pom.xml @@ -1,82 +1,148 @@ - - + + + + + org.wso2.samples.is + wso2is-identity-samples-usermgt + 4.6.3-SNAPSHOT + ../pom.xml + 4.0.0 - org.soasecurity - org.soasecurity.user.mgt.custom.extension + custom-user-store-listener bundle - 1.0.0 - User Mgt Custom Extension + Custom User Store Listener + + + + wso2-nexus + WSO2 internal Repository + https://maven.wso2.org/nexus/content/groups/wso2-public/ + + true + daily + ignore + + + + + wso2.releases + WSO2 internal Repository + https://maven.wso2.org/nexus/content/repositories/releases/ + + true + daily + ignore + + + + + wso2.snapshots + Apache Snapshot Repository + https://maven.wso2.org/nexus/content/repositories/snapshots/ + + true + daily + + + false + + + + + wso2-maven2-repository + http://dist.wso2.org/maven2 + + + org.wso2.carbon - org.wso2.carbon.core - 4.2.0 + org.wso2.carbon.user.api + ${carbon.kernel.version} + + + org.wso2.carbon + org.wso2.carbon.user.core + ${carbon.kernel.version} + + + org.wso2.eclipse.osgi + org.eclipse.osgi.services + ${equinox.osgi.services.version} commons-logging commons-logging - 1.1.1 + ${commons-logging.version} + + + org.apache.felix + org.apache.felix.scr.ds-annotations + ${apache.felix.scr.ds.annotations.version} - - 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.wso2.custom.user.store.listener.internal, - !org.soasecurity.user.mgt.custom.extension.internal, - org.soasecurity.user.mgt.custom.extension.* + !org.wso2.custom.user.store.listener.internal, + org.wso2.custom.user.store.listener.* - * + + org.osgi.framework.*;version="${osgi.framework.imp.pkg.version.range}", + org.osgi.service.component.*;version="${osgi.service.component.imp.pkg.version.range}", + + org.apache.axiom.om.util.*; version="${axiom.imp.pkg.version}", + org.apache.commons.lang; version="${commons-lang.wso2.osgi.version.range}", + org.apache.commons.logging.*; version="${commons-logging.osgi.version.range}", + + org.wso2.carbon.user.core.*; version="${carbon.kernel.package.import.version.range}", + org.wso2.carbon.user.api.*; version="${carbon.user.api.imp.pkg.version.range}", + org.wso2.carbon.utils.*; version="${carbon.kernel.package.import.version.range}", + *;resolution:=optional + - - - wso2-maven2-repository - http://dist.wso2.org/maven2 - - - wso2-maven2-repository @@ -84,4 +150,26 @@ + + + ${project.version} + [4.6.0, 5.0.0) + + + 4.10.13 + [4.6.0, 5.0.0) + [1.0.1, 2.0.0) + + + 3.0.0.v201112011016 + [1.7.0, 2.0.0) + [1.2.0, 2.0.0) + [1.2.11, 1.3.0) + 2.6.0.wso2v1 + [2.6.0,3.0.0) + 1.2 + [1.2,2.0) + 1.2.4 + 3.5.100.v20160504-1419 + diff --git a/user-mgt/custom-user-store-listener/src/main/java/org/soasecurity/user/mgt/custom/extension/MyUserMgtCustomExtension.java b/user-mgt/custom-user-store-listener/src/main/java/org/wso2/custom/user/store/listener/MyUserStoreCustomListener.java similarity index 67% rename from user-mgt/custom-user-store-listener/src/main/java/org/soasecurity/user/mgt/custom/extension/MyUserMgtCustomExtension.java rename to user-mgt/custom-user-store-listener/src/main/java/org/wso2/custom/user/store/listener/MyUserStoreCustomListener.java index d831e7fe7..7f4ecb52d 100644 --- a/user-mgt/custom-user-store-listener/src/main/java/org/soasecurity/user/mgt/custom/extension/MyUserMgtCustomExtension.java +++ b/user-mgt/custom-user-store-listener/src/main/java/org/wso2/custom/user/store/listener/MyUserStoreCustomListener.java @@ -1,40 +1,54 @@ -package org.soasecurity.user.mgt.custom.extension; +/* + * 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.wso2.custom.user.store.listener; 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; -import org.wso2.carbon.user.core.claim.Claim; import java.lang.Override; import java.lang.String; -import java.util.List; import java.util.Map; + /** * */ -public class MyUserMgtCustomExtension extends AbstractUserOperationEventListener { +public class MyUserStoreCustomListener extends AbstractUserOperationEventListener { - private static Log log = LogFactory.getLog(MyUserMgtCustomExtension.class); + private static final Log log = LogFactory.getLog(MyUserStoreCustomListener.class); @Override public int getExecutionOrderId() { + return 9883; } - @Override - public boolean doPostAuthenticate(String userName, boolean authenticated, UserStoreManager userStoreManager) throws UserStoreException { + public boolean doPostAuthenticate(String userName, boolean authenticated, UserStoreManager userStoreManager) + throws UserStoreException { // check whether user is authenticated - if(authenticated){ + if (authenticated) { log.info("=== doPostAuthenticate ==="); log.info("User " + userName + " logged in at " + System.currentTimeMillis()); log.info("=== /doPostAuthenticate ==="); - } return true; @@ -46,7 +60,6 @@ public boolean doPostAddUser(String userName, Object credential, String[] roleLi UserStoreManager userStoreManager) throws UserStoreException { - log.info("=== doPostAddUser ==="); log.info("User " + userName + " created at " + System.currentTimeMillis()); log.info(credential.toString()); @@ -57,21 +70,20 @@ public boolean doPostAddUser(String userName, Object credential, String[] roleLi return true; } - @Override public boolean doPostSetUserClaimValues(String userName, Map claims, String profileName, UserStoreManager userStoreManager) throws UserStoreException { - log.info("=== doPostSetUserClaimValues ==="); log.info("Username: " + userName); log.info("Profile: " + profileName); - log.info("NAME: " + userStoreManager.getUserClaimValue(userName, "http://wso2.org/claims/fullname", profileName)); - log.info("EMAIL: " + userStoreManager.getUserClaimValue(userName, "http://wso2.org/claims/emailaddress", profileName)); - + 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", profileName)); @@ -95,5 +107,4 @@ public boolean doPostSetUserClaimValues(String userName, Map cla return true; } - } diff --git a/user-mgt/custom-user-store-listener/src/main/java/org/soasecurity/user/mgt/custom/extension/internal/CustomExtensionServiceComponent.java b/user-mgt/custom-user-store-listener/src/main/java/org/wso2/custom/user/store/listener/internal/CustomExtensionServiceComponent.java similarity index 61% rename from user-mgt/custom-user-store-listener/src/main/java/org/soasecurity/user/mgt/custom/extension/internal/CustomExtensionServiceComponent.java rename to user-mgt/custom-user-store-listener/src/main/java/org/wso2/custom/user/store/listener/internal/CustomExtensionServiceComponent.java index 1e41ab668..204cb52bf 100644 --- a/user-mgt/custom-user-store-listener/src/main/java/org/soasecurity/user/mgt/custom/extension/internal/CustomExtensionServiceComponent.java +++ b/user-mgt/custom-user-store-listener/src/main/java/org/wso2/custom/user/store/listener/internal/CustomExtensionServiceComponent.java @@ -14,39 +14,34 @@ * limitations under the License. */ -package org.soasecurity.user.mgt.custom.extension.internal; +package org.wso2.custom.user.store.listener.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.osgi.service.component.annotations.Component; +import org.wso2.custom.user.store.listener.MyUserStoreCustomListener; import org.wso2.carbon.user.core.listener.UserOperationEventListener; - /** - * @scr.component name="org.soasecurity.user.mgt.custom.extension.internal.CustomExtensionServiceComponent" - * immediate="true" + * Custom User Store Listener Component. */ - +@Component(name = "custom.user.store.listener.component", + immediate = true) public class CustomExtensionServiceComponent { - private static Log log = LogFactory.getLog(CustomExtensionServiceComponent.class); - - private ServiceRegistration serviceRegistration = null; + private static final Log log = LogFactory.getLog(CustomExtensionServiceComponent.class); protected void activate(ComponentContext context) { - MyUserMgtCustomExtension listener = new MyUserMgtCustomExtension(); - serviceRegistration = - context.getBundleContext().registerService(UserOperationEventListener.class.getName(), - listener, null); + MyUserStoreCustomListener listener = new MyUserStoreCustomListener(); + 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"); } }