Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
PERFORMA_REPLICA
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Muhammad Usman
PERFORMA_REPLICA
Commits
d704fc95
Commit
d704fc95
authored
Sep 21, 2017
by
chenith
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Social login for Admin portal.
parent
5e7926f7
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
135 additions
and
50 deletions
+135
-50
SendCompanyUserInvitesFP.java
cmsWebApp/src/performa/form/SendCompanyUserInvitesFP.java
+19
-9
VerifyCompanyUserFP.java
cmsWebApp/src/performa/form/VerifyCompanyUserFP.java
+42
-23
PerformaOAuthCallbackDecorator.java
...pp/src/performa/utils/PerformaOAuthCallbackDecorator.java
+18
-1
Utils.java
cmsWebApp/src/performa/utils/Utils.java
+3
-3
CustomServlets_adminPortal.xml
...oot/extensions/adminportal/CustomServlets_adminPortal.xml
+1
-1
company_profile.jsp
cmsWebApp/webroot/extensions/adminportal/company_profile.jsp
+2
-0
company_user_data.jsp
.../webroot/extensions/adminportal/inc/company_user_data.jsp
+1
-1
invite_users.jsp
cmsWebApp/webroot/extensions/adminportal/invite_users.jsp
+3
-2
page_admin_home.jsp
cmsWebApp/webroot/extensions/adminportal/page_admin_home.jsp
+13
-0
verify_company.jsp
cmsWebApp/webroot/extensions/adminportal/verify_company.jsp
+33
-10
No files found.
cmsWebApp/src/performa/form/SendCompanyUserInvitesFP.java
View file @
d704fc95
...
@@ -62,19 +62,24 @@ public class SendCompanyUserInvitesFP extends ORMProcessFormProcessor
...
@@ -62,19 +62,24 @@ public class SendCompanyUserInvitesFP extends ORMProcessFormProcessor
CompanyUser
companyUser
=
company
.
getAddedByUser
();
CompanyUser
companyUser
=
company
.
getAddedByUser
();
SecUser
secUser
=
companyUser
.
getUser
();
SecUser
secUser
=
companyUser
.
getUser
();
String
nextPage
=
(
String
)
request
.
getAttribute
(
"nextPage"
);
String
nextPage
=
(
String
)
request
.
getAttribute
(
"nextPage"
);
Boolean
socialLogin
=
CollectionUtils
.
equals
(
process
.
getAttribute
(
"socialLogin"
),
Boolean
.
TRUE
);
LogMgr
.
log
(
LOG
,
LogLevel
.
PROCESSING1
,
"Verifing Company User"
,
companyUser
,
secUser
);
LogMgr
.
log
(
LOG
,
LogLevel
.
PROCESSING1
,
"Verifing Company User"
,
companyUser
,
secUser
);
secUser
.
setAttribute
(
"md5:"
+
SecUser
.
FIELD_Password
,
companyUser
.
getPassword
());
companyUser
.
setIsAccountVerified
(
Boolean
.
TRUE
);
companyUser
.
setIsAccountVerified
(
Boolean
.
TRUE
);
company
.
setIsVerified
(
Boolean
.
TRUE
);
company
.
setIsVerified
(
Boolean
.
TRUE
);
sendAccountCreatedMail
(
companyUser
,
request
);
sendAccountCreatedMail
(
companyUser
,
request
);
request
.
getSession
().
setAttribute
(
SecUser
.
SEC_USER_ID
,
secUser
);
if
(!
socialLogin
)
request
.
getSession
().
setAttribute
(
SessionSecUserDecorator
.
REFRESH_SECURITY
,
Boolean
.
TRUE
);
{
secUser
.
setAttribute
(
"md5:"
+
SecUser
.
FIELD_Password
,
companyUser
.
getPassword
());
request
.
getSession
().
setAttribute
(
SecUser
.
SEC_USER_ID
,
secUser
);
request
.
getSession
().
setAttribute
(
SessionSecUserDecorator
.
REFRESH_SECURITY
,
Boolean
.
TRUE
);
LogMgr
.
log
(
LOG
,
LogLevel
.
PROCESSING1
,
"Password resetted"
,
companyUser
,
secUser
);
LogMgr
.
log
(
LOG
,
LogLevel
.
PROCESSING1
,
"Password resetted"
,
companyUser
,
secUser
);
}
LogMgr
.
log
(
LOG
,
LogLevel
.
PROCESSING1
,
"Verifing Company User finished"
,
companyUser
,
secUser
);
LogMgr
.
log
(
LOG
,
LogLevel
.
PROCESSING1
,
"Verifing Company User finished"
,
companyUser
,
secUser
);
...
@@ -84,11 +89,16 @@ public class SendCompanyUserInvitesFP extends ORMProcessFormProcessor
...
@@ -84,11 +89,16 @@ public class SendCompanyUserInvitesFP extends ORMProcessFormProcessor
{
{
if
(!
CollectionUtils
.
equals
(
cUser
,
companyUser
))
if
(!
CollectionUtils
.
equals
(
cUser
,
companyUser
))
{
{
SecUser
sUser
=
Utils
.
getSecUserForCompanyIfAvailable
(
cUser
);
Tuple
.
T2
<
SecUser
,
Boolean
>
userdata
=
Utils
.
getSecUserForCompanyIfAvailable
(
cUser
);
SecUser
sUser
=
userdata
.
get0
();
LogMgr
.
log
(
LOG
,
LogLevel
.
PROCESSING1
,
"Started to send invitaion email."
,
cUser
);
LogMgr
.
log
(
LOG
,
LogLevel
.
PROCESSING1
,
"Started to send invitaion email."
,
cUser
);
sUser
.
setUserName
(
sUser
.
getEmail
().
toLowerCase
());
if
(!
userdata
.
get1
())
//check user availablility
{
sUser
.
setUserName
(
sUser
.
getEmail
().
toLowerCase
());
}
sUser
.
setAttribute
(
"md5:"
+
SecUser
.
FIELD_Password
,
DEFAULT_PASSWORD
);
sUser
.
setAttribute
(
"md5:"
+
SecUser
.
FIELD_Password
,
DEFAULT_PASSWORD
);
sUser
.
addRole
(
Utils
.
getRole
(
Utils
.
ROLE_CLIENT
,
objTran
));
sUser
.
addRole
(
Utils
.
getRole
(
Utils
.
ROLE_CLIENT
,
objTran
));
...
...
cmsWebApp/src/performa/form/VerifyCompanyUserFP.java
View file @
d704fc95
...
@@ -33,10 +33,20 @@ public class VerifyCompanyUserFP extends ORMProcessFormProcessor
...
@@ -33,10 +33,20 @@ public class VerifyCompanyUserFP extends ORMProcessFormProcessor
{
{
HttpServletRequest
request
=
submission
.
getRequest
();
HttpServletRequest
request
=
submission
.
getRequest
();
CompanyUser
companyUser
=
(
CompanyUser
)
request
.
getAttribute
(
"CompanyUser"
);
CompanyUser
companyUser
=
(
CompanyUser
)
request
.
getAttribute
(
"CompanyUser"
);
Boolean
socialLogin
=
(
Boolean
)
request
.
getAttribute
(
"socialLogin"
);
SecUser
secUser
=
companyUser
.
getUser
();
SecUser
secUser
=
companyUser
.
getUser
();
Company
company
=
companyUser
.
getCompany
();
Company
company
=
companyUser
.
getCompany
();
BusinessObjectParser
.
assertFieldCondition
(
StringUtils
.
isEmailAddress
(
secUser
.
getUserName
()),
secUser
,
SecUser
.
FIELD_Email
,
"invalid"
,
exceptions
,
true
,
request
);
if
(
socialLogin
)
{
BusinessObjectParser
.
assertFieldCondition
(
secUser
.
getEmail
()!=
null
,
secUser
,
SecUser
.
FIELD_Email
,
"invalid"
,
exceptions
,
true
,
request
);
BusinessObjectParser
.
assertFieldCondition
(!
Utils
.
isCompanyUserEmailFound
(
secUser
.
getTransaction
(),
secUser
.
getEmail
()),
secUser
,
SecUser
.
FIELD_Email
,
"emailExists"
,
exceptions
,
true
,
request
);
}
else
{
BusinessObjectParser
.
assertFieldCondition
(
StringUtils
.
isEmailAddress
(
secUser
.
getUserName
()),
secUser
,
SecUser
.
FIELD_Email
,
"invalid"
,
exceptions
,
true
,
request
);
}
BusinessObjectParser
.
assertFieldCondition
(
secUser
.
getFirstName
()!=
null
,
secUser
,
SecUser
.
FIELD_FirstName
,
"mandatory"
,
exceptions
,
true
,
request
);
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
);
BusinessObjectParser
.
assertFieldCondition
(
secUser
.
getLastName
()!=
null
,
secUser
,
SecUser
.
FIELD_LastName
,
"mandatory"
,
exceptions
,
true
,
request
);
...
@@ -45,28 +55,31 @@ public class VerifyCompanyUserFP extends ORMProcessFormProcessor
...
@@ -45,28 +55,31 @@ public class VerifyCompanyUserFP extends ORMProcessFormProcessor
BusinessObjectParser
.
assertFieldCondition
(
company
.
getCompanyName
()!=
null
,
company
,
Company
.
FIELD_CompanyName
,
"mandatory"
,
exceptions
,
true
,
request
);
BusinessObjectParser
.
assertFieldCondition
(
company
.
getCompanyName
()!=
null
,
company
,
Company
.
FIELD_CompanyName
,
"mandatory"
,
exceptions
,
true
,
request
);
}
}
BusinessObjectParser
.
assertFieldCondition
(
companyUser
.
getPassword
()!=
null
,
companyUser
,
CompanyUser
.
FIELD_Password
,
"mandatory"
,
exceptions
,
true
,
request
);
if
(!
socialLogin
)
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
BusinessObjectParser
.
assertFieldCondition
(
companyUser
.
getPassword
()!=
null
,
companyUser
,
CompanyUser
.
FIELD_Password
,
"mandatory"
,
exceptions
,
true
,
request
);
if
(
passwordValidator
!=
null
)
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
{
{
passwordValidator
.
validate
(
null
,
secUser
,
"Password"
,
companyUser
.
getPassword
());
//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
);
}
}
}
catch
(
FieldException
e
)
{
exceptions
.
addException
(
new
FieldException
(
e
,
CompanyUser
.
FIELD_Password
));
}
catch
(
Exception
e
)
{
throw
NestedException
.
wrap
(
e
);
}
}
return
super
.
validate
(
submission
,
exceptions
);
return
super
.
validate
(
submission
,
exceptions
);
...
@@ -81,6 +94,7 @@ public class VerifyCompanyUserFP extends ORMProcessFormProcessor
...
@@ -81,6 +94,7 @@ public class VerifyCompanyUserFP extends ORMProcessFormProcessor
SecUser
secUser
=
companyUser
.
getUser
();
SecUser
secUser
=
companyUser
.
getUser
();
Company
company
=
companyUser
.
getCompany
();
Company
company
=
companyUser
.
getCompany
();
String
nextPage
=
(
String
)
request
.
getAttribute
(
"nextPage"
);
String
nextPage
=
(
String
)
request
.
getAttribute
(
"nextPage"
);
Boolean
socialLogin
=
(
Boolean
)
request
.
getAttribute
(
"socialLogin"
);
LogMgr
.
log
(
LOG
,
LogLevel
.
PROCESSING1
,
"Verifing User"
,
companyUser
,
secUser
);
LogMgr
.
log
(
LOG
,
LogLevel
.
PROCESSING1
,
"Verifing User"
,
companyUser
,
secUser
);
...
@@ -89,6 +103,7 @@ public class VerifyCompanyUserFP extends ORMProcessFormProcessor
...
@@ -89,6 +103,7 @@ public class VerifyCompanyUserFP extends ORMProcessFormProcessor
if
(
company
.
getIsVerified
()!=
Boolean
.
TRUE
&&
CollectionUtils
.
equals
(
company
.
getAddedByUser
(),
companyUser
))
if
(
company
.
getIsVerified
()!=
Boolean
.
TRUE
&&
CollectionUtils
.
equals
(
company
.
getAddedByUser
(),
companyUser
))
{
{
process
.
setAttribute
(
"Company"
,
company
);
process
.
setAttribute
(
"Company"
,
company
);
process
.
setAttribute
(
"socialLogin"
,
socialLogin
);
return
new
ProcessRedirectResult
(
nextPage
,
new
String
[
0
]);
return
new
ProcessRedirectResult
(
nextPage
,
new
String
[
0
]);
}
}
...
@@ -103,14 +118,18 @@ public class VerifyCompanyUserFP extends ORMProcessFormProcessor
...
@@ -103,14 +118,18 @@ public class VerifyCompanyUserFP extends ORMProcessFormProcessor
IntercomUtils
.
createIntercomUser
(
secUser
,
"Hiring Team"
,
intercomCompany
);
IntercomUtils
.
createIntercomUser
(
secUser
,
"Hiring Team"
,
intercomCompany
);
}
}
secUser
.
setAttribute
(
"md5:"
+
SecUser
.
FIELD_Password
,
companyUser
.
getPassword
());
if
(!
socialLogin
)
companyUser
.
setIsAccountVerified
(
Boolean
.
TRUE
);
{
secUser
.
setAttribute
(
"md5:"
+
SecUser
.
FIELD_Password
,
companyUser
.
getPassword
());
}
companyUser
.
setIsAccountVerified
(
Boolean
.
TRUE
);
sendMail
(
companyUser
,
request
);
sendMail
(
companyUser
,
request
);
request
.
getSession
().
setAttribute
(
SecUser
.
SEC_USER_ID
,
secUser
);
request
.
getSession
().
setAttribute
(
SecUser
.
SEC_USER_ID
,
secUser
);
request
.
getSession
().
setAttribute
(
SessionSecUserDecorator
.
REFRESH_SECURITY
,
Boolean
.
TRUE
);
request
.
getSession
().
setAttribute
(
SessionSecUserDecorator
.
REFRESH_SECURITY
,
Boolean
.
TRUE
);
LogMgr
.
log
(
LOG
,
LogLevel
.
PROCESSING1
,
"Password resetted"
,
companyUser
,
secUser
);
LogMgr
.
log
(
LOG
,
LogLevel
.
PROCESSING1
,
"Password resetted"
,
companyUser
,
secUser
);
}
}
...
...
cmsWebApp/src/performa/utils/PerformaOAuthCallbackDecorator.java
View file @
d704fc95
...
@@ -10,6 +10,7 @@ import oneit.components.*;
...
@@ -10,6 +10,7 @@ import oneit.components.*;
import
oneit.logging.LogLevel
;
import
oneit.logging.LogLevel
;
import
oneit.logging.LogMgr
;
import
oneit.logging.LogMgr
;
import
oneit.logging.LoggingArea
;
import
oneit.logging.LoggingArea
;
import
oneit.objstore.ObjectStatus
;
import
oneit.objstore.ObjectTransaction
;
import
oneit.objstore.ObjectTransaction
;
import
oneit.objstore.services.TransactionServicesFactory
;
import
oneit.objstore.services.TransactionServicesFactory
;
import
oneit.security.Role
;
import
oneit.security.Role
;
...
@@ -23,6 +24,9 @@ import oneit.servlets.utils.decorator.ServletDecorator;
...
@@ -23,6 +24,9 @@ import oneit.servlets.utils.decorator.ServletDecorator;
import
oneit.servlets.utils.decorator.ServletDecoratorConfig
;
import
oneit.servlets.utils.decorator.ServletDecoratorConfig
;
import
oneit.utils.*
;
import
oneit.utils.*
;
import
performa.orm.Candidate
;
import
performa.orm.Candidate
;
import
performa.orm.CompanyUser
;
import
performa.orm.Company
;
import
performa.orm.types.RoleType
;
/**
/**
* This is almost similar class to OAuthCallbackDecorator,
* This is almost similar class to OAuthCallbackDecorator,
...
@@ -85,7 +89,20 @@ public class PerformaOAuthCallbackDecorator implements ServletDecorator, Initial
...
@@ -85,7 +89,20 @@ public class PerformaOAuthCallbackDecorator implements ServletDecorator, Initial
else
if
(
fullURL
.
contains
(
WebUtils
.
ADMIN_PORTAL
))
else
if
(
fullURL
.
contains
(
WebUtils
.
ADMIN_PORTAL
))
{
{
secUser
.
addRole
(
Role
.
searchNAME
(
secUser
.
getTransaction
(),
Utils
.
ROLE_CLIENT
));
secUser
.
addRole
(
Role
.
searchNAME
(
secUser
.
getTransaction
(),
Utils
.
ROLE_CLIENT
));
secUser
.
addRole
(
Role
.
searchNAME
(
secUser
.
getTransaction
(),
Utils
.
ROLE_COMPANY_ADMIN
));
CompanyUser
companyUser
=
secUser
.
getExtensionOrCreate
(
CompanyUser
.
REFERENCE_CompanyUser
);
if
(
companyUser
.
getStatus
()==
ObjectStatus
.
NEW
)
{
Company
company
=
Company
.
createCompany
(
transaction
);
company
.
setCompanyName
(
" "
);
company
.
setAddedByUser
(
companyUser
);
company
.
addToUsers
(
companyUser
);
companyUser
.
setRole
(
RoleType
.
ADMIN
);
}
}
}
transaction
.
commit
();
transaction
.
commit
();
...
...
cmsWebApp/src/performa/utils/Utils.java
View file @
d704fc95
...
@@ -380,7 +380,7 @@ public class Utils
...
@@ -380,7 +380,7 @@ public class Utils
}
}
public
static
SecUser
getSecUserForCompanyIfAvailable
(
CompanyUser
companyUser
)
public
static
Tuple
.
T2
<
SecUser
,
Boolean
>
getSecUserForCompanyIfAvailable
(
CompanyUser
companyUser
)
{
{
SecUser
secUser
=
companyUser
.
getUser
();
SecUser
secUser
=
companyUser
.
getUser
();
SecUser
availableSecUser
=
SecUser
.
searchNAME
(
companyUser
.
getTransaction
(),
secUser
.
getEmail
());
SecUser
availableSecUser
=
SecUser
.
searchNAME
(
companyUser
.
getTransaction
(),
secUser
.
getEmail
());
...
@@ -396,11 +396,11 @@ public class Utils
...
@@ -396,11 +396,11 @@ public class Utils
secUser
.
removeFromExtensions
(
companyUser
);
secUser
.
removeFromExtensions
(
companyUser
);
secUser
.
delete
();
secUser
.
delete
();
return
availableSecUser
;
return
new
Tuple
.
T2
<
SecUser
,
Boolean
>(
availableSecUser
,
Boolean
.
TRUE
)
;
}
}
}
}
return
secUser
;
return
new
Tuple
.
T2
<
SecUser
,
Boolean
>(
secUser
,
Boolean
.
FALSE
)
;
}
}
...
...
cmsWebApp/webroot/extensions/adminportal/CustomServlets_adminPortal.xml
View file @
d704fc95
...
@@ -71,7 +71,7 @@
...
@@ -71,7 +71,7 @@
</FORM>
</FORM>
<FORM
name=
"*.facebookOAuthLogin"
factory=
"Participant"
class=
"oneit.security.oauth.form.FacebookOAuthLoginFP"
/>
<FORM
name=
"*.facebookOAuthLogin"
factory=
"Participant"
class=
"oneit.security.oauth.form.FacebookOAuthLoginFP"
/>
<FORM
name=
"*.googleOAuthLogin"
factory=
"Participant"
class=
"oneit.security.oauth.form.GoogleOAuthLoginFP"
/>
<FORM
name=
"*.googleOAuthLogin"
factory=
"Participant"
class=
"oneit.security.oauth.form.GoogleOAuthLoginFP"
/>
<
!--<FORM name="*.linkedinOAuthLogin" factory="Participant" class="performa.form.LinkedInOAuthLoginFP"/>--
>
<
FORM
name=
"*.linkedinOAuthLogin"
factory=
"Participant"
class=
"performa.form.LinkedInOAuthLoginFP"
/
>
</NODE>
</NODE>
<NODE
name=
"forgot_password_jsp"
factory=
"Participant"
>
<NODE
name=
"forgot_password_jsp"
factory=
"Participant"
>
...
...
cmsWebApp/webroot/extensions/adminportal/company_profile.jsp
View file @
d704fc95
...
@@ -10,6 +10,7 @@
...
@@ -10,6 +10,7 @@
<%
<%
String nextPage = WebUtils.getSamePageInRenderMode(request, "InviteUsers");
String nextPage = WebUtils.getSamePageInRenderMode(request, "InviteUsers");
Company company = (Company) process.getAttribute("Company");
Company company = (Company) process.getAttribute("Company");
Boolean socialLogin = CollectionUtils.equals(process.getAttribute("socialLogin"), Boolean.TRUE);
Debug.assertion(company != null, "Invalid company user in admin portal");
Debug.assertion(company != null, "Invalid company user in admin portal");
...
@@ -18,6 +19,7 @@
...
@@ -18,6 +19,7 @@
Integer pageNumber = 1;
Integer pageNumber = 1;
process.setAttribute("Company", company);
process.setAttribute("Company", company);
process.setAttribute("socialLogin", socialLogin);
%>
%>
<div class="hello-company-name">Hello, <%= secUser.getFirstName() %></div>
<div class="hello-company-name">Hello, <%= secUser.getFirstName() %></div>
...
...
cmsWebApp/webroot/extensions/adminportal/inc/company_user_data.jsp
View file @
d704fc95
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
<div class="form-group text-left">
<div class="form-group text-left">
<label>Email Address</label>
<label>Email Address</label>
<%
<%
if(companyUser.getStatus()==ObjectStatus.NEW)
if(companyUser.getStatus()==ObjectStatus.NEW
|| secUser.getEmail()==null
)
{
{
%>
%>
<oneit:ormInput obj="<%= secUser %>" type="text" attributeName="Email" cssClass="form-control" style="text-transform: lowercase" required="true"/>
<oneit:ormInput obj="<%= secUser %>" type="text" attributeName="Email" cssClass="form-control" style="text-transform: lowercase" required="true"/>
...
...
cmsWebApp/webroot/extensions/adminportal/invite_users.jsp
View file @
d704fc95
...
@@ -10,9 +10,10 @@
...
@@ -10,9 +10,10 @@
<%
<%
String nextPage = WebUtils.getArticleByShortCut(process.getTransaction(), WebUtils.ADMIN_HOME).getLink(request) + "?showModal=true";
String nextPage = WebUtils.getArticleByShortCut(process.getTransaction(), WebUtils.ADMIN_HOME).getLink(request) + "?showModal=true";
Company company = (Company) process.getAttribute("Company");
Company company = (Company) process.getAttribute("Company");
Boolean socialLogin = CollectionUtils.equals(process.getAttribute("socialLogin"), Boolean.TRUE);
Debug.assertion(company != null, "Invalid company user in admin portal");
Debug.assertion(company != null, "Invalid company user in admin portal");
CompanyUser companyUser = company.getAddedByUser();
CompanyUser companyUser = company.getAddedByUser();
SecUser secUser = companyUser.getUser();
SecUser secUser = companyUser.getUser();
Integer pageNumber = 2;
Integer pageNumber = 2;
...
@@ -88,7 +89,7 @@
...
@@ -88,7 +89,7 @@
<div class="main-sc-section text-center company-profile-btn">
<div class="main-sc-section text-center company-profile-btn">
<oneit:button value="Send invites & proceed" name="sendCompanyUserInvites" cssClass="btn btn-primary box-btn"
<oneit:button value="Send invites & proceed" name="sendCompanyUserInvites" cssClass="btn btn-primary box-btn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Company", company).toMap())
.mapEntry("procParams", CollectionUtils.mapEntry("
socialLogin", socialLogin).mapEntry("
Company", company).toMap())
.toMap() %>"/>
.toMap() %>"/>
</div>
</div>
</div>
</div>
...
...
cmsWebApp/webroot/extensions/adminportal/page_admin_home.jsp
View file @
d704fc95
...
@@ -8,6 +8,19 @@
...
@@ -8,6 +8,19 @@
<%
<%
//TODO: filter with Client;
//TODO: filter with Client;
SecUser secUser = SecUser.getTXUser(transaction);
SecUser secUser = SecUser.getTXUser(transaction);
//to verify social login and redirect to login verification
if(secUser.hasRole(Utils.ROLE_CLIENT))
{
CompanyUser companyUser = secUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
if(companyUser!=null && companyUser.getIsAccountVerified()!=Boolean.TRUE)
{
response.sendRedirect(WebUtils.getArticleByShortCut(process.getTransaction(), WebUtils.COMPANY_ACCOUNT_VERIFICATION).getLink(request));
return;
}
}
Job[] jobs = Job.SearchByAll().andJobStatus(new EqualsFilter<>(JobStatus.OPEN))
Job[] jobs = Job.SearchByAll().andJobStatus(new EqualsFilter<>(JobStatus.OPEN))
.andCompanyUser(new EqualsFilter(secUser.getExtension(CompanyUser.REFERENCE_CompanyUser)))
.andCompanyUser(new EqualsFilter(secUser.getExtension(CompanyUser.REFERENCE_CompanyUser)))
.search(transaction);
.search(transaction);
...
...
cmsWebApp/webroot/extensions/adminportal/verify_company.jsp
View file @
d704fc95
...
@@ -10,7 +10,8 @@
...
@@ -10,7 +10,8 @@
String nextPage = WebUtils.getSamePageInRenderMode(request, "CompanyProfile");
String nextPage = WebUtils.getSamePageInRenderMode(request, "CompanyProfile");
CompanyUser companyUser = (CompanyUser) process.getAttribute("CompanyUser");
CompanyUser companyUser = (CompanyUser) process.getAttribute("CompanyUser");
SecUser secUser = null;
SecUser secUser = null;
Boolean socialLogin = Boolean.FALSE;
//to process company user verification
//to process company user verification
String id = request.getParameter("id");
String id = request.getParameter("id");
String key = request.getParameter("key");
String key = request.getParameter("key");
...
@@ -31,7 +32,21 @@
...
@@ -31,7 +32,21 @@
if(invalid)
if(invalid)
{
{
response.sendRedirect(WebUtils.getArticleByShortCut(process.getTransaction(), WebUtils.ADMIN_HOME).getLink(request));
//to handle social login
SecUser logedInUser = SecUser.getTXUser(transaction);
companyUser = logedInUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
if(logedInUser!=null
&& logedInUser.hasRole(Utils.ROLE_CLIENT)
&& companyUser!=null
&& companyUser.getIsAccountVerified()!=Boolean.TRUE)
{
socialLogin = Boolean.TRUE;
}
else
{
response.sendRedirect(WebUtils.getArticleByShortCut(process.getTransaction(), WebUtils.ADMIN_HOME).getLink(request));
}
}
}
Debug.assertion(companyUser != null, "Invalid CompanyUser in admin portal");
Debug.assertion(companyUser != null, "Invalid CompanyUser in admin portal");
...
@@ -78,17 +93,25 @@
...
@@ -78,17 +93,25 @@
<div class="main-box-layout login-box">
<div class="main-box-layout login-box">
<oneit:dynInclude page="/extensions/adminportal/inc/company_user_data.jsp" data="<%= CollectionUtils.EMPTY_MAP%>" CompanyUser="<%= companyUser %>"/>
<oneit:dynInclude page="/extensions/adminportal/inc/company_user_data.jsp" data="<%= CollectionUtils.EMPTY_MAP%>" CompanyUser="<%= companyUser %>"/>
<div class="form-group text-left">
<%
<label>Password</label>
if(!socialLogin)
<oneit:ormInput obj="<%= companyUser %>" type="password" attributeName="Password" cssClass="form-control second-style reset-pw" required="true"/>
{
</div>
%>
<div class="form-group text-left">
<div class="form-group text-left">
<label>Confirm password</label>
<label>Password</label>
<oneit:ormInput obj="<%= companyUser %>" type="password" attributeName="ConfirmPassword" cssClass="form-control second-style reset-pw " required="true"/>
<oneit:ormInput obj="<%= companyUser %>" type="password" attributeName="Password" cssClass="form-control second-style reset-pw" required="true"/>
</div>
</div>
<div class="form-group text-left">
<label>Confirm password</label>
<oneit:ormInput obj="<%= companyUser %>" type="password" attributeName="ConfirmPassword" cssClass="form-control second-style reset-pw " required="true"/>
</div>
<%
}
%>
<oneit:button value="Verify and login" name="verifyCompanyUser" cssClass="box-btn verify-btn"
<oneit:button value="Verify and login" name="verifyCompanyUser" cssClass="box-btn verify-btn"
requestAttribs="<%= CollectionUtils.mapEntry("CompanyUser", companyUser)
requestAttribs="<%= CollectionUtils.mapEntry("CompanyUser", companyUser)
.mapEntry("socialLogin", socialLogin)
.mapEntry("nextPage", nextPage).toMap() %>"/>
.mapEntry("nextPage", nextPage).toMap() %>"/>
</div>
</div>
</oneit:form>
</oneit:form>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment