projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5627d93
)
fix missing user variable
author
Tom Clegg <tom@clinicalfuture.com>
Thu, 24 Jan 2013 03:03:12 +0000
(19:03 -0800)
committer
Tom Clegg <tom@clinicalfuture.com>
Thu, 24 Jan 2013 03:03:12 +0000
(19:03 -0800)
app/controllers/user_sessions_controller.rb
patch
|
blob
|
history
diff --git
a/app/controllers/user_sessions_controller.rb
b/app/controllers/user_sessions_controller.rb
index 20da46732098dd0b87f699954a62caac98e2ec4c..4b0df68e23983943e030069716d7fc70fd77eabc 100644
(file)
--- a/
app/controllers/user_sessions_controller.rb
+++ b/
app/controllers/user_sessions_controller.rb
@@
-46,7
+46,7
@@
class UserSessionsController < ApplicationController
@redirect_to = root_path
if session.has_key? :return_to
@redirect_to = root_path
if session.has_key? :return_to
- return send_api_token_to(session.delete
:return_to
)
+ return send_api_token_to(session.delete
(:return_to), user
)
end
redirect_to @redirect_to
end
end
redirect_to @redirect_to
end
@@
-76,7
+76,7
@@
class UserSessionsController < ApplicationController
# FIXME: if current_user has never authorized this app before,
# ask for confirmation here!
# FIXME: if current_user has never authorized this app before,
# ask for confirmation here!
- send_api_token_to(params[:return_to])
+ send_api_token_to(params[:return_to]
, current_user
)
else
# TODO: make joshid propagate return_to as a GET parameter, and
# use that GET parameter instead of session[] when redirecting
else
# TODO: make joshid propagate return_to as a GET parameter, and
# use that GET parameter instead of session[] when redirecting
@@
-89,7
+89,7
@@
class UserSessionsController < ApplicationController
end
end
end
end
- def send_api_token_to(callback_url)
+ def send_api_token_to(callback_url
, user
)
# Give the API client a token for making API calls on behalf of
# the authenticated user
# Give the API client a token for making API calls on behalf of
# the authenticated user