Skip to content

P
PERFORMA_REPLICA
Commit 7dd8c1c2 by Harsh Shah
Options

Minor review changes, Issue fixes

parent 9fc4cbe7
Showing with 65 additions and 52 deletions
cmsWebApp/src/performa/form/SendCompanyUserInvitesFP.java
......@@ -25,8 +25,8 @@ import performa.utils.WebUtils;
public class SendCompanyUserInvitesFP extends ORMProcessFormProcessor
{
private static LoggingArea LOG = LoggingArea.createLoggingArea("VerifyCompanyUser");
private static final String DEFAULT_PASSWORD = "Talentology123";
private static final LoggingArea LOG = LoggingArea.createLoggingArea("SendCompanyUserInvites");
protected ConfigurableArticleTemplateEmailer emailer;
protected ConfigurableArticleTemplateEmailer invitationEmailer;
......@@ -99,7 +99,7 @@ public class SendCompanyUserInvitesFP extends ORMProcessFormProcessor
sUser.setUserName(sUser.getEmail().toLowerCase());
}
sUser.setAttribute("md5:" + SecUser.FIELD_Password, DEFAULT_PASSWORD);
sUser.setAttribute("md5:" + SecUser.FIELD_Password, CompanyUser.DEFAULT_PASSWORD);
sUser.addRole(Utils.getRole(Utils.ROLE_CLIENT, objTran));
LogMgr.log(LOG, LogLevel.PROCESSING1, "New user created :: ", sUser);
......@@ -131,12 +131,11 @@ public class SendCompanyUserInvitesFP extends ORMProcessFormProcessor
invitationEmailer = (ConfigurableArticleTemplateEmailer) (context.getSingleChild("InvitationEmailer"));
}
protected void sendAccountCreatedMail(CompanyUser companyUser, HttpServletRequest request) throws BusinessException
private void sendAccountCreatedMail(CompanyUser companyUser, HttpServletRequest request) throws BusinessException
{
try
{
LogMgr.log(LOG, LogLevel.PROCESSING1, "Sending Account Created mail from VerifyCompanyUserFP to :: ", companyUser);
LogMgr.log(LOG, LogLevel.PROCESSING1, "Sending Account Created mail from SendCompanyUserInvitesFP to :: ", companyUser);
Map defaultParams = CollectionUtils.EMPTY_MAP;
ObjectTransform transform = Utils.createCompoundTransform(defaultParams, companyUser);
......@@ -153,16 +152,15 @@ public class SendCompanyUserInvitesFP extends ORMProcessFormProcessor
}
}
protected void sendInvitationMail(CompanyUser companyUser, HttpServletRequest request) throws BusinessException
private void sendInvitationMail(CompanyUser companyUser, HttpServletRequest request) throws BusinessException
{
if(companyUser.getIsAccountVerified()!=Boolean.TRUE)
if(!companyUser.isTrue(companyUser.getIsAccountVerified()))
{
try
{
LogMgr.log(LOG, LogLevel.PROCESSING1, "Sending invitation mail from SendVerificationMailFP to :: ", companyUser);
Article invitationArticle = WebUtils.getArticleByShortCut(companyUser.getTransaction(), WebUtils.COMPANY_ACCOUNT_VERIFICATION);
Article invitationArticle = WebUtils.getArticleByShortCut(companyUser.getTransaction(), WebUtils.COMPANY_ACCOUNT_VERIFICATION);
RandomStringGen random = new RandomStringGen();
//set invitation key and send mail time
......
cmsWebApp/src/performa/form/SendUserInvitationFP.java
......@@ -24,10 +24,8 @@ import performa.utils.WebUtils;
public class SendUserInvitationFP extends SaveFP
{
private static LoggingArea LOG = LoggingArea.createLoggingArea("SendUserInvitationFP");
private static final String DEFAULT_PASSWORD = "Talentology1234";
protected ConfigurableArticleTemplateEmailer invitationEmailer;
@Override
public void validate(ORMProcessState process, SubmissionDetails submission, MultiException exceptions, Map params) throws StorageException
{
......@@ -82,7 +80,7 @@ public class SendUserInvitationFP extends SaveFP
CompanyUser newComUser = secUser.getExtensionOrCreate(CompanyUser.REFERENCE_CompanyUser);
secUser.setEmail(secUser.getUserName());
secUser.setAttribute("md5:" + SecUser.FIELD_Password, DEFAULT_PASSWORD);
secUser.setAttribute("md5:" + SecUser.FIELD_Password, CompanyUser.DEFAULT_PASSWORD);
secUser.addRole(Utils.getRole(Utils.ROLE_CLIENT, objTran));
secUser.setFirstName(company.getFirstName());
secUser.setLastName(company.getLastName());
......
cmsWebApp/src/performa/form/SendVerificationMailFP.java
......@@ -24,8 +24,7 @@ import performa.utils.WebUtils;
public class SendVerificationMailFP extends SaveFP
{
private static LoggingArea LOG = LoggingArea.createLoggingArea("SendVerificationLink");
private static final String DEFAULT_PASSWORD = "Talentology123";
private static final LoggingArea LOG = LoggingArea.createLoggingArea("SendVerificationLink");
protected ConfigurableArticleTemplateEmailer emailer;
......@@ -91,7 +90,7 @@ public class SendVerificationMailFP extends SaveFP
{
secUser.setUserName(secUser.getEmail().toLowerCase());
secUser.setAttribute("md5:" + SecUser.FIELD_Password, DEFAULT_PASSWORD);
secUser.setAttribute("md5:" + SecUser.FIELD_Password, CompanyUser.DEFAULT_PASSWORD);
secUser.addRole(Utils.getRole(Utils.ROLE_CLIENT, objTran));
LogMgr.log(LOG, LogLevel.PROCESSING1, "New user created :: ", secUser);
......@@ -129,7 +128,7 @@ public class SendVerificationMailFP extends SaveFP
secUser = SecUser.createSecUser(objTran);
secUser.setUserName(email);
secUser.setAttribute("md5:" + SecUser.FIELD_Password, DEFAULT_PASSWORD);
secUser.setAttribute("md5:" + SecUser.FIELD_Password, CompanyUser.DEFAULT_PASSWORD);
secUser.addRole(Utils.getRole(Utils.ROLE_APPLICANT, objTran));
}
......@@ -155,9 +154,9 @@ public class SendVerificationMailFP extends SaveFP
}
protected void sendVerificationMail(Candidate candidate, Job job, HttpServletRequest request) throws BusinessException
private void sendVerificationMail(Candidate candidate, Job job, HttpServletRequest request) throws BusinessException
{
if(candidate.getIsAccountVerified()!=Boolean.TRUE)
if(!candidate.isTrue(candidate.getIsAccountVerified()))
{
try
{
......
cmsWebApp/src/performa/form/UserLoginFP.java
......@@ -23,7 +23,7 @@ public class UserLoginFP extends LoginProcessor
CompanyUser companyUser = userToCheck.getExtension(CompanyUser.REFERENCE_CompanyUser);
if(!Utils.checkAdminPortalAccess(userToCheck) || companyUser == null || companyUser.getIsAccountVerified()!=Boolean.TRUE)
if(!Utils.checkAdminPortalAccess(userToCheck) || companyUser == null || !companyUser.isTrue(companyUser.getIsAccountVerified()))
{
throw new FieldException("You're not an authorised user to access this portal.", SecUser.FIELD_UserName);
}
......
cmsWebApp/src/performa/form/VerifyCompanyUserFP.java
......@@ -24,15 +24,14 @@ import performa.utils.WebUtils;
public class VerifyCompanyUserFP extends ORMProcessFormProcessor
{
private static LoggingArea LOG = LoggingArea.createLoggingArea("VerifyCompanyUser");
private static final LoggingArea LOG = LoggingArea.createLoggingArea("VerifyCompanyUser");
protected ConfigurableArticleTemplateEmailer emailer;
@Override
protected Map validate(SubmissionDetails submission, MultiException exceptions)
public void validate(ORMProcessState process, SubmissionDetails submission, MultiException exceptions, Map params) throws StorageException
{
HttpServletRequest request = submission.getRequest();
CompanyUser companyUser = (CompanyUser) request.getAttribute("CompanyUser");
CompanyUser companyUser = (CompanyUser) process.getAttribute("CompanyUser");
Boolean socialLogin = (Boolean) request.getAttribute("socialLogin");
SecUser secUser = companyUser.getUser();
Company company = companyUser.getCompany();
......@@ -50,7 +49,7 @@ public class VerifyCompanyUserFP extends ORMProcessFormProcessor
BusinessObjectParser.assertFieldCondition(secUser.getFirstName()!=null, secUser, SecUser.FIELD_FirstName, "mandatory", exceptions, true, request);
BusinessObjectParser.assertFieldCondition(secUser.getLastName()!=null, secUser, SecUser.FIELD_LastName, "mandatory", exceptions, true, request);
if(company.getIsVerified()!=Boolean.TRUE)
if(!company.isTrue(company.getIsVerified()))
{
BusinessObjectParser.assertFieldCondition(company.getCompanyName()!=null, company, Company.FIELD_CompanyName, "mandatory", exceptions, true, request);
}
......@@ -81,8 +80,7 @@ public class VerifyCompanyUserFP extends ORMProcessFormProcessor
throw NestedException.wrap(e);
}
}
return super.validate(submission, exceptions);
super.validate(process, submission, exceptions, params);
}
......@@ -90,7 +88,7 @@ public class VerifyCompanyUserFP extends ORMProcessFormProcessor
public SuccessfulResult processForm(ORMProcessState process, SubmissionDetails submission, Map params) throws BusinessException, StorageException
{
HttpServletRequest request = submission.getRequest();
CompanyUser companyUser = (CompanyUser) request.getAttribute("CompanyUser");
CompanyUser companyUser = (CompanyUser) process.getAttribute("CompanyUser");
SecUser secUser = companyUser.getUser();
Company company = companyUser.getCompany();
String nextPage = (String) request.getAttribute("nextPage");
......@@ -100,7 +98,7 @@ public class VerifyCompanyUserFP extends ORMProcessFormProcessor
if(CollectionUtils.equals(companyUser.getPassword(), companyUser.getConfirmPassword()))
{
if(company.getIsVerified()!=Boolean.TRUE && CollectionUtils.equals(company.getAddedByUser(), companyUser))
if(!company.isTrue(company.getIsVerified()) && CollectionUtils.equals(company.getAddedByUser(), companyUser))
{
process.setAttribute("Company", company);
process.setAttribute("socialLogin", socialLogin);
......
cmsWebApp/src/performa/orm/Company.java
package performa.orm;
import oneit.logging.LoggingArea;
import oneit.security.SecUser;
import oneit.utils.CollectionUtils;
import oneit.utils.parsers.FieldException;
public class Company extends BaseCompany
......@@ -20,4 +23,26 @@ public class Company extends BaseCompany
{
return isTrue(getHasClientSupport());
}
//This logic moved from invite_users.jsp
public boolean createDefaultUser() throws FieldException
{
boolean addUser = true;
for (CompanyUser cUser : getUsersSet())
{
if(!CollectionUtils.equals(cUser, getAddedByUser()))
{
addUser = false;
}
}
if(addUser)
{
SecUser secUser = SecUser.createSecUser(getTransaction());
CompanyUser companyUser = secUser.getExtensionOrCreate(CompanyUser.REFERENCE_CompanyUser);
addToUsers(companyUser);
}
return addUser;
}
}
\ No newline at end of file
cmsWebApp/src/performa/orm/CompanyUser.java
......@@ -14,7 +14,8 @@ public class CompanyUser extends BaseCompanyUser
{
private static final long serialVersionUID = 0L;
public static LoggingArea LOG = LoggingArea.createLoggingArea("CompanyUser");
public static LoggingArea LOG = LoggingArea.createLoggingArea("CompanyUser");
public static final String DEFAULT_PASSWORD = "Talentology123";
// This constructor should not be called
public CompanyUser ()
......
cmsWebApp/webroot/extensions/adminportal/inc/invite_user_add.jsp
......@@ -9,10 +9,10 @@
ORMProcessState process = (ORMProcessState) ProcessDecorator.getDefaultProcess(request);
ObjectTransaction objTran = process.getTransaction ();
Company company = (Company) process.getAttribute("Company");
CompanyUser companyUser = (CompanyUser) getData(request, "CompanyUser");
CompanyUser companyUser = (CompanyUser) getData(request, "CUser");
SecUser secUser = null;
if(companyUser==null || request.getParameter("newuser") != null)
if(companyUser == null)
{
secUser = SecUser.createSecUser(objTran);
companyUser = secUser.getExtensionOrCreate(CompanyUser.REFERENCE_CompanyUser);
......@@ -23,7 +23,7 @@
secUser = companyUser.getUser();
%>
<oneit:form method="POST">
<oneit:form name="companyProfile" method="POST">
<oneit:evalBody buffer="<%= getBuffer(request) %>">
<%
......@@ -38,7 +38,7 @@
FormTag.setVariable (request, deleteVarKey, "objToDelete", secUser);
FormTag.setVariable (request, deleteVarKey, "jqToDelete", "#" + secUser.getID());
%>
<div class="main-user-invite" id="<%= secUser.getID() %>">
<span class="delete-company-user" onclick="return deleteUser (<%= deleteVarKey %>)"><span></span></span>
<oneit:ormInput obj="<%= secUser %>" type="text" attributeName="Email" cssClass="form-control" />
......
cmsWebApp/webroot/extensions/adminportal/invite_users.jsp
......@@ -17,13 +17,19 @@
CompanyUser companyUser = company.getAddedByUser();
SecUser secUser = companyUser.getUser();
Integer pageNumber = 2;
boolean toRedirect = company.createDefaultUser();
if (toRedirect)
{
%><%@include file="/saferedirect.jsp"%><%
}
%>
<script type="text/javascript">
function addUser() {
var divID = "#usersSection";
ajaxProcessAddJQ ("<%= request.getContextPath() %>/extensions/adminportal/inc/invite_user_add.jsp", divID, {newuser: "true"}, function (theHTML_JQ) {
ajaxProcessAddJQ ("<%= request.getContextPath() %>/extensions/adminportal/inc/invite_user_add.jsp", divID, {}, function (theHTML_JQ) {
$(divID).append (theHTML_JQ);
});
}
......@@ -53,28 +59,17 @@
<div class="form-group">
<div id="usersSection">
<%
Boolean firtUser = Boolean.TRUE;
for (CompanyUser cUser : company.getUsersSet())
{
if(!CollectionUtils.equals(cUser, companyUser))
{
firtUser = Boolean.FALSE;
%>
<oneit:dynInclude page="/extensions/adminportal/inc/invite_user_add.jsp"
CompanyUser="<%= cUser %>"
CUser="<%= cUser %>"
data="<%= CollectionUtils.EMPTY_MAP%>"/>
<%
}
}
if(firtUser)
{
%>
<oneit:dynInclude page="/extensions/adminportal/inc/invite_user_add.jsp"
CompanyUser="<%= null %>"
data="<%= CollectionUtils.EMPTY_MAP%>"/>
<%
}
%>
</div>
</div>
......
cmsWebApp/webroot/extensions/adminportal/verify_company.jsp
......@@ -34,7 +34,7 @@
{
//to handle social login
SecUser logedInUser = SecUser.getTXUser(transaction);
companyUser = logedInUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
companyUser = logedInUser != null ? logedInUser.getExtension(CompanyUser.REFERENCE_CompanyUser) : null;
if(logedInUser!=null
&& logedInUser.hasRole(Utils.ROLE_CLIENT)
......@@ -110,8 +110,7 @@
%>
<oneit:button value="Verify and login" name="verifyCompanyUser" cssClass="box-btn verify-btn"
requestAttribs="<%= CollectionUtils.mapEntry("CompanyUser", companyUser)
.mapEntry("socialLogin", socialLogin)
requestAttribs="<%= CollectionUtils.mapEntry("socialLogin", socialLogin)
.mapEntry("nextPage", nextPage).toMap() %>"/>
</div>
</oneit:form>
......
cmsWebApp/webroot/extensions/applicantportal/sign_in.jsp
......@@ -180,7 +180,6 @@
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", currentPage)
.mapEntry("Job",job)
.mapEntry("restartProcess", Boolean.TRUE)
.mapEntry("attribNamesToRestore", "Job")
.mapEntry("attribNamesToRestore", Collections.singleton("Job"))
.mapEntry(NotificationUtils.NOTIFICATION_MSG_PARAM, "emailSent")
.toMap() %>"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment