diff options
author | randx <dmitriy.zaporozhets@gmail.com> | 2012-09-20 20:35:56 +0400 |
---|---|---|
committer | randx <dmitriy.zaporozhets@gmail.com> | 2012-09-20 20:35:56 +0400 |
commit | 49fe8fed11d5a8b73e15b507b214ea10b61524a5 (patch) | |
tree | 64569541bef730f8ef7bf321261ffb8ffe2be470 /lib | |
parent | a605943d76216f2c5e78178c2b87ed92ff79741f (diff) | |
parent | d12579aa43372bdaa5989eee95db9c10e89befe7 (diff) |
Merge branch 'api'
Diffstat (limited to 'lib')
-rw-r--r-- | lib/api/entities.rb | 8 | ||||
-rw-r--r-- | lib/api/session.rb | 5 |
2 files changed, 5 insertions, 8 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 5d8cc2765b1..a8b786aebb0 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -9,8 +9,8 @@ module Gitlab expose :id, :email, :name, :blocked, :created_at end - class UserLogin < Grape::Entity - expose :id, :email, :name, :private_token, :blocked, :created_at + class UserLogin < UserBasic + expose :private_token end class Hook < Grape::Entity @@ -56,9 +56,7 @@ module Gitlab end class Key < Grape::Entity - expose :id, - :title, - :key + expose :id, :title, :key end end end diff --git a/lib/api/session.rb b/lib/api/session.rb index 5bcdf93abe9..b4050160ae4 100644 --- a/lib/api/session.rb +++ b/lib/api/session.rb @@ -8,14 +8,13 @@ module Gitlab post "/session" do resource = User.find_for_database_authentication(email: params[:email]) - return forbidden! unless resource + return unauthorized! unless resource if resource.valid_password?(params[:password]) present resource, with: Entities::UserLogin else - forbidden! + unauthorized! end end end end - |