Перенести все админские эндпоинты на порт 8445 и добавить отдельную авторизацию для админов. Часть 2. Final #3

src/handlers/admin/admin_handler_login.erl

@@ -10,7 +10,7 @@ init(Req0, State) ->
           {ok, Body, Req1} = cowboy_req:read_body(Req0),
           try jsx:decode(Body, [return_maps]) of
             #{<<"email">> := Email, <<"password">> := Password} ->
-              case auth:authenticate_admin_request(Req1, Email, Password) of
+              case eventhub_auth:authenticate_admin_request(Req1, Email, Password) of
                 {ok, Token, User} ->
                   Resp = jsx:encode(#{
                     <<"token">> => Token,

src/handlers/admin/admin_handler_report_by_id.erl

@@ -6,9 +6,9 @@
 
 init(Req, _Opts) ->
   case cowboy_req:method(Req) of
-    <<"GET">> -> get_report(Req);
-    <<"PUT">> -> update_report(Req);
-    _         -> send_error(Req, 405, <<"Method not allowed">>)
+    <<"GET">>  -> get_report(Req);
+    <<"PUT">>  -> update_report(Req);
+    _          -> send_error(Req, 405, <<"Method not allowed">>)
   end.
 
 get_report(Req) ->
@@ -39,7 +39,8 @@ update_report(Req) ->
           {ok, Body, Req2} = cowboy_req:read_body(Req1),
           try jsx:decode(Body, [return_maps]) of
             #{<<"status">> := NewStatus} ->
-              case core_report:update_status(ReportId, NewStatus) of
+              StatusAtom = binary_to_atom(NewStatus, utf8),
+              case core_report:update_status(ReportId, StatusAtom, AdminId) of
                 {ok, Report} ->
                   send_json(Req2, 200, report_to_json(Report));
                 {error, not_found} ->

src/handlers/admin/admin_handler_reports.erl

@@ -2,7 +2,7 @@
 -behaviour(cowboy_handler).
 -export([init/2]).
 
--include("records.hrl").   %% ← обязательно для #user{} и #report{}
+-include("records.hrl").
 
 init(Req, _Opts) ->
   case cowboy_req:method(Req) of
@@ -16,7 +16,7 @@ list_reports(Req) ->
     {ok, AdminId, Req1} ->
       case is_admin(AdminId) of
         true ->
-          Reports = core_report:list_reports(),
+          {ok, Reports} = core_report:list_all(),
           send_json(Req1, 200, [report_to_json(R) || R <- Reports]);
         false ->
           send_error(Req1, 403, <<"Admin access required">>)
@@ -34,7 +34,7 @@ update_report(Req) ->
           {ok, Body, Req2} = cowboy_req:read_body(Req1),
           try jsx:decode(Body, [return_maps]) of
             #{<<"status">> := NewStatus} ->
-              case core_report:update_status(ReportId, NewStatus) of
+              case core_report:update_status(ReportId, NewStatus, AdminId) of
                 {ok, Report} ->
                   send_json(Req2, 200, report_to_json(Report));
                 {error, not_found} ->

src/handlers/admin/admin_handler_subscriptions.erl

@@ -39,7 +39,7 @@ list_subscriptions(Req) ->
 
 create_subscription(Req) ->
   case auth_admin(Req) of
-    {ok, AdminId, Req1} ->
+    {ok, _AdminId, Req1} ->
       {ok, Body, Req2} = cowboy_req:read_body(Req1),
       try jsx:decode(Body, [return_maps]) of
         #{<<"user_id">> := _UserId} = Data ->

src/handlers/admin/admin_handler_tickets.erl

@@ -28,7 +28,7 @@ handle_item(TicketId, Req) ->
 list_tickets(Req) ->
   case auth_admin(Req) of
     {ok, _AdminId, Req1} ->
-      Tickets = core_ticket:list_tickets(),
+      Tickets = core_ticket:list_all(),   % ← было list_tickets()
       send_json(Req1, 200, [ticket_to_json(T) || T <- Tickets]);
     {error, Code, Message, Req1} ->
       send_error(Req1, Code, Message)
@@ -36,7 +36,7 @@ list_tickets(Req) ->
 
 create_ticket(Req) ->
   case auth_admin(Req) of
-    {ok, AdminId, Req1} ->
+    {ok, _AdminId, Req1} ->
       {ok, Body, Req2} = cowboy_req:read_body(Req1),
       try jsx:decode(Body, [return_maps]) of
         #{<<"error_message">> := _} = Data ->

src/handlers/admin/admin_ws_handler.erl

@@ -1,6 +1,5 @@
 -module(admin_ws_handler).
 -behaviour(cowboy_websocket).
-
 -export([init/2]).
 -export([websocket_init/1]).
 -export([websocket_handle/2]).
@@ -21,15 +20,13 @@ init(Req, _Opts) ->
     Token ->
       io:format("[ADMIN_WS] Token received: ~s...~n", [binary_part(Token, 0, 30)]),
       case logic_auth:verify_jwt(Token) of
-        {ok, Claims} ->
-          UserId = maps:get(<<"user_id">>, Claims),
-          Role = maps:get(<<"role">>, Claims),
+        {ok, UserId, Role} ->
           io:format("[ADMIN_WS] UserId: ~s, Role: ~s~n", [UserId, Role]),
-          case Role of
-            <<"admin">> ->
+          case is_admin_role(Role) of
+            true ->
               io:format("[ADMIN_WS] Admin access granted~n"),
               {cowboy_websocket, Req, #state{admin_id = UserId}};
-            _ ->
+            false ->
               io:format("[ADMIN_WS] Access denied: not admin~n"),
               Resp = cowboy_req:reply(403, #{}, <<"Admin access required">>, Req),
               {ok, Resp, undefined}
@@ -84,4 +81,7 @@ websocket_info(_Info, State) ->
 
 terminate(_Reason, _Req, _State) ->
   pg:leave(eventhub_admin_ws, self()),
-  ok.
+  ok.
+
+is_admin_role(Role) ->
+  lists:member(Role, [<<"admin">>, <<"superadmin">>, <<"moderator">>, <<"support">>]).