Merge pull request #2629 from matrix-org/rav/register_inhibit_login

support inhibit_login in /register

synapse/rest/client/v2_alpha/register.py

@@ -557,10 +557,15 @@ class RegisterRestServlet(RestServlet):
         Args:
             (str) user_id: full canonical @user:id
             (object) params: registration parameters, from which we pull
-                device_id and initial_device_name
+                device_id, initial_device_name and inhibit_login
         Returns:
             defer.Deferred: (object) dictionary for response from /register
         """
+        result = {
+            "user_id": user_id,
+            "home_server": self.hs.hostname,
+        }
+        if not params.get("inhibit_login", False):
             device_id = yield self._register_device(user_id, params)
 
             access_token = (
@@ -569,12 +574,11 @@ class RegisterRestServlet(RestServlet):
                 )
             )
 
-        defer.returnValue({
-            "user_id": user_id,
+            result.update({
                 "access_token": access_token,
-            "home_server": self.hs.hostname,
                 "device_id": device_id,
             })
+        defer.returnValue(result)
 
     def _register_device(self, user_id, params):
         """Register a device for a user.