diff options
author | Azul <azul@leap.se> | 2012-10-11 12:53:10 +0200 |
---|---|---|
committer | Azul <azul@leap.se> | 2012-10-11 12:53:10 +0200 |
commit | 09003d3d2df7c250d3a0b55e83094e5e27094859 (patch) | |
tree | 90d2a851cd558652121182937a5ec8373722cab0 /users/app/controllers/sessions_controller.rb | |
parent | 118d9ab5c9f4d7a82b7cf24774ef12d3c221f8ef (diff) | |
parent | 33ef3d2ac9a03b06ff29f1367c69731a89f1dfc7 (diff) |
Merge branch 'release-0.1.0' into develop
Diffstat (limited to 'users/app/controllers/sessions_controller.rb')
-rw-r--r-- | users/app/controllers/sessions_controller.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/users/app/controllers/sessions_controller.rb b/users/app/controllers/sessions_controller.rb index b8043f5..284c0e2 100644 --- a/users/app/controllers/sessions_controller.rb +++ b/users/app/controllers/sessions_controller.rb @@ -9,7 +9,7 @@ class SessionsController < ApplicationController @user = User.find_by_param(params[:login]) session[:handshake] = @user.initialize_auth(params['A'].hex) User.current = @user #? - render :json => { :B => session[:handshake].bb.to_s(16), :salt => @user.password_salt } + render :json => session[:handshake] rescue RECORD_NOT_FOUND render :json => {:errors => {:login => ["unknown user"]}} end @@ -18,10 +18,10 @@ class SessionsController < ApplicationController # TODO: validate the id belongs to the session @user = User.find_by_param(params[:id]) @srp_session = session.delete(:handshake) - @server_auth = @srp_session.authenticate!(params[:client_auth].hex) + @srp_session.authenticate!(params[:client_auth].hex) session[:user_id] = @user.id User.current = @user #? - render :json => {:M2 => "%064x" % @server_auth} + render :json => @srp_session rescue WRONG_PASSWORD session[:handshake] = nil render :json => {:errors => {"password" => ["wrong password"]}} |