diff options
author | Amber Brown <hawkowl@atleastfornow.net> | 2018-06-14 18:27:37 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-14 18:27:37 +1000 |
commit | a61738b316db70a4184d5c355696e0a039e7867f (patch) | |
tree | caca1a3ef0267aad2827f2f46755161d41f2ad5a /synapse/handlers/auth.py | |
parent | Merge pull request #3368 from matrix-org/rav/fix_federation_client_host (diff) | |
download | synapse-a61738b316db70a4184d5c355696e0a039e7867f.tar.xz |
Remove run_on_reactor (#3395)
Diffstat (limited to 'synapse/handlers/auth.py')
-rw-r--r-- | synapse/handlers/auth.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py index 912136534d..dabc744890 100644 --- a/synapse/handlers/auth.py +++ b/synapse/handlers/auth.py @@ -13,6 +13,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + from twisted.internet import defer, threads from ._base import BaseHandler @@ -23,7 +24,6 @@ from synapse.api.errors import ( ) from synapse.module_api import ModuleApi from synapse.types import UserID -from synapse.util.async import run_on_reactor from synapse.util.caches.expiringcache import ExpiringCache from synapse.util.logcontext import make_deferred_yieldable @@ -423,15 +423,11 @@ class AuthHandler(BaseHandler): def _check_msisdn(self, authdict, _): return self._check_threepid('msisdn', authdict) - @defer.inlineCallbacks def _check_dummy_auth(self, authdict, _): - yield run_on_reactor() - defer.returnValue(True) + return defer.succeed(True) @defer.inlineCallbacks def _check_threepid(self, medium, authdict): - yield run_on_reactor() - if 'threepid_creds' not in authdict: raise LoginError(400, "Missing threepid_creds", Codes.MISSING_PARAM) |