From 689e310e15a053e95adfac03d910c170419dcfdd Mon Sep 17 00:00:00 2001
From: gsd <mr.little.cat.ru@gmail.com>
Date: Sat, 4 Mar 2023 16:15:17 +0300
Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D1=8B=20=D0=B8=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D1=87=D0=B0=D0=BB=D0=BE=20=D1=80=D0=B5=D0=B3=D0=B8?=
 =?UTF-8?q?=20=D0=B2=20=D0=B4=D0=B8=D1=81=D0=BA=D0=BE=D1=80=D0=B4=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../discord/DiscordController.java            | 27 ++++++++++++++++---
 .../app/services/db/PermitionService.java     |  1 +
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/main/java/app/controllers/discord/DiscordController.java b/src/main/java/app/controllers/discord/DiscordController.java
index eef7449..aa5910f 100644
--- a/src/main/java/app/controllers/discord/DiscordController.java
+++ b/src/main/java/app/controllers/discord/DiscordController.java
@@ -8,10 +8,7 @@ import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("api/discord")
@@ -29,4 +26,26 @@ public class DiscordController {
                                               @RequestParam String discord_id) {
         return new ResponseEntity(discordAuthService.getSteamIDofDiscordID(discord_id), HttpStatus.OK);
     }
+
+    @PostMapping
+    @CheckWebAccess(auth_method = AuthMethod.SECRET_KEY)
+    public ResponseEntity registerDiscordUser(HttpServletRequest request,
+                                              @RequestParam String steam64,
+                                              @RequestParam String discord_id){
+        SteamID steamID = discordAuthService.getSteamIDofDiscordID(discord_id);
+        if (steamID != null) return new ResponseEntity(HttpStatus.NOT_ACCEPTABLE);
+        //Релизовать регистрацию пользователя
+        return new ResponseEntity(HttpStatus.INTERNAL_SERVER_ERROR);
+    }
+
+    @DeleteMapping
+    @CheckWebAccess(auth_method = AuthMethod.SECRET_KEY)
+    public ResponseEntity unregisterDiscordUser(HttpServletRequest request,
+                                              @RequestParam String steam64,
+                                              @RequestParam String discord_id){
+        SteamID steamID = discordAuthService.getSteamIDofDiscordID(discord_id);
+        if (steamID == null) return new ResponseEntity(HttpStatus.NOT_ACCEPTABLE);
+        //Релизовать де-регистрацию
+        return new ResponseEntity(HttpStatus.INTERNAL_SERVER_ERROR);
+    }
 }
diff --git a/src/main/java/app/services/db/PermitionService.java b/src/main/java/app/services/db/PermitionService.java
index 1bb3165..605fc4c 100644
--- a/src/main/java/app/services/db/PermitionService.java
+++ b/src/main/java/app/services/db/PermitionService.java
@@ -24,6 +24,7 @@ public class PermitionService {
     }
 
     public boolean CheckMorePowerfull(SteamID user_1, SteamID user_2) {
+        if (user_1.is(user_2)) return true;
         Permition permition_1 = getPermition(user_1);
         if (permition_1 == null) return false;
         Permition permition_2 = getPermition(user_2);