summary refs log tree commit diff
path: root/tests/rest/client/v1 (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fix unit testsKegan Dougal2015-02-271-0/+3
|
* Update testsErik Johnston2015-02-191-0/+1
|
* Merge branch 'develop' into application-servicesKegan Dougal2015-02-115-133/+29
|\
| * Factor out some of the common homeserver setup code into aMark Haines2015-02-115-133/+29
| | | | | | | | setup_test_homeserver function in utils.
* | Modify auth.get_user_by_req for authing appservices directly.Kegan Dougal2015-02-091-0/+3
|/ | | | | | 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)
* 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
|
* 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-227-0/+2128