User login and refresh on auth_session (phase 2). Refs EventHub/EventHubBack#26
This commit is contained in:
+105
-105
@@ -1,106 +1,106 @@
|
||||
%%%-------------------------------------------------------------------
|
||||
%%% @doc Обработчик входа пользователя (клиентский API).
|
||||
%%% POST – аутентифицирует пользователя по email и паролю,
|
||||
%%% возвращает JWT токен и refresh токен.
|
||||
%%% @end
|
||||
%%%-------------------------------------------------------------------
|
||||
-module(handler_login).
|
||||
-behaviour(cowboy_handler).
|
||||
|
||||
-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) ->
|
||||
handle(Req, Opts).
|
||||
|
||||
%%% Swagger metadata
|
||||
-spec trails() -> [map()].
|
||||
trails() ->
|
||||
[
|
||||
#{
|
||||
path => <<"/v1/login">>,
|
||||
method => <<"POST">>,
|
||||
description => <<"User login">>,
|
||||
tags => [<<"Auth">>],
|
||||
requestBody => #{
|
||||
required => true,
|
||||
content => #{<<"application/json">> => #{schema => #{
|
||||
type => object,
|
||||
required => [<<"email">>, <<"password">>],
|
||||
properties => #{
|
||||
email => #{type => string, format => <<"email">>},
|
||||
password => #{type => string, format => <<"password">>}
|
||||
}
|
||||
}}}
|
||||
},
|
||||
responses => #{
|
||||
200 => #{description => <<"Login successful, returns token and user info">>},
|
||||
400 => #{description => <<"Missing email or password, or invalid JSON">>},
|
||||
401 => #{description => <<"Invalid credentials">>},
|
||||
403 => #{description => <<"Account frozen or deleted">>}
|
||||
}
|
||||
}
|
||||
].
|
||||
|
||||
%%%===================================================================
|
||||
%%% HTTP-методы
|
||||
%%%===================================================================
|
||||
|
||||
%% @private
|
||||
-spec handle(cowboy_req:req(), any()) -> {ok, cowboy_req:req(), any()}.
|
||||
handle(Req, _Opts) ->
|
||||
case cowboy_req:method(Req) of
|
||||
<<"POST">> -> login(Req);
|
||||
_ -> handler_utils:send_error(Req, 405, <<"Method not allowed">>)
|
||||
end.
|
||||
|
||||
%% @doc POST /v1/login — аутентификация пользователя.
|
||||
-spec login(cowboy_req:req()) -> {ok, binary(), cowboy_req:req()}.
|
||||
login(Req) ->
|
||||
case cowboy_req:has_body(Req) of
|
||||
true ->
|
||||
{ok, Body, Req1} = cowboy_req:read_body(Req),
|
||||
case Body of
|
||||
<<>> ->
|
||||
handler_utils:send_error(Req1, 400, <<"Empty request body">>);
|
||||
_ ->
|
||||
try jsx:decode(Body, [return_maps]) of
|
||||
#{<<"email">> := Email, <<"password">> := Password} ->
|
||||
case eventhub_auth:authenticate_user_request(Req1, Email, Password) of
|
||||
{ok, Token, User} ->
|
||||
UserId = maps:get(id, User),
|
||||
{RefreshToken, _ExpiresAt} = eventhub_auth:generate_refresh_token(UserId),
|
||||
core_session:create(UserId, RefreshToken),
|
||||
core_user:update_last_login(UserId),
|
||||
Response = #{
|
||||
<<"token">> => Token,
|
||||
<<"user">> => #{
|
||||
<<"id">> => UserId,
|
||||
<<"email">> => maps:get(email, User),
|
||||
<<"role">> => maps:get(role, User)
|
||||
},
|
||||
<<"refresh_token">> => RefreshToken
|
||||
},
|
||||
handler_utils:send_json(Req1, 200, Response);
|
||||
{error, not_verified} ->
|
||||
handler_utils:send_error(Req1, 403, <<"Account not verified">>);
|
||||
{error, frozen} ->
|
||||
handler_utils:send_error(Req1, 403, <<"Account frozen">>);
|
||||
{error, deleted} ->
|
||||
handler_utils:send_error(Req1, 403, <<"Account deleted">>);
|
||||
{error, _Reason} ->
|
||||
handler_utils:send_error(Req1, 401, <<"Invalid credentials">>)
|
||||
end;
|
||||
_ ->
|
||||
handler_utils:send_error(Req1, 400, <<"Missing email or password">>)
|
||||
catch
|
||||
_:_ -> handler_utils:send_error(Req1, 400, <<"Invalid JSON">>)
|
||||
end
|
||||
end;
|
||||
false ->
|
||||
handler_utils:send_error(Req, 400, <<"Missing request body">>)
|
||||
%%%-------------------------------------------------------------------
|
||||
%%% @doc Обработчик входа пользователя (клиентский API).
|
||||
%%% POST – аутентифицирует пользователя по email и паролю,
|
||||
%%% возвращает JWT токен и refresh токен.
|
||||
%%% @end
|
||||
%%%-------------------------------------------------------------------
|
||||
-module(handler_login).
|
||||
-behaviour(cowboy_handler).
|
||||
|
||||
-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) ->
|
||||
handle(Req, Opts).
|
||||
|
||||
%%% Swagger metadata
|
||||
-spec trails() -> [map()].
|
||||
trails() ->
|
||||
[
|
||||
#{
|
||||
path => <<"/v1/login">>,
|
||||
method => <<"POST">>,
|
||||
description => <<"User login">>,
|
||||
tags => [<<"Auth">>],
|
||||
requestBody => #{
|
||||
required => true,
|
||||
content => #{<<"application/json">> => #{schema => #{
|
||||
type => object,
|
||||
required => [<<"email">>, <<"password">>],
|
||||
properties => #{
|
||||
email => #{type => string, format => <<"email">>},
|
||||
password => #{type => string, format => <<"password">>}
|
||||
}
|
||||
}}}
|
||||
},
|
||||
responses => #{
|
||||
200 => #{description => <<"Login successful, returns token and user info">>},
|
||||
400 => #{description => <<"Missing email or password, or invalid JSON">>},
|
||||
401 => #{description => <<"Invalid credentials">>},
|
||||
403 => #{description => <<"Account frozen or deleted">>}
|
||||
}
|
||||
}
|
||||
].
|
||||
|
||||
%%%===================================================================
|
||||
%%% HTTP-методы
|
||||
%%%===================================================================
|
||||
|
||||
%% @private
|
||||
-spec handle(cowboy_req:req(), any()) -> {ok, cowboy_req:req(), any()}.
|
||||
handle(Req, _Opts) ->
|
||||
case cowboy_req:method(Req) of
|
||||
<<"POST">> -> login(Req);
|
||||
_ -> handler_utils:send_error(Req, 405, <<"Method not allowed">>)
|
||||
end.
|
||||
|
||||
%% @doc POST /v1/login — аутентификация пользователя.
|
||||
-spec login(cowboy_req:req()) -> {ok, binary(), cowboy_req:req()}.
|
||||
login(Req) ->
|
||||
case cowboy_req:has_body(Req) of
|
||||
true ->
|
||||
{ok, Body, Req1} = cowboy_req:read_body(Req),
|
||||
case Body of
|
||||
<<>> ->
|
||||
handler_utils:send_error(Req1, 400, <<"Empty request body">>);
|
||||
_ ->
|
||||
try jsx:decode(Body, [return_maps]) of
|
||||
#{<<"email">> := Email, <<"password">> := Password} ->
|
||||
case eventhub_auth:authenticate_user_request(Req1, Email, Password) of
|
||||
{ok, _Token, User} ->
|
||||
UserId = maps:get(id, User),
|
||||
Role = maps:get(role, User),
|
||||
{ok, Token, RefreshToken} = logic_auth_session:issue_user_tokens(UserId, Role),
|
||||
core_user:update_last_login(UserId),
|
||||
Response = #{
|
||||
<<"token">> => Token,
|
||||
<<"user">> => #{
|
||||
<<"id">> => UserId,
|
||||
<<"email">> => maps:get(email, User),
|
||||
<<"role">> => maps:get(role, User)
|
||||
},
|
||||
<<"refresh_token">> => RefreshToken
|
||||
},
|
||||
handler_utils:send_json(Req1, 200, Response);
|
||||
{error, not_verified} ->
|
||||
handler_utils:send_error(Req1, 403, <<"Account not verified">>);
|
||||
{error, frozen} ->
|
||||
handler_utils:send_error(Req1, 403, <<"Account frozen">>);
|
||||
{error, deleted} ->
|
||||
handler_utils:send_error(Req1, 403, <<"Account deleted">>);
|
||||
{error, _Reason} ->
|
||||
handler_utils:send_error(Req1, 401, <<"Invalid credentials">>)
|
||||
end;
|
||||
_ ->
|
||||
handler_utils:send_error(Req1, 400, <<"Missing email or password">>)
|
||||
catch
|
||||
_:_ -> handler_utils:send_error(Req1, 400, <<"Invalid JSON">>)
|
||||
end
|
||||
end;
|
||||
false ->
|
||||
handler_utils:send_error(Req, 400, <<"Missing request body">>)
|
||||
end.
|
||||
@@ -1,102 +1,95 @@
|
||||
%%%-------------------------------------------------------------------
|
||||
%%% @doc Обработчик обновления токена (клиентский API).
|
||||
%%% POST – принимает refresh_token, возвращает новую пару access + refresh токенов.
|
||||
%%% @end
|
||||
%%%-------------------------------------------------------------------
|
||||
-module(handler_refresh).
|
||||
-behaviour(cowboy_handler).
|
||||
-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/auth/refresh">>,
|
||||
method => <<"POST">>,
|
||||
description => <<"Refresh user 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 user token pair (access + refresh)">>,
|
||||
content => #{
|
||||
<<"application/json">> => #{
|
||||
schema => token_pair_schema()
|
||||
}
|
||||
}
|
||||
},
|
||||
400 => #{description => <<"Missing refresh_token field or invalid JSON">>},
|
||||
401 => #{description => <<"Refresh token expired or not found">>}
|
||||
}
|
||||
}
|
||||
].
|
||||
|
||||
token_pair_schema() ->
|
||||
#{
|
||||
type => object,
|
||||
properties => #{
|
||||
token => #{type => string, description => <<"JWT access token">>},
|
||||
refresh_token => #{type => string, description => <<"Refresh token">>}
|
||||
}
|
||||
}.
|
||||
|
||||
%%%===================================================================
|
||||
%%% HTTP-методы
|
||||
%%%===================================================================
|
||||
|
||||
%% @doc POST /v1/auth/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 core_session:validate(RefreshToken) of
|
||||
{ok, UserId, User} ->
|
||||
user_refresh(UserId, User, RefreshToken, Req1);
|
||||
{error, not_found} ->
|
||||
handler_utils:send_error(Req1, 401, <<"Refresh token not found">>);
|
||||
{error, expired} ->
|
||||
handler_utils:send_error(Req1, 401, <<"Refresh token expired">>)
|
||||
end;
|
||||
_ ->
|
||||
handler_utils:send_error(Req1, 400, <<"Missing refresh_token field">>)
|
||||
catch
|
||||
_:_ -> handler_utils:send_error(Req1, 400, <<"Invalid JSON">>)
|
||||
end.
|
||||
|
||||
%%%===================================================================
|
||||
%%% Внутренние функции
|
||||
%%%===================================================================
|
||||
|
||||
%% @private Обновляет токен для обычного пользователя.
|
||||
-spec user_refresh(binary(), #user{}, binary(), cowboy_req:req()) -> {ok, binary(), cowboy_req:req()}.
|
||||
user_refresh(UserId, User, OldToken, Req) ->
|
||||
core_session:delete(OldToken),
|
||||
Role = atom_to_binary(User#user.role, utf8),
|
||||
NewToken = eventhub_auth:generate_user_token(UserId, Role),
|
||||
{NewRefreshToken, _ExpiresAt} = eventhub_auth:generate_refresh_token(UserId),
|
||||
core_session:create(UserId, NewRefreshToken),
|
||||
handler_utils:send_json(Req, 200, #{token => NewToken, refresh_token => NewRefreshToken}).
|
||||
%%%-------------------------------------------------------------------
|
||||
%%% @doc Обработчик обновления токена (клиентский API).
|
||||
%%% POST – принимает refresh_token, возвращает новую пару access + refresh токенов.
|
||||
%%% @end
|
||||
%%%-------------------------------------------------------------------
|
||||
-module(handler_refresh).
|
||||
-behaviour(cowboy_handler).
|
||||
-export([init/2]).
|
||||
-export([trails/0]).
|
||||
|
||||
%%% 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 user 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 user token pair (access + refresh)">>,
|
||||
content => #{
|
||||
<<"application/json">> => #{
|
||||
schema => token_pair_schema()
|
||||
}
|
||||
}
|
||||
},
|
||||
400 => #{description => <<"Missing refresh_token field or invalid JSON">>},
|
||||
401 => #{description => <<"Refresh token expired or not found">>}
|
||||
}
|
||||
}
|
||||
].
|
||||
|
||||
token_pair_schema() ->
|
||||
#{
|
||||
type => object,
|
||||
properties => #{
|
||||
token => #{type => string, description => <<"JWT access token">>},
|
||||
refresh_token => #{type => string, description => <<"Refresh token">>}
|
||||
}
|
||||
}.
|
||||
|
||||
%%%===================================================================
|
||||
%%% 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 logic_auth_session:refresh_user(RefreshToken) of
|
||||
{ok, NewToken, NewRefreshToken} ->
|
||||
handler_utils:send_json(Req1, 200, #{
|
||||
token => NewToken,
|
||||
refresh_token => NewRefreshToken
|
||||
});
|
||||
{error, reuse_detected} ->
|
||||
handler_utils:send_error(Req1, 401, <<"Refresh token reuse detected">>);
|
||||
{error, not_found} ->
|
||||
handler_utils:send_error(Req1, 401, <<"Refresh token not found">>);
|
||||
{error, expired} ->
|
||||
handler_utils:send_error(Req1, 401, <<"Refresh token expired">>);
|
||||
{error, revoked} ->
|
||||
handler_utils:send_error(Req1, 401, <<"Refresh token revoked">>);
|
||||
{error, _} ->
|
||||
handler_utils:send_error(Req1, 401, <<"Invalid refresh token">>)
|
||||
end;
|
||||
_ ->
|
||||
handler_utils:send_error(Req1, 400, <<"Missing refresh_token field">>)
|
||||
catch
|
||||
_:_ -> handler_utils:send_error(Req1, 400, <<"Invalid JSON">>)
|
||||
end.
|
||||
|
||||
Reference in New Issue
Block a user