summaryrefslogtreecommitdiff
path: root/users/app/controllers
diff options
context:
space:
mode:
authorazul <azul@riseup.net>2013-03-01 03:50:26 -0800
committerazul <azul@riseup.net>2013-03-01 03:50:26 -0800
commita91b77e5b60bb467c2e12fec8bd04d028896ae53 (patch)
tree9f25940168c0c2312eabfcf245c8d71172bd2ba5 /users/app/controllers
parent2eaa2238224408532b5e4eb41662e6dece7ac390 (diff)
parent4a92bab4d8c231a17a14afc81c391f9a1f91c063 (diff)
Merge pull request #32 from azul/feature/api-version-1-fixes
Feature: API version 1 fixes
Diffstat (limited to 'users/app/controllers')
-rw-r--r--users/app/controllers/sessions_controller.rb2
-rw-r--r--users/app/controllers/v1/sessions_controller.rb10
2 files changed, 9 insertions, 3 deletions
diff --git a/users/app/controllers/sessions_controller.rb b/users/app/controllers/sessions_controller.rb
index 0345fbd..01ecff6 100644
--- a/users/app/controllers/sessions_controller.rb
+++ b/users/app/controllers/sessions_controller.rb
@@ -1,7 +1,5 @@
class SessionsController < ApplicationController
- skip_before_filter :verify_authenticity_token
-
def new
@session = Session.new
if authentication_errors
diff --git a/users/app/controllers/v1/sessions_controller.rb b/users/app/controllers/v1/sessions_controller.rb
index 27d10fb..0551ca9 100644
--- a/users/app/controllers/v1/sessions_controller.rb
+++ b/users/app/controllers/v1/sessions_controller.rb
@@ -18,12 +18,20 @@ module V1
def update
authenticate!
- render :json => session.delete(:handshake)
+ render :json => login_response
end
def destroy
logout
redirect_to root_path
end
+
+ protected
+
+ def login_response
+ handshake = session.delete(:handshake)
+ handshake.to_hash.merge(:id => current_user.id)
+ end
+
end
end