mirror of
https://gitlab.com/famedly/conduit.git
synced 2024-11-17 10:48:18 -07:00
Merge branch 'allow_appservice_registration' into 'master'
Always allow appservices to register new users See merge request famedly/conduit!105
This commit is contained in:
commit
fee7d3d2e3
@ -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.",
|
||||
|
Loading…
Reference in New Issue
Block a user