Commit 8d290c9e by Chamath

Creating new user issue after cougar upgrade fixed.

parent bffb1542
...@@ -134,6 +134,8 @@ public class SendCompanyUserInvitesFP extends SaveFP ...@@ -134,6 +134,8 @@ public class SendCompanyUserInvitesFP extends SaveFP
SecUser sUser = cUser.getCompanyUser().getUser(); SecUser sUser = cUser.getCompanyUser().getUser();
objTran.setAttrib(SecUser.CREATE_USER_KEY, true);
if(isSkip) //remove invitaions due to skip if(isSkip) //remove invitaions due to skip
{ {
sUser.removeFromExtensions(cUser.getCompanyUser()); sUser.removeFromExtensions(cUser.getCompanyUser());
......
...@@ -79,6 +79,8 @@ public class SendUserInvitationFP extends SaveFP ...@@ -79,6 +79,8 @@ public class SendUserInvitationFP extends SaveFP
{ {
secUser = SecUser.createSecUser(objTran); secUser = SecUser.createSecUser(objTran);
objTran.setAttrib(SecUser.CREATE_USER_KEY, true);
secUser.setUserName(inviteTeammate.getUserEmail().toLowerCase()); secUser.setUserName(inviteTeammate.getUserEmail().toLowerCase());
} }
......
...@@ -146,6 +146,8 @@ public class TestAnalysisFP extends ORMProcessFormProcessor ...@@ -146,6 +146,8 @@ public class TestAnalysisFP extends ORMProcessFormProcessor
//updated to use sec user ext //updated to use sec user ext
SecUser user = SecUser.createSecUser(objTran); SecUser user = SecUser.createSecUser(objTran);
objTran.setAttrib(SecUser.CREATE_USER_KEY, true);
user.setFirstName(values[i]); user.setFirstName(values[i]);
user.setUserName(values[i]); user.setUserName(values[i]);
user.setPassword(values[i]); user.setPassword(values[i]);
......
...@@ -383,6 +383,8 @@ public class PerformaEmailFetcher implements Runnable, InitialisationParticipant ...@@ -383,6 +383,8 @@ public class PerformaEmailFetcher implements Runnable, InitialisationParticipant
newUser = true; newUser = true;
secUser = SecUser.createSecUser(objTran); secUser = SecUser.createSecUser(objTran);
objTran.setAttrib(SecUser.CREATE_USER_KEY, true);
secUser.setUserName(replyTo); secUser.setUserName(replyTo);
secUser.setEmail(replyTo); secUser.setEmail(replyTo);
secUser.setAttribute("md5:" + SecUser.FIELD_Password, CompanyUser.DEFAULT_PASSWORD); secUser.setAttribute("md5:" + SecUser.FIELD_Password, CompanyUser.DEFAULT_PASSWORD);
...@@ -448,6 +450,8 @@ public class PerformaEmailFetcher implements Runnable, InitialisationParticipant ...@@ -448,6 +450,8 @@ public class PerformaEmailFetcher implements Runnable, InitialisationParticipant
secUser = SecUser.createSecUser(objTran); secUser = SecUser.createSecUser(objTran);
newUser = true; newUser = true;
objTran.setAttrib(SecUser.CREATE_USER_KEY, true);
secUser.setUserName(fromAddress); secUser.setUserName(fromAddress);
secUser.setEmail(fromAddress); secUser.setEmail(fromAddress);
secUser.setAttribute("md5:" + SecUser.FIELD_Password, CompanyUser.DEFAULT_PASSWORD); secUser.setAttribute("md5:" + SecUser.FIELD_Password, CompanyUser.DEFAULT_PASSWORD);
......
...@@ -13,6 +13,7 @@ import oneit.objstore.*; ...@@ -13,6 +13,7 @@ import oneit.objstore.*;
import oneit.objstore.rdbms.filters.*; import oneit.objstore.rdbms.filters.*;
import oneit.objstore.utils.ObjstoreUtils; import oneit.objstore.utils.ObjstoreUtils;
import oneit.security.*; import oneit.security.*;
import static oneit.security.SecUser.PASSWORD_WRITEABILITY_KEY;
import oneit.security.jsp.*; import oneit.security.jsp.*;
import oneit.security.oauth.form.*; import oneit.security.oauth.form.*;
import oneit.servlets.forms.*; import oneit.servlets.forms.*;
...@@ -314,13 +315,14 @@ public class Utils ...@@ -314,13 +315,14 @@ public class Utils
{ {
DataMap dm = DataMap.getDataMap(request, true); DataMap dm = DataMap.getDataMap(request, true);
user.getTransaction().setAttrib(SecUser.PASSWORD_WRITEABILITY_KEY, user.getID());
return dm.storeORMHandler(new PasswordDIHandler(user, "md5:" + SecUser.FIELD_Password, mandatoryPwd), user, "md5:" + SecUser.FIELD_Password); return dm.storeORMHandler(new PasswordDIHandler(user, "md5:" + SecUser.FIELD_Password, mandatoryPwd), user, "md5:" + SecUser.FIELD_Password);
} }
return ""; return "";
} }
public static SuccessfulResult processSuccessfulLogin(ORMProcessState process, SubmissionDetails submission, Map params, SecUser user) throws BusinessException public static SuccessfulResult processSuccessfulLogin(ORMProcessState process, SubmissionDetails submission, Map params, SecUser user) throws BusinessException
{ {
HttpServletRequest request = submission.getRequest(); HttpServletRequest request = submission.getRequest();
......
...@@ -18,6 +18,9 @@ ...@@ -18,6 +18,9 @@
{ {
link = CompanyUserHiringTeamLink.createCompanyUserHiringTeamLink(objTran); link = CompanyUserHiringTeamLink.createCompanyUserHiringTeamLink(objTran);
secUser = SecUser.createSecUser(objTran); secUser = SecUser.createSecUser(objTran);
objTran.setAttrib(SecUser.CREATE_USER_KEY, true);
companyUser = secUser.getExtensionOrCreate(CompanyUser.REFERENCE_CompanyUser); companyUser = secUser.getExtensionOrCreate(CompanyUser.REFERENCE_CompanyUser);
link.setHiringTeam(hiringTeam); link.setHiringTeam(hiringTeam);
......
...@@ -25,6 +25,9 @@ ...@@ -25,6 +25,9 @@
if(companyUser == null) if(companyUser == null)
{ {
secUser = SecUser.createSecUser(objTran); secUser = SecUser.createSecUser(objTran);
objTran.setAttrib(SecUser.CREATE_USER_KEY, true);
companyUser = secUser.getExtensionOrCreate(CompanyUser.REFERENCE_CompanyUser); companyUser = secUser.getExtensionOrCreate(CompanyUser.REFERENCE_CompanyUser);
company.setAddedByUser(companyUser); company.setAddedByUser(companyUser);
......
...@@ -25,6 +25,9 @@ ...@@ -25,6 +25,9 @@
if(companyUser == null) if(companyUser == null)
{ {
secUser = SecUser.createSecUser(objTran); secUser = SecUser.createSecUser(objTran);
objTran.setAttrib(SecUser.CREATE_USER_KEY, true);
companyUser = secUser.getExtensionOrCreate(CompanyUser.REFERENCE_CompanyUser); companyUser = secUser.getExtensionOrCreate(CompanyUser.REFERENCE_CompanyUser);
company.setAddedByUser(companyUser); company.setAddedByUser(companyUser);
......
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