Api registrazione utente da admin

.gitignore

@@ -31,3 +31,4 @@ build/
 
 ### VS Code ###
 .vscode/
+/src/main/resources/application-localdev.properties

Dockerfile

@@ -0,0 +1,5 @@
+FROM openjdk:17-oracle
+ARG JAR_FILE=target/*.jar
+COPY ${JAR_FILE} app.jar
+EXPOSE 8080
+ENTRYPOINT ["java","-jar","/app.jar"]

docker-compose.yml

@@ -0,0 +1,67 @@
+version: "2.2"
+services:
+    # App backend service
+
+    db:
+        image: mysql:5.7
+        container_name: facility_management_db
+        volumes:
+            - facility_management_db:/var/lib/mysql
+        restart: always
+        ports:
+            - "6001:3306"
+        environment:
+            MYSQL_ROOT_PASSWORD: 4P2bauIt7WIdpXnd
+            MYSQL_DATABASE: facility_management
+            MYSQL_PASSWORD: 4P2bauIt7WIdpXnd
+        networks:
+            network:
+                ipv4_address: 172.95.0.2
+
+    app-server:
+        # Configuration for building the docker image for the backend service
+        container_name: facility_management_be
+        build:
+            context: facilityManager
+            dockerfile: Dockerfile
+        ports:
+            - 6003:8080 # Forward the exposed port 8080 on the container to port 5002 on the host machine
+        restart: always
+        depends_on:
+            - db # This service depends on mysql. Start that first.
+        environment: # Pass environment variables to the service
+            - spring.profiles.active=prod
+            - spring.datasource.url=jdbc:mysql://db:3306/facility_management?useSSL=false&serverTimezone=UTC
+            - spring.datasource.username=root
+            - spring.datasource.password=4P2bauIt7WIdpXnd
+        networks:
+            network:
+                ipv4_address: 172.95.0.3
+
+    # for php myadmin goto http://localhost:5001
+    phpmyadmino:
+        container_name: facility_management_db_phpmyadmin
+        depends_on:
+            - db
+        image: phpmyadmin
+        restart: always
+        ports:
+            - "6002:80"
+        environment:
+            PMA_HOST: db
+            MYSQL_ROOT_PASSWORD: 4P2bauIt7WIdpXnd
+        networks:
+            network:
+                ipv4_address: 172.95.0.4
+
+volumes:
+    facility_management_db:
+
+networks:
+    network:
+        driver: bridge
+        ipam:
+            config:
+                -
+                    subnet: 172.95.0.0/16
+                    gateway: 172.95.0.1

src/main/java/it/bruffa/facilitymanager/FacilityManagerApplication.java

@@ -2,16 +2,23 @@
 
 import io.swagger.v3.oas.annotations.OpenAPIDefinition;
 import io.swagger.v3.oas.annotations.info.Info;
+import io.swagger.v3.oas.annotations.servers.Server;
+import io.swagger.v3.oas.models.OpenAPI;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.core.task.TaskExecutor;
 
-@SpringBootApplication
-@OpenAPIDefinition(info = @Info(title = "FacilityManagerApplication", version = "2.0", description = "FacilityManager Application"))
+import java.util.List;
 
+@SpringBootApplication
+//@OpenAPIDefinition(info = @Info(title = "FacilityManagerApplication", version = "2.0", description = "FacilityManager Application"),servers = {
+//        @Server(url = "https://facilitymanager.be.flaminiovilla.it/", description = "Default Server URL")
+//})
+@OpenAPIDefinition(info = @Info(title = "FacilityManagerApplication", version = "2.0", description = "FacilityManager Application")
+)
 public class FacilityManagerApplication {
 
     public static void main(String[] args) {

src/main/java/it/bruffa/facilitymanager/controller/AuthController.java

@@ -8,6 +8,7 @@
 import it.bruffa.facilitymanager.model.dto.AuthResponseDTO;
 import it.bruffa.facilitymanager.model.dto.LoginDto;
 import it.bruffa.facilitymanager.model.dto.TokenRefreshResponseDto;
+import it.bruffa.facilitymanager.model.dto.request.RegisterUserRequestDto;
 import it.bruffa.facilitymanager.model.dto.request.SignUpRequestDto;
 import it.bruffa.facilitymanager.model.entity.User;
 import it.bruffa.facilitymanager.model.exception.ApiError;
@@ -35,8 +36,11 @@ public interface AuthController{
     //sign up
     @Operation(summary = "Sign up", description = "Sign up", tags = {"auth"})
     @PostMapping("/signup")
-    ResponseEntity<User> registerUser(@Valid @RequestBody SignUpRequestDto signUpRequestDto) throws Exception;
+    ResponseEntity<User> signup(@Valid @RequestBody SignUpRequestDto signUpRequestDto) throws Exception;
 
+    @Operation(summary = "Sign up from admin", description = "Sign up", tags = {"auth"})
+    @PostMapping("/registerUser")
+    ResponseEntity<User> registerUser(@Valid @RequestBody RegisterUserRequestDto registerUser) throws Exception;
 
     @Operation(summary = "Logout", description = "Logout", tags = {"auth"})
     @PostMapping("/logout")

src/main/java/it/bruffa/facilitymanager/controller/impl/AuthControllerImpl.java

@@ -4,6 +4,7 @@
 import it.bruffa.facilitymanager.model.dto.AuthResponseDTO;
 import it.bruffa.facilitymanager.model.dto.LoginDto;
 import it.bruffa.facilitymanager.model.dto.TokenRefreshResponseDto;
+import it.bruffa.facilitymanager.model.dto.request.RegisterUserRequestDto;
 import it.bruffa.facilitymanager.model.dto.request.SignUpRequestDto;
 import it.bruffa.facilitymanager.model.entity.User;
 import it.bruffa.facilitymanager.model.entity.UserPrincipal;
@@ -50,8 +51,13 @@ public ResponseEntity<UserMeInfo> getCurrentUser(@CurrentUser UserPrincipal user
         return authService.getCurrentUser(userPrincipal);
     }
     @Override
-    public ResponseEntity<User> registerUser(SignUpRequestDto signUpRequestDto) throws Exception {
-        return authService.registerUser(signUpRequestDto);
+    public ResponseEntity<User> signup(SignUpRequestDto signUpRequestDto) throws Exception {
+        return authService.signup(signUpRequestDto);
+    }
+
+    @Override
+    public ResponseEntity<User> registerUser(RegisterUserRequestDto registerUser) throws Exception {
+        return  authService.registerUser(registerUser);
     }
 
     @Override

src/main/java/it/bruffa/facilitymanager/model/dto/request/RegisterUserRequestDto.java

@@ -0,0 +1,35 @@
+package it.bruffa.facilitymanager.model.dto.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+@Data
+public class RegisterUserRequestDto {
+    @NotBlank
+    @Schema(description = "First name of the user", example = "Mario")
+    private String firstName;
+
+    @NotBlank
+    @Schema(description = "Last name of the user", example = "Rossi")
+    private String lastName;
+
+    @NotBlank
+    @Email
+    @Schema(description = "Email of the user", example = "mariorossi@gmail.com")
+    private String email;
+
+    @NotNull
+    @Schema(description = "Latitude of the user", example = "45.123456")
+    private Double latitude;
+
+    @NotNull
+    @Schema(description = "Longitude of the user", example = "9.123456")
+    private Double longitude;
+
+    @NotBlank
+    @Schema(description = "Role of the user", example = "ROLE_USER / ROLE_ADMIN / ROLE_CLEANER / ROLE_MAINTAINER")
+    private String role;
+}

src/main/java/it/bruffa/facilitymanager/model/projection/UserDetailInfo.java

@@ -26,13 +26,13 @@ public interface UserDetailInfo {
 
     String getPassword();
 
-    Boolean isEnable();
+    Boolean getEnable();
 
-    Boolean isCredentialExpired();
+    Boolean getCredentialExpired();
 
-    Boolean isAccountNonExpired();
+    Boolean getAccountNonExpired();
 
-    Boolean isAccountNonLocked();
+    Boolean getAccountNonLocked();
 
     Collection<RoleInfo> getRoles();
 

src/main/java/it/bruffa/facilitymanager/service/AuthService.java

@@ -3,6 +3,7 @@
 import it.bruffa.facilitymanager.model.dto.AuthResponseDTO;
 import it.bruffa.facilitymanager.model.dto.LoginDto;
 import it.bruffa.facilitymanager.model.dto.TokenRefreshResponseDto;
+import it.bruffa.facilitymanager.model.dto.request.RegisterUserRequestDto;
 import it.bruffa.facilitymanager.model.dto.request.SignUpRequestDto;
 import it.bruffa.facilitymanager.model.entity.User;
 import it.bruffa.facilitymanager.model.entity.UserPrincipal;
@@ -14,7 +15,7 @@
 public interface AuthService {
     ResponseEntity<AuthResponseDTO> login(LoginDto loginDto);
 
-    ResponseEntity<User> registerUser(SignUpRequestDto signUpRequestDto) throws Exception;
+    ResponseEntity<User> signup(SignUpRequestDto signUpRequestDto) throws Exception;
 
 
     ResponseEntity<TokenRefreshResponseDto> refreshtoken(String refreshToken) throws Exception;
@@ -26,4 +27,6 @@ public interface AuthService {
     ResponseEntity<?> getAuthenticationToChangePassword(String token);
 
     ResponseEntity<Boolean> logout(HttpServletRequest request, HttpServletResponse response);
+
+    ResponseEntity<User> registerUser(RegisterUserRequestDto registerUser) throws Exception;
 }

src/main/java/it/bruffa/facilitymanager/service/UserService.java

@@ -1,5 +1,6 @@
 package it.bruffa.facilitymanager.service;
 
+import it.bruffa.facilitymanager.model.dto.MailResponse;
 import it.bruffa.facilitymanager.model.dto.request.ChangePassworRequest;
 import it.bruffa.facilitymanager.model.entity.User;
 import it.bruffa.facilitymanager.model.entity.UserPrincipal;
@@ -18,4 +19,6 @@ public interface UserService {
 
     UserDetailInfo getUserById(Long userId);
 
+    MailResponse requestResetPassword(User user);
+
 }

src/main/java/it/bruffa/facilitymanager/service/impl/AuthServiceImpl.java

@@ -3,6 +3,7 @@
 import it.bruffa.facilitymanager.model.dto.AuthResponseDTO;
 import it.bruffa.facilitymanager.model.dto.LoginDto;
 import it.bruffa.facilitymanager.model.dto.TokenRefreshResponseDto;
+import it.bruffa.facilitymanager.model.dto.request.RegisterUserRequestDto;
 import it.bruffa.facilitymanager.model.dto.request.SignUpRequestDto;
 import it.bruffa.facilitymanager.model.entity.*;
 import it.bruffa.facilitymanager.model.exception.ExpiredJwtException;
@@ -16,6 +17,7 @@
 import it.bruffa.facilitymanager.security.CustomAuthenticationManager;
 import it.bruffa.facilitymanager.security.JwtUtility;
 import it.bruffa.facilitymanager.service.AuthService;
+import it.bruffa.facilitymanager.service.UserService;
 import it.bruffa.facilitymanager.utilities.PropertiesHelper;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -46,6 +48,8 @@ public class AuthServiceImpl implements AuthService {
     private PasswordResetTokenRepository passwordResetTokenRepository;
     @Autowired
     private JwtUtility tokenProvider;
+    @Autowired
+    private UserService userService;
 
     private final CustomAuthenticationManager authenticationManager;
     private final JwtUtility jwtUtility;
@@ -98,7 +102,7 @@ public ResponseEntity<AuthResponseDTO> login(LoginDto loginDto) {
     }
 
     @Override
-    public ResponseEntity<User> registerUser(SignUpRequestDto signUpRequestDto) throws Exception {
+    public ResponseEntity<User> signup(SignUpRequestDto signUpRequestDto) throws Exception {
         // Check if the email is already in use.
         if (userRepository.existsByEmail(signUpRequestDto.getEmail()))
             throw new Exception("Email is already in use!");
@@ -206,15 +210,14 @@ public ResponseEntity<?> createFirstUser(HttpServletRequest req) throws Exceptio
         user.setAccountNonLocked(true);
         user.setAccountNonExpired(true);
         user.setCredentialExpired(false);
+        user.setLatitude(0.0);
+        user.setLongitude(0.0);
         user.setEnable(true);
 
-
-
-        // Save the user in the database.
         try {
             userRepository.save(user);
         } catch (Exception e) {
-            throw new InvalidCredentialsException("User already present!");
+            throw e;
 
         }
         return ResponseEntity.ok(user);
@@ -265,6 +268,41 @@ public ResponseEntity<Boolean> logout(HttpServletRequest request, HttpServletRes
         return ResponseEntity.ok(true);
     }
 
+    @Override
+    public ResponseEntity<User> registerUser(RegisterUserRequestDto registerUser) throws Exception {
+        // Check if the email is already in use.
+        if (userRepository.existsByEmail(registerUser.getEmail()))
+            throw new Exception("Email is already in use!");
+
+        // Trying to find the role with the given name, if not found a bad request exception will be thrown.
+        Role role = roleRepository.findByName(registerUser.getRole()).orElseThrow(() -> new ItemNotFoundException("Role not found"));
+        // Create the collection to store all the roles.
+        ArrayList<Role> roles = new ArrayList<>();
+        roles.add(role);
+
+        // Creating user's account
+        User user = new User();
+
+        user.setFirstName(registerUser.getFirstName());
+        user.setLastName(registerUser.getLastName());
+        user.setEmail(registerUser.getEmail());
+        user.setLatitude(registerUser.getLatitude());
+        user.setLongitude(registerUser.getLongitude());
+        user.setRoles(roles);
+        user.setEnable(true);
+        user.setAccountNonLocked(true);
+        user.setAccountNonExpired(true);
+        user.setCredentialExpired(false);
+
+        // Save the user in the database.
+        User result = userRepository.save(user);
+
+        userService.requestResetPassword(result);
+        // Return the created user.
+        return ResponseEntity.ok(result);
+
+    }
+
     /**
      * Check if the token is found.
      *

src/main/java/it/bruffa/facilitymanager/service/impl/UserServiceImpl.java

@@ -60,6 +60,7 @@ public User changePassword(UserPrincipal userPrincipal, ChangePassworRequest bod
 
         // Save the user.
         User updatedUser = userRepository.save(user);
+        updatedUser.setPassword(null);
         return updatedUser;
     }
 

src/main/resources/application-dev.properties

@@ -1,4 +1,4 @@
-spring.datasource.url=jdbc:mysql://localhost:3306/facility_manager?useUnicode=true&useSSL=false&serverTimezone=UTC
+spring.datasource.url=jdbc:mysql://localhost:3306/facility_manager2?useUnicode=true&useSSL=false&serverTimezone=UTC
 spring.datasource.username=root
 spring.datasource.password=flaminio
 spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver

src/main/resources/application-prod.properties

@@ -0,0 +1,11 @@
+spring.datasource.url=jdbc:mysql://db:3306/facility_management?useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
+spring.datasource.username=root
+spring.datasource.password=4P2bauIt7WIdpXnd
+spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
+spring.jpa.show-sql=true
+spring.jpa.hibernate.ddl-auto=update
+
+
+
+mail.username=software@gmail.com
+mail.password=ekssdfsdfob

src/main/resources/application.properties

@@ -1,15 +1,18 @@
-spring.profiles.active=dev
+spring.profiles.active=localdev
 spring.jpa.properties.hibernate.hbm2dll.create_namespaces=true
 server.port=8080
 
 springdoc.enable-native-support=true
 springdoc.swagger-ui.path=/swagger-ui.html
 #MQTT dashboard to test
 #https://mqtthq.com/client
-
+#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
 #Swagger UI
 # http://localhost:8080/swagger-ui/index.html
 
 #H2 console
 #SCRIPT TO 'data_init.sql'
-
+#cd facilityManager/
+#git pull
+#mvn -U clean package install -DskipTests
+#docker-compose up --no-deps --build