[NAE-2092] User and Auth endpoints refactor

- updated services and packages

Author: renczesstefan

application-engine/src/main/groovy/com/netgrif/application/engine/petrinet/domain/dataset/logic/action/ActionDelegate.groovy

@@ -1,14 +1,14 @@
 package com.netgrif.application.engine.petrinet.domain.dataset.logic.action
 
 import com.netgrif.application.engine.auth.service.GroupService
+import com.netgrif.application.engine.auth.service.RegistrationService
 import com.netgrif.application.engine.auth.service.UserService
 import com.netgrif.application.engine.petrinet.service.interfaces.IPetriNetService
 import com.netgrif.application.engine.adapter.spring.petrinet.service.ProcessRoleService
 import com.netgrif.application.engine.adapter.spring.workflow.domain.QCase
 import com.netgrif.application.engine.adapter.spring.workflow.domain.QTask
 import com.netgrif.application.engine.AsyncRunner
 import com.netgrif.application.engine.auth.service.UserDetailsServiceImpl
-import com.netgrif.application.engine.auth.service.interfaces.IRegistrationService
 import com.netgrif.application.engine.auth.web.requestbodies.NewUserRequest
 import com.netgrif.application.engine.configuration.ApplicationContextProvider
 import com.netgrif.application.engine.configuration.PublicViewProperties
