[NAE-2092] User and Auth endpoints refactor - step 1

README.md

@@ -29,6 +29,15 @@ NAE provides additional components to make integration to your project/environme
 
 * License: [NETGRIF Community License](https://netgrif.com/license)
 
+##  Loading nae-user-ce as symlink to modules
+
+```bash
+ln -s nae-user-ce/target/nae-user-ce-*-SNAPSHOT.jar application-engine/modules/.
+```
+
+Build with DEV profile
+
+
 ## Repository Content
 
 | Name                    | Description | Dependencies |

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

@@ -1,17 +1,13 @@
 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.UserService
-import com.netgrif.application.engine.integration.modules.ModuleHolder
-import com.netgrif.application.engine.petrinet.service.interfaces.IPetriNetService
 import com.netgrif.application.engine.AsyncRunner
 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.auth.service.GroupService
 import com.netgrif.application.engine.auth.service.UserDetailsServiceImpl
+import com.netgrif.application.engine.auth.service.UserRegistrationService
 import com.netgrif.application.engine.auth.service.UserService
-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
@@ -24,19 +20,10 @@ import com.netgrif.application.engine.export.domain.ExportDataConfig
 import com.netgrif.application.engine.export.service.interfaces.IExportService
 import com.netgrif.application.engine.impersonation.service.interfaces.IImpersonationService
 import com.netgrif.application.engine.importer.service.FieldFactory
+import com.netgrif.application.engine.integration.modules.ModuleHolder
 import com.netgrif.application.engine.mail.domain.MailDraft
 import com.netgrif.application.engine.mail.interfaces.IMailAttemptService
 import com.netgrif.application.engine.mail.interfaces.IMailService
-import com.netgrif.application.engine.pdf.generator.config.PdfResource
-import com.netgrif.application.engine.pdf.generator.service.interfaces.IPdfGenerator
-import com.netgrif.application.engine.petrinet.service.interfaces.IUriService
-import com.netgrif.application.engine.startup.ImportHelper
-import com.netgrif.application.engine.startup.runner.DefaultFiltersRunner
-import com.netgrif.application.engine.startup.runner.FilterRunner
-import com.netgrif.application.engine.utils.FullPageRequest
-import com.netgrif.application.engine.workflow.service.FileFieldInputStream
-import com.netgrif.application.engine.workflow.service.TaskService
-import com.netgrif.application.engine.workflow.service.interfaces.*
 import com.netgrif.application.engine.objects.auth.domain.Author
 import com.netgrif.application.engine.objects.auth.domain.IUser
 import com.netgrif.application.engine.objects.auth.domain.LoggedUser
@@ -71,7 +58,7 @@ import com.netgrif.application.engine.utils.FullPageRequest
 import com.netgrif.application.engine.workflow.service.FileFieldInputStream
 import com.netgrif.application.engine.workflow.service.TaskService
 import com.netgrif.application.engine.workflow.service.interfaces.*
-import com.netgrif.application.engine.workflow.web.responsebodies.MessageResource
+import com.netgrif.application.engine.adapter.spring.workflow.web.responsebodies.MessageResource
 import com.netgrif.application.engine.workflow.web.responsebodies.TaskReference
 import com.querydsl.core.types.Predicate
 import groovy.transform.NamedVariant
@@ -91,7 +78,6 @@ import org.springframework.data.domain.Pageable
 import java.text.Normalizer
 import java.time.ZoneId
 import java.util.stream.Collectors
-
 /**
  * ActionDelegate class contains Actions API methods.
  */
@@ -148,7 +134,7 @@ class ActionDelegate {
     ProcessRoleService processRoleService
 
     @Autowired
-    IRegistrationService registrationService
+    UserRegistrationService registrationService
 
     @Autowired
     IMailAttemptService mailAttemptService
@@ -162,9 +148,6 @@ class ActionDelegate {
     @Autowired
     InitValueExpressionEvaluator initValueExpressionEvaluator
 
-//    @Autowired
-//    RuleRepository ruleRepository
-
     @Autowired
     Scheduler scheduler
 
@@ -207,7 +190,7 @@ class ActionDelegate {
     FrontendActionOutcome Frontend
 
     ModuleHolder Module
-  
+
     /**
      * Reference of case and task in which current action is taking place.
      */

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

@@ -1,8 +1,8 @@
-package com.netgrif.application.engine.auth.service;
-
-public class InvalidUserTokenException extends Exception {
-
-    public InvalidUserTokenException(String token) {
-        super("Token " + token + " has invalid format");
-    }
-}
+//package com.netgrif.application.engine.auth.service;
+//
+//public class InvalidUserTokenException extends Exception {
+//
+//    public InvalidUserTokenException(String token) {
+//        super("Token " + token + " has invalid format");
+//    }
+//}