Merge pull request 'Aconnect Change Password Issue: now on first login password will update successfully' (#17) from aconnect/BS-ChangePasswordIssue into FMFI-PRE-PRODUCTION-2026

Reviewed-on: https://ct.mfsys.com.pk/aConnect/aConnect-BS/pulls/17

aconnect/src/main/java/com/mfsys/aconnect/client/service/ThirdPartyUserService.java

@@ -6,9 +6,11 @@ import com.mfsys.aconnect.configuration.config.WebClientConfig;
 import com.mfsys.aconnect.usermanagement.dto.UserDTOs;
 import com.mfsys.aconnect.usermanagement.exceptions.EmailAlreadyExistException;
 import com.mfsys.aconnect.usermanagement.exceptions.UsernameAlreadyExistException;
+import com.mfsys.aconnect.usermanagement.model.User;
 import com.mfsys.aconnect.usermanagement.repository.UserRepository;
 import com.mfsys.aconnect.usermanagement.model.Role;
 import com.mfsys.aconnect.usermanagement.service.UserService;
+import jakarta.persistence.EntityNotFoundException;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.http.*;
@@ -119,6 +121,10 @@ public class ThirdPartyUserService {
             userRequest.setRole(Role.USER);
 
             userService.createUser(userRequest);
+            User saved = userRepository.findByUserId(request.getSusUsercode())
+                    .orElseThrow(() -> new EntityNotFoundException("User not found: " + request.getSusUsercode()));
+            saved.setAconnectUser(true);
+            userRepository.save(saved);
         } catch (Exception e) {
             System.err.println("Failed to save third party user to Aconnect: " + e.getMessage());
         }

aconnect/src/main/java/com/mfsys/aconnect/usermanagement/model/User.java

@@ -51,6 +51,9 @@ public class User {
   @Column(name = "is_deleted", columnDefinition = FieldNameLength.BOOLEAN_BIT)
   private boolean isDeleted = false;
 
+  @Column(name = "is_aconnect_user", columnDefinition = FieldNameLength.BOOLEAN_BIT)
+  private boolean isAconnectUser = false;
+
   @CreationTimestamp
   @Column(name = "created_at", updatable = false)
   private LocalDateTime createdAt;

aconnect/src/main/java/com/mfsys/aconnect/usermanagement/repository/UserRepository.java

@@ -9,6 +9,7 @@ import java.util.Optional;
 
 @Repository
 public interface UserRepository extends JpaRepository<User, String> {
+    Optional<User> findByUserId(String userId);
   Optional<User> findByUserIdAndIsActiveTrue(String userId);
   boolean existsByUserId(String userId);
   boolean existsByEmail(String email);

aconnect/src/main/java/com/mfsys/aconnect/usermanagement/service/UserService.java

@@ -63,6 +63,7 @@ public class UserService {
       user.setFirstLogin(false);
     }
     user.setPassword(passwordEncryptionService.hashPassword(request.getPassword()));
+    user.setAconnectUser(false);
     User savedUser = userRepository.save(user);
     return mapToResponseDTO(savedUser);
   }
@@ -84,8 +85,6 @@ public class UserService {
     @Transactional
     public String firstLogin(ChangePasswordDTO request) throws JsonProcessingException {
 
-        String url = securityURI + "/security/thirdparty/user/changePassword";
-
         User user = userRepository.findById(request.getUserId())
                 .orElseThrow(() -> new EntityNotFoundException(
                         "User not found with ID: " + request.getUserId()));
@@ -97,30 +96,33 @@ public class UserService {
             throw new OldPasswordNotMatch(request.getPorOrgacode());
         }
 
-        HttpHeaders headers = new HttpHeaders();
+        if (user.isAconnectUser()) {
-        headers.setContentType(MediaType.APPLICATION_JSON);
+
-        headers.set("sus_usercode", request.getUserId());
+            String url = securityURI + "/security/thirdparty/user/changePassword";
-        headers.set("por_orgacode", request.getPorOrgacode());
+
-
+            HttpHeaders headers = new HttpHeaders();
-        // Build $set payload
+            headers.setContentType(MediaType.APPLICATION_JSON);
-        Map<String, Object> setPayload = new HashMap<>();
+            headers.set("sus_usercode", request.getUserId());
-        setPayload.put("SUS_USERCODE", user.getUserId());
+            headers.set("por_orgacode", request.getPorOrgacode());
-        setPayload.put("SUS_PASSWORD", request.getNewPassword());
+
-        setPayload.put("OLD_PASSWORD", request.getOldPassword());
+            Map<String, Object> setPayload = new HashMap<>();
-        setPayload.put("POR_ORGACODE", user.getPorOrgacode());
+            setPayload.put("SUS_USERCODE", user.getUserId());
-
+            setPayload.put("SUS_PASSWORD", request.getNewPassword());
-        // Build main payload
+            setPayload.put("OLD_PASSWORD", request.getOldPassword());
-        Map<String, Object> requestBody = new HashMap<>();
+            setPayload.put("POR_ORGACODE", user.getPorOrgacode());
-        requestBody.put("formId", "SH_SM_US_USER"); // your form ID
+
-        requestBody.put("porOrgacode", user.getPorOrgacode());
+            Map<String, Object> requestBody = new HashMap<>();
-        requestBody.put("set", objectMapper.writeValueAsString(setPayload));
+            requestBody.put("formId", "SH_SM_US_USER");
-        requestBody.put("filter", buildFilter(user.getPorOrgacode(), user.getUserId()));
+            requestBody.put("porOrgacode", user.getPorOrgacode());
-
+            requestBody.put("set", objectMapper.writeValueAsString(setPayload));
-        ResponseEntity<Object> ciihiveResponse =
+            requestBody.put("filter", buildFilter(user.getPorOrgacode(), user.getUserId()));
-                webClientConfig.patch(url, requestBody, headers);
+
-
+            ResponseEntity<Object> ciihiveResponse =
-        if (!ciihiveResponse.getStatusCode().is2xxSuccessful()) {
+                    webClientConfig.patch(url, requestBody, headers);
-            throw new RuntimeException("Failed to update password in ciihive: " + ciihiveResponse.getBody());
+
+            if (!ciihiveResponse.getStatusCode().is2xxSuccessful()) {
+                throw new RuntimeException("Failed to update password in ciihive: " + ciihiveResponse.getBody());
+            }
         }
 
         // Update local DB