mirror of
https://github.com/matrix-construct/construct
synced 2024-10-03 06:08:52 +02:00
modules/client: Cleanup/consistency in register/login handle stack.
This commit is contained in:
parent
4c3d20d959
commit
da9393016d
2 changed files with 20 additions and 18 deletions
|
@ -148,7 +148,7 @@ post__login_password(client &client,
|
||||||
}
|
}
|
||||||
|
|
||||||
resource::response
|
resource::response
|
||||||
post_login(client &client,
|
post__login(client &client,
|
||||||
const resource::request::object<body> &request)
|
const resource::request::object<body> &request)
|
||||||
{
|
{
|
||||||
const auto &type
|
const auto &type
|
||||||
|
@ -168,11 +168,11 @@ post_login(client &client,
|
||||||
resource::method
|
resource::method
|
||||||
method_post
|
method_post
|
||||||
{
|
{
|
||||||
login_resource, "POST", post_login
|
login_resource, "POST", post__login
|
||||||
};
|
};
|
||||||
|
|
||||||
resource::response
|
resource::response
|
||||||
get_login(client &client,
|
get__login(client &client,
|
||||||
const resource::request &request)
|
const resource::request &request)
|
||||||
{
|
{
|
||||||
const json::member login_password
|
const json::member login_password
|
||||||
|
@ -197,5 +197,5 @@ get_login(client &client,
|
||||||
resource::method
|
resource::method
|
||||||
method_get
|
method_get
|
||||||
{
|
{
|
||||||
login_resource, "GET", get_login
|
login_resource, "GET", get__login
|
||||||
};
|
};
|
||||||
|
|
|
@ -42,7 +42,7 @@ static void validate_user_id(const m::id::user &user_id);
|
||||||
static void validate_password(const string_view &password);
|
static void validate_password(const string_view &password);
|
||||||
|
|
||||||
resource::response
|
resource::response
|
||||||
handle_post_kind_user(client &client,
|
post__register_user(client &client,
|
||||||
const resource::request::object<body> &request)
|
const resource::request::object<body> &request)
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
@ -171,7 +171,7 @@ catch(const m::INVALID_MXID &e)
|
||||||
};
|
};
|
||||||
|
|
||||||
resource::response
|
resource::response
|
||||||
handle_post_kind_guest(client &client,
|
post__register_guest(client &client,
|
||||||
const resource::request::object<body> &request)
|
const resource::request::object<body> &request)
|
||||||
{
|
{
|
||||||
throw m::error
|
throw m::error
|
||||||
|
@ -203,7 +203,7 @@ handle_post_kind_guest(client &client,
|
||||||
}
|
}
|
||||||
|
|
||||||
resource::response
|
resource::response
|
||||||
handle_post(client &client,
|
post__register(client &client,
|
||||||
const resource::request::object<body> &request)
|
const resource::request::object<body> &request)
|
||||||
{
|
{
|
||||||
const auto kind
|
const auto kind
|
||||||
|
@ -212,10 +212,10 @@ handle_post(client &client,
|
||||||
};
|
};
|
||||||
|
|
||||||
if(kind == "guest")
|
if(kind == "guest")
|
||||||
return handle_post_kind_guest(client, request);
|
return post__register_guest(client, request);
|
||||||
|
|
||||||
if(kind.empty() || kind == "user")
|
if(kind.empty() || kind == "user")
|
||||||
return handle_post_kind_user(client, request);
|
return post__register_user(client, request);
|
||||||
|
|
||||||
throw m::UNSUPPORTED
|
throw m::UNSUPPORTED
|
||||||
{
|
{
|
||||||
|
@ -223,17 +223,19 @@ handle_post(client &client,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
resource register_resource
|
resource
|
||||||
|
register_resource
|
||||||
{
|
{
|
||||||
"/_matrix/client/r0/register",
|
"/_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
|
void
|
||||||
|
|
Loading…
Reference in a new issue