Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-11-13 01:50:42 -05:00
Code Issues Projects Releases Packages Wiki Activity

s/user_id/user/g for consistency

Browse source
This commit is contained in:
Daniel Wagner-Hall 2015-09-01 12:41:16 +01:00
parent 81450fded8
commit e255c2c32f
6 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tests/api/test_auth.py
View file

@ -146,17 +146,17 @@ class AuthTestCase(unittest.TestCase):
return_value={"name": "@baldrick:matrix.org"}
)
user = "@baldrick:matrix.org"
user_id = "@baldrick:matrix.org"
macaroon = pymacaroons.Macaroon(
location=self.hs.config.server_name,
identifier="key",
key=self.hs.config.macaroon_secret_key)
macaroon.add_first_party_caveat("gen = 1")
macaroon.add_first_party_caveat("type = access")
macaroon.add_first_party_caveat("user_id = %s" % (user,))
macaroon.add_first_party_caveat("user_id = %s" % (user_id,))
user_info = yield self.auth._get_user_from_macaroon(macaroon.serialize())
user_id = user_info["user_id"]
self.assertEqual(UserID.from_string(user), user_id)
user = user_info["user"]
self.assertEqual(UserID.from_string(user_id), user)
@defer.inlineCallbacks
def test_get_user_from_macaroon_user_db_mismatch(self):

4
tests/rest/client/v1/test_presence.py
View file

@ -72,7 +72,7 @@ class PresenceStateTestCase(unittest.TestCase):
def _get_user_by_access_token(token=None):
return {
"user_id": UserID.from_string(myid),
"user": UserID.from_string(myid),
"token_id": 1,
}
@ -159,7 +159,7 @@ class PresenceListTestCase(unittest.TestCase):
def _get_user_by_access_token(token=None):
return {
"user_id": UserID.from_string(myid),
"user": UserID.from_string(myid),
"token_id": 1,
}

14
tests/rest/client/v1/test_rooms.py
View file

@ -56,7 +56,7 @@ class RoomPermissionsTestCase(RestTestCase):
def _get_user_by_access_token(token=None):
return {
"user_id": UserID.from_string(self.auth_user_id),
"user": UserID.from_string(self.auth_user_id),
"token_id": 1,
}
hs.get_v1auth()._get_user_by_access_token = _get_user_by_access_token
@ -441,7 +441,7 @@ class RoomsMemberListTestCase(RestTestCase):
def _get_user_by_access_token(token=None):
return {
"user_id": UserID.from_string(self.auth_user_id),
"user": UserID.from_string(self.auth_user_id),
"token_id": 1,
}
hs.get_v1auth()._get_user_by_access_token = _get_user_by_access_token
@ -519,7 +519,7 @@ class RoomsCreateTestCase(RestTestCase):
def _get_user_by_access_token(token=None):
return {
"user_id": UserID.from_string(self.auth_user_id),
"user": UserID.from_string(self.auth_user_id),
"token_id": 1,
}
hs.get_v1auth()._get_user_by_access_token = _get_user_by_access_token
@ -610,7 +610,7 @@ class RoomTopicTestCase(RestTestCase):
def _get_user_by_access_token(token=None):
return {
"user_id": UserID.from_string(self.auth_user_id),
"user": UserID.from_string(self.auth_user_id),
"token_id": 1,
}
@ -715,7 +715,7 @@ class RoomMemberStateTestCase(RestTestCase):
def _get_user_by_access_token(token=None):
return {
"user_id": UserID.from_string(self.auth_user_id),
"user": UserID.from_string(self.auth_user_id),
"token_id": 1,
}
hs.get_v1auth()._get_user_by_access_token = _get_user_by_access_token
@ -840,7 +840,7 @@ class RoomMessagesTestCase(RestTestCase):
def _get_user_by_access_token(token=None):
return {
"user_id": UserID.from_string(self.auth_user_id),
"user": UserID.from_string(self.auth_user_id),
"token_id": 1,
}
hs.get_v1auth()._get_user_by_access_token = _get_user_by_access_token
@ -935,7 +935,7 @@ class RoomInitialSyncTestCase(RestTestCase):
def _get_user_by_access_token(token=None):
return {
"user_id": UserID.from_string(self.auth_user_id),
"user": UserID.from_string(self.auth_user_id),
"token_id": 1,
}
hs.get_v1auth()._get_user_by_access_token = _get_user_by_access_token

2
tests/rest/client/v1/test_typing.py
View file

@ -63,7 +63,7 @@ class RoomTypingTestCase(RestTestCase):
def _get_user_by_access_token(token=None):
return {
"user_id": UserID.from_string(self.auth_user_id),
"user": UserID.from_string(self.auth_user_id),
"token_id": 1,
}

2
tests/rest/client/v2_alpha/__init__.py
View file

@ -45,7 +45,7 @@ class V2AlphaRestTestCase(unittest.TestCase):
def _get_user_by_access_token(token=None):
return {
"user_id": UserID.from_string(self.USER_ID),
"user": UserID.from_string(self.USER_ID),
"token_id": 1,
}
hs.get_auth()._get_user_by_access_token = _get_user_by_access_token