@@ -137,7 +137,7 @@ class ActionDelegate {
     ProcessRoleService processRoleService
 
     @Autowired
-    IRegistrationService registrationService
+    RegistrationService registrationService
 
     @Autowired
     IMailAttemptService mailAttemptService

application-engine/src/main/java/com/netgrif/application/engine/auth/service/RegistrationService.java

@@ -4,7 +4,7 @@
 //import com.netgrif.application.engine.objects.auth.domain.RegisteredUser;
 //import com.netgrif.application.engine.objects.auth.domain.User;
 //import com.netgrif.application.engine.objects.auth.domain.enums.UserState;
-//import com.netgrif.application.engine.auth.service.interfaces.IRegistrationService;
+//import com.netgrif.application.engine.auth.service.RegistrationService;
 //import com.netgrif.application.engine.auth.service.UserService;
 //import com.netgrif.application.engine.auth.web.requestbodies.NewUserRequest;
 //import com.netgrif.application.engine.auth.web.requestbodies.RegistrationRequest;

application-engine/src/main/java/com/netgrif/application/engine/auth/service/UserResourceHelperService.java

@@ -1,5 +1,7 @@
 package com.netgrif.application.engine.auth.service;
 
+import com.netgrif.application.engine.auth.web.responsebodies.User;
+import com.netgrif.application.engine.auth.web.responsebodies.UserResource;
 import com.netgrif.application.engine.objects.auth.domain.IUser;
 import com.netgrif.application.engine.objects.auth.domain.LoggedUser;
 import com.netgrif.application.engine.auth.service.interfaces.IUserResourceHelperService;
@@ -20,7 +22,7 @@ public class UserResourceHelperService implements IUserResourceHelperService {
     private UserService userService;
 
     @Autowired
-    private IUserFactory userFactory;
+    private UserFactory userFactory;
 
     @Autowired
     private IImpersonationService impersonationService;

application-engine/src/main/java/com/netgrif/application/engine/auth/service/UserService.java

@@ -3,7 +3,7 @@
 //import com.netgrif.application.engine.objects.auth.domain.Authority;.*;
 //import com.netgrif.application.engine.objects.auth.domain.Authority;.repositories.AuthorityRepository;
 //import com.netgrif.application.engine.objects.auth.domain.Authority;.repositories.UserRepository;
-//import com.netgrif.application.engine.auth.service.interfaces.IRegistrationService;
+//import com.netgrif.application.engine.auth.service.RegistrationService;
 //import com.netgrif.application.engine.auth.web.requestbodies.UpdateUserRequest;
 //import com.netgrif.application.engine.event.events.user.UserRegistrationEvent;
 //import com.netgrif.application.engine.orgstructure.groups.config.GroupConfigurationProperties;

application-engine/src/main/java/com/netgrif/application/engine/auth/service/interfaces/IUserResourceHelperService.java

@@ -1,5 +1,7 @@
 package com.netgrif.application.engine.auth.service.interfaces;
 
+import com.netgrif.application.engine.auth.web.responsebodies.User;
+import com.netgrif.application.engine.auth.web.responsebodies.UserResource;
 import com.netgrif.application.engine.objects.auth.domain.IUser;
 import com.netgrif.application.engine.objects.auth.domain.LoggedUser;
 

application-engine/src/main/java/com/netgrif/application/engine/auth/web/AuthenticationController.java

@@ -6,7 +6,7 @@
 //import com.netgrif.application.engine.objects.auth.domain.RegisteredUser;
 //import com.netgrif.application.engine.auth.service.InvalidUserTokenException;
 //import com.netgrif.application.engine.auth.service.UserDetailsServiceImpl;
-//import com.netgrif.application.engine.auth.service.interfaces.IRegistrationService;
+//import com.netgrif.application.engine.auth.service.RegistrationService;
 //import com.netgrif.application.engine.auth.service.UserService;
 //import com.netgrif.application.engine.auth.web.requestbodies.ChangePasswordRequest;
 //import com.netgrif.application.engine.auth.web.requestbodies.NewUserRequest;

application-engine/src/main/java/com/netgrif/application/engine/auth/web/responsebodies/UserResource.java

@@ -1,30 +1,12 @@
 //package com.netgrif.application.engine.auth.web.responsebodies;
 //
-//
-//import com.netgrif.application.engine.auth.web.UserController;
 //import org.springframework.hateoas.EntityModel;
-//import org.springframework.hateoas.server.mvc.WebMvcLinkBuilder;
-//
 //import java.util.ArrayList;
 //
 //public class UserResource extends EntityModel<User> {
 //
 //    public UserResource(User content, String selfRel) {
 //        super(content, new ArrayList<>());
-//        buildLinks(selfRel);
 //    }
 //
-//    private void buildLinks(String selfRel) {
-//        WebMvcLinkBuilder getLink = WebMvcLinkBuilder.linkTo(WebMvcLinkBuilder.methodOn(UserController.class)
-//                .getUser(getContent().getId(), false, null));
-//        add(selfRel.equalsIgnoreCase("profile") ? getLink.withSelfRel() : getLink.withRel("profile"));
-//
-//        WebMvcLinkBuilder roleLink = WebMvcLinkBuilder.linkTo(WebMvcLinkBuilder.methodOn(UserController.class)
-//                .assignRolesToUser(getContent().getId(), null, null));
-//        add(selfRel.equalsIgnoreCase("assignProcessRole") ? roleLink.withSelfRel() : roleLink.withRel("assignProcessRole"));
-//
-//        WebMvcLinkBuilder authorityLink = WebMvcLinkBuilder.linkTo(WebMvcLinkBuilder.methodOn(UserController.class)
-//                .assignAuthorityToUser(getContent().getId(), null));
-//        add(selfRel.equalsIgnoreCase("assignRole") ? authorityLink.withSelfRel() : authorityLink.withRel("assignRole"));
-//    }
 //}

application-engine/src/main/java/com/netgrif/application/engine/configuration/PrototypesConfiguration.java

@@ -1,6 +1,7 @@
 package com.netgrif.application.engine.configuration;
 
 //import com.netgrif.application.engine.auth.web.responsebodies.UserResourceAssembler;
+import com.netgrif.application.engine.auth.web.responsebodies.UserResourceAssembler;
 import com.netgrif.application.engine.importer.service.Importer;
 import com.netgrif.application.engine.pdf.generator.service.PdfDataHelper;
 import com.netgrif.application.engine.pdf.generator.service.PdfDrawer;

application-engine/src/main/java/com/netgrif/application/engine/configuration/UserServiceConfiguration.java

@@ -1,5 +1,6 @@
 package com.netgrif.application.engine.configuration;
 
+import com.netgrif.application.engine.auth.service.UserFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -25,10 +26,10 @@ public class UserServiceConfiguration {
 //        return new RegistrationService();
 //    }
 
-    @Bean
-    public IUserFactory userFactory() {
-        return new UserFactory();
-    }
+//    @Bean
+//    public UserFactory userFactory() {
+//        return new UserFactoryImpl();
+//    }
 
 //    @Bean
 //    @ConditionalOnMissingBean

application-engine/src/main/java/com/netgrif/application/engine/impersonation/web/ImpersonationController.java

@@ -1,5 +1,7 @@
 package com.netgrif.application.engine.impersonation.web;
 
+import com.netgrif.application.engine.auth.web.responsebodies.UserResource;
+import com.netgrif.application.engine.auth.web.responsebodies.UserResourceAssembler;
 import com.netgrif.application.engine.workflow.web.responsebodies.ResourceLinkAssembler;
 import com.netgrif.application.engine.objects.auth.domain.IUser;
 import com.netgrif.application.engine.objects.auth.domain.LoggedUser;