From f9055952a43f78641931cd42d745ebaa3ea4acce Mon Sep 17 00:00:00 2001
From: Julien Fontanet <julien.fontanet@isonoe.net>
Date: Tue, 30 Jul 2013 17:21:27 +0200
Subject: [PATCH] Various updates.

---
 .jshintrc  |  1 +
 src/api.js | 37 ++++++++++++++++++++++++++++++++-----
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/.jshintrc b/.jshintrc
index 51ef6e9..205f370 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -4,6 +4,7 @@
 	"eqeqeq": true,
 	"es5": true,
 	"latedef": true,
+	"laxbreak": true,
 	"maxcomplexity": 10,
 	"maxdepth": 5,
 	"maxlen": 80,
diff --git a/src/api.js b/src/api.js
index 2fac2ea..b3a9385 100644
--- a/src/api.js
+++ b/src/api.js
@@ -146,7 +146,7 @@ Api.prototype.checkPermission = function (session, permission)
 
 	if (!permission)
 	{
-		/* jshint newcap:false */
+		/* jshint newcap: false */
 		return Q();
 	}
 
@@ -316,11 +316,41 @@ Api.fn.user = {
 
 			return user.setPassword(p_new);
 		}).then(function () {
-			/* jshint newcap:false */
 			return users.update(user).thenResolve(true);
 		});
 	},
 
+	'get': function (session, req) {
+		var p_id = req.params.id;
+		if (undefined === p_id)
+		{
+			throw Api.err.INVALID_PARAMS;
+		}
+
+		var promise;
+		if (session.get('user_id') === p_id)
+		{
+			/* jshint newcap: false */
+			promise = Q();
+		}
+		else
+		{
+			promise = this.checkPermission(session, 'admin');
+		}
+
+		var users = this.xo.users;
+		return promise.then(function () {
+			return users.first(p_id);
+		}).then(function (user) {
+			if (!user)
+			{
+				throw Api.err.NO_SUCH_OBJECT;
+			}
+
+			return _.pick(user.properties, 'id', 'email', 'permission');
+		});
+	},
+
 	'getAll': function (session) {
 		var users = this.xo.users;
 		return this.checkPermission(session, 'admin').then(function () {
@@ -344,7 +374,6 @@ Api.fn.user = {
 		var p_password = request.params.password;
 		var p_permission = request.params.permission;
 
-		/* jshint laxbreak: true */
 		if ((undefined === p_id)
 			|| ((undefined === p_email)
 				&& (undefined === p_password)
@@ -401,7 +430,6 @@ Api.fn.user = {
 Api.fn.token = {
 	'create': function (session) {
 		var user_id = session.get('user_id');
-		/* jshint laxbreak: true */
 		if ((undefined === user_id)
 			|| session.has('token_id'))
 		{
@@ -426,7 +454,6 @@ Api.fn.token = {
 			}
 
 			// @todo Returns NO_SUCH_OBJECT if the token does not exists.
-			/* jshint newcap:false */
 			return tokens.remove(p_token).thenResolve(true);
 		});
 	},