Merge dev to dev2 1201b2 3

resident/resident-service/src/main/java/io/mosip/resident/aspect/LoginCheck.java

@@ -22,6 +22,7 @@
 import io.mosip.resident.entity.ResidentUserEntity;
 import io.mosip.resident.repository.ResidentUserRepository;
 import io.mosip.resident.service.impl.IdentityServiceImpl;
+import io.mosip.resident.util.Utility;
 
 /**
  * Aspect class for login redirect API
@@ -33,7 +34,6 @@
 @EnableAspectJAutoProxy
 public class LoginCheck {
 
-	private static final String ID_TOKEN = "id_token";
 	private static final String SET_COOKIE = "Set-Cookie";
 	private static final String USER_AGENT = "User-Agent";
 	private static final String WINDOWS = "Windows";
@@ -42,18 +42,6 @@ public class LoginCheck {
 	private static final String X11 = "x11";
 	private static final String ANDROID = "Android";
 	private static final String IPHONE = "IPhone";
-	private static final String X_FORWARDED_FOR = "X-Forwarded-For";
-	private static final String X_REAL_IP = "x-real-ip";
-	private static final String PROXY_CLIENT_IP = "Proxy-Client-IP";
-	private static final String WL_PROXY_CLIENT_IP = "WL-Proxy-Client-IP";
-	private static final String HTTP_X_FORWARDED_FOR = "HTTP_X_FORWARDED_FOR";
-	private static final String HTTP_X_FORWARDED = "HTTP_X_FORWARDED";
-	private static final String HTTP_X_CLUSTER_CLIENT_IP = "HTTP_X_CLUSTER_CLIENT_IP";
-	private static final String HTTP_CLIENT_IP = "HTTP_CLIENT_IP";
-	private static final String HTTP_FORWARDED_FOR = "HTTP_FORWARDED_FOR";
-	private static final String HTTP_FORWARDED = "HTTP_FORWARDED";
-	private static final String HTTP_VIA = "HTTP_VIA";
-	private static final String REMOTE_ADDR = "REMOTE_ADDR";
 	private static final CharSequence AUTHORIZATION_TOKEN = "Authorization";
 
 	@Autowired
@@ -62,6 +50,9 @@ public class LoginCheck {
 	@Autowired
 	private IdentityServiceImpl identityServiceImpl;
 
+	@Autowired
+	private Utility utility;
+
 	private static final Logger logger = LoggerConfiguration.logConfig(LoginCheck.class);
 
 	@After("execution(* io.mosip.kernel.authcodeflowproxy.api.controller.LoginController.loginRedirect(..)) && args(redirectURI,state,sessionState,code,stateCookie,req,res)")
@@ -82,11 +73,11 @@ public void getUserDetails(String redirectURI, String state, String sessionState
 		if(idaToken!=null && !idaToken.isEmpty()) {
 			Optional<ResidentUserEntity> userData = residentUserRepository.findById(idaToken);
 			if (userData.isPresent()) {
-				residentUserRepository.updateUserData(idaToken, DateUtils.getUTCCurrentDateTime(), getClientIp(req),
+				residentUserRepository.updateUserData(idaToken, DateUtils.getUTCCurrentDateTime(), utility.getClientIp(req),
 						req.getRemoteHost(), getMachineType(req));
 			} else {
 				residentUserRepository.save(new ResidentUserEntity(idaToken, DateUtils.getUTCCurrentDateTime(),
-						getClientIp(req), req.getRemoteHost(), getMachineType(req)));
+						utility.getClientIp(req), req.getRemoteHost(), getMachineType(req)));
 			}
 		}
 		logger.debug("LoginCheck::getUserDetails()::exit");
@@ -126,34 +117,4 @@ private String getMachineType(HttpServletRequest req) {
 		logger.debug("LoginCheck::getMachineType()::exit");
 		return os;
 	}
-
-	private String getClientIp(HttpServletRequest req) {
-		logger.debug("LoginCheck::getClientIp()::entry");
-		String[] IP_HEADERS = {
-				X_FORWARDED_FOR,
-				X_REAL_IP,
-				PROXY_CLIENT_IP,
-				WL_PROXY_CLIENT_IP,
-				HTTP_X_FORWARDED_FOR,
-				HTTP_X_FORWARDED,
-				HTTP_X_CLUSTER_CLIENT_IP,
-				HTTP_CLIENT_IP,
-				HTTP_FORWARDED_FOR,
-				HTTP_FORWARDED,
-				HTTP_VIA,
-				REMOTE_ADDR
-		};
-		for (String header : IP_HEADERS) {
-			String value = req.getHeader(header);
-			if (value == null || value.isEmpty()) {
-				continue;
-			}
-			String[] parts = value.split(",");
-			logger.debug("LoginCheck::getClientIp()::exit");
-			return parts[0].trim();
-		}
-		logger.debug("LoginCheck::getClientIp()::exit - excecuted till end");
-		return req.getRemoteAddr();
-	}
-
 }

resident/resident-service/src/main/java/io/mosip/resident/config/Config.java

@@ -30,7 +30,7 @@
 import io.mosip.kernel.keygenerator.bouncycastle.KeyGenerator;
 import io.mosip.kernel.templatemanager.velocity.impl.TemplateManagerImpl;
 import io.mosip.resident.util.ResidentServiceRestClient;
-import io.mosip.resident.util.Utilitiy;
+import io.mosip.resident.util.Utility;
 
 
 @Configuration
@@ -52,7 +52,7 @@ public class Config {
 
 	@Bean("varres")
 	public VariableResolverFactory getVariableResolverFactory() {
-		String mvelExpression = Utilitiy.readResourceContent(mvelFile);
+		String mvelExpression = Utility.readResourceContent(mvelFile);
 		VariableResolverFactory functionFactory = new MapVariableResolverFactory();
 		MVEL.eval(mvelExpression, functionFactory);
 		return functionFactory;

resident/resident-service/src/main/java/io/mosip/resident/constant/RequestType.java

@@ -10,6 +10,13 @@
 import java.util.Map;
 import java.util.function.BiFunction;
 
+import org.apache.commons.lang3.function.TriFunction;
+
+import io.mosip.resident.dto.NotificationTemplateVariableDTO;
+import io.mosip.resident.function.QuadFunction;
+import io.mosip.resident.util.TemplateUtil;
+import reactor.util.function.Tuple2;
+
 /**
  * The Enum RequestType.
  * 
@@ -73,7 +80,7 @@ public enum RequestType {
 	DEFAULT("Default", TemplateUtil::getDefaultTemplateVariables, List.of(), List.of(), List.of(), "",
 			TemplateUtil::getNotificationCommonTemplateVariables, null);
 
-	private TriFunction<TemplateUtil, String, String, Tuple2<Map<String, String>, String>> ackTemplateVariablesFunction;
+	private QuadFunction<TemplateUtil, String, String, Integer, Tuple2<Map<String, String>, String>> ackTemplateVariablesFunction;
 	private List<EventStatusSuccess> successStatusList;
 	private List<EventStatusFailure> failureStatusList;
 	private List<EventStatusInProgress> inProgressStatusList;
@@ -83,7 +90,7 @@ public enum RequestType {
 
 	private String name;
 
-	private RequestType(String name, TriFunction<TemplateUtil, String, String, Tuple2<Map<String, String>, String>> ackTemplateVariablesFunction,
+	private RequestType(String name, QuadFunction<TemplateUtil, String, String, Integer, Tuple2<Map<String, String>, String>> ackTemplateVariablesFunction,
 						List<EventStatusSuccess> successStatusList, List<EventStatusFailure> failureStatusList,
 						List<EventStatusInProgress> inProgressStatusList, String featureName,
 						BiFunction<TemplateUtil, NotificationTemplateVariableDTO, Map<String, Object>> notificationTemplateVariablesFunction,
@@ -149,8 +156,8 @@ public String getSummaryTemplateCodeProperty(TemplateType templateType) {
 		return "resident.template.summary." + templateType.getType() + "." + getFeatureName();
 	}
 
-	public Tuple2<Map<String, String>, String> getAckTemplateVariables(TemplateUtil templateUtil, String eventId, String languageCode) {
-		return ackTemplateVariablesFunction.apply(templateUtil, eventId, languageCode);
+	public Tuple2<Map<String, String>, String> getAckTemplateVariables(TemplateUtil templateUtil, String eventId, String languageCode, Integer timeZoneOffset) {
+		return ackTemplateVariablesFunction.apply(templateUtil, eventId, languageCode, timeZoneOffset);
 	}
 
 	public Map<String, Object> getNotificationTemplateVariables(TemplateUtil templateUtil, NotificationTemplateVariableDTO dto) {

resident/resident-service/src/main/java/io/mosip/resident/constant/ResidentConstants.java

@@ -8,7 +8,8 @@
  */
 public class ResidentConstants {
 
-    private ResidentConstants() {
+    public static final int UTC_TIMEZONE_OFFSET = 0;
+	private ResidentConstants() {
 	}
 
     public static final String OBJECT_STORE_ACCOUNT_NAME = "mosip.resident.object.store.account-name";
@@ -178,9 +179,25 @@ private ResidentConstants() {
     public static final String ACTION_PERFORMED = "actionPerformed";
     public static final String VID_TYPE = "vidType";
     public static final String MASKED_VID = "*masked VID*";
-    public static final String ACK_DATE_TIME_PATTERN = "resident.ack.datetime.pattern";
+    public static final String UI_DATE_TIME_PATTERN = "resident.ui.datetime.pattern";
+    public static final String FILENAME_DATETIME_PATTERN = "resident.filename.datetime.pattern";
 
     public static final String NO_ID = "NO_ID";
     public static final String NO_ID_TYPE = "NO_ID_TYPE";
+
+    // IP headers constants start---
+    public static final String X_FORWARDED_FOR = "X-Forwarded-For";
+    public static final String X_REAL_IP = "x-real-ip";
+    public static final String PROXY_CLIENT_IP = "Proxy-Client-IP";
+    public static final String WL_PROXY_CLIENT_IP = "WL-Proxy-Client-IP";
+    public static final String HTTP_X_FORWARDED_FOR = "HTTP_X_FORWARDED_FOR";
+    public static final String HTTP_X_FORWARDED = "HTTP_X_FORWARDED";
+    public static final String HTTP_X_CLUSTER_CLIENT_IP = "HTTP_X_CLUSTER_CLIENT_IP";
+    public static final String HTTP_CLIENT_IP = "HTTP_CLIENT_IP";
+    public static final String HTTP_FORWARDED_FOR = "HTTP_FORWARDED_FOR";
+    public static final String HTTP_FORWARDED = "HTTP_FORWARDED";
+    public static final String HTTP_VIA = "HTTP_VIA";
+    public static final String REMOTE_ADDR = "REMOTE_ADDR";
+    // IP headers constants end---
 
 }

resident/resident-service/src/main/java/io/mosip/resident/controller/AcknowledgementController.java

@@ -5,28 +5,33 @@
 import io.mosip.kernel.core.logger.spi.Logger;
 import io.mosip.resident.config.LoggerConfiguration;
 import io.mosip.resident.constant.LoggerFileConstant;
+import io.mosip.resident.constant.ResidentConstants;
+import io.mosip.resident.exception.InvalidInputException;
 import io.mosip.resident.exception.ResidentServiceCheckedException;
+import io.mosip.resident.exception.ResidentServiceException;
 import io.mosip.resident.service.AcknowledgementService;
 import io.mosip.resident.util.AuditUtil;
 import io.mosip.resident.util.EventEnum;
 import io.mosip.resident.util.TemplateUtil;
-import io.mosip.resident.util.Utilitiy;
+import io.mosip.resident.util.Utility;
 import io.mosip.resident.validator.RequestValidator;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.InputStreamResource;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.util.List;
+import java.util.Map;
 
 /**
  * This class is used to create api for getting acknowledgement.
@@ -57,36 +62,40 @@ public class AcknowledgementController {
     private TemplateUtil templateUtil;
 
     @Autowired
-    private Utilitiy utilitiy;
+    private Utility utility;
 
     @GetMapping("/ack/download/pdf/event/{eventId}/language/{languageCode}")
     public ResponseEntity<Object> getAcknowledgement(@PathVariable("eventId") String eventId,
-                                                  @PathVariable("languageCode") String languageCode) throws ResidentServiceCheckedException, IOException {
+                                                  @PathVariable("languageCode") String languageCode,
+                                                  @RequestHeader(name = "time-zone-offset", required = false, defaultValue = "0") int timeZoneOffset) throws ResidentServiceCheckedException, IOException {
         logger.debug("AcknowledgementController::acknowledgement()::entry");
         InputStreamResource resource = null;
         String featureName = null;
         try {
-        auditUtil.setAuditRequestDto(EventEnum.getEventEnumWithValue(EventEnum.GET_ACKNOWLEDGEMENT_DOWNLOAD_URL, "acknowledgement"));
-        requestValidator.validateEventIdLanguageCode(eventId, languageCode);
-        byte[] pdfBytes = acknowledgementService.getAcknowledgementPDF(eventId, languageCode);
-        resource = new InputStreamResource(new ByteArrayInputStream(pdfBytes));
-        auditUtil.setAuditRequestDto(EventEnum.GET_ACKNOWLEDGEMENT_DOWNLOAD_URL_SUCCESS);
-        logger.debug("AcknowledgementController::acknowledgement()::exit");
-        featureName = templateUtil.getFeatureName(eventId);
+        	requestValidator.validateEventIdLanguageCode(eventId, languageCode);
+        } catch (ResidentServiceException | InvalidInputException e) {
+			throw new ResidentServiceException(e.getErrorCode(), e.getErrorText(), e,
+					Map.of(ResidentConstants.HTTP_STATUS_CODE, HttpStatus.BAD_REQUEST, ResidentConstants.REQ_RES_ID,
+							ackDownloadId));
+		}
+        try {
+            auditUtil.setAuditRequestDto(EventEnum.getEventEnumWithValue(EventEnum.GET_ACKNOWLEDGEMENT_DOWNLOAD_URL, "acknowledgement"));
+	        byte[] pdfBytes = acknowledgementService.getAcknowledgementPDF(eventId, languageCode, timeZoneOffset);
+	        resource = new InputStreamResource(new ByteArrayInputStream(pdfBytes));
+	        auditUtil.setAuditRequestDto(EventEnum.GET_ACKNOWLEDGEMENT_DOWNLOAD_URL_SUCCESS);
+	        logger.debug("AcknowledgementController::acknowledgement()::exit");
+	        featureName = templateUtil.getFeatureName(eventId);
         } catch(ResidentServiceCheckedException e) {
-        	ResponseWrapper<?> responseWrapper = new ResponseWrapper<>();
-        	responseWrapper.setId(ackDownloadId);
-    		responseWrapper.setVersion(ackDownloadVersion);
 			auditUtil.setAuditRequestDto(EventEnum.GET_ACKNOWLEDGEMENT_DOWNLOAD_URL_FAILURE);
 			logger.error(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.APPLICATIONID.toString(),
 					LoggerFileConstant.APPLICATIONID.toString(), ExceptionUtils.getStackTrace(e));
-			responseWrapper.setErrors(List.of(new ServiceError(e.getErrorCode(), e.getErrorText())));
-			return ResponseEntity.badRequest().contentType(MediaType.APPLICATION_JSON)
-	                .body(responseWrapper);
+			throw new ResidentServiceCheckedException(e.getErrorCode(), e.getErrorText(), e,
+					Map.of(ResidentConstants.HTTP_STATUS_CODE, HttpStatus.BAD_REQUEST, ResidentConstants.REQ_RES_ID,
+							ackDownloadId));
         }
         return ResponseEntity.ok().contentType(MediaType.APPLICATION_PDF)
                 .header("Content-Disposition", "attachment; filename=\"" +
-                        utilitiy.getFileNameAsPerFeatureName(eventId, featureName) + ".pdf\"")
+                        utility.getFileNameAsPerFeatureName(eventId, featureName, timeZoneOffset) + ".pdf\"")
                 .body(resource);
     }
 }

resident/resident-service/src/main/java/io/mosip/resident/controller/DownLoadMasterDataController.java

@@ -7,7 +7,7 @@
 import io.mosip.resident.service.DownLoadMasterDataService;
 import io.mosip.resident.util.AuditUtil;
 import io.mosip.resident.util.EventEnum;
-import io.mosip.resident.util.Utilitiy;
+import io.mosip.resident.util.Utility;
 import io.mosip.resident.validator.RequestValidator;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +16,7 @@
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -51,7 +52,7 @@ public class DownLoadMasterDataController {
 	private AuditUtil audit;
 
 	@Autowired
-	private Utilitiy utilitiy;
+	private Utility utility;
 
 	@Autowired
 	private Environment environment;
@@ -70,7 +71,8 @@ public class DownLoadMasterDataController {
 	 */
 	@GetMapping("/download/registration-centers-list")
 	public ResponseEntity<Object> downloadRegistrationCentersByHierarchyLevel(@RequestParam(name="langcode") String langCode,
-			@RequestParam(name="hierarchylevel") Short hierarchyLevel, @RequestParam("name") List<String> name)
+			@RequestParam(name="hierarchylevel") Short hierarchyLevel, @RequestParam("name") List<String> name,
+			@RequestHeader(name = "time-zone-offset", required = false, defaultValue = "0") int timeZoneOffset)
 			throws ResidentServiceCheckedException, IOException, Exception {
 		logger.debug("DownLoadMasterDataController::getRegistrationCentersByHierarchyLevel()::entry");
 		DOWNLOADABLE_REGCEN_FILENAME = "regcenter-";
@@ -83,16 +85,17 @@ public ResponseEntity<Object> downloadRegistrationCentersByHierarchyLevel(@Reque
 		logger.debug("downLoad file name::" + DOWNLOADABLE_REGCEN_FILENAME);
 		logger.debug("AcknowledgementController::acknowledgement()::exit");
 		return ResponseEntity.ok().contentType(MediaType.parseMediaType("application/pdf"))
-				.header("Content-Disposition", "attachment; filename=\"" + utilitiy.getFileName(null,
+				.header("Content-Disposition", "attachment; filename=\"" + utility.getFileName(null,
 						Objects.requireNonNull(this.environment.getProperty(
-								ResidentConstants.DOWNLOAD_REGISTRATION_CENTRE_FILE_NAME_CONVENTION_PROPERTY))) + ".pdf\"")
+								ResidentConstants.DOWNLOAD_REGISTRATION_CENTRE_FILE_NAME_CONVENTION_PROPERTY)), timeZoneOffset) + ".pdf\"")
 				.body(resource);
 	}
 
 	@GetMapping("/download/nearestRegistrationcenters")
 	public ResponseEntity<Object> downloadNearestRegistrationcenters(@RequestParam(name="langcode") String langCode,
 			@RequestParam(name="longitude") double longitude, @RequestParam(name="latitude") double latitude,
-			@RequestParam(name="proximitydistance") int proximityDistance)
+			@RequestParam(name="proximitydistance") int proximityDistance,
+			@RequestHeader(name = "time-zone-offset", required = false, defaultValue = "0") int timeZoneOffset)
 			throws ResidentServiceCheckedException, IOException, Exception {
 		logger.debug("DownLoadMasterDataController::getRegistrationCentersByHierarchyLevel()::entry");
 		DOWNLOADABLE_REGCEN_FILENAME = "regcenter-";
@@ -105,14 +108,15 @@ public ResponseEntity<Object> downloadNearestRegistrationcenters(@RequestParam(n
 		logger.debug("downLoad file name::" + DOWNLOADABLE_REGCEN_FILENAME);
 		logger.debug("AcknowledgementController::acknowledgement()::exit");
 		return ResponseEntity.ok().contentType(MediaType.parseMediaType("application/pdf"))
-				.header("Content-Disposition", "attachment; filename=\"" + utilitiy.getFileName(null,
+				.header("Content-Disposition", "attachment; filename=\"" + utility.getFileName(null,
 						Objects.requireNonNull(this.environment.getProperty(
-								ResidentConstants.DOWNLOAD_NEAREST_REGISTRATION_CENTRE_FILE_NAME_CONVENTION_PROPERTY))) + ".pdf\"")
+								ResidentConstants.DOWNLOAD_NEAREST_REGISTRATION_CENTRE_FILE_NAME_CONVENTION_PROPERTY)), timeZoneOffset) + ".pdf\"")
 				.body(resource);
 	}
 
 	@GetMapping(path = "/download/supporting-documents", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-	public ResponseEntity<Object> downloadSupportingDocsByLanguage(@RequestParam(name = "langcode") String langCode)
+	public ResponseEntity<Object> downloadSupportingDocsByLanguage(@RequestParam(name = "langcode") String langCode,
+			@RequestHeader(name = "time-zone-offset", required = false, defaultValue = "0") int timeZoneOffset)
 			throws ResidentServiceCheckedException, IOException, Exception {
 		logger.debug("DownLoadMasterDataController::getSupportingDocsByLanguageCode()::entry");
 		DOWNLOADABLE_SUPPORTING_FILENAME = "supportingDocs-";
@@ -125,9 +129,9 @@ public ResponseEntity<Object> downloadSupportingDocsByLanguage(@RequestParam(nam
 		logger.debug("downLoad file name::" + DOWNLOADABLE_SUPPORTING_FILENAME);
 		logger.debug("AcknowledgementController::acknowledgement()::exit");
 		return ResponseEntity.ok().contentType(MediaType.parseMediaType("application/pdf"))
-				.header("Content-Disposition", "attachment; filename=\"" + utilitiy.getFileName(null,
+				.header("Content-Disposition", "attachment; filename=\"" + utility.getFileName(null,
 						Objects.requireNonNull(this.environment.getProperty(
-								ResidentConstants.DOWNLOAD_SUPPORTING_DOCUMENT_FILE_NAME_CONVENTION_PROPERTY))) + ".pdf\"")
+								ResidentConstants.DOWNLOAD_SUPPORTING_DOCUMENT_FILE_NAME_CONVENTION_PROPERTY)), timeZoneOffset) + ".pdf\"")
 				.body(resource);
 	}
 	/**