From 2474be998b4e87c9df36bee41a845594b89b48ac Mon Sep 17 00:00:00 2001
From: aalehin <aalehin@mfd.ru>
Date: Mon, 19 Dec 2022 14:28:48 +0300
Subject: [PATCH] =?UTF-8?q?http://jira.mfd.msk:8088/browse/CLS-63=20---=20?=
 =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB=20UserAuthAction?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/queue/user/UserController.java |  4 +-
 .../request/cud/utilities/UserAuthAction.java | 40 +++++++++++++------
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/user/UserController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/user/UserController.java
index 4263f3661..9c676f3f0 100644
--- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/user/UserController.java
+++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/user/UserController.java
@@ -37,7 +37,9 @@ public class UserController extends AbstractQueueController {
     private final Imdg<User> userImdg;
 
     @Autowired
-    public UserController(IOperator operator, IStateLoader stateLoader, ImdgProvider imdgProvider) {
+    public UserController(IOperator operator,
+                          IStateLoader stateLoader,
+                          ImdgProvider imdgProvider) {
         super(operator);
         this.stateLoader = stateLoader;
         this.userImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_User, User.class);
diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/utilities/UserAuthAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/utilities/UserAuthAction.java
index 260c7b901..b5559e8dd 100644
--- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/utilities/UserAuthAction.java
+++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/utilities/UserAuthAction.java
@@ -1,31 +1,41 @@
 package ru.spcex.clearing.backendapi.controller.request.cud.utilities;
 
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import ru.spcex.clearing.backendapi.domain.actions.IAction;
 import ru.spcex.clearing.backendapi.errors.BackEndError;
 import ru.spcex.clearing.platform.messaging.domain.ActionType;
 import ru.spcex.clearing.platform.messaging.domain.cud.utilities.UserAuthRequest;
+import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer;
+import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer;
 import ru.spcex.platform.utils.enumeration.EnumMessage;
 
+import java.time.Instant;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
 public class UserAuthAction implements IAction<UserAuthRequest> {
-    private final UserAuthRequest authRequest;
-
-    public UserAuthAction() {
-        this.authRequest = new UserAuthRequest();
-    }
-
-    public UserAuthRequest getAuthRequest() {
-        return authRequest;
-    }
+    @JsonProperty
+    private String username;
+    @JsonProperty
+    private List<String> roles = new ArrayList<>();
+    @JsonSerialize(using = InstantSerializer.class)
+    @JsonDeserialize(using = InstantDeserializer.class)
+    @JsonProperty
+    private Instant time;
+    @JsonProperty
+    private String serverIp;
+    @JsonProperty
+    private String clientIp;
 
     @Override
     public Collection<EnumMessage> validate() {
-        long count = authRequest.getRoles().stream().distinct().count();
-        if (count != authRequest.getRoles().size()) {
+        long count = roles.stream().distinct().count();
+        if (count != roles.size()) {
             return List.of(new EnumMessage(BackEndError.KeycloakRepeatedRoles));
         }
         return Collections.emptyList();
@@ -33,7 +43,13 @@ public class UserAuthAction implements IAction<UserAuthRequest> {
 
     @Override
     public UserAuthRequest toRequest() {
-        return authRequest;
+        UserAuthRequest userAuthRequest = new UserAuthRequest();
+        userAuthRequest.setServerIp(serverIp);
+        userAuthRequest.setUsername(username);
+        userAuthRequest.setRoles(roles);
+        userAuthRequest.setTime(time);
+        return userAuthRequest;
+
     }
 
     @Override