MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-26 08:42:34 +01:00
Code Issues Releases Wiki Activity

modules/client: Cleanup/consistency in register/login handle stack.

Browse source
This commit is contained in:
Jason Volk 2018-02-16 17:17:18 -08:00
parent 4c3d20d959
commit da9393016d
2 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
modules/client/login.cc
View file

@ -148,8 +148,8 @@ post__login_password(client &client,
}
resource::response
post_login(client &client,
const resource::request::object<body> &request)
post__login(client &client,
const resource::request::object<body> &request)
{
const auto &type
{
@ -168,12 +168,12 @@ post_login(client &client,
resource::method
method_post
{
login_resource, "POST", post_login
login_resource, "POST", post__login
};
resource::response
get_login(client &client,
const resource::request &request)
get__login(client &client,
const resource::request &request)
{
const json::member login_password
{
@ -197,5 +197,5 @@ get_login(client &client,
resource::method
method_get
{
login_resource, "GET", get_login
login_resource, "GET", get__login
};

26
modules/client/register.cc
View file

@ -42,8 +42,8 @@ static void validate_user_id(const m::id::user &user_id);
static void validate_password(const string_view &password);
resource::response
handle_post_kind_user(client &client,
const resource::request::object<body> &request)
post__register_user(client &client,
const resource::request::object<body> &request)
try
{
// 3.3.1 Additional authentication information for the user-interactive authentication API.
@ -171,8 +171,8 @@ catch(const m::INVALID_MXID &e)
};
resource::response
handle_post_kind_guest(client &client,
const resource::request::object<body> &request)
post__register_guest(client &client,
const resource::request::object<body> &request)
{
throw m::error
{
@ -203,8 +203,8 @@ handle_post_kind_guest(client &client,
}
resource::response
handle_post(client &client,
const resource::request::object<body> &request)
post__register(client &client,
const resource::request::object<body> &request)
{
const auto kind
{
@ -212,10 +212,10 @@ handle_post(client &client,
};
if(kind == "guest")
return handle_post_kind_guest(client, request);
return post__register_guest(client, request);
if(kind.empty() || kind == "user")
return handle_post_kind_user(client, request);
return post__register_user(client, request);
throw m::UNSUPPORTED
{
@ -223,17 +223,19 @@ handle_post(client &client,
};
}
resource register_resource
resource
register_resource
{
"/_matrix/client/r0/register",
{
"Register for an account on this homeserver. (3.3.1)"
"(3.3.1) Register for an account on this homeserver."
}
};
resource::method post
resource::method
method_post
{
register_resource, "POST", handle_post
register_resource, "POST", post__register
};
void