summaryrefslogtreecommitdiff
path: root/users/app
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2012-11-02 11:12:15 -0700
committerjessib <jessib@riseup.net>2012-11-02 11:12:15 -0700
commit4db41d772725387ba36240cf8f3529780e896755 (patch)
tree4c4e0f7651ee100f93273775ec934dba1a934724 /users/app
parent8b5f7fb6ef438ef034541d6fb500b5ab7e12f3f2 (diff)
parent872b9fa6759d5708f5efb19ba46b3c8e2b5d4862 (diff)
Merge branch 'feature-admin_users' into help_develop
Diffstat (limited to 'users/app')
-rw-r--r--users/app/controllers/controller_extension/authentication.rb21
-rw-r--r--users/app/models/user.rb10
-rw-r--r--users/app/views/sessions/_nav.html.haml5
3 files changed, 26 insertions, 10 deletions
diff --git a/users/app/controllers/controller_extension/authentication.rb b/users/app/controllers/controller_extension/authentication.rb
index 507b62f..c3342f3 100644
--- a/users/app/controllers/controller_extension/authentication.rb
+++ b/users/app/controllers/controller_extension/authentication.rb
@@ -4,14 +4,31 @@ module ControllerExtension::Authentication
private
included do
- helper_method :current_user
+ helper_method :current_user, :logged_in?, :admin?
end
def current_user
@current_user ||= User.find(session[:user_id]) if session[:user_id]
end
+ def logged_in?
+ !!current_user
+ end
+
def authorize
- redirect_to login_url, :alert => "Not authorized" if current_user.nil?
+ access_denied unless logged_in?
end
+
+ def access_denied
+ redirect_to login_url, :alert => "Not authorized"
+ end
+
+ def admin?
+ current_user && current_user.is_admin?
+ end
+
+ def authorize_admin
+ access_denied unless admin?
+ end
+
end
diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index a06893f..0f5d650 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -66,13 +66,9 @@ class User < CouchRest::Model::Base
login
end
-=begin
- def self.current
- Thread.current[:user]
+ # Since we are storing admins by login, we cannot allow admins to change their login.
+ def is_admin?
+ APP_CONFIG['admins'].include? self.login
end
- def self.current=(user)
- Thread.current[:user] = user
- end
-=end
end
diff --git a/users/app/views/sessions/_nav.html.haml b/users/app/views/sessions/_nav.html.haml
index a5397bd..204ba88 100644
--- a/users/app/views/sessions/_nav.html.haml
+++ b/users/app/views/sessions/_nav.html.haml
@@ -1,6 +1,9 @@
-- if current_user
+- if logged_in?
%li
+ = 'logged in as ' + current_user.login
= link_to t(:logout), logout_path
+ - if admin?
+ = 'ADMIN' # obviously not like this
- else
%li
= link_to t(:login), login_path