1.0.11

.github/workflows/push_trigger.yml

@@ -85,6 +85,11 @@ jobs:
 
   build_client:
     runs-on: ubuntu-latest
+    env:
+      NAMESPACE: mosipdev
+      SERVICE_NAME: registration-client
+      SERVICE_LOCATION: registration
+
     steps:
     - uses: actions/checkout@v2
     - name: Set up JDK 1.8
@@ -124,7 +129,7 @@ jobs:
     - name: Build with Maven
       run: |
         cd registration
-        mvn -B package -s $GITHUB_WORKSPACE/settings.xml -DskipTests --file pom.xml
+        mvn clean install -s $GITHUB_WORKSPACE/settings.xml -DskipTests --file pom.xml
 
     - name: Publish the maven package
       run: |
@@ -135,6 +140,29 @@ jobs:
         GPG_TTY: $(tty)
 
 
+
+    - name: Build image
+      run: |
+        cd "./${{env.SERVICE_LOCATION}}"
+        docker build . --file Dockerfile --tag ${{ env.SERVICE_NAME }}
+
+    - name: Log into registry
+      run: echo "${{ secrets.release_docker_hub }}" | docker login -u ${{ secrets.actor_docker_hub }} --password-stdin
+
+    - name: Push image
+      run: |
+        IMAGE_ID=$NAMESPACE/$SERVICE_NAME
+
+        # Change all uppercase to lowercase
+        IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
+        # echo "push version ${{steps.getPomVersion.outputs.info}}"
+        VERSION=$BRANCH_NAME
+        echo IMAGE_ID=$IMAGE_ID
+        echo VERSION=$VERSION
+        docker tag $SERVICE_NAME $IMAGE_ID:$VERSION
+        docker push $IMAGE_ID:$VERSION
+
+
   publish_to_nexus:
 
     runs-on: ubuntu-latest

registration-processor/pre-processor/registration-processor-osi-validator-stage/src/main/java/io/mosip/registration/processor/stages/osivalidator/UMCValidator.java

@@ -6,6 +6,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import io.mosip.registration.processor.core.packet.dto.DigitalId;
+import io.mosip.registration.processor.core.packet.dto.NewDigitalId;
+import io.mosip.registration.processor.core.packet.dto.RegisteredDevice;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.env.Environment;
@@ -31,7 +34,7 @@
 import io.mosip.registration.processor.core.packet.dto.FieldValue;
 import io.mosip.registration.processor.core.packet.dto.Identity;
 import io.mosip.registration.processor.core.packet.dto.RegOsiDto;
-import io.mosip.registration.processor.core.packet.dto.RegisteredDevice;
+import io.mosip.registration.processor.core.packet.dto.NewRegisteredDevice;
 import io.mosip.registration.processor.core.packet.dto.RegistrationCenterMachineDto;
 import io.mosip.registration.processor.core.packet.dto.regcentermachine.DeviceValidateHistoryRequest;
 import io.mosip.registration.processor.core.packet.dto.regcentermachine.DeviceValidateHistoryResponse;
