summaryrefslogtreecommitdiff
path: root/users/app/controllers/v1/sessions_controller.rb
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2013-04-08 11:04:01 -0700
committerjessib <jessib@riseup.net>2013-04-08 11:04:01 -0700
commit176845b45f6982b0bf26aa69e7432562eed97c69 (patch)
tree1dd74d5afcdb8cfb96588937eda612b37449923c /users/app/controllers/v1/sessions_controller.rb
parent602229c463c58be9ffb909570155d14d59f6b4d5 (diff)
parent654ab25fa4659119d5ddaa9ae116fce69a386ab1 (diff)
Merge pull request #41 from azul/feature/allow-getting-salt
Allow getting salt and proper error messages for invalid login attempts
Diffstat (limited to 'users/app/controllers/v1/sessions_controller.rb')
-rw-r--r--users/app/controllers/v1/sessions_controller.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/users/app/controllers/v1/sessions_controller.rb b/users/app/controllers/v1/sessions_controller.rb
index 0551ca9..9365d76 100644
--- a/users/app/controllers/v1/sessions_controller.rb
+++ b/users/app/controllers/v1/sessions_controller.rb
@@ -13,7 +13,12 @@ module V1
def create
logout if logged_in?
- authenticate!
+ if params['A']
+ authenticate!
+ else
+ @user = User.find_by_login(params['login'])
+ render :json => {salt: @user.salt}
+ end
end
def update