diff options
author | Robert Schilling <rschilling@student.tugraz.at> | 2016-11-09 19:36:35 +0300 |
---|---|---|
committer | Robert Schilling <rschilling@student.tugraz.at> | 2016-11-09 19:36:35 +0300 |
commit | 603ebe55f0232f16b5f1db95d2962a4cf5cdcc1b (patch) | |
tree | 78dbf11edfbdd1bf2f93331c2096c6b09bcba13e /lib/api | |
parent | c392b0cc24ba40e3fed920c6c693cb24665193af (diff) |
Grapify the session API
Diffstat (limited to 'lib/api')
-rw-r--r-- | lib/api/session.rb | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/lib/api/session.rb b/lib/api/session.rb index 55ec66a6d67..d09400b81f5 100644 --- a/lib/api/session.rb +++ b/lib/api/session.rb @@ -1,15 +1,14 @@ module API - # Users API class Session < Grape::API - # Login to get token - # - # Parameters: - # login (*required) - user login - # email (*required) - user email - # password (required) - user password - # - # Example Request: - # POST /session + desc 'Login to get token' do + success Entities::UserLogin + end + params do + optional :login, type: String, desc: 'The username' + optional :email, type: String, desc: 'The email of the user' + requires :password, type: String, desc: 'The password of the user' + at_least_one_of :login, :email + end post "/session" do user = Gitlab::Auth.find_with_user_password(params[:email] || params[:login], params[:password]) |