Revert "MOSIP-38450: Removed SBI id belongs to the user for Partner A…

…dmin (#1…" This reverts commit 8938473.
mosip · Jan 13, 2025 · fbc0fdb · fbc0fdb
1 parent 8938473
commit fbc0fdb
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 34 deletions.
diff --git a/...ce/src/main/java/io/mosip/pms/device/authdevice/service/impl/DeviceDetailServiceImpl.java b/...ce/src/main/java/io/mosip/pms/device/authdevice/service/impl/DeviceDetailServiceImpl.java
@@ -525,7 +525,7 @@ public ResponseWrapperV2<Boolean> approveOrRejectMappingDeviceToSbi(String devic
 				}
 			}
 			// validate sbi and device mapping
-			partnerHelper.validateSbiDeviceMapping(partnerId, sbiId, deviceId, false);
+			partnerHelper.validateSbiDeviceMapping(partnerId, sbiId, deviceId);
 
 			DeviceDetailSBI deviceDetailSBI = deviceDetailSbiRepository.findByDeviceProviderIdAndSbiIdAndDeviceDetailId(partnerId, sbiId, deviceId);
 			if (Objects.isNull(deviceDetailSBI)) {

diff --git a/...java/io/mosip/pms/device/authdevice/service/impl/SecureBiometricInterfaceServiceImpl.java b/...java/io/mosip/pms/device/authdevice/service/impl/SecureBiometricInterfaceServiceImpl.java
@@ -880,14 +880,9 @@ private void addInactiveMappingDeviceToSbi(String sbiId, String deviceId, String
 			throw new PartnerServiceException(ErrorCode.SBI_DEVICE_MAPPING_ALREADY_EXIST.getErrorCode(),
 					ErrorCode.SBI_DEVICE_MAPPING_ALREADY_EXIST.getErrorMessage());
 		}
-		boolean isAdmin = partnerHelper.isPartnerAdmin(authUserDetails().getAuthorities().toString());
 
 		// validate sbi and device mapping
-		if (isAdmin) {
-			partnerHelper.validateSbiDeviceMapping(partnerId, sbiId, deviceId, true);
-		} else {
-			partnerHelper.validateSbiDeviceMapping(partnerId, sbiId, deviceId, false);
-		}
+		partnerHelper.validateSbiDeviceMapping(partnerId, sbiId, deviceId);
 
 		DeviceDetailSBI entity = new DeviceDetailSBI();
 
@@ -926,40 +921,39 @@ private void deleteDeviceDetail(String deviceDetailId) {
 	public ResponseWrapperV2<List<DeviceDto>> getAllDevicesForSbi(String sbiId) {
 		ResponseWrapperV2<List<DeviceDto>> responseWrapper = new ResponseWrapperV2<>();
 		try {
+			String userId = getUserId();
+			List<Partner> partnerList = partnerRepository.findByUserId(userId);
+
+			if (partnerList.isEmpty()) {
+				LOGGER.info("sessionId", "idType", "id", "User id does not exist.");
+				throw new PartnerServiceException(ErrorCode.USER_ID_NOT_EXISTS.getErrorCode(),
+						ErrorCode.USER_ID_NOT_EXISTS.getErrorMessage());
+			}
+
 			Optional<SecureBiometricInterface> secureBiometricInterface = sbiRepository.findById(sbiId);
+
 			if (secureBiometricInterface.isEmpty()) {
 				LOGGER.info("sessionId", "idType", "id", "Sbi is not associated with partner Id.");
 				throw new PartnerServiceException(ErrorCode.SBI_NOT_EXISTS.getErrorCode(),
 						ErrorCode.SBI_NOT_EXISTS.getErrorMessage());
 			}
-			SecureBiometricInterface sbi = secureBiometricInterface.get();
-			boolean isAdmin = partnerHelper.isPartnerAdmin(authUserDetails().getAuthorities().toString());
-			if (!isAdmin) {
-				String userId = getUserId();
-				List<Partner> partnerList = partnerRepository.findByUserId(userId);
 
-				if (partnerList.isEmpty()) {
-					LOGGER.info("sessionId", "idType", "id", "User id does not exist.");
-					throw new PartnerServiceException(ErrorCode.USER_ID_NOT_EXISTS.getErrorCode(),
-							ErrorCode.USER_ID_NOT_EXISTS.getErrorMessage());
-				}
-
-				// check if partnerId is associated with user
-				boolean partnerIdExists = false;
-				for (Partner partner : partnerList) {
-					if (partner.getId().equals(sbi.getProviderId())) {
-						partnerHelper.validatePartnerId(partner, userId);
-						validateDevicePartnerType(partner, userId);
-						partnerIdExists = true;
-						break;
-					}
-				}
-				if (!partnerIdExists) {
-					LOGGER.info("sessionId", "idType", "id", "Partner id is not associated with user.");
-					throw new PartnerServiceException(ErrorCode.SBI_NOT_ASSOCIATED_WITH_USER.getErrorCode(),
-							ErrorCode.SBI_NOT_ASSOCIATED_WITH_USER.getErrorMessage());
+			SecureBiometricInterface sbi = secureBiometricInterface.get();
+			// check if partnerId is associated with user
+			boolean partnerIdExists = false;
+			for (Partner partner : partnerList) {
+				if (partner.getId().equals(sbi.getProviderId())) {
+					partnerHelper.validatePartnerId(partner, userId);
+					validateDevicePartnerType(partner, userId);
+					partnerIdExists = true;
+					break;
 				}
 			}
+			if (!partnerIdExists) {
+				LOGGER.info("sessionId", "idType", "id", "Partner id is not associated with user.");
+				throw new PartnerServiceException(ErrorCode.SBI_NOT_ASSOCIATED_WITH_USER.getErrorCode(),
+						ErrorCode.SBI_NOT_ASSOCIATED_WITH_USER.getErrorMessage());
+			}
 			// fetch devices list
 			List<DeviceDetailSBI> deviceDetailSBIList = deviceDetailSbiRepository.findByDeviceProviderIdAndSbiId(sbi.getProviderId(), sbiId);
 			if (!deviceDetailSBIList.isEmpty()) {

diff --git a/...ner/partner-management-service/src/main/java/io/mosip/pms/partner/util/PartnerHelper.java b/...ner/partner-management-service/src/main/java/io/mosip/pms/partner/util/PartnerHelper.java
@@ -172,13 +172,13 @@ public class PartnerHelper {
     @Autowired
     private Environment environment;
 
-    public void validateSbiDeviceMapping(String partnerId, String sbiId, String deviceDetailId, boolean skipSbiIdBelongsToUser) {
+    public void validateSbiDeviceMapping(String partnerId, String sbiId, String deviceDetailId) {
         Optional<SecureBiometricInterface> secureBiometricInterface = secureBiometricInterfaceRepository.findById(sbiId);
         if (secureBiometricInterface.isEmpty()) {
             LOGGER.info("sessionId", "idType", "id", "Sbi does not exists.");
             throw new PartnerServiceException(ErrorCode.SBI_NOT_EXISTS.getErrorCode(),
                     ErrorCode.SBI_NOT_EXISTS.getErrorMessage());
-        } else if (!skipSbiIdBelongsToUser && !secureBiometricInterface.get().getProviderId().equals(partnerId)) {
+        } else if (!secureBiometricInterface.get().getProviderId().equals(partnerId)) {
             LOGGER.info("sessionId", "idType", "id", "Sbi is not associated with partner Id.");
             throw new PartnerServiceException(ErrorCode.SBI_NOT_ASSOCIATED_WITH_PARTNER_ID.getErrorCode(),
                     ErrorCode.SBI_NOT_ASSOCIATED_WITH_PARTNER_ID.getErrorMessage());