@@ -494,9 +497,9 @@ private boolean isValidDevice(RegistrationCenterMachineDto rcmDto,
 	private boolean isDeviceMappedWithCenter(RegistrationCenterMachineDto rcmDto,
 			InternalRegistrationStatusDto registrationStatusDto) throws ApisResourceAccessException, IOException {
 		boolean isDeviceMappedWithCenter = false;
-		List<RegisteredDevice> registreredDevices = identity.getCapturedRegisteredDevices();
+		List<NewRegisteredDevice> registreredDevices = identity.getCapturedRegisteredDevices();
 		if (registreredDevices != null && !registreredDevices.isEmpty()) {
-			for (RegisteredDevice deviceDetails : registreredDevices) {
+			for (NewRegisteredDevice deviceDetails : registreredDevices) {
 				String deviceCode = null;
 				deviceCode = deviceDetails.getDeviceCode();
 				RegistrationCenterDeviceHistoryResponseDto registrationCenterDeviceHistoryResponseDto;
@@ -592,13 +595,14 @@ private boolean isDeviceActive(RegistrationCenterMachineDto rcmDto,
 			throws JsonProcessingException, IOException, ApisResourceAccessException {
 		boolean isDeviceValid = false;
 
-		List<RegisteredDevice> registreredDevices = identity.getCapturedRegisteredDevices();
+		List<NewRegisteredDevice> registreredDevices = identity.getCapturedRegisteredDevices();
 		if (registreredDevices != null && !registreredDevices.isEmpty()) {
-			for (RegisteredDevice deviceDetails : registreredDevices) {
+			for (NewRegisteredDevice deviceDetails : registreredDevices) {
+				RegisteredDevice registeredDevice = convert(deviceDetails);
 				DeviceValidateHistoryRequest deviceValidateHistoryRequest = new DeviceValidateHistoryRequest();
-				deviceValidateHistoryRequest.setDeviceCode(deviceDetails.getDeviceCode());
-				deviceValidateHistoryRequest.setDeviceServiceVersion(deviceDetails.getDeviceServiceVersion());
-				deviceValidateHistoryRequest.setDigitalId(deviceDetails.getDigitalId());
+				deviceValidateHistoryRequest.setDeviceCode(registeredDevice.getDeviceCode());
+				deviceValidateHistoryRequest.setDeviceServiceVersion(registeredDevice.getDeviceServiceVersion());
+				deviceValidateHistoryRequest.setDigitalId(registeredDevice.getDigitalId());
 				deviceValidateHistoryRequest.setTimeStamp(rcmDto.getPacketCreationDate());
 				RequestWrapper<DeviceValidateHistoryRequest> request = new RequestWrapper<>();
 
@@ -653,6 +657,29 @@ private boolean isDeviceActive(RegistrationCenterMachineDto rcmDto,
 		return isDeviceValid;
 	}
 
+	/**
+	 * Converts new registered device to masterdata registered device
+	 *
+	 * @param deviceDetails
+	 * @return
+	 */
+	private RegisteredDevice convert(NewRegisteredDevice deviceDetails) {
+		DigitalId digitalId = new DigitalId();
+		NewDigitalId newDigitalId = deviceDetails.getDigitalId();
+		if (newDigitalId != null) {
+			digitalId.setDateTime(newDigitalId.getDateTime());
+			digitalId.setDeviceSubType(newDigitalId.getDeviceSubType());
+			digitalId.setDp(newDigitalId.getDeviceProvider());
+			digitalId.setDpId(newDigitalId.getDeviceProviderId());
+			digitalId.setMake(newDigitalId.getMake());
+			digitalId.setModel(newDigitalId.getModel());
+			digitalId.setSerialNo(newDigitalId.getSerialNo());
+			digitalId.setType(newDigitalId.getType());
+		}
+		RegisteredDevice registeredDevice = new RegisteredDevice(deviceDetails.getDeviceCode(), deviceDetails.getDeviceServiceVersion(), digitalId);
+		return registeredDevice;
+	}
+
 	/**
 	 * Checks if is valid center id timestamp.
 	 * 

registration-processor/pre-processor/registration-processor-osi-validator-stage/src/test/java/io/mosip/registration/processor/stages/umcvalidator/UMCValidatorTest.java

@@ -12,6 +12,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import io.mosip.registration.processor.core.packet.dto.NewDigitalId;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -38,7 +39,7 @@
 import io.mosip.registration.processor.core.packet.dto.FieldValue;
 import io.mosip.registration.processor.core.packet.dto.Identity;
 import io.mosip.registration.processor.core.packet.dto.RegOsiDto;
-import io.mosip.registration.processor.core.packet.dto.RegisteredDevice;
+import io.mosip.registration.processor.core.packet.dto.NewRegisteredDevice;
 import io.mosip.registration.processor.core.packet.dto.RegistrationCenterMachineDto;
 import io.mosip.registration.processor.core.packet.dto.regcentermachine.DeviceValidateHistoryRequest;
 import io.mosip.registration.processor.core.packet.dto.regcentermachine.DeviceValidateHistoryResponse;
@@ -192,8 +193,8 @@ public void isValidUMCSuccessTest() throws ApisResourceAccessException, JsonPars
 		rcdto.setLatitude("13.0049");
 		rcdto.setId("12245");
 
-		List<RegisteredDevice> capturedRegisteredDevices = new ArrayList<RegisteredDevice>();
-		RegisteredDevice deviceDetails = new RegisteredDevice();
+		List<NewRegisteredDevice> capturedRegisteredDevices = new ArrayList<NewRegisteredDevice>();
+		NewRegisteredDevice deviceDetails = new NewRegisteredDevice();
 		deviceDetails.setDeviceCode("3000111");
 
 		capturedRegisteredDevices.add(deviceDetails);
@@ -962,8 +963,8 @@ public void isValidUMCCenterIdValidationRejectedTest() throws ApisResourceAccess
 		rcdto.setLongitude("80.24492");
 		rcdto.setLatitude("13.0049");
 		rcdto.setId("12245");
-		List<RegisteredDevice> capturedRegisteredDevices = new ArrayList<RegisteredDevice>();
-		RegisteredDevice deviceDetails = new RegisteredDevice();
+		List<NewRegisteredDevice> capturedRegisteredDevices = new ArrayList<NewRegisteredDevice>();
+		NewRegisteredDevice deviceDetails = new NewRegisteredDevice();
 		deviceDetails.setDeviceCode("3000111");
 
 		capturedRegisteredDevices.add(deviceDetails);
@@ -1142,8 +1143,8 @@ public void isValidCenterHistroyTest() throws ApisResourceAccessException, JsonP
 		rcdto.setLatitude("13.0049");
 		rcdto.setId("12245");
 
-		List<RegisteredDevice> capturedRegisteredDevices = new ArrayList<RegisteredDevice>();
-		RegisteredDevice fv1 = new RegisteredDevice();
+		List<NewRegisteredDevice> capturedRegisteredDevices = new ArrayList<NewRegisteredDevice>();
+		NewRegisteredDevice fv1 = new NewRegisteredDevice();
 		fv1.setDeviceCode("3000111");
 
 		capturedRegisteredDevices.add(fv1);
@@ -1257,8 +1258,8 @@ public void isValidMachineHistroyTest() throws ApisResourceAccessException, Json
 		rcdto.setLatitude("13.0049");
 		rcdto.setId("12245");
 
-		List<RegisteredDevice> capturedRegisteredDevices = new ArrayList<RegisteredDevice>();
-		RegisteredDevice fv1 = new RegisteredDevice();
+		List<NewRegisteredDevice> capturedRegisteredDevices = new ArrayList<NewRegisteredDevice>();
+		NewRegisteredDevice fv1 = new NewRegisteredDevice();
 		fv1.setDeviceCode("3000111");
 
 		capturedRegisteredDevices.add(fv1);
@@ -1398,10 +1399,10 @@ public void isValidDeviceMappedWithCenterTest() throws ApisResourceAccessExcepti
 		rcdto.setLatitude("13.0049");
 		rcdto.setId("12245");
 
-		List<RegisteredDevice> capturedRegisteredDevices = new ArrayList<RegisteredDevice>();
-		RegisteredDevice deviceDetails = new RegisteredDevice();
+		List<NewRegisteredDevice> capturedRegisteredDevices = new ArrayList<NewRegisteredDevice>();
+		NewRegisteredDevice deviceDetails = new NewRegisteredDevice();
 		deviceDetails.setDeviceCode("3000111");
-		DigitalId digitalid = new DigitalId();
+		NewDigitalId digitalid = new NewDigitalId();
 		digitalid.setType("FACE");
 		deviceDetails.setDigitalId(digitalid);
 		capturedRegisteredDevices.add(deviceDetails);
@@ -1588,11 +1589,13 @@ public void isValidDeviceTest() throws ApisResourceAccessException, JsonParseExc
 		rcdto.setLatitude("13.0049");
 		rcdto.setId("12245");
 
-		List<RegisteredDevice> capturedRegisteredDevices = new ArrayList<RegisteredDevice>();
-		RegisteredDevice deviceDetails = new RegisteredDevice();
+		List<NewRegisteredDevice> capturedRegisteredDevices = new ArrayList<NewRegisteredDevice>();
+		NewRegisteredDevice deviceDetails = new NewRegisteredDevice();
 		deviceDetails.setDeviceCode("3000111");
-        DigitalId digitalid=new DigitalId();
+        NewDigitalId digitalid=new NewDigitalId();
         digitalid.setType("FACE");
+		DigitalId digitalId=new DigitalId();
+		digitalId.setType("FACE");
         deviceDetails.setDigitalId(digitalid);
 		capturedRegisteredDevices.add(deviceDetails);
 		// fv1 = new FieldValue();
@@ -1697,7 +1700,7 @@ public void isValidDeviceTest() throws ApisResourceAccessException, JsonParseExc
 
 		DeviceValidateHistoryRequest deviceValidateHistoryRequest = new DeviceValidateHistoryRequest();
 		deviceValidateHistoryRequest.setDeviceCode(deviceDetails.getDeviceCode());
-		deviceValidateHistoryRequest.setDigitalId(digitalid);
+		deviceValidateHistoryRequest.setDigitalId(digitalId);
 
 		RequestWrapper<DeviceValidateHistoryRequest> request = new RequestWrapper<>();
 
@@ -1788,8 +1791,8 @@ public void isValidCenterIdAndTimestampTest() throws ApisResourceAccessException
 		rcdto.setLatitude("13.0049");
 		rcdto.setId("12245");
 
-		List<RegisteredDevice> capturedRegisteredDevices = new ArrayList<RegisteredDevice>();
-		RegisteredDevice deviceDetails = new RegisteredDevice();
+		List<NewRegisteredDevice> capturedRegisteredDevices = new ArrayList<NewRegisteredDevice>();
+		NewRegisteredDevice deviceDetails = new NewRegisteredDevice();
 		deviceDetails.setDeviceCode("3000111");
 
 		capturedRegisteredDevices.add(deviceDetails);
@@ -1986,8 +1989,8 @@ public void isValidCenterUserMachineMappingTest() throws ApisResourceAccessExcep
 		rcdto.setLatitude("13.0049");
 		rcdto.setId("12245");
 
-		List<RegisteredDevice> capturedRegisteredDevices = new ArrayList<RegisteredDevice>();
-		RegisteredDevice deviceDetails = new RegisteredDevice();
+		List<NewRegisteredDevice> capturedRegisteredDevices = new ArrayList<NewRegisteredDevice>();
+		NewRegisteredDevice deviceDetails = new NewRegisteredDevice();
 		deviceDetails.setDeviceCode("3000111");
 
 		capturedRegisteredDevices.add(deviceDetails);

registration-processor/pre-processor/registration-processor-packet-validator-stage/src/main/java/io/mosip/registration/processor/stages/helper/RestHelperImpl.java

@@ -113,7 +113,7 @@ private Mono<?> request(AsyncRequestDTO request, SslContext sslContext) throws I
 			uri = method.uri(builder -> builder.build());
 		}
 
-		uri.cookie("Authorization", restApiClient.getToken());
+		uri.header("cookie", restApiClient.getToken());
 
 		if (request.getRequestBody() != null) {
 			exchange = uri.syncBody(request.getRequestBody()).retrieve();

registration-processor/registration-processor-core/src/main/java/io/mosip/registration/processor/core/packet/dto/Identity.java

@@ -20,7 +20,7 @@ public class Identity {
 	private List<FieldValue> operationsData;
 	private List<FieldValueArray> hashSequence1;
 	private List<FieldValueArray> hashSequence2;
-	private List<RegisteredDevice> capturedRegisteredDevices;
+	private List<NewRegisteredDevice> capturedRegisteredDevices;
 	private List<FieldValue> capturedNonRegisteredDevices;
 	private List<FieldValue> checkSum;
 	private List<String> uinUpdatedFields;
@@ -163,15 +163,15 @@ public void setHashSequence2(List<FieldValueArray> hashSequence2) {
 	/**
 	 * @return the capturedRegisteredDevices
 	 */
-	public List<RegisteredDevice> getCapturedRegisteredDevices() {
+	public List<NewRegisteredDevice> getCapturedRegisteredDevices() {
 		return capturedRegisteredDevices;
 	}
 
 	/**
 	 * @param capturedRegisteredDevices
 	 *            the capturedRegisteredDevices to set
 	 */
-	public void setCapturedRegisteredDevices(List<RegisteredDevice> capturedRegisteredDevices) {
+	public void setCapturedRegisteredDevices(List<NewRegisteredDevice> capturedRegisteredDevices) {
 		this.capturedRegisteredDevices = capturedRegisteredDevices;
 	}
 

registration-processor/registration-processor-core/src/main/java/io/mosip/registration/processor/core/packet/dto/NewDigitalId.java

@@ -0,0 +1,20 @@
+package io.mosip.registration.processor.core.packet.dto;
+
+import lombok.Data;
+
+/**
+ * Instantiates a new digital id dto.
+ */
+@Data
+public class NewDigitalId {
+
+    private String serialNo;
+    private String make;
+    private String model;
+    private String type;
+    private String deviceSubType;
+    private String deviceProviderId;
+    private String deviceProvider;
+    private String dateTime;
+
+}

registration-processor/registration-processor-core/src/main/java/io/mosip/registration/processor/core/packet/dto/NewRegisteredDevice.java

@@ -0,0 +1,11 @@
+package io.mosip.registration.processor.core.packet.dto;
+
+import lombok.Data;
+
+@Data
+public class NewRegisteredDevice {
+
+	private String deviceCode;
+	private String deviceServiceVersion;
+	private NewDigitalId digitalId;
+}

registration-processor/registration-processor-core/src/main/java/io/mosip/registration/processor/core/packet/dto/RegisteredDevice.java

@@ -1,11 +1,17 @@
-package io.mosip.registration.processor.core.packet.dto;
-
-import lombok.Data;
-
-@Data
-public class RegisteredDevice {
-
-	private String deviceCode;
-	private String deviceServiceVersion;
-	private DigitalId digitalId;
-}
+package io.mosip.registration.processor.core.packet.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode
+public class RegisteredDevice {
+
+    private String deviceCode;
+    private String deviceServiceVersion;
+    private DigitalId digitalId;
+}

registration-processor/registration-processor-rest-client/src/main/java/io/mosip/registration/processor/rest/client/utils/RestApiClient.java

@@ -313,8 +313,6 @@ public String getToken() throws IOException {
 			if (cookie.length == 0)
 				throw new TokenGenerationFailedException();
 			token = response.getHeaders("Set-Cookie")[0].getValue();
-			logger.info(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.APPLICATIONID.toString(),
-					LoggerFileConstant.APPLICATIONID.toString(), "Cookie => " + cookie[0]);
 				System.setProperty("token", token.substring(14, token.indexOf(';')));
 			return token.substring(0, token.indexOf(';'));
 		} catch (IOException e) {