ref: refs/heads/master
commit 7786f59c402295cff748526d423681f6046ef987
Author: Stefan Schubert
Date: Tue Jul 21 15:20:55 2009 +0200
auth_token will ALSO be set by remember_me
---
webservice/app/controllers/sessions_controller.rb | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/webservice/app/controllers/sessions_controller.rb b/webservice/app/controllers/sessions_controller.rb
index 44b63b0..86295c2 100644
--- a/webservice/app/controllers/sessions_controller.rb
+++ b/webservice/app/controllers/sessions_controller.rb
@@ -35,14 +35,13 @@ class SessionsController < ApplicationController
end
@cmd_ret = Hash.new
if logged_in?
- auth_token = { :value => self.current_account.remember_token , :expires => self.current_account.remember_token_expires_at }
if params[:remember_me]
current_account.remember_me unless current_account.remember_token?
- cookies[:auth_token] = auth_token
+ cookies[:auth_token] = { :value => self.current_account.remember_token , :expires => self.current_account.remember_token_expires_at }
end
@cmd_ret["login"] = "granted"
- @cmd_ret["auth_token"] = auth_token
+ @cmd_ret["auth_token"] = { :value => self.current_account.remember_token , :expires => self.current_account.remember_token_expires_at }
else
@cmd_ret["login"] = "denied"
end
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
