Merge pull request #245 from fsmanuel/rss_feed + 1

This commit is contained in:
wvengen 2014-01-06 13:55:32 +01:00
commit 69a29b8296
16 changed files with 171 additions and 6 deletions

View file

@ -30,7 +30,7 @@ class ApplicationController < ActionController::Base
end
private
def authenticate(role = 'any')
# Attempt to retrieve authenticated user from controller instance or session...
if !current_user
@ -87,6 +87,18 @@ class ApplicationController < ActionController::Base
end
end
def authenticate_or_token(prefix, role = 'any')
if not params[:token].blank?
begin
TokenVerifier.new(prefix).verify(params[:token])
rescue ActiveSupport::MessageVerifier::InvalidSignature
redirect_to root_path, alert: I18n.t('application.controller.error_token')
end
else
authenticate(role)
end
end
# Stores this controller instance as a thread local varibale to be accessible from outside ActionController/ActionView.
def store_controller
Thread.current[:application_controller] = self