Сделано подтверждение регистрации пользователей #22
This commit is contained in:
@@ -0,0 +1,35 @@
|
||||
-module(admin_handler_user_verification_token).
|
||||
-behaviour(cowboy_handler).
|
||||
-export([init/2]).
|
||||
-export([trails/0]).
|
||||
|
||||
init(Req, _Opts) ->
|
||||
case cowboy_req:method(Req) of
|
||||
<<"GET">> -> get_token(Req);
|
||||
_ -> handler_utils:send_error(Req, 405, <<"Method not allowed">>)
|
||||
end.
|
||||
|
||||
get_token(Req) ->
|
||||
case handler_utils:auth_admin(Req) of
|
||||
{ok, _AdminId, Req1} ->
|
||||
UserId = cowboy_req:binding(id, Req1),
|
||||
case core_verification:get_or_create_token(UserId) of
|
||||
{ok, Token, ExpiresAt} ->
|
||||
handler_utils:send_json(Req1, 200, #{
|
||||
<<"token">> => Token,
|
||||
<<"expires_at">> => handler_utils:datetime_to_iso8601(ExpiresAt)
|
||||
});
|
||||
{error, not_found} ->
|
||||
handler_utils:send_error(Req1, 404, <<"User not found">>)
|
||||
end;
|
||||
{error, Code, Msg, Req1} ->
|
||||
handler_utils:send_error(Req1, Code, Msg)
|
||||
end.
|
||||
|
||||
trails() ->
|
||||
[#{path => <<"/v1/admin/users/:id/verification-token">>,
|
||||
method => <<"GET">>,
|
||||
description => <<"Get or create verification token for user (admin)">>,
|
||||
tags => [<<"Users">>],
|
||||
parameters => [#{name => <<"id">>, in => <<"path">>, required => true, schema => #{type => string}}],
|
||||
responses => #{200 => #{description => <<"Token">>}}}].
|
||||
@@ -86,6 +86,8 @@ login(Req) ->
|
||||
<<"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} ->
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
%%%-------------------------------------------------------------------
|
||||
%%% @doc Обработчик регистрации пользователя (клиентский API).
|
||||
%%% POST – создаёт нового пользователя, возвращает JWT токен.
|
||||
%%% POST – создаёт нового пользователя (статус pending), возвращает
|
||||
%%% информацию о пользователе без JWT токена.
|
||||
%%% @end
|
||||
%%%-------------------------------------------------------------------
|
||||
-module(handler_register).
|
||||
@@ -23,7 +24,7 @@ trails() ->
|
||||
#{
|
||||
path => <<"/v1/register">>,
|
||||
method => <<"POST">>,
|
||||
description => <<"Register a new user">>,
|
||||
description => <<"Register a new user (account will be pending until email verified)">>,
|
||||
tags => [<<"Auth">>],
|
||||
requestBody => #{
|
||||
required => true,
|
||||
@@ -37,7 +38,7 @@ trails() ->
|
||||
}}}
|
||||
},
|
||||
responses => #{
|
||||
201 => #{description => <<"User registered, returns token and user info">>},
|
||||
201 => #{description => <<"User registered successfully (pending verification)">>},
|
||||
400 => #{description => <<"Missing email or password, or invalid JSON">>},
|
||||
409 => #{description => <<"Email already exists">>}
|
||||
}
|
||||
@@ -74,17 +75,16 @@ register(Req) ->
|
||||
false ->
|
||||
case core_user:create(Email, Password) of
|
||||
{ok, User} ->
|
||||
Token = logic_auth:generate_jwt(
|
||||
User#user.id,
|
||||
atom_to_binary(User#user.role, utf8)
|
||||
),
|
||||
% Создаём верификационный токен и отправляем письмо
|
||||
{ok, VerificationToken, _Expires} = core_verification:create_token(User#user.id),
|
||||
logic_email:send_verification_email(Email, VerificationToken),
|
||||
Response = #{
|
||||
user => #{
|
||||
id => User#user.id,
|
||||
email => User#user.email,
|
||||
role => User#user.role
|
||||
},
|
||||
token => Token
|
||||
id => User#user.id,
|
||||
email => User#user.email,
|
||||
role => atom_to_binary(User#user.role, utf8),
|
||||
status => atom_to_binary(User#user.status, utf8) % <<"pending">>
|
||||
}
|
||||
},
|
||||
handler_utils:send_json(Req1, 201, Response);
|
||||
{error, email_exists} ->
|
||||
|
||||
@@ -0,0 +1,67 @@
|
||||
%%%-------------------------------------------------------------------
|
||||
%%% @doc Обработчик подтверждения email.
|
||||
%%% POST /v1/verify – активирует аккаунт по верификационному токену.
|
||||
%%% @end
|
||||
%%%-------------------------------------------------------------------
|
||||
-module(handler_verify).
|
||||
-behaviour(cowboy_handler).
|
||||
-export([init/2]).
|
||||
-export([trails/0]).
|
||||
|
||||
%%% cowboy_handler callback
|
||||
init(Req, _Opts) ->
|
||||
case cowboy_req:method(Req) of
|
||||
<<"POST">> ->
|
||||
{ok, Body, Req1} = cowboy_req:read_body(Req),
|
||||
try jsx:decode(Body, [return_maps]) of
|
||||
#{<<"token">> := Token} ->
|
||||
case core_verification:verify_token(Token) of
|
||||
{ok, UserId} ->
|
||||
core_user:update(UserId, [{status, active}]),
|
||||
core_verification:delete_token(Token),
|
||||
handler_utils:send_json(Req1, 200, #{<<"message">> => <<"Account verified">>});
|
||||
{error, expired} ->
|
||||
handler_utils:send_error(Req1, 410, <<"Token expired">>);
|
||||
{error, not_found} ->
|
||||
handler_utils:send_error(Req1, 404, <<"Token not found">>)
|
||||
end;
|
||||
_ ->
|
||||
handler_utils:send_error(Req1, 400, <<"Missing token">>)
|
||||
catch
|
||||
_:_ -> handler_utils:send_error(Req1, 400, <<"Invalid JSON">>)
|
||||
end;
|
||||
_ ->
|
||||
handler_utils:send_error(Req, 405, <<"Method not allowed">>)
|
||||
end.
|
||||
|
||||
%%% Swagger metadata
|
||||
-spec trails() -> [map()].
|
||||
trails() ->
|
||||
[
|
||||
#{
|
||||
path => <<"/v1/verify">>,
|
||||
method => <<"POST">>,
|
||||
description => <<"Verify user account using email verification token">>,
|
||||
tags => [<<"Auth">>],
|
||||
requestBody => #{
|
||||
required => true,
|
||||
content => #{
|
||||
<<"application/json">> => #{
|
||||
schema => #{
|
||||
type => object,
|
||||
required => [<<"token">>],
|
||||
properties => #{
|
||||
token => #{type => string, description => <<"Verification token received by email">>}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
responses => #{
|
||||
200 => #{description => <<"Account verified successfully">>},
|
||||
400 => #{description => <<"Missing token field or invalid JSON">>},
|
||||
404 => #{description => <<"Token not found">>},
|
||||
410 => #{description => <<"Token expired">>}
|
||||
}
|
||||
}
|
||||
].
|
||||
Reference in New Issue
Block a user