From af50be3e9cbd4cfa3dc9a492025959b9698d06e9 Mon Sep 17 00:00:00 2001 From: renczesstefan Date: Wed, 30 Apr 2025 16:18:53 +0200 Subject: [PATCH 1/9] [NAE-2092] User and Auth endpoints refactor - updated contrrollers according to old user objects --- .../responsebodies/ProcessRoleFactory.html | 2 +- .../auth/web/responsebodies/UserFactory.html | 2 +- .../class-use/IProcessRoleFactory.html | 4 +- .../class-use/IUserFactory.html | 4 +- .../class-use/ProcessRoleFactory.html | 6 +- .../responsebodies/class-use/UserFactory.html | 6 +- .../service/InvalidUserTokenException.java | 16 +- .../auth/service/RegistrationService.java | 482 +++++++------- .../service/UserResourceHelperService.java | 4 - .../interfaces/IRegistrationService.java | 82 +-- .../IUserResourceHelperService.java | 2 - .../auth/web/AuthenticationController.java | 428 ++++++------ .../engine/auth/web/PublicUserController.java | 230 +++---- .../engine/auth/web/UserController.java | 496 +++++++------- .../engine/auth/web/UserControllerAdvice.java | 44 +- .../requestbodies/ChangePasswordRequest.java | 38 +- .../web/requestbodies/NewUserRequest.java | 32 +- .../requestbodies/RegistrationRequest.java | 26 +- .../web/requestbodies/UpdateUserRequest.java | 620 +++++++++--------- .../requestbodies/UserSearchRequestBody.java | 30 +- .../responsebodies/AuthoritiesResources.java | 44 +- .../responsebodies/IProcessRoleFactory.java | 14 +- .../auth/web/responsebodies/IUserFactory.java | 40 +- .../auth/web/responsebodies/ProcessRole.java | 72 +- .../responsebodies/ProcessRoleFactory.java | 66 +- .../engine/auth/web/responsebodies/User.java | 134 ++-- .../auth/web/responsebodies/UserFactory.java | 90 +-- .../auth/web/responsebodies/UserResource.java | 60 +- .../responsebodies/UserResourceAssembler.java | 76 +-- .../web/responsebodies/UsersResource.java | 64 +- .../PrototypesConfiguration.java | 2 - .../UserServiceConfiguration.java | 3 - .../web/ImpersonationController.java | 3 - .../service/ProcessRoleFactoryImpl.java | 35 + .../interfaces/IProcessRoleService.java | 80 +-- .../engine/settings/domain/Preferences.java | 114 ++-- .../domain/PreferencesRepository.java | 20 +- .../settings/service/IPreferencesService.java | 20 +- .../settings/service/PreferencesService.java | 46 +- .../settings/web/PreferencesResource.java | 26 +- .../workflow/web/responsebodies/Task.java | 2 - .../objects/auth/domain/Preferences.java | 49 ++ .../spring/auth/domain/Preferences.java | 18 + .../spring/petrinet/dto/ProcessRole.java | 36 + .../petrinet/service/ProcessRoleFactory.java | 9 + .../auth/config/AuthBeansConfiguration.java | 11 + .../auth/service/PreferencesServiceImpl.java | 22 + .../auth/service/RegistrationServiceImpl.java | 240 +++++++ .../engine/auth/service/UserFactoryImpl.java | 48 ++ .../engine/auth/web/AuthController.java | 240 +++++++ .../engine/auth/web/UserController.java | 330 ++++++++++ .../engine/auth/web/UserControllerAdvice.java | 22 + .../repository/PreferencesRepository.java | 11 + .../auth/service/PreferencesService.java | 11 + .../auth/service/RegistrationService.java | 41 ++ .../engine/auth/service/UserFactory.java | 21 + .../service/UserResourceHelperService.java | 15 + .../throwable/InvalidUserTokenException.java | 8 + .../requestbodies/ChangePasswordRequest.java | 19 + .../web/requestbodies/NewUserRequest.java | 16 + .../web/requestbodies/PreferencesRequest.java | 35 + .../requestbodies/RegistrationRequest.java | 13 + .../web/requestbodies/UpdateUserRequest.java | 310 +++++++++ .../web/requestbodies/UserCreateRequest.java | 13 + .../requestbodies/UserSearchRequestBody.java | 15 + .../responsebodies/AuthoritiesResources.java | 22 + .../responsebodies/PreferencesResource.java | 38 ++ .../auth/web/responsebodies/ProcessRole.java | 36 + .../engine/auth/web/responsebodies/User.java | 68 ++ .../auth/web/responsebodies/UserResource.java | 30 + .../responsebodies/UserResourceAssembler.java | 38 ++ .../web/responsebodies/UsersResource.java | 32 + 72 files changed, 3608 insertions(+), 1774 deletions(-) create mode 100644 application-engine/src/main/java/com/netgrif/application/engine/petrinet/service/ProcessRoleFactoryImpl.java create mode 100644 nae-object-library/src/main/java/com/netgrif/application/engine/objects/auth/domain/Preferences.java create mode 100644 nae-spring-core-adapter/src/main/java/com/netgrif/application/engine/adapter/spring/auth/domain/Preferences.java create mode 100644 nae-spring-core-adapter/src/main/java/com/netgrif/application/engine/adapter/spring/petrinet/dto/ProcessRole.java create mode 100644 nae-spring-core-adapter/src/main/java/com/netgrif/application/engine/adapter/spring/petrinet/service/ProcessRoleFactory.java create mode 100644 nae-user-ce/src/main/java/com/netgrif/application/engine/auth/service/PreferencesServiceImpl.java create mode 100644 nae-user-ce/src/main/java/com/netgrif/application/engine/auth/service/RegistrationServiceImpl.java create mode 100644 nae-user-ce/src/main/java/com/netgrif/application/engine/auth/service/UserFactoryImpl.java create mode 100644 nae-user-ce/src/main/java/com/netgrif/application/engine/auth/web/AuthController.java create mode 100644 nae-user-ce/src/main/java/com/netgrif/application/engine/auth/web/UserController.java create mode 100644 nae-user-ce/src/main/java/com/netgrif/application/engine/auth/web/UserControllerAdvice.java create mode 100644 nae-user-common/src/main/java/com/netgrif/application/engine/auth/repository/PreferencesRepository.java create mode 100644 nae-user-common/src/main/java/com/netgrif/application/engine/auth/service/PreferencesService.java create mode 100644 nae-user-common/src/main/java/com/netgrif/application/engine/auth/service/RegistrationService.java create mode 100644 nae-user-common/src/main/java/com/netgrif/application/engine/auth/service/UserFactory.java create mode 100644 nae-user-common/src/main/java/com/netgrif/application/engine/auth/service/UserResourceHelperService.java create mode 100644 nae-user-common/src/main/java/com/netgrif/application/engine/auth/throwable/InvalidUserTokenException.java create mode 100644 nae-user-common/src/main/java/com/netgrif/application/engine/auth/web/requestbodies/ChangePasswordRequest.java create mode 100644 nae-user-common/src/main/java/com/netgrif/application/engine/auth/web/requestbodies/NewUserRequest.java create mode 100644 nae-user-common/src/main/java/com/netgrif/application/engine/auth/web/requestbodies/PreferencesRequest.java create mode 100644 nae-user-common/src/main/java/com/netgrif/application/engine/auth/web/requestbodies/RegistrationRequest.java create mode 100644 nae-user-common/src/main/java/com/netgrif/application/engine/auth/web/requestbodies/UpdateUserRequest.java create mode 100644 nae-user-common/src/main/java/com/netgrif/application/engine/auth/web/requestbodies/UserCreateRequest.java create mode 100644 nae-user-common/src/main/java/com/netgrif/application/engine/auth/web/requestbodies/UserSearchRequestBody.java create mode 100644 nae-user-common/src/main/java/com/netgrif/application/engine/auth/web/responsebodies/AuthoritiesResources.java create mode 100644 nae-user-common/src/main/java/com/netgrif/application/engine/auth/web/responsebodies/PreferencesResource.java create mode 100644 nae-user-common/src/main/java/com/netgrif/application/engine/auth/web/responsebodies/ProcessRole.java create mode 100644 nae-user-common/src/main/java/com/netgrif/application/engine/auth/web/responsebodies/User.java create mode 100644 nae-user-common/src/main/java/com/netgrif/application/engine/auth/web/responsebodies/UserResource.java create mode 100644 nae-user-common/src/main/java/com/netgrif/application/engine/auth/web/responsebodies/UserResourceAssembler.java create mode 100644 nae-user-common/src/main/java/com/netgrif/application/engine/auth/web/responsebodies/UsersResource.java diff --git a/application-engine/docs/javadoc/com/netgrif/application/engine/auth/web/responsebodies/ProcessRoleFactory.html b/application-engine/docs/javadoc/com/netgrif/application/engine/auth/web/responsebodies/ProcessRoleFactory.html index 1fddb80a27c..ef57d248157 100644 --- a/application-engine/docs/javadoc/com/netgrif/application/engine/auth/web/responsebodies/ProcessRoleFactory.html +++ b/application-engine/docs/javadoc/com/netgrif/application/engine/auth/web/responsebodies/ProcessRoleFactory.html @@ -125,7 +125,7 @@

