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

src/handlers/handler_refresh.erl

@@ -1,91 +1,67 @@
 -module(handler_refresh).
 -include("records.hrl").
-
 -export([init/2]).
 
-init(Req, Opts) ->
-  handle(Req, Opts).
-
-handle(Req, _Opts) ->
-  case cowboy_req:method(Req) of
+init(Req0, _Opts) ->
+  case cowboy_req:method(Req0) of
     <<"POST">> ->
-      {ok, Body, Req1} = cowboy_req:read_body(Req),
-      case jsx:decode(Body, [return_maps]) of
+      {ok, Body, Req1} = cowboy_req:read_body(Req0),
+      try jsx:decode(Body, [return_maps]) of
         #{<<"refresh_token">> := RefreshToken} ->
-          case validate_refresh_token(RefreshToken) of
-            {ok, UserId} ->
-              case core_user:get_by_id(UserId) of
-                {ok, User} ->
-                  % Генерируем новые токены
-                  NewToken = logic_auth:generate_jwt(User#user.id, User#user.role),
-                  {NewRefreshToken, ExpiresAt} = logic_auth:generate_refresh_token(User#user.id),
-
-                  % Сохраняем новый refresh token
-                  save_refresh_token(User#user.id, NewRefreshToken, ExpiresAt),
-
-                  % Удаляем старый refresh token
-                  delete_refresh_token(RefreshToken),
-
-                  Response = #{
+          case get_session(RefreshToken) of
+            {ok, Session} ->
+              % Проверяем, не истекла ли сессия
+              case Session#session.expires_at > calendar:universal_time() of
+                true ->
+                  % Генерируем новый access-токен и refresh-токен
+                  User = get_user(Session#session.user_id),
+                  NewToken = eventhub_auth:generate_user_token(
+                    User#user.id,
+                    atom_to_binary(User#user.role, utf8)
+                  ),
+                  {NewRefreshToken, ExpiresAt} =
+                    eventhub_auth:generate_refresh_token(User#user.id),
+                  % Удаляем старую сессию и сохраняем новую
+                  mnesia:dirty_delete_object(Session),
+                  NewSession = #session{
+                    token = NewRefreshToken,
+                    user_id = User#user.id,
+                    expires_at = ExpiresAt,
+                    type = refresh
+                  },
+                  mnesia:dirty_write(NewSession),
+                  Resp = jsx:encode(#{
                     token => NewToken,
                     refresh_token => NewRefreshToken
-                  },
-                  send_json(Req1, 200, Response);
-                {error, not_found} ->
-                  send_error(Req1, 401, <<"User not found">>)
+                  }),
+                  cowboy_req:reply(200, #{
+                    <<"content-type">> => <<"application/json">>
+                  }, Resp, Req1);
+                false ->
+                  mnesia:dirty_delete_object(Session),
+                  send_error(Req1, 401, <<"Refresh token expired">>)
               end;
-            {error, expired} ->
-              send_error(Req1, 401, <<"Refresh token expired">>);
-            {error, invalid} ->
-              send_error(Req1, 401, <<"Invalid refresh token">>)
+            {error, not_found} ->
+              send_error(Req1, 401, <<"Refresh token not found">>)
           end;
         _ ->
-          send_error(Req1, 400, <<"Missing refresh_token">>)
+          send_error(Req1, 400, <<"Missing refresh_token field">>)
+      catch
+        _:_ -> send_error(Req1, 400, <<"Invalid JSON">>)
       end;
     _ ->
-      send_error(Req, 405, <<"Method not allowed">>)
+      send_error(Req0, 405, <<"Method not allowed">>)
   end.
 
-validate_refresh_token(Token) ->
-  case get_session_by_token(Token) of
-    {ok, Session} ->
-      % Проверяем срок действия
-      Now = calendar:universal_time(),
-      case Session#session.expires_at > Now of
-        true -> {ok, Session#session.user_id};
-        false -> {error, expired}
-      end;
-    {error, not_found} ->
-      {error, invalid}
+get_session(Token) ->
+  case mnesia:dirty_read({session, Token}) of
+    [Session] -> {ok, Session};
+    [] -> {error, not_found}
   end.
 
-get_session_by_token(Token) ->
-  Match = #session{token = Token, type = refresh, _ = '_'},
-  case mnesia:dirty_match_object(Match) of
-    [] -> {error, not_found};
-    [Session] -> {ok, Session}
-  end.
-
-save_refresh_token(UserId, Token, ExpiresAt) ->
-  Session = #session{
-    token = Token,
-    user_id = UserId,
-    expires_at = ExpiresAt,
-    type = refresh
-  },
-  mnesia:dirty_write(Session).
-
-delete_refresh_token(Token) ->
-  Match = #session{token = Token, type = refresh, _ = '_'},
-  case mnesia:dirty_match_object(Match) of
-    [] -> ok;
-    [Session] -> mnesia:dirty_delete_object(Session)
-  end.
-
-send_json(Req, Status, Data) ->
-  Body = jsx:encode(Data),
-  cowboy_req:reply(Status, #{<<"content-type">> => <<"application/json">>}, Body, Req),
-  {ok, Body, []}.
+get_user(UserId) ->
+  [User] = mnesia:dirty_read({user, UserId}),
+  User.
 
 send_error(Req, Status, Message) ->
   Body = jsx:encode(#{error => Message}),