Рефакторинг обработчиков. Часть 2 #21

This commit is contained in:
2026-05-11 21:51:45 +03:00
parent 6403f061df
commit 61bb44ab4a
31 changed files with 8391 additions and 1480 deletions
+76 -38
View File
@@ -1,33 +1,79 @@
%%%-------------------------------------------------------------------
%%% @doc Обработчик обновления токена (клиентский API).
%%% POST принимает refresh_token, возвращает новую пару access + refresh токенов.
%%% @end
%%%-------------------------------------------------------------------
-module(handler_refresh).
-include("records.hrl").
-export([init/2]).
-behaviour(cowboy_handler).
init(Req0, _Opts) ->
case cowboy_req:method(Req0) of
<<"POST">> ->
{ok, Body, Req1} = cowboy_req:read_body(Req0),
try jsx:decode(Body, [return_maps]) of
#{<<"refresh_token">> := RefreshToken} ->
case find_and_refresh(RefreshToken) of
{ok, NewTokenPair} ->
Resp = jsx:encode(NewTokenPair),
cowboy_req:reply(200, #{<<"content-type">> => <<"application/json">>}, Resp, Req1);
{error, Reason} ->
send_error(Req1, 401, Reason)
end;
_ ->
send_error(Req1, 400, <<"Missing refresh_token field">>)
catch
_:_ -> send_error(Req1, 400, <<"Invalid JSON">>)
end;
_ ->
send_error(Req0, 405, <<"Method not allowed">>)
-export([init/2]).
-export([trails/0]).
-include("records.hrl").
%%% cowboy_handler callback
-spec init(cowboy_req:req(), any()) -> {ok, cowboy_req:req(), any()}.
init(Req, _Opts) ->
case cowboy_req:method(Req) of
<<"POST">> -> refresh(Req);
_ -> handler_utils:send_error(Req, 405, <<"Method not allowed">>)
end.
%% --------------------------------------------------------
%% Общая логика: проверяет обе таблицы сессий
%% --------------------------------------------------------
%%% Swagger metadata
-spec trails() -> [map()].
trails() ->
[
#{
path => <<"/v1/refresh">>,
method => <<"POST">>,
description => <<"Refresh access token using refresh token">>,
tags => [<<"Auth">>],
requestBody => #{
required => true,
content => #{<<"application/json">> => #{schema => #{
type => object,
required => [<<"refresh_token">>],
properties => #{
refresh_token => #{type => string}
}
}}}
},
responses => #{
200 => #{description => <<"New token pair (access + refresh)">>},
400 => #{description => <<"Missing refresh_token field or invalid JSON">>},
401 => #{description => <<"Refresh token expired or not found">>}
}
}
].
%%%===================================================================
%%% HTTP-методы
%%%===================================================================
%% @doc POST /v1/refresh — обновление токена.
-spec refresh(cowboy_req:req()) -> {ok, binary(), cowboy_req:req()}.
refresh(Req) ->
{ok, Body, Req1} = cowboy_req:read_body(Req),
try jsx:decode(Body, [return_maps]) of
#{<<"refresh_token">> := RefreshToken} ->
case find_and_refresh(RefreshToken) of
{ok, NewTokenPair} ->
handler_utils:send_json(Req1, 200, NewTokenPair);
{error, Reason} ->
handler_utils:send_error(Req1, 401, Reason)
end;
_ ->
handler_utils:send_error(Req1, 400, <<"Missing refresh_token field">>)
catch
_:_ -> handler_utils:send_error(Req1, 400, <<"Invalid JSON">>)
end.
%%%===================================================================
%%% Внутренние функции
%%%===================================================================
%% @private Проверяет refresh-токен в таблицах пользовательских и админских сессий.
-spec find_and_refresh(binary()) -> {ok, map()} | {error, binary()}.
find_and_refresh(RefreshToken) ->
case core_session:validate(RefreshToken) of
{ok, UserId, User} ->
@@ -45,31 +91,23 @@ find_and_refresh(RefreshToken) ->
{error, <<"Refresh token expired">>}
end.
%% @private Обновляет токен для обычного пользователя.
-spec user_refresh(binary(), #user{}, binary()) -> {ok, map()}.
user_refresh(UserId, User, OldToken) ->
% Удаляем старый refresh-токен
core_session:delete(OldToken),
% Генерируем новый access-токен и refresh-токен
Role = atom_to_binary(User#user.role, utf8),
NewToken = eventhub_auth:generate_user_token(UserId, Role),
{NewRefreshToken, _ExpiresAt} = eventhub_auth:generate_refresh_token(UserId),
% Сохраняем новый refresh-токен в таблице session
core_session:create(UserId, NewRefreshToken),
{ok, #{token => NewToken, refresh_token => NewRefreshToken}}.
%% @private Обновляет токен для администратора.
-spec admin_refresh(binary(), binary()) -> {ok, map()}.
admin_refresh(AdminId, OldToken) ->
% Удаляем старый refresh-токен
core_admin_session:delete(OldToken),
% Получаем роль админа
{ok, Admin} = core_admin:get_by_id(AdminId),
Role = atom_to_binary(Admin#admin.role, utf8),
% Генерируем новый access-токен и refresh-токен
NewToken = eventhub_auth:generate_admin_token(AdminId, Role),
{NewRefreshToken, _ExpiresAt} = eventhub_auth:generate_refresh_token(AdminId),
% Сохраняем новый refresh-токен в таблице admin_session
core_admin_session:create(AdminId, NewRefreshToken),
{ok, #{token => NewToken, refresh_token => NewRefreshToken}}.
send_error(Req, Status, Message) ->
Body = jsx:encode(#{error => Message}),
cowboy_req:reply(Status, #{<<"content-type">> => <<"application/json">>}, Body, Req),
{ok, Body, []}.
{ok, #{token => NewToken, refresh_token => NewRefreshToken}}.