Username is technically optional.
This commit is contained in:
parent
70c3d01125
commit
c15895ae06
1 changed files with 10 additions and 15 deletions
|
@ -71,7 +71,7 @@ ROUTE_IMPL(RouteRegister, args)
|
||||||
}
|
}
|
||||||
|
|
||||||
response = MatrixUserInteractiveAuth(args->context,
|
response = MatrixUserInteractiveAuth(args->context,
|
||||||
args->matrixArgs->db, request);
|
args->matrixArgs->db, request);
|
||||||
|
|
||||||
if (response)
|
if (response)
|
||||||
{
|
{
|
||||||
|
@ -89,22 +89,17 @@ ROUTE_IMPL(RouteRegister, args)
|
||||||
}
|
}
|
||||||
|
|
||||||
val = HashMapGet(request, "username");
|
val = HashMapGet(request, "username");
|
||||||
if (!val)
|
if (val)
|
||||||
{
|
{
|
||||||
HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
|
if (JsonValueType(val) != JSON_STRING)
|
||||||
response = MatrixErrorCreate(M_MISSING_PARAM);
|
{
|
||||||
goto finish;
|
HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
|
||||||
|
response = MatrixErrorCreate(M_BAD_JSON);
|
||||||
|
goto finish;
|
||||||
|
}
|
||||||
|
username = JsonValueAsString(val);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (JsonValueType(val) != JSON_STRING)
|
|
||||||
{
|
|
||||||
HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
|
|
||||||
response = MatrixErrorCreate(M_BAD_JSON);
|
|
||||||
goto finish;
|
|
||||||
}
|
|
||||||
|
|
||||||
username = JsonValueAsString(val);
|
|
||||||
|
|
||||||
val = HashMapGet(request, "password");
|
val = HashMapGet(request, "password");
|
||||||
if (!val)
|
if (!val)
|
||||||
{
|
{
|
||||||
|
@ -177,12 +172,12 @@ ROUTE_IMPL(RouteRegister, args)
|
||||||
/* TODO: Register new user here */
|
/* TODO: Register new user here */
|
||||||
|
|
||||||
/* These values are already set */
|
/* These values are already set */
|
||||||
(void) username;
|
|
||||||
(void) password;
|
(void) password;
|
||||||
(void) refreshToken;
|
(void) refreshToken;
|
||||||
(void) inhibitLogin;
|
(void) inhibitLogin;
|
||||||
|
|
||||||
/* These may be NULL */
|
/* These may be NULL */
|
||||||
|
(void) username;
|
||||||
(void) deviceId;
|
(void) deviceId;
|
||||||
(void) initialDeviceDisplayName;
|
(void) initialDeviceDisplayName;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue