Skip to content

Commit

Permalink
Merge pull request #2204 from dangkhanhtrung/release-candidate-2.3-or…
Browse files Browse the repository at this point in the history 
…iginal

Update usermgt security
  • Loading branch information
@dangkhanhtrung
dangkhanhtrung authored Feb 21, 2020
2 parents 0302c2c + c704de9 commit 3cd1b51
Show file tree
Hide file tree
Showing 12 changed files with 37 additions and 105 deletions.
1 change: 1 addition & 0 deletions ...sermgt/backend-usermgt-api/src/main/java/org/opencps/usermgt/constants/ApplicantTerm.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public class ApplicantTerm {
public static final String TOTAL = "total";
public static final String DATA = "data";
public static final String PAGINATION_TYPE = "paginationType";
public static final String REGULAR = "regular";
public static final int PASSWORD_LENGHT = 10;
public static final String REPRE_ENTERPRISE = "representativeEnterprise";

Expand Down
3 changes: 2 additions & 1 deletion ...mgt/backend-usermgt-api/src/main/java/org/opencps/usermgt/constants/ResourceRoleTerm.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ public class ResourceRoleTerm {
public static final String PAGINATION_TYPE = "paginationType";
public static final String SELECTED = "selected";
public static final String READONLY = "readonly";

public static final String REGULAR = "regular";

private long resourceRoleId;

private long groupId;
Expand Down
36 changes: 22 additions & 14 deletions ...mgt-service/src/main/java/org/opencps/usermgt/service/impl/ApplicantLocalServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.exception.SystemException;
import com.liferay.portal.kernel.json.JSONObject;
import com.liferay.portal.kernel.language.LanguageUtil;
import com.liferay.portal.kernel.log.Log;
import com.liferay.portal.kernel.log.LogFactoryUtil;
import com.liferay.portal.kernel.model.Role;
Expand Down Expand Up @@ -383,8 +382,11 @@ public Applicant updateApplication(ServiceContext context, long groupId, long ap
password = PwdGenerator.getPassword(ServiceProps.PASSWORD_LENGHT);
}

String firstName = ("citizen".equals(applicantIdType) ? "Ông/bà"
: ("business".equals(applicantIdType) ? "Quý công ty" : "Tổ chức"));
String firstName = (ApplicantTerm.APPLICANTIDTYPE_CITIZEN.equals(applicantIdType) ? MessageUtil.getMessage(
ConfigConstants.HEADER_USER)
: (ApplicantTerm.APPLICANTIDTYPE_BUSINESS.equals(applicantIdType) ? MessageUtil.getMessage(
ConfigConstants.HEADER_COMPANY) : MessageUtil.getMessage(
ConfigConstants.HEADER_BUSSINESS)));
String lastName = applicantName;

UserMgtUtils.SplitName spn = UserMgtUtils.splitName(firstName, lastName);
Expand Down Expand Up @@ -714,7 +716,7 @@ public Hits searchLucene(LinkedHashMap<String, Object> params, Sort[] sorts, int

searchContext.addFullQueryEntryClassName(Applicant.class.getName());
searchContext.setEntryClassNames(new String[] { Applicant.class.getName() });
searchContext.setAttribute("paginationType", "regular");
searchContext.setAttribute(ApplicantTerm.PAGINATION_TYPE, ApplicantTerm.REGULAR);
searchContext.setLike(true);
searchContext.setStart(start);
searchContext.setEnd(end);
Expand Down Expand Up @@ -1176,12 +1178,12 @@ public Applicant importApplicationDB(long groupId, long userId, long applicantId
User auditUser = userPersistence.fetchByPrimaryKey(userId);
Applicant applicant = null;
if (applicantId == 0) {
System.out.println("contactEmail: " + contactEmail + "| applicantId: " + applicantId);
// System.out.println("contactEmail: " + contactEmail + "| applicantId: " + applicantId);
applicantId = counterLocalService.increment(Applicant.class.getName());
applicant = applicantPersistence.create(applicantId);

try {
System.out.println("MAPPING USER ID: " + mappingUserId);
// System.out.println("MAPPING USER ID: " + mappingUserId);
// Add audit field
applicant.setCreateDate(now);
applicant.setModifiedDate(now);
Expand Down Expand Up @@ -1224,11 +1226,11 @@ public Applicant importApplicationDB(long groupId, long userId, long applicantId
Applicant applicant = null;
// String password = "12345";
String password = PwdGenerator.getPassword(4) + "1@#A";
System.out.println("contactEmail: " + contactEmail + "| password: " + password);
// System.out.println("contactEmail: " + contactEmail + "| password: " + password);
_log.info("contactEmail: " + contactEmail + "| password: " + password);

if (applicantId == 0) {
System.out.println("contactEmail: " + contactEmail + "| applicantId: " + applicantId);
// System.out.println("contactEmail: " + contactEmail + "| applicantId: " + applicantId);
applicantId = counterLocalService.increment(Applicant.class.getName());
applicant = applicantPersistence.create(applicantId);

Expand All @@ -1252,8 +1254,11 @@ public Applicant importApplicationDB(long groupId, long userId, long applicantId
password = PwdGenerator.getPassword(ServiceProps.PASSWORD_LENGHT);
}

String firstName = ("citizen".equals(applicantIdType) ? "Ông/bà"
: ("business".equals(applicantIdType) ? "Quý công ty" : "Tổ chức"));
String firstName = (ApplicantTerm.APPLICANTIDTYPE_CITIZEN.equals(applicantIdType) ? MessageUtil.getMessage(
ConfigConstants.HEADER_USER)
: (ApplicantTerm.APPLICANTIDTYPE_BUSINESS.equals(applicantIdType) ? MessageUtil.getMessage(
ConfigConstants.HEADER_COMPANY) : MessageUtil.getMessage(
ConfigConstants.HEADER_BUSSINESS)));
String lastName = applicantName;

UserMgtUtils.SplitName spn = UserMgtUtils.splitName(firstName, lastName);
Expand Down Expand Up @@ -1282,13 +1287,13 @@ public Applicant importApplicationDB(long groupId, long userId, long applicantId
StringPool.BLANK, LocaleUtil.getDefault(), spn.getFirstName(), spn.getMidName(),
spn.getLastName(), 0, 0, true, month, dayOfMonth, year, ServiceProps.APPLICANT_JOB_TITLE,
groupIds, organizationIds, roleIds, userGroupIds, sendEmail, context);
System.out.println("MAPPING USER: " + mappingUser.getLastName() + "," + mappingUser.getFullName());
// System.out.println("MAPPING USER: " + mappingUser.getLastName() + "," + mappingUser.getFullName());
// mappingUser.setStatus(WorkflowConstants.STATUS_APPROVED);
userLocalService.updateStatus(mappingUser.getUserId(), WorkflowConstants.STATUS_APPROVED, context);
//

long mappingUserId = mappingUser.getUserId();
System.out.println("MAPPING USER ID: " + mappingUserId);
// System.out.println("MAPPING USER ID: " + mappingUserId);
// Add audit field
applicant.setCreateDate(now);
applicant.setModifiedDate(now);
Expand Down Expand Up @@ -1403,8 +1408,11 @@ public Applicant updateApplicationDB(long groupId, long userId, long applicantId
secretCode = PwdGenerator.getPassword(ServiceProps.PASSWORD_LENGHT);
}

String firstName = ("citizen".equals(applicantIdType) ? "Ông/bà"
: ("business".equals(applicantIdType) ? "Quý công ty" : "Tổ chức"));
String firstName = (ApplicantTerm.APPLICANTIDTYPE_CITIZEN.equals(applicantIdType) ? MessageUtil.getMessage(
ConfigConstants.HEADER_USER)
: (ApplicantTerm.APPLICANTIDTYPE_BUSINESS.equals(applicantIdType) ? MessageUtil.getMessage(
ConfigConstants.HEADER_COMPANY) : MessageUtil.getMessage(
ConfigConstants.HEADER_BUSSINESS)));
String lastName = applicantName;

UserMgtUtils.SplitName spn = UserMgtUtils.splitName(firstName, lastName);
Expand Down
14 changes: 1 addition & 13 deletions ...ervice/src/main/java/org/opencps/usermgt/service/impl/EmployeeJobPosLocalServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,6 @@

package org.opencps.usermgt.service.impl;

import java.util.ArrayList;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;

import org.opencps.backend.usermgt.service.util.ConfigConstants;
import org.opencps.usermgt.constants.EmployeeJobPosTerm;
import org.opencps.usermgt.model.Employee;
import org.opencps.usermgt.model.EmployeeJobPos;
import org.opencps.usermgt.model.JobPos;
import org.opencps.usermgt.service.JobPosLocalServiceUtil;
import org.opencps.usermgt.service.base.EmployeeJobPosLocalServiceBaseImpl;

import com.liferay.asset.kernel.exception.DuplicateCategoryException;
import com.liferay.counter.kernel.service.CounterLocalServiceUtil;
import com.liferay.petra.string.StringPool;
Expand Down Expand Up @@ -62,6 +49,7 @@
import java.util.LinkedHashMap;
import java.util.List;

import org.opencps.backend.usermgt.service.util.ConfigConstants;
import org.opencps.usermgt.constants.EmployeeJobPosTerm;
import org.opencps.usermgt.model.Employee;
import org.opencps.usermgt.model.EmployeeJobPos;
Expand Down
2 changes: 1 addition & 1 deletion ...rmgt-service/src/main/java/org/opencps/usermgt/service/impl/EmployeeLocalServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1109,7 +1109,7 @@ public Employee adminProcessData(JSONObject objectData) {

Employee object = null;

if (objectData.getLong("employeeId") > 0) {
if (objectData.getLong(EmployeeTerm.EMPLOYEE_ID) > 0) {

object = employeePersistence.fetchByPrimaryKey(objectData.getLong(EmployeeTerm.EMPLOYEE_ID));

Expand Down
15 changes: 1 addition & 14 deletions ...sermgt-service/src/main/java/org/opencps/usermgt/service/impl/JobPosLocalServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,6 @@

package org.opencps.usermgt.service.impl;

import java.util.Date;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;

import org.opencps.backend.usermgt.service.util.ConfigConstants;
import org.opencps.usermgt.constants.JobPosTerm;
import org.opencps.usermgt.constants.UserMGTConstants;
import org.opencps.usermgt.exception.NoSuchJobPosException;
import org.opencps.usermgt.model.JobPos;
import org.opencps.usermgt.service.base.JobPosLocalServiceBaseImpl;

import com.liferay.asset.kernel.exception.DuplicateCategoryException;
import com.liferay.counter.kernel.service.CounterLocalServiceUtil;
import com.liferay.petra.string.StringPool;
Expand Down Expand Up @@ -69,6 +55,7 @@
import java.util.Locale;
import java.util.Map;

import org.opencps.backend.usermgt.service.util.ConfigConstants;
import org.opencps.usermgt.constants.JobPosTerm;
import org.opencps.usermgt.constants.UserMGTConstants;
import org.opencps.usermgt.exception.NoSuchJobPosException;
Expand Down
12 changes: 2 additions & 10 deletions ...gt-service/src/main/java/org/opencps/usermgt/service/impl/JobPosWorkLocalServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,6 @@

package org.opencps.usermgt.service.impl;

import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;

import org.opencps.backend.usermgt.service.util.ConfigConstants;
import org.opencps.usermgt.constants.JobPosTerm;
import org.opencps.usermgt.constants.JobPosWorkTerm;
import org.opencps.usermgt.model.JobPosWork;
import org.opencps.usermgt.service.base.JobPosWorkLocalServiceBaseImpl;

import com.liferay.petra.string.StringPool;
import com.liferay.portal.kernel.exception.NoSuchUserException;
import com.liferay.portal.kernel.model.User;
Expand All @@ -49,6 +39,8 @@
import java.util.LinkedHashMap;
import java.util.List;

import org.opencps.backend.usermgt.service.util.ConfigConstants;
import org.opencps.usermgt.constants.JobPosTerm;
import org.opencps.usermgt.constants.JobPosWorkTerm;
import org.opencps.usermgt.model.JobPosWork;
import org.opencps.usermgt.service.base.JobPosWorkLocalServiceBaseImpl;
Expand Down
10 changes: 1 addition & 9 deletions ...gt-service/src/main/java/org/opencps/usermgt/service/impl/OfficeSiteLocalServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,6 @@

package org.opencps.usermgt.service.impl;

import java.util.Date;
import java.util.LinkedHashMap;

import org.opencps.backend.usermgt.service.util.ConfigConstants;
import org.opencps.usermgt.constants.OfficeSiteTerm;
import org.opencps.usermgt.exception.NoSuchOfficeSiteException;
import org.opencps.usermgt.model.OfficeSite;
import org.opencps.usermgt.service.base.OfficeSiteLocalServiceBaseImpl;

import com.liferay.counter.kernel.service.CounterLocalServiceUtil;
import com.liferay.petra.string.StringPool;
import com.liferay.portal.kernel.exception.NoSuchUserException;
Expand Down Expand Up @@ -51,6 +42,7 @@
import java.util.Date;
import java.util.LinkedHashMap;

import org.opencps.backend.usermgt.service.util.ConfigConstants;
import org.opencps.usermgt.constants.OfficeSiteTerm;
import org.opencps.usermgt.exception.NoSuchOfficeSiteException;
import org.opencps.usermgt.model.OfficeSite;
Expand Down
8 changes: 0 additions & 8 deletions ...t-service/src/main/java/org/opencps/usermgt/service/impl/PreferencesLocalServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@

package org.opencps.usermgt.service.impl;

import java.util.Date;

import org.opencps.auth.api.BackendAuthImpl;
import org.opencps.usermgt.model.Preferences;
import org.opencps.usermgt.service.base.PreferencesLocalServiceBaseImpl;

import com.liferay.asset.kernel.exception.DuplicateCategoryException;
import com.liferay.counter.kernel.service.CounterLocalServiceUtil;
import com.liferay.portal.kernel.exception.NoSuchUserException;
Expand All @@ -44,8 +38,6 @@
import backend.auth.api.exception.NotFoundException;
import backend.auth.api.exception.UnauthenticationException;
import backend.auth.api.exception.UnauthorizationException;
import backend.auth.api.keys.ActionKeys;
import backend.auth.api.keys.ModelNameKeys;

/**
* The implementation of the preferences local service. <p> All custom service
Expand Down
13 changes: 2 additions & 11 deletions ...-service/src/main/java/org/opencps/usermgt/service/impl/ResourceRoleLocalServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,6 @@

package org.opencps.usermgt.service.impl;

import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;

import org.opencps.backend.usermgt.service.util.ConfigConstants;
import org.opencps.usermgt.constants.ResourceRoleTerm;
import org.opencps.usermgt.exception.NoSuchResourceRoleException;
import org.opencps.usermgt.model.ResourceRole;
import org.opencps.usermgt.service.base.ResourceRoleLocalServiceBaseImpl;

import com.liferay.counter.kernel.service.CounterLocalServiceUtil;
import com.liferay.petra.string.StringPool;
import com.liferay.portal.kernel.exception.NoSuchUserException;
Expand Down Expand Up @@ -55,6 +45,7 @@
import java.util.LinkedHashMap;
import java.util.List;

import org.opencps.backend.usermgt.service.util.ConfigConstants;
import org.opencps.usermgt.constants.ResourceRoleTerm;
import org.opencps.usermgt.exception.NoSuchResourceRoleException;
import org.opencps.usermgt.model.ResourceRole;
Expand Down Expand Up @@ -265,7 +256,7 @@ public Hits luceneSearchEngine(LinkedHashMap<String, Object> params, Sort[] sort

searchContext.addFullQueryEntryClassName(ResourceRole.class.getName());
searchContext.setEntryClassNames(new String[] { ResourceRole.class.getName() });
searchContext.setAttribute("paginationType", "regular");
searchContext.setAttribute(ResourceRoleTerm.PAGINATION_TYPE, ResourceRoleTerm.REGULAR);
searchContext.setLike(true);
searchContext.setStart(start);
searchContext.setEnd(end);
Expand Down
15 changes: 3 additions & 12 deletions ...-service/src/main/java/org/opencps/usermgt/service/impl/ResourceUserLocalServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,6 @@

package org.opencps.usermgt.service.impl;

import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;

import org.opencps.backend.usermgt.service.util.ConfigConstants;
import org.opencps.usermgt.constants.ResourceUserTerm;
import org.opencps.usermgt.exception.NoSuchResourceUserException;
import org.opencps.usermgt.model.ResourceUser;
import org.opencps.usermgt.service.base.ResourceUserLocalServiceBaseImpl;

import com.liferay.counter.kernel.service.CounterLocalServiceUtil;
import com.liferay.petra.string.StringPool;
import com.liferay.portal.kernel.exception.NoSuchUserException;
Expand Down Expand Up @@ -53,6 +43,7 @@
import java.util.LinkedHashMap;
import java.util.List;

import org.opencps.backend.usermgt.service.util.ConfigConstants;
import org.opencps.usermgt.constants.ResourceUserTerm;
import org.opencps.usermgt.exception.NoSuchResourceUserException;
import org.opencps.usermgt.model.ResourceUser;
Expand Down Expand Up @@ -439,9 +430,9 @@ public ResourceUser adminProcessData(JSONObject objectData) {

ResourceUser object = null;

if (objectData.getLong("resourceUserId") > 0) {
if (objectData.getLong(ResourceUserTerm.RESOURCEUSER_ID) > 0) {

object = resourceUserPersistence.fetchByPrimaryKey(objectData.getLong("resourceUserId"));
object = resourceUserPersistence.fetchByPrimaryKey(objectData.getLong(ResourceUserTerm.RESOURCEUSER_ID));

object.setModifiedDate(new Date());

Expand Down
13 changes: 1 addition & 12 deletions ...t-service/src/main/java/org/opencps/usermgt/service/impl/WorkingUnitLocalServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,6 @@

package org.opencps.usermgt.service.impl;

import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;

import org.opencps.backend.usermgt.service.util.ConfigConstants;
import org.opencps.usermgt.constants.CommonTerm;
import org.opencps.usermgt.constants.WorkingUnitTerm;
import org.opencps.usermgt.exception.NoSuchWorkingUnitException;
import org.opencps.usermgt.model.EmployeeJobPos;
import org.opencps.usermgt.model.WorkingUnit;
import org.opencps.usermgt.service.base.WorkingUnitLocalServiceBaseImpl;

import com.liferay.asset.kernel.exception.DuplicateCategoryException;
import com.liferay.counter.kernel.service.CounterLocalServiceUtil;
import com.liferay.petra.string.StringPool;
Expand Down Expand Up @@ -57,6 +45,7 @@
import java.util.LinkedHashMap;
import java.util.List;

import org.opencps.backend.usermgt.service.util.ConfigConstants;
import org.opencps.usermgt.constants.CommonTerm;
import org.opencps.usermgt.constants.WorkingUnitTerm;
import org.opencps.usermgt.exception.NoSuchWorkingUnitException;
Expand Down

0 comments on commit 3cd1b51

Please sign in to comment.