Updated user authentication.

cmsWebApp/src/performa/form/SendCompanyUserInvitesFP.java

@@ -45,7 +45,7 @@ public class SendCompanyUserInvitesFP extends ORMProcessFormProcessor
 
                 BusinessObjectParser.assertFieldCondition(secUser.getEmail()!=null, secUser, SecUser.FIELD_Email, "mandatory", exceptions, true, request);
                 
-                BusinessObjectParser.assertFieldCondition(!isEmailFound(process.getTransaction(), secUser.getEmail()), secUser, SecUser.FIELD_Email, "emailExists", exceptions, true, request);
+                BusinessObjectParser.assertFieldCondition(!Utils.isCompanyUserEmailFound(process.getTransaction(), secUser.getEmail()), secUser, SecUser.FIELD_Email, "emailExists", exceptions, true, request);
             }
         }
         
@@ -84,7 +84,7 @@ public class SendCompanyUserInvitesFP extends ORMProcessFormProcessor
         {
             if(!CollectionUtils.equals(cUser, companyUser))
             {
-                SecUser sUser   =   cUser.getUser();
+                SecUser sUser   =   Utils.getSecUserForCompanyIfAvailable(cUser);
 
                 LogMgr.log(LOG, LogLevel.PROCESSING1, "Started to send invitaion email.", cUser);
 
@@ -182,21 +182,4 @@ public class SendCompanyUserInvitesFP extends ORMProcessFormProcessor
             LogMgr.log(LOG, LogLevel.PROCESSING1, "Call from " + SendVerificationMailFP.class + ". Account is already verified  for candidate :: ", companyUser);
         }
     }
-    
-    
-    
-    private Boolean isEmailFound(ObjectTransaction objTran, String email)
-    {
-        if(email!=null)
-        {
-            SecUser user    = SecUser.searchNAME(objTran, email.toLowerCase());
-            
-            if(user!=null && user.getExtension(CompanyUser.REFERENCE_CompanyUser)!=null)
-            {
-                return Boolean.TRUE;
-            }
-        }
-        
-        return Boolean.FALSE;
-    }
 }
\ No newline at end of file

cmsWebApp/src/performa/form/SendUserInvitationFP.java

@@ -24,7 +24,7 @@ import performa.utils.WebUtils;
 public class SendUserInvitationFP extends SaveFP
 {
     private static LoggingArea  LOG                 =   LoggingArea.createLoggingArea("SendUserInvitationFP");
-    private static final String DEFAULT_PASSWORD    =   "Talentology123";
+    private static final String DEFAULT_PASSWORD    =   "Talentology1234";
     protected ConfigurableArticleTemplateEmailer invitationEmailer;
     
     
@@ -42,7 +42,7 @@ public class SendUserInvitationFP extends SaveFP
         else
         {
             BusinessObjectParser.assertFieldCondition(company.getUserEmail()!=null, company, Company.FIELD_UserEmail, "mandatory", exceptions, true, request);
-            BusinessObjectParser.assertFieldCondition(!isEmailFound(process.getTransaction(), company.getUserEmail()), company, Company.FIELD_UserEmail, "emailExists", exceptions, true, request);
+            BusinessObjectParser.assertFieldCondition(!Utils.isCompanyUserEmailFound(process.getTransaction(), company.getUserEmail()), company, Company.FIELD_UserEmail, "emailExists", exceptions, true, request);
             BusinessObjectParser.assertFieldCondition(company.getRoleType()!=null, company, Company.FIELD_RoleType, "mandatory", exceptions, true, request);
         }
         
@@ -57,6 +57,7 @@ public class SendUserInvitationFP extends SaveFP
         ObjectTransaction   objTran     =   process.getTransaction();
         Company             company     =   (Company) process.getAttribute("Company");
         CompanyUser         resendUser  =   (CompanyUser) request.getAttribute("ResendUser");
+        String              email       =   company.getUserEmail().toLowerCase();
         
         if(resendUser!=null)
         {
@@ -70,24 +71,35 @@ public class SendUserInvitationFP extends SaveFP
         {
             LogMgr.log(LOG, LogLevel.PROCESSING1, "Started to create new use", company);
 
-            SecUser     newUser     =   SecUser.createSecUser(objTran);
-            CompanyUser newComUser  =   newUser.getExtensionOrCreate(CompanyUser.REFERENCE_CompanyUser);
+            SecUser     secUser     =   null;
             
-            newUser.setUserName(company.getUserEmail().toLowerCase());
-            newUser.setEmail(newUser.getUserName());
-            newUser.setAttribute("md5:" + SecUser.FIELD_Password, DEFAULT_PASSWORD);
-            newUser.addRole(Utils.getRole(Utils.ROLE_CLIENT, objTran));
-            newUser.setFirstName(company.getFirstName());
-            newUser.setLastName(company.getLastName());
+            if(SecUser.searchNAME(objTran, company.getUserEmail())!=null)
+            {
+                secUser =   SecUser.searchNAME(objTran, company.getUserEmail());
+            }
+            else
+            {
+                secUser =   SecUser.createSecUser(objTran);
+                
+                secUser.setUserName(email);
+            }
+            
+            CompanyUser newComUser  =   secUser.getExtensionOrCreate(CompanyUser.REFERENCE_CompanyUser);
+
+            secUser.setEmail(secUser.getUserName());
+            secUser.setAttribute("md5:" + SecUser.FIELD_Password, DEFAULT_PASSWORD);
+            secUser.addRole(Utils.getRole(Utils.ROLE_CLIENT, objTran));
+            secUser.setFirstName(company.getFirstName());
+            secUser.setLastName(company.getLastName());
 
             newComUser.setCompany(company);
             newComUser.setRole(company.getRoleType());
 
-            LogMgr.log(LOG, LogLevel.PROCESSING1, "New user created :: ", newUser);
+            LogMgr.log(LOG, LogLevel.PROCESSING1, "New user created :: ", secUser);
 
             sendInvitationMail(newComUser, request);
             
-            LogMgr.log(LOG, LogLevel.PROCESSING1, "End of sending invitation email.", newUser);
+            LogMgr.log(LOG, LogLevel.PROCESSING1, "End of sending invitation email.", secUser);
         }
 
         return super.processForm(process, submission, params);
@@ -146,21 +158,4 @@ public class SendUserInvitationFP extends SaveFP
             LogMgr.log(LOG, LogLevel.PROCESSING1, "Call from " + SendUserInvitationFP.class + ". Account is already verified  for candidate :: ", companyUser);
         }
     }
-    
-    
-    
-    private Boolean isEmailFound(ObjectTransaction objTran, String email)
-    {
-        if(email!=null)
-        {
-            SecUser user    = SecUser.searchNAME(objTran, email.toLowerCase());
-            
-            if(user!=null) //&& user.getExtension(CompanyUser.REFERENCE_CompanyUser)!=null
-            {
-                return Boolean.TRUE;
-            }
-        }
-        
-        return Boolean.FALSE;
-    }
 }
\ No newline at end of file

cmsWebApp/src/performa/form/SendVerificationMailFP.java

@@ -44,7 +44,7 @@ public class SendVerificationMailFP extends SaveFP
             CompanyUser companyUser =   company.getAddedByUser();
             SecUser     secUser     =   companyUser.getUser();
             
-            BusinessObjectParser.assertFieldCondition(!isCompanyUserEmailFound(process.getTransaction(), secUser.getEmail()), secUser, SecUser.FIELD_Email, "emailExists", exceptions, true, request);
+            BusinessObjectParser.assertFieldCondition(!Utils.isCompanyUserEmailFound(process.getTransaction(), secUser.getEmail()), secUser, SecUser.FIELD_Email, "emailExists", exceptions, true, request);
         }
         else
         {
@@ -236,20 +236,4 @@ public class SendVerificationMailFP extends SaveFP
             LogMgr.log(LOG, LogLevel.PROCESSING1, "Call from " + SendVerificationMailFP.class + ". Account is already verified  for candidate :: ", companyUser);
         }
     }
-    
-    
-    private Boolean isCompanyUserEmailFound(ObjectTransaction objTran, String email)
-    {
-        if(email!=null)
-        {
-            SecUser user    = SecUser.searchNAME(objTran, email.toLowerCase());
-            
-            if(user!=null && user.getExtension(CompanyUser.REFERENCE_CompanyUser)!=null)
-            {
-                return Boolean.TRUE;
-            }
-        }
-        
-        return Boolean.FALSE;
-    }
 }
\ No newline at end of file

cmsWebApp/src/performa/utils/Utils.java

@@ -348,6 +348,7 @@ public class Utils
         return new RedirectResult((String) request.getAttribute("nextPage"), null);
     }
     
+    
     public static Client[] getClientsByCompany(ObjectTransaction transaction)
     {
         SecUser     secUser     =   SecUser.getTXUser(transaction);
@@ -358,6 +359,46 @@ public class Utils
                     .andCompany(new EqualsFilter<>(company))
                     .search(transaction);
     }
+    
+    
+    public static Boolean isCompanyUserEmailFound(ObjectTransaction objTran, String email)
+    {
+        if(email!=null)
+        {
+            SecUser user    = SecUser.searchNAME(objTran, email.toLowerCase());
+            
+            if(user!=null && user.getExtension(CompanyUser.REFERENCE_CompanyUser)!=null)
+            {
+                return Boolean.TRUE;
+            }
+        }
+        
+        return Boolean.FALSE;
+    }
+    
+    
+    public static SecUser getSecUserForCompanyIfAvailable(CompanyUser companyUser)
+    {
+        SecUser     secUser             =   companyUser.getUser();
+        SecUser     availableSecUser    =   SecUser.searchNAME(companyUser.getTransaction(), secUser.getEmail());
+
+        if(availableSecUser!=null)
+        {
+            if(availableSecUser.getExtension(CompanyUser.REFERENCE_CompanyUser)==null)
+            {
+
+                availableSecUser.addToExtensions(companyUser);
+
+                //remove new sec user obj
+                secUser.removeFromExtensions(companyUser);
+                secUser.delete();
+
+                return availableSecUser;
+            }
+        }
+        
+        return secUser;
+    }
 }