updated code

src/main/java/net/gepafin/tendermanagement/service/impl/UserServiceImpl.java

@@ -2,23 +2,26 @@ package net.gepafin.tendermanagement.service.impl;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import net.gepafin.tendermanagement.config.jwt.TokenProvider;
+import net.gepafin.tendermanagement.config.SamlSuccessHandler;
 import net.gepafin.tendermanagement.dao.UserDao;
 import net.gepafin.tendermanagement.entities.UserEntity;
 import net.gepafin.tendermanagement.model.request.LoginReq;
 import net.gepafin.tendermanagement.model.request.UpdateUserReq;
 import net.gepafin.tendermanagement.model.request.UserReq;
+import net.gepafin.tendermanagement.enums.RoleStatusEnum;
 import net.gepafin.tendermanagement.enums.UserStatusEnum;
 import net.gepafin.tendermanagement.model.request.*;
+import net.gepafin.tendermanagement.model.response.UserSamlResponse;
 import net.gepafin.tendermanagement.model.response.UserResponseBean;
 import net.gepafin.tendermanagement.model.util.JWTToken;
 import net.gepafin.tendermanagement.service.UserService;
+import net.gepafin.tendermanagement.util.Validator;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
-import java.util.Map;
 
 
 @Service
@@ -26,12 +29,22 @@ public class UserServiceImpl implements UserService {
 
     @Autowired
     private UserDao userDao;
+    
     @Autowired
-    private TokenProvider tokenProvider;
+    private Validator validator;
+    
+    @Autowired
+    private SamlSuccessHandler samlSuccessHandler;
 
+    @Override
     @Transactional(rollbackFor = Exception.class)
-    public UserResponseBean createUser(UserReq userReq) {
-        return userDao.createUser(userReq);
+    public JWTToken createUser(HttpServletRequest request, String tempToken, UserReq userReq) {
+		if (tempToken == null) {
+			validator.validateRequest(request,RoleStatusEnum.ROLE_SUPER_ADMIN);
+		}else {
+			samlSuccessHandler.validateToken(tempToken, userReq.getCodiceFiscale());
+		}
+        return userDao.createUser(request, tempToken, userReq);
     }
 
 
@@ -54,8 +67,8 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public JWTToken login(LoginReq loginReq) {
-        return userDao.login(loginReq);
+    public JWTToken login(LoginReq loginReq, HttpServletRequest request) {
+        return userDao.login(loginReq,request);
 
     }
 
@@ -74,8 +87,8 @@ public class UserServiceImpl implements UserService {
         return userDao.resetPassword(resetPasswordReq);
     }
     @Override
-    public Boolean changePassword(ChangePasswordRequest request){
-        return  userDao.changePassword(request);
+    public Boolean changePassword(HttpServletRequest httpServletRequest, ChangePasswordRequest request){
+        return  userDao.changePassword(validator.validateUser(httpServletRequest), request);
     }
     @Override
     public void logoutUser(HttpServletRequest request, HttpServletResponse response) {
@@ -90,19 +103,38 @@ public class UserServiceImpl implements UserService {
     @Override
     @Transactional(readOnly = true)
     public UserResponseBean getValidUser(HttpServletRequest request) {
-        Map<String, Object> userInfo= tokenProvider.getUserInfoAndUserIdFromToken(request);
-        UserEntity user=tokenProvider.validateUser(userInfo);
+        UserEntity user=validator.validateUser(request);
         return userDao.getUserById(user.getId());
     }
+    
     @Override
     @Transactional(readOnly = true)
     public List<UserResponseBean> getUserByHubId(String hubId) {
         return userDao.getUserByHubId(hubId);
     }
+    
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public UserResponseBean createUserByHubId(String hubId, UserReq userReq) {
-        return userDao.createUserByHubId(hubId, userReq);
+    public JWTToken validateExistingUserToken(HttpServletRequest request, String token) {
+    	return userDao.validateExistingUserToken(token);
+    }
+    @Override
+    public UserSamlResponse validateNewUserToken(HttpServletRequest request, String token) {
+    	return userDao.validateNewUserToken(token);
+    }
+    @Override
+    public UserEntity getUserByBeneficiaryId(Long beneficiaryId) {
+        return userDao.getUserByBeneficiaryId(beneficiaryId);
+    }
+    @Override
+    public UserEntity getUserEntityById(Long userId) {
+        // Calling DAO Function
+        return userDao.validateUser(userId);
+    }
+    @Override
+    @Transactional(readOnly = true)
+    public List<UserResponseBean> getAllUsers(Long roleId) {
+        // Calling DAO Function
+        return userDao.getAllUsers(roleId);
     }
-
 }