Class ProcessRoleFactory

  • java.lang.Object
  • diff --git a/application-engine/docs/javadoc/com/netgrif/application/engine/auth/web/responsebodies/UserFactory.html b/application-engine/docs/javadoc/com/netgrif/application/engine/auth/web/responsebodies/UserFactory.html index fb3ffde206a..cd0257cdfac 100644 --- a/application-engine/docs/javadoc/com/netgrif/application/engine/auth/web/responsebodies/UserFactory.html +++ b/application-engine/docs/javadoc/com/netgrif/application/engine/auth/web/responsebodies/UserFactory.html @@ -125,7 +125,7 @@

    Class UserFactory

  • java.lang.Object
  • diff --git a/application-engine/docs/javadoc/com/netgrif/application/engine/auth/web/responsebodies/class-use/IProcessRoleFactory.html b/application-engine/docs/javadoc/com/netgrif/application/engine/auth/web/responsebodies/class-use/IProcessRoleFactory.html index b1a481eba51..a0f303fa20a 100644 --- a/application-engine/docs/javadoc/com/netgrif/application/engine/auth/web/responsebodies/class-use/IProcessRoleFactory.html +++ b/application-engine/docs/javadoc/com/netgrif/application/engine/auth/web/responsebodies/class-use/IProcessRoleFactory.html @@ -3,7 +3,7 @@ -Uses of Interface com.netgrif.application.engine.auth.web.responsebodies.IProcessRoleFactory (NETGRIF Application Engine 6.4.0 API) +Uses of Interface com.netgrif.application.engine.auth.web.responsebodies.ProcessRoleFactory (NETGRIF Application Engine 6.4.0 API) @@ -95,7 +95,7 @@
    -

    Uses of Interface
    com.netgrif.application.engine.auth.web.responsebodies.IProcessRoleFactory

    +

    Uses of Interface
    com.netgrif.application.engine.auth.web.responsebodies.ProcessRoleFactory

      diff --git a/application-engine/docs/javadoc/com/netgrif/application/engine/auth/web/responsebodies/class-use/IUserFactory.html b/application-engine/docs/javadoc/com/netgrif/application/engine/auth/web/responsebodies/class-use/IUserFactory.html index dde67c200bd..856332aac6e 100644 --- a/application-engine/docs/javadoc/com/netgrif/application/engine/auth/web/responsebodies/class-use/IUserFactory.html +++ b/application-engine/docs/javadoc/com/netgrif/application/engine/auth/web/responsebodies/class-use/IUserFactory.html @@ -3,7 +3,7 @@ -Uses of Interface com.netgrif.application.engine.auth.web.responsebodies.IUserFactory (NETGRIF Application Engine 6.4.0 API) +Uses of Interface com.netgrif.application.engine.auth.service.UserFactory (NETGRIF Application Engine 6.4.0 API) @@ -95,7 +95,7 @@
      -

      Uses of Interface
      com.netgrif.application.engine.auth.web.responsebodies.IUserFactory

      +

      Uses of Interface
      com.netgrif.application.engine.auth.service.UserFactory

        diff --git a/application-engine/docs/javadoc/com/netgrif/application/engine/auth/web/responsebodies/class-use/ProcessRoleFactory.html b/application-engine/docs/javadoc/com/netgrif/application/engine/auth/web/responsebodies/class-use/ProcessRoleFactory.html index 07004d2484d..bb9e07056e2 100644 --- a/application-engine/docs/javadoc/com/netgrif/application/engine/auth/web/responsebodies/class-use/ProcessRoleFactory.html +++ b/application-engine/docs/javadoc/com/netgrif/application/engine/auth/web/responsebodies/class-use/ProcessRoleFactory.html @@ -3,7 +3,7 @@ -Uses of Class com.netgrif.application.engine.auth.web.responsebodies.ProcessRoleFactory (NETGRIF Application Engine 6.4.0 API) +Uses of Class com.netgrif.application.engine.auth.web.responsebodies.ProcessRoleFactoryImpl (NETGRIF Application Engine 6.4.0 API) @@ -95,9 +95,9 @@
        -

        Uses of Class
        com.netgrif.application.engine.auth.web.responsebodies.ProcessRoleFactory

        +

        Uses of Class
        com.netgrif.application.engine.auth.web.responsebodies.ProcessRoleFactoryImpl

        -
        No usage of com.netgrif.application.engine.auth.web.responsebodies.ProcessRoleFactory
        +
        No usage of com.netgrif.application.engine.auth.web.responsebodies.ProcessRoleFactoryImpl
      diff --git a/docs/javadoc/com/netgrif/application/engine/auth/service/UserService.html b/docs/javadoc/com/netgrif/application/engine/auth/service/UserService.html index fa27767c7fd..f91e57d43e6 100644 --- a/docs/javadoc/com/netgrif/application/engine/auth/service/UserService.html +++ b/docs/javadoc/com/netgrif/application/engine/auth/service/UserService.html @@ -190,7 +190,7 @@

      Field Summary

      protected IRegistrationService -registrationService +userRegistrationService   @@ -485,14 +485,14 @@

      groupService

      protected INextGroupService groupService
    - + diff --git a/docs/javadoc/com/netgrif/application/engine/auth/service/class-use/RegistrationService.html b/docs/javadoc/com/netgrif/application/engine/auth/service/class-use/RegistrationService.html index cc60fb66573..32e81ec9391 100644 --- a/docs/javadoc/com/netgrif/application/engine/auth/service/class-use/RegistrationService.html +++ b/docs/javadoc/com/netgrif/application/engine/auth/service/class-use/RegistrationService.html @@ -3,7 +3,7 @@ -Uses of Class com.netgrif.application.engine.auth.service.RegistrationService (NETGRIF Application Engine 6.4.0 API) +Uses of Class com.netgrif.application.engine.auth.service.UserRegistrationService (NETGRIF Application Engine 6.4.0 API) @@ -22,7 +22,7 @@