Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit 1807115

Browse files
committed
Remove placeholders/dummy classes for supporting identifiers in existing tests
1 parent cb64c95 commit 1807115

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

tests/rest/client/v1/test_login.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,9 +273,7 @@ def _delete_device(self, access_token, user_id, password, device_id):
273273

274274
auth = {
275275
"type": "m.login.password",
276-
# https://github.com/matrix-org/synapse/issues/5665
277-
# "identifier": {"type": "m.id.user", "user": user_id},
278-
"user": user_id,
276+
"identifier": {"type": "m.id.user", "user": user_id},
279277
"password": password,
280278
"session": channel.json_body["session"],
281279
}

tests/rest/client/v2_alpha/test_auth.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@ def check_auth(self, authdict, clientip):
3838
return succeed(True)
3939

4040

41-
class DummyPasswordChecker(UserInteractiveAuthChecker):
42-
def check_auth(self, authdict, clientip):
43-
return succeed(authdict["identifier"]["user"])
44-
45-
4641
class FallbackAuthTests(unittest.HomeserverTestCase):
4742

4843
servlets = [
@@ -166,9 +161,6 @@ class UIAuthTests(unittest.HomeserverTestCase):
166161
]
167162

168163
def prepare(self, reactor, clock, hs):
169-
auth_handler = hs.get_auth_handler()
170-
auth_handler.checkers[LoginType.PASSWORD] = DummyPasswordChecker(hs)
171-
172164
self.user_pass = "pass"
173165
self.user = self.register_user("test", self.user_pass)
174166
self.user_tok = self.login("test", self.user_pass)

0 commit comments

Comments
 (0)