summary refs log tree commit diff
path: root/tests/rest/client (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5212 from matrix-org/erikj/deny_multiple_reactionsErik Johnston2019-05-211-1/+26
|\ | | | | Block attempts to annotate the same event twice
| * Block attempts to annotate the same event twiceErik Johnston2019-05-201-1/+26
| |
* | Merge pull request #5204 from ↵Brendan Abolivier2019-05-211-0/+55
|\ \ | |/ |/| | | | | matrix-org/babolivier/account_validity_expiration_date Add startup background job for account validity
| * Add startup background job for account validityBrendan Abolivier2019-05-171-0/+55
| | | | | | | | If account validity is enabled in the server's configuration, this job will run at startup as a background job and will stick an expiration date to any registered account missing one.
* | Rename relation types to match MSCErik Johnston2019-05-201-11/+11
| |
* | Merge pull request #5209 from matrix-org/erikj/reactions_baseErik Johnston2019-05-201-0/+539
|\ \ | | | | | | Land basic reaction and edit support.
| * | Fixup commentsErik Johnston2019-05-201-2/+2
| | |
| * | Correctly update aggregation counts after redactionErik Johnston2019-05-201-0/+37
| | |
| * | Make tests use different user for each reaction it sendsErik Johnston2019-05-171-12/+68
| | | | | | | | | | | | As users aren't allowed to react with the same emoji more than once.
| * | Add basic editing supportErik Johnston2019-05-161-9/+82
| | |
| * | Check that event is visible in new APIsErik Johnston2019-05-161-1/+1
| | |
| * | Add aggregations APIErik Johnston2019-05-161-3/+248
| | |
| * | Add simple pagination APIErik Johnston2019-05-151-0/+30
| | |
| * | Add simple send_relation API and track in DBErik Johnston2019-05-151-0/+98
| | |
* | | Merge pull request #5196 from matrix-org/babolivier/per_room_profilesBrendan Abolivier2019-05-171-1/+69
|\ \ \ | | |/ | |/| Add an option to disable per-room profiles
| * | LintBrendan Abolivier2019-05-161-1/+0
| | |
| * | LintBrendan Abolivier2019-05-161-1/+3
| | |
| * | Forgot copyrightBrendan Abolivier2019-05-161-0/+1
| | |
| * | Add test caseBrendan Abolivier2019-05-161-1/+67
| |/
* | Merge pull request #5174 from matrix-org/dbkr/add_dummy_flow_to_recaptcha_onlyDavid Baker2019-05-161-1/+8
|\ \ | |/ |/| Re-order registration stages to do msisdn & email auth last
| * And now I realise why the test is failing...David Baker2019-05-131-1/+8
| |
* | Migrate all tests to use the dict-based config format instead of hanging ↵Amber Brown2019-05-138-34/+48
|/ | | | items off HomeserverConfig (#5171)
* Run Black on the tests again (#5170)Amber Brown2019-05-105-134/+72
|
* Fix bogus imports in tests (#5154)Brendan Abolivier2019-05-083-5/+6
|
* add options to require an access_token to GET /profile and /publicRooms on ↵Matthew Hodgson2019-05-082-1/+123
| | | | | | | | | | | | | | | | | CS API (#5083) This commit adds two config options: * `restrict_public_rooms_to_local_users` Requires auth to fetch the public rooms directory through the CS API and disables fetching it through the federation API. * `require_auth_for_profile_requests` When set to `true`, requires that requests to `/profile` over the CS API are authenticated, and only returns the user's profile if the requester shares a room with the profile's owner, as per MSC1301. MSC1301 also specifies a behaviour for federation (only returning the profile if the server asking for it shares a room with the profile's owner), but that's currently really non-trivial to do in a not too expensive way. Next step is writing down a MSC that allows a HS to specify which user sent the profile query. In this implementation, Synapse won't send a profile query over federation if it doesn't believe it already shares a room with the profile's owner, though. Groups have been intentionally omitted from this commit.
* Do checks on aliases for incoming m.room.aliases events (#5128)Brendan Abolivier2019-05-081-0/+169
| | | | | Follow-up to #5124 Also added a bunch of checks to make sure everything (both the stuff added on #5124 and this PR) works as intended.
* Add admin api for sending server_notices (#5121)Richard van der Hoff2019-05-029-10/+10
|
* Move admin api impl to its own packageRichard van der Hoff2019-05-0110-636/+27
| | | | It doesn't really belong under rest/client/v1 any more.
* Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-04-173-2/+191
|\ | | | | | | babolivier/account_expiration
| * Merge pull request #5047 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-171-1/+99
| |\ | | | | | | Send out emails with links to extend an account's validity period
| * \ Merge pull request #5027 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-091-2/+49
| |\ \ | | | | | | | | Add time-based account expiration
| * | | Add config option to block users from looking up 3PIDs (#5010)Brendan Abolivier2019-04-041-0/+65
| | | |
| * | | Add unit test for deleting groupsErik Johnston2019-04-031-0/+124
| | | |
| * | | Collect room-version variations into one place (#4969)Richard van der Hoff2019-04-011-2/+2
| | | | | | | | | | | | | | | | Collect all the things that make room-versions different to one another into one place, so that it's easier to define new room versions.
* | | | Add management endpoints for account validityBrendan Abolivier2019-04-171-8/+87
| |_|/ |/| |
* | | Send out emails with links to extend an account's validity periodBrendan Abolivier2019-04-171-1/+99
| |/ |/|
* | Add account expiration featureBrendan Abolivier2019-04-091-2/+49
|/
* Some more porting to HomeserverTestCase and remove old RESTHelper (#4913)Amber Brown2019-03-221-125/+0
|
* Merge pull request #4908 from matrix-org/erikj/block_peek_on_blocked_roomsErik Johnston2019-03-211-1/+65
|\ | | | | Deny peeking into rooms that have been blocked
| * isortErik Johnston2019-03-211-1/+1
| |
| * Deny peeking into rooms that have been blockedErik Johnston2019-03-211-1/+65
| |
* | Fix typo and add descriptionErik Johnston2019-03-211-1/+5
|/
* Rejig testcase to make it more extensibleErik Johnston2019-03-211-17/+22
|
* Remove debugErik Johnston2019-03-211-1/+0
|
* Add testsErik Johnston2019-03-211-1/+66
|
* Fix registration testRichard van der Hoff2019-03-191-1/+2
| | | | | * Set allow_guest_access = True, since we rely on it * config doesn't have a `hostname` attribute; it is `server_name`
* Add ratelimiting on failed login attempts (#4865)Brendan Abolivier2019-03-181-0/+45
|
* Add ratelimiting on login (#4821)Brendan Abolivier2019-03-152-2/+122
| | | Add two ratelimiters on login (per-IP address and per-userID).
* Merge pull request #4772 from jbweston/jbweston/server-version-apiErik Johnston2019-03-051-2/+36
|\ | | | | Add 'server_version' endpoint to admin API
| * Add 'server_version' endpoint to admin APIJoseph Weston2019-03-011-1/+35
| | | | | | | | | | This is required because the 'Server' HTTP header is not always passed through proxies.
| * Import 'admin' module rather than 'register_servlets' directlyJoseph Weston2019-03-011-2/+2
| | | | | | | | | | | | We will later need also to import 'register_servlets' from the 'login' module, so we un-pollute the namespace now to keep the logical changes separate.
* | Add rate-limiting on registration (#4735)Brendan Abolivier2019-03-054-7/+55
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Rate-limiting for registration * Add unit test for registration rate limiting * Add config parameters for rate limiting on auth endpoints * Doc * Fix doc of rate limiting function Co-Authored-By: babolivier <contact@brendanabolivier.com> * Incorporate review * Fix config parsing * Fix linting errors * Set default config for auth rate limiting * Fix tests * Add changelog * Advance reactor instead of mocked clock * Move parameters to registration specific config and give them more sensible default values * Remove unused config options * Don't mock the rate limiter un MAU tests * Rename _register_with_store into register_with_store * Make CI happy * Remove unused import * Update sample config * Fix ratelimiting test for py2 * Add non-guest test
* Move register_device into handlerErik Johnston2019-02-181-70/+23
|
* Fix unit testsErik Johnston2019-02-181-6/+15
|
* rework format of change password capabilityNeil Johnson2019-01-291-2/+2
|
* support change_password in capabilities end-pointNeil Johnson2019-01-291-0/+23
|
* isortNeil Johnson2019-01-291-1/+2
|
* enforce auth for capabilities endpointNeil Johnson2019-01-291-4/+19
|
* Support room version capabilities in CS API (MSC1804)Neil Johnson2019-01-251-0/+39
|
* Remove v1 only REST APIs now we don't ship matrix console (#4334)Amber Brown2018-12-292-145/+44
|
* create support user (#4141)Neil Johnson2018-12-141-5/+28
| | | | | | Allow for the creation of a support user. A support user can access the server, join rooms, interact with other users, but does not appear in the user directory nor does it contribute to monthly active user limits.
* Fix fallback auth on Python 3 (#4197)Amber Brown2018-11-191-0/+104
|
* Add a test for the public T&Cs formRichard van der Hoff2018-11-141-0/+7
|
* Remove some boilerplate in tests (#4156)Amber Brown2018-11-075-178/+117
|
* Tests for user consent resource (#4140)Amber Brown2018-11-061-0/+111
|
* Fix typing being reset causing infinite syncs (#4127)Amber Brown2018-11-031-0/+123
|
* Fix search 500ing (#4122)Amber Brown2018-10-311-1/+105
|
* Port tests/ to Python 3 (#3808)Amber Brown2018-09-072-311/+258
|
* Port storage/ to Python 3 (#3725)Amber Brown2018-08-311-4/+10
|
* Integrate presence from hotfixes (#3694)Amber Brown2018-08-182-46/+105
|
* Fix the testsAmber Brown2018-08-155-45/+24
|
* Implement a new test baseclass to cut down on boilerplate (#3684)Amber Brown2018-08-141-37/+29
|
* Run tests under PostgreSQL (#3423)Amber Brown2018-08-139-5/+9
|
* Run black.black2018-08-108-128/+117
|
* Test fixes for Python 3 (#3647)Amber Brown2018-08-097-36/+36
|
* Admin API for creating new users (#3415)Amber Brown2018-07-201-0/+305
|
* Move v1-only APIs into their own module & isolate deprecated ones (#3460)Amber Brown2018-07-195-86/+27
|
* Refactor REST API tests to use explicit reactors (#3351)Amber Brown2018-07-177-921/+902
|
* Make auth & transactions more testable (#3499)Amber Brown2018-07-141-1/+4
|
* run isortAmber Brown2018-07-0910-41/+44
|
* Pass around the reactor explicitly (#3385)Amber Brown2018-06-221-3/+3
|
* Fix logcontext leak in HttpTransactionCacheRichard van der Hoff2018-05-211-0/+21
| | | | ONE DAY I WILL PURGE THE WORLD OF THIS EVIL
* Stop the transaction cache caching failuresRichard van der Hoff2018-05-211-0/+54
| | | | | | The transaction cache has some code which tries to stop it caching failures, but if the callback function failed straight away, then things would happen backwards and we'd end up with the failure stuck in the cache.
* Burminate v1authAdrian Tschira2018-04-304-13/+18
| | | | | | | | | | | | | | | | | | This closes #2602 v1auth was created to account for the differences in status code between the v1 and v2_alpha revisions of the protocol (401 vs 403 for invalid tokens). However since those protocols were merged, this makes the r0 version/endpoint internally inconsistent, and violates the specification for the r0 endpoint. This might break clients that rely on this inconsistency with the specification. This is said to affect the legacy angular reference client. However, I feel that restoring parity with the spec is more important. Either way, it is critical to inform developers about this change, in case they rely on the illegal behaviour. Signed-off-by: Adrian Tschira <nota@notafile.com>
* Use six.moves.urlparseAdrian Tschira2018-04-151-7/+7
| | | | | | The imports were shuffled around a bunch in py3 Signed-off-by: Adrian Tschira <nota@notafile.com>
* move handling of auto_join_rooms to RegisterHandlerKrombel2018-03-141-0/+1
| | | | | | | | | | | | | Currently the handling of auto_join_rooms only works when a user registers itself via public register api. Registrations via registration_shared_secret and ModuleApi do not work This auto_joins the users in the registration handler which enables the auto join feature for all 3 registration paths. This is related to issue #2725 Signed-Off-by: Matthias Kesler <krombel@krombel.de>
* s/replication_client/federation_client/Erik Johnston2018-03-134-11/+11
|
* Fix testsErik Johnston2018-03-134-11/+11
|
* Move RoomMemberHandler out of HandlersErik Johnston2018-03-011-1/+1
|
* mock registrations_require_3pidMatthew Hodgson2018-01-191-0/+1
|
* Remove dead codeRichard van der Hoff2018-01-091-3/+0
| | | | pointless function is pointless
* Refactor UI auth implementationRichard van der Hoff2017-12-051-4/+7
| | | | | Instead of returning False when auth is incomplete, throw an exception which can be caught with a wrapper.
* Fix testDavid Baker2017-10-171-0/+1
|
* Split out profile handler to fix testsErik Johnston2017-08-251-2/+1
|
* Add groups to sync streamErik Johnston2017-07-201-2/+2
|
* use jsonschema.FormatChecker for RoomID and UserID stringspik2017-03-231-2/+2
| | | | | | * use a valid filter in rest/client/v2_alpha test Signed-off-by: pik <alexander.maznev@gmail.com>
* Add basic implementation of local device list changesErik Johnston2017-01-251-2/+2
|
* Linearize updates to membership via PUT /state/Erik Johnston2017-01-092-3/+6
|
* Stop generating refresh tokensRichard van der Hoff2016-11-281-8/+4
| | | | | | | Since we're not doing refresh tokens any more, we should start killing off the dead code paths. /tokenrefresh itself is a bit of a thornier subject, since there might be apps out there using it, but we can at least not generate refresh tokens on new logins.
* Clean transactions based on time. Add HttpTransactionCache tests.Kegan Dougal2016-11-141-0/+69
|
* Merge pull request #1098 from matrix-org/markjh/bearer_tokenMark Haines2016-10-252-0/+4
|\ | | | | Allow clients to supply access_tokens as headers
| * Fix unit testsMark Haines2016-09-122-0/+4
| |
* | Merge pull request #1164 from pik/error-codesErik Johnston2016-10-191-40/+87
|\ \ | | | | | | Clarify Error codes for GET /filter/
| * | Refactor test_filter to use real DataStorepik2016-10-181-43/+81
| | | | | | | | | | | | * add tests for filter api errors
| * | Error codes for filtersAlexander Maznev2016-10-141-3/+12
| | | | | | | | | | | | | | | | | | * add tests Signed-off-by: Alexander Maznev <alexander.maznev@gmail.com>
* | | rest/client/v1/register: use the correct requester in createUserPatrik Oldsberg2016-10-061-21/+9
| | | | | | | | | | | | Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
* | | storage/appservice: make appservice methods only relying on the cache ↵Patrik Oldsberg2016-10-061-1/+1
|/ / | | | | | | synchronous
* / Time out typing over federationErik Johnston2016-09-231-4/+1
|/
* More 0_0 in testsMark Haines2016-08-251-2/+2
|
* Add `create_requester` functionRichard van der Hoff2016-07-261-8/+5
| | | | | Wrap the `Requester` constructor with a function which provides sensible defaults, and use it throughout
* Implement deleting devicesRichard van der Hoff2016-07-261-4/+10
|
* Register a device_id in the /v2/register flow.Richard van der Hoff2016-07-201-3/+10
| | | | | | | | | | This doesn't cover *all* of the registration flows, but it does cover the most common ones: in particular: shared_secret registration, appservice registration, and normal user/pass registration. Pull device_id from the registration parameters. Register the device in the devices table. Associate the device with the returned access and refresh tokens. Profit.
* Further registration refactoringRichard van der Hoff2016-07-191-1/+5
| | | | | | | | | | | | | | * `RegistrationHandler.appservice_register` no longer issues an access token: instead it is left for the caller to do it. (There are two of these, one in `synapse/rest/client/v1/register.py`, which now simply calls `AuthHandler.issue_access_token`, and the other in `synapse/rest/client/v2_alpha/register.py`, which is covered below). * In `synapse/rest/client/v2_alpha/register.py`, move the generation of access_tokens into `_create_registration_details`. This means that the normal flow no longer needs to call `AuthHandler.issue_access_token`; the shared-secret flow can tell `RegistrationHandler.register` not to generate a token; and the appservice flow continues to work despite the above change.
* rest/client/v2_alpha/register.py: Refactor flow somewhat.Richard van der Hoff2016-07-191-1/+2
| | | | | | | | | | | This is meant to be an *almost* non-functional change, with the exception that it fixes what looks a lot like a bug in that it only calls `auth_handler.add_threepid` and `add_pusher` once instead of three times. The idea is to move the generation of the `access_token` out of `registration_handler.register`, because `access_token`s now require a device_id, and we only want to generate a device_id once registration has been successful.
* Split out the auth handlerDavid Baker2016-06-021-1/+1
|
* Move typing handler out of the Handlers objectMark Haines2016-05-171-1/+1
|
* Create user with expiryNegi Fazeli2016-05-131-0/+88
| | | | | | - Add unittests for client, api and handler Signed-off-by: Negar Fazeli <negar.fazeli@ericsson.com>
* Do checks for memberships before creating eventsErik Johnston2016-04-011-2/+2
|
* Fix testsDavid Baker2016-03-161-4/+5
|
* Use parse_json_object_from_request to parse JSON out of request bodiesMark Haines2016-03-111-2/+4
|
* Flake8 fixblide2016-03-101-6/+6
|
* Register endpoint returns refresh_tokenblide2016-03-101-12/+18
| | | | Guest registration still doesn't return refresh_token
* Fix testsDavid Baker2016-03-073-20/+20
|
* Fix unit testsMark Haines2016-03-041-2/+2
|
* Pass whole requester to ratelimitingDaniel Wagner-Hall2016-03-031-2/+2
| | | | This will enable more detailed decisions
* Fix flake8 warnings for testsMark Haines2016-02-198-170/+181
|
* Remove old tests.Erik Johnston2016-02-182-418/+0
|
* Rename config field to reflect yaml nameDaniel Wagner-Hall2016-02-032-3/+3
|
* Allow paginating backwards from stream tokenErik Johnston2016-01-281-8/+1
|
* Merge pull request #535 from matrix-org/rav/paginate_from_stream_tokenRichard van der Hoff2016-01-281-2/+14
|\ | | | | Make it possible to paginate forwards from stream tokens
| * Make it possible to paginate forwards from stream tokensRichard van der Hoff2016-01-271-2/+14
| | | | | | | | | | In order that we can fill the gap after a /sync, make it possible to paginate forwards from a stream token.
* | Remove redundated BaseHomeServerErik Johnston2016-01-261-8/+10
|/
* Introduce a Requester objectDaniel Wagner-Hall2016-01-112-7/+5
| | | | | | | | | This tracks data about the entity which made the request. This is instead of passing around a tuple, which requires call-site modifications every time a new piece of optional context is passed around. I tried to introduce a User object. I gave up.
* copyrightsMatthew Hodgson2016-01-0710-10/+10
|
* Return non-room events from guest /events callsDaniel Wagner-Hall2015-11-121-0/+3
|
* Add a couple of unit tests for room/<x>/messagesRichard van der Hoff2015-11-091-0/+56
| | | | ... merely because I was trying to figure out how it worked, and couldn't.
* Open up /events to anonymous users for room events onlyDaniel Wagner-Hall2015-11-052-2/+12
| | | | Squash-merge of PR #345 from daniel/anonymousevents
* Allow guests to register and call /events?room_id=Daniel Wagner-Hall2015-11-045-15/+26
| | | | | | | This follows the same flows-based flow as regular registration, but as the only implemented flow has no requirements, it auto-succeeds. In the future, other flows (e.g. captcha) may be required, so clients should treat this like the regular registration flow choices.
* Support clients supplying older tokens, fix short poll testMark Haines2015-10-301-2/+2
|
* Allow rejecting invitesDaniel Wagner-Hall2015-10-201-2/+2
| | | | | This is done by using the same /leave flow as you would use if you had already accepted the invite and wanted to leave.
* Move NullSource out of synapse and into tests since it is only used by the testsMark Haines2015-09-221-1/+17
|
* Merge pull request #276 from ↵Mark Haines2015-09-211-7/+7
|\ | | | | | | | | matrix-org/markjh/history_for_rooms_that_have_been_left SPEC-216: Allow users to view the history of rooms that they have left.
| * Allow users to GET individual state events for rooms that they have leftMark Haines2015-09-101-5/+5
| |
| * Allow users that have left the room to view the member list from the point ↵Mark Haines2015-09-091-2/+2
| | | | | | | | they left
* | s/user_id/user/g for consistencyDaniel Wagner-Hall2015-09-014-11/+11
| |
* | Attempt to validate macaroonsDaniel Wagner-Hall2015-08-265-25/+22
|/ | | | | | | | | | | | | A couple of weird caveats: * If we can't validate your macaroon, we fall back to checking that your access token is in the DB, and ignoring the failure * Even if we can validate your macaroon, we still have to hit the DB to get the access token ID, which we pretend is a device ID all over the codebase. This mostly adds the interesting code, and points out the two pieces we need to delete (and necessary conditions) in order to fix the above caveats.
* Stop looking up "admin", which we never readDaniel Wagner-Hall2015-08-254-11/+0
|
* Remove completely unused concepts from codebaseDaniel Wagner-Hall2015-08-254-11/+0
| | | | | | | | | | Removes device_id and ClientInfo device_id is never actually written, and the matrix.org DB has no non-null entries for it. Right now, it's just cluttering up code. This doesn't remove the columns from the database, because that's fiddly.
* Merge branch 'develop' into refreshDaniel Wagner-Hall2015-08-201-1/+2
|\ | | | | | | | | Conflicts: synapse/rest/client/v1/login.py
| * Fix testsDavid Baker2015-08-041-1/+2
| |
* | s/by_token/by_access_token/gDaniel Wagner-Hall2015-08-205-23/+23
|/ | | | We're about to have two kinds of token, access and refresh
* Use the same reg paths as register v1 for ASes.Kegan Dougal2015-07-291-1/+3
| | | | Namely this means using registration_handler.appservice_register.
* Fix v2_alpha registration. Add unit tests.Kegan Dougal2015-07-281-0/+132
| | | | | | | | V2 Registration forced everyone (including ASes) to create a password for a user, when ASes should be able to omit passwords. Also unbreak AS registration in general which checked too early if the given username was claimed by an AS; it was checked before knowing if the AS was the one doing the registration! Add unit tests for AS reg, user reg and disabled_registration flag.
* Fix test.Erik Johnston2015-07-071-1/+11
|
* Add receipts_key to StreamTokenErik Johnston2015-07-021-2/+2
|
* Fix the presence testsMark Haines2015-05-221-2/+2
|
* Merge pull request #157 from matrix-org/markjh/presence_performanceMark Haines2015-05-221-0/+3
|\ | | | | Improve presence performance in loadtest
| * Fix the presence testsMark Haines2015-05-201-0/+3
| |
* | Oops, get_rooms_for_user returns a namedtuple, not a room_idMark Haines2015-05-211-1/+6
|/
* Discard unused NotifierUserStreamsMark Haines2015-05-131-0/+1
|
* Don't bother checking for updates if the stream token hasn't advanced for a userMark Haines2015-05-131-5/+10
|
* Merge branch 'develop' of github.com:matrix-org/synapse into postgresErik Johnston2015-04-284-13/+13
|\
| * Merge branch 'develop' into csauthDavid Baker2015-04-171-2/+5
| |\
| * | Fix testsDavid Baker2015-03-244-13/+13
| | |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into postgresErik Johnston2015-04-171-2/+5
|\ \ \ | | |/ | |/|
| * | Various minor fixes to unit-test structure around typing notificationsPaul "LeoNerd" Evans2015-04-151-2/+4
| | |
| * | Have TypingNotificationEventSource.get_new_events_for_user() return a ↵Paul "LeoNerd" Evans2015-04-151-1/+2
| |/ | | | | | | deferred, for consistency and extensibility
* / Make work in both Maria and SQLite. Fix testsErik Johnston2015-04-011-9/+0
|/
* Fix testsErik Johnston2015-03-091-4/+4
|
* Fix unit testsKegan Dougal2015-02-271-0/+3
|
* Update testsErik Johnston2015-02-191-0/+1
|
* Merge branch 'develop' into application-servicesKegan Dougal2015-02-116-141/+34
|\
| * Factor out some of the common homeserver setup code into aMark Haines2015-02-116-141/+34
| | | | | | | | setup_test_homeserver function in utils.
* | Modify auth.get_user_by_req for authing appservices directly.Kegan Dougal2015-02-092-1/+6
|/ | | | | | Add logic to map the appservice token to the autogenned appservice user ID. Add unit tests for all forms of get_user_by_req (user/appservice, valid/bad/missing tokens)
* Merge in auth changes from developMark Haines2015-01-291-0/+1
|
* Merge changes from developMark Haines2015-01-294-2/+12
|\
| * Merge pull request #36 from matrix-org/device_id_from_access_tokenMark Haines2015-01-284-2/+12
| |\ | | | | | | Extract the device id and token id from the access token when autheniticating users
| | * Extract the id token of the token when authing users, include the token and ↵Mark Haines2015-01-283-0/+10
| | | | | | | | | | | | device_id in the internal meta data for the event along with the transaction id when sending events
| | * Return the device_id from get_auth_by_reqMark Haines2015-01-282-2/+2
| | |
* | | More unit-testing of REST errorsPaul "LeoNerd" Evans2015-01-271-1/+35
| | |
* | | Move storage of user filters into real datastore layer; now have to mock it ↵Paul "LeoNerd" Evans2015-01-272-3/+27
| | | | | | | | | | | | out in the REST-level tests
* | | Use new V2AlphaRestTestCasePaul "LeoNerd" Evans2015-01-271-38/+2
| | |
* | | Merge branch 'develop' into client_v2_filterPaul "LeoNerd" Evans2015-01-271-0/+45
|\| |
| * | Initial cut of a shared base class for REST unit testsPaul "LeoNerd" Evans2015-01-271-0/+45
| |/
* | Minor changes to v2_alpha filter REST test to allow the setUp method to be ↵Paul "LeoNerd" Evans2015-01-271-5/+7
| | | | | | | | shareable
* | Initial trivial REST test of v2_alpha filter APIPaul "LeoNerd" Evans2015-01-261-0/+74
|/
* Create (empty) v2_alpha REST tests directoryPaul "LeoNerd" Evans2015-01-261-0/+15
|
* Replace hs.parse_userid with UserID.from_stringMark Haines2015-01-234-24/+24
|
* Merge rest servlets into the client json resource objectMark Haines2015-01-232-4/+9
|
* Move client rest tests back under restMark Haines2015-01-228-0/+2142