add users API

3 files changed, 49 insertions, 1 deletions

diff --git a/lib/api.rb b/lib/api.rb
index a3e9e57b5a2..9e38bc496fe 100644
--- a/lib/api.rb
+++ b/lib/api.rb
@@ -1,2 +1,31 @@
-class Gitlab::API < Grape::API
+require 'api/entities'
+require 'api/helpers'
+
+module Gitlab
+  class API < Grape::API
+    format :json
+    helpers APIHelpers
+
+    resource :users do
+      before { authenticate! }
+
+      # GET /users
+      get do
+        @users = User.all
+        present @users, :with => Entities::User
+      end
+
+      # GET /users/:id
+      get ":id" do
+        @user = User.find(params[:id])
+        present @user, :with => Entities::User
+      end
+    end
+
+    # GET /user
+    get "/user" do
+      authenticate!
+      present @current_user, :with => Entities::User
+    end
+  end
 end
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
new file mode 100644
index 00000000000..3548e8cc5a9
--- /dev/null
+++ b/lib/api/entities.rb
@@ -0,0 +1,8 @@
+module Gitlab
+  module Entities
+    class User < Grape::Entity
+      expose :id, :email, :name, :bio, :skype, :linkedin, :twitter,
+             :dark_scheme, :theme_id, :blocked, :created_at
+    end
+  end
+end
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
new file mode 100644
index 00000000000..cd2e39bf3a7
--- /dev/null
+++ b/lib/api/helpers.rb
@@ -0,0 +1,11 @@
+module Gitlab
+  module APIHelpers
+    def current_user
+      @current_user ||= User.find_by_authentication_token(params[:private_token])
+    end
+
+    def authenticate!
+      error!('401 Unauthorized', 401) unless current_user
+    end
+  end
+end