Validation for company user login.

Restricted own role change for user who created the company.

cmsWebApp/src/performa/form/VerifyCompanyUserFP.java

@@ -2,17 +2,20 @@ package performa.form;
 
 import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
+import oneit.appservices.config.ConfigMgr;
 import oneit.components.ParticipantInitialisationContext;
 import oneit.email.ConfigurableArticleTemplateEmailer;
 import oneit.email.ConfigurableEmailerException;
 import oneit.logging.*;
 import oneit.objstore.StorageException;
 import oneit.objstore.parser.BusinessObjectParser;
+import oneit.objstore.validator.AttributeValidator;
 import oneit.security.SecUser;
 import oneit.servlets.forms.*;
 import oneit.servlets.process.*;
 import oneit.servlets.security.SessionSecUserDecorator;
 import oneit.utils.*;
+import oneit.utils.parsers.FieldException;
 import performa.intercom.utils.IntercomUtils;
 import performa.orm.*;
 import performa.utils.Utils;
@@ -42,9 +45,29 @@ public class VerifyCompanyUserFP extends ORMProcessFormProcessor
             BusinessObjectParser.assertFieldCondition(company.getCompanyName()!=null, company, Company.FIELD_CompanyName, "mandatory", exceptions, true, request);
         }
         
-        BusinessObjectParser.assertFieldCondition(companyUser.getPassword()!= null, companyUser, Job.FIELD_Password, "mandatory", exceptions, true, request);
-        BusinessObjectParser.assertFieldCondition(companyUser.getConfirmPassword()!= null, companyUser, Job.FIELD_ConfirmPassword, "mandatory", exceptions, true, request);
-        BusinessObjectParser.assertFieldCondition(CollectionUtils.equals(companyUser.getPassword(), companyUser.getConfirmPassword()), companyUser, Job.FIELD_ConfirmPassword, "passwordNotMatch", exceptions, true, request);
+        BusinessObjectParser.assertFieldCondition(companyUser.getPassword()!= null, companyUser, CompanyUser.FIELD_Password, "mandatory", exceptions, true, request);
+        BusinessObjectParser.assertFieldCondition(companyUser.getConfirmPassword()!= null, companyUser, CompanyUser.FIELD_ConfirmPassword, "mandatory", exceptions, true, request);
+        BusinessObjectParser.assertFieldCondition(CollectionUtils.equals(companyUser.getPassword(), companyUser.getConfirmPassword()), companyUser, CompanyUser.FIELD_ConfirmPassword, "passwordNotMatch", exceptions, true, request);
+        
+        //to validate password
+        AttributeValidator passwordValidator = (AttributeValidator)(ConfigMgr.getConfigObject ("CONFIG.ORMVALIDATOR", "PasswordValidator", null));
+        
+        try
+        {
+            //execute if not null
+            if (passwordValidator != null)
+            {
+                passwordValidator.validate (null, secUser, "Password", companyUser.getPassword());
+            }
+        }
+        catch (FieldException e)
+        {
+            exceptions.addException(new FieldException(e, CompanyUser.FIELD_Password));
+        }
+        catch (Exception e)
+        {
+            throw NestedException.wrap(e);
+        }
         
         return super.validate(submission, exceptions);
     }

cmsWebApp/src/performa/orm/CompanyUser.java

@@ -74,4 +74,16 @@ public class CompanyUser extends BaseCompanyUser
         
         super.postRoleChange();
     }
+
+    
+    @Override
+    public FieldWriteability getWriteability_Role() 
+    {
+        if(CollectionUtils.equals(getCompany().getAddedByUser(),this))
+        {
+            return FieldWriteability.NOT_IN_GUI;
+        }
+        
+        return super.getWriteability_Role();
+    }
 }
\ No newline at end of file