summaryrefslogtreecommitdiff
path: root/users/app
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2012-10-31 11:14:38 -0700
committerjessib <jessib@riseup.net>2012-10-31 11:14:38 -0700
commitfa6c453603d2754644f80efc6e8a0f6e792cc9bd (patch)
tree4ec755dc917fea9eba4c94d988a0aae25eca6790 /users/app
parenta2a8caf577415ef51c0f99da43f9b47bde226fc6 (diff)
parentfc625a54eb5c54cecb5331811ff482df12b7c059 (diff)
Merge branch 'develop' into feature-admin_users
Conflicts: users/app/controllers/application_controller.rb users/app/models/user.rb
Diffstat (limited to 'users/app')
-rw-r--r--users/app/controllers/application_controller.rb32
-rw-r--r--users/app/controllers/controller_extension/authentication.rb17
-rw-r--r--users/app/models/user.rb5
3 files changed, 21 insertions, 33 deletions
diff --git a/users/app/controllers/application_controller.rb b/users/app/controllers/application_controller.rb
deleted file mode 100644
index 0d6e5d1..0000000
--- a/users/app/controllers/application_controller.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-class ApplicationController < ActionController::Base
- protect_from_forgery
-
- protected
-
- def current_user
- @current_user ||= User.find(session[:user_id]) if session[:user_id]
- end
- helper_method :current_user
-
- def logged_in?
- !!current_user
- end
- helper_method :logged_in?
-
- def authorize
- access_denied unless logged_in?
- end
-
- def admin?
- current_user && current_user.is_admin?
- end
- helper_method :admin?
-
- def authorize_admin
- access_denied unless admin?
- end
-
- def access_denied
- redirect_to login_url, :alert => "Not authorized"
- 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
diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index 9bbf169..2b8ead7 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -44,7 +44,10 @@ class User < CouchRest::Model::Base
end
def to_json(options={})
- super(options.merge(:only => ['login', 'password_salt']))
+ {
+ :login => login,
+ :ok => valid?
+ }.to_json(options)
end
def initialize_auth(aa)