|
@@ -309,22 +309,16 @@ class RegisterRestServlet(RestServlet):
|
|
|
assigned_user_id=registered_user_id,
|
|
|
)
|
|
|
|
|
|
- # Only give msisdn flows if the x_show_msisdn flag is given:
|
|
|
- # this is a hack to work around the fact that clients were shipped
|
|
|
- # that use fallback registration if they see any flows that they don't
|
|
|
- # recognise, which means we break registration for these clients if we
|
|
|
- # advertise msisdn flows. Once usage of Riot iOS <=0.3.9 and Riot
|
|
|
- # Android <=0.6.9 have fallen below an acceptable threshold, this
|
|
|
- # parameter should go away and we should always advertise msisdn flows.
|
|
|
- show_msisdn = False
|
|
|
- if 'x_show_msisdn' in body and body['x_show_msisdn']:
|
|
|
- show_msisdn = True
|
|
|
-
|
|
|
# FIXME: need a better error than "no auth flow found" for scenarios
|
|
|
# where we required 3PID for registration but the user didn't give one
|
|
|
require_email = 'email' in self.hs.config.registrations_require_3pid
|
|
|
require_msisdn = 'msisdn' in self.hs.config.registrations_require_3pid
|
|
|
|
|
|
+ show_msisdn = True
|
|
|
+ if self.hs.config.disable_msisdn_registration:
|
|
|
+ show_msisdn = False
|
|
|
+ require_msisdn = False
|
|
|
+
|
|
|
flows = []
|
|
|
if self.hs.config.enable_registration_captcha:
|
|
|
# only support 3PIDless registration if no 3PIDs are required
|