Skip to content
Snippets Groups Projects
Commit fee7d3d2 authored by Timo Kösters's avatar Timo Kösters
Browse files

Merge branch 'allow_appservice_registration' into 'master'

Always allow appservices to register new users

See merge request famedly/conduit!105
parents 1a70ea57 637d9d3b
No related branches found
No related tags found
No related merge requests found
......@@ -88,7 +88,7 @@ pub async fn register_route(
db: State<'_, Arc<Database>>,
body: Ruma<register::Request<'_>>,
) -> ConduitResult<register::Response> {
if !db.globals.allow_registration() {
if !db.globals.allow_registration() && !body.from_appservice {
return Err(Error::BadRequest(
ErrorKind::Forbidden,
"Registration has been disabled.",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment