summaryrefslogtreecommitdiff
path: root/users/app/controllers
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2012-10-31 10:43:33 -0700
committerjessib <jessib@riseup.net>2012-10-31 10:43:33 -0700
commitfc625a54eb5c54cecb5331811ff482df12b7c059 (patch)
tree6ffae8ccde3662360416fc2ce6e15ccfc2cf29a4 /users/app/controllers
parent2de76b40a926985fce186c8ba18450d310ed4fa3 (diff)
parent4b7333eec8eaf0c01227ade9d77a21f7a879ff0b (diff)
Merge branch 'develop' of ssh://leap.se/leap_web into develop
Diffstat (limited to 'users/app/controllers')
-rw-r--r--users/app/controllers/application_controller.rb14
-rw-r--r--users/app/controllers/controller_extension/authentication.rb17
2 files changed, 17 insertions, 14 deletions
diff --git a/users/app/controllers/application_controller.rb b/users/app/controllers/application_controller.rb
deleted file mode 100644
index 64e1a55..0000000
--- a/users/app/controllers/application_controller.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class ApplicationController < ActionController::Base
- protect_from_forgery
-
- private
-
- def current_user
- @current_user ||= User.find(session[:user_id]) if session[:user_id]
- end
- helper_method :current_user
-
- def authorize
- redirect_to login_url, alert: "Not authorized" if current_user.nil?
- end
-end
diff --git a/users/app/controllers/controller_extension/authentication.rb b/users/app/controllers/controller_extension/authentication.rb
new file mode 100644
index 0000000..507b62f
--- /dev/null
+++ b/users/app/controllers/controller_extension/authentication.rb
@@ -0,0 +1,17 @@
+module ControllerExtension::Authentication
+ extend ActiveSupport::Concern
+
+ private
+
+ included do
+ helper_method :current_user
+ end
+
+ def current_user
+ @current_user ||= User.find(session[:user_id]) if session[:user_id]
+ end
+
+ def authorize
+ redirect_to login_url, :alert => "Not authorized" if current_user.nil?
+ end
+end