serv/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2024-12-29 05:53:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'allow_appservice_registration' into 'master'

Browse source 
Always allow appservices to register new users

See merge request famedly/conduit!105
This commit is contained in:
Timo Kösters 2021-06-21 10:15:48 +00:00
commit fee7d3d2e3
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/client_server/account.rs
View file

@ -88,7 +88,7 @@ pub async fn register_route(
db: State<'_, Arc<Database>>, db: State<'_, Arc<Database>>,
body: Ruma<register::Request<'_>>, body: Ruma<register::Request<'_>>,
) -> ConduitResult<register::Response> { ) -> ConduitResult<register::Response> {
if !db.globals.allow_registration() { if !db.globals.allow_registration() && !body.from_appservice {
return Err(Error::BadRequest( return Err(Error::BadRequest(
ErrorKind::Forbidden, ErrorKind::Forbidden,
"Registration has been disabled.", "Registration has been disabled.",