diff options
author | Joram Wilander <jwawilander@gmail.com> | 2016-09-14 08:57:33 -0400 |
---|---|---|
committer | enahum <nahumhbl@gmail.com> | 2016-09-14 09:57:33 -0300 |
commit | 837808eba389f1f74da8200b35d1fdc7ea14900e (patch) | |
tree | 69742d74ccd39ad7313bb382e94462699c4ff790 /webapp | |
parent | abe6e8e47114c8757f064bba072ef71541b3ed7d (diff) | |
download | chat-837808eba389f1f74da8200b35d1fdc7ea14900e.tar.gz chat-837808eba389f1f74da8200b35d1fdc7ea14900e.tar.bz2 chat-837808eba389f1f74da8200b35d1fdc7ea14900e.zip |
Update getUser API and add it to the JS driver (#4020)
Diffstat (limited to 'webapp')
-rw-r--r-- | webapp/client/client.jsx | 9 | ||||
-rw-r--r-- | webapp/tests/client_user.test.jsx | 15 |
2 files changed, 24 insertions, 0 deletions
diff --git a/webapp/client/client.jsx b/webapp/client/client.jsx index 6aabee080..a5d179a0d 100644 --- a/webapp/client/client.jsx +++ b/webapp/client/client.jsx @@ -856,6 +856,15 @@ export default class Client { end(this.handleResponse.bind(this, 'getMe', success, error)); } + getUser(userId, success, error) { + request. + get(`${this.getUserNeededRoute(userId)}/get`). + set(this.defaultHeaders). + type('application/json'). + accept('application/json'). + end(this.handleResponse.bind(this, 'getUser', success, error)); + } + login(loginId, password, mfaToken, success, error) { this.doLogin({login_id: loginId, password, token: mfaToken}, success, error); diff --git a/webapp/tests/client_user.test.jsx b/webapp/tests/client_user.test.jsx index 116eee4ae..6c65e8ef5 100644 --- a/webapp/tests/client_user.test.jsx +++ b/webapp/tests/client_user.test.jsx @@ -21,6 +21,21 @@ describe('Client.User', function() { }); }); + it('getUser', function(done) { + TestHelper.initBasic(() => { + TestHelper.basicClient().getUser( + TestHelper.basicUser().id, + function(data) { + assert.equal(data.id, TestHelper.basicUser().id); + done(); + }, + function(err) { + done(new Error(err.message)); + } + ); + }); + }); + it('getInitialLoad', function(done) { TestHelper.initBasic(() => { TestHelper.basicClient().getInitialLoad( |