summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
Diffstat (limited to 'webapp')
-rw-r--r--webapp/client/client.jsx9
-rw-r--r--webapp/tests/client_user.test.jsx15
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(