From b7cf67590042eca10381a95f8b74070d7430dbdb Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Wed, 31 Oct 2012 10:40:03 +0100
Subject: user creation should send ok flag so js can start login

---
 users/app/models/user.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'users')

diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index 8b7c0b3..b57af98 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)
-- 
cgit v1.2.3


From 4b7333eec8eaf0c01227ade9d77a21f7a879ff0b Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Wed, 31 Oct 2012 17:39:06 +0100
Subject: using controller extensions for application controller by hand

---
 users/app/controllers/application_controller.rb         | 14 --------------
 .../controllers/controller_extension/authentication.rb  | 17 +++++++++++++++++
 users/config/initializers/add_controller_methods.rb     |  3 +++
 3 files changed, 20 insertions(+), 14 deletions(-)
 delete mode 100644 users/app/controllers/application_controller.rb
 create mode 100644 users/app/controllers/controller_extension/authentication.rb
 create mode 100644 users/config/initializers/add_controller_methods.rb

(limited to 'users')

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
diff --git a/users/config/initializers/add_controller_methods.rb b/users/config/initializers/add_controller_methods.rb
new file mode 100644
index 0000000..2579176
--- /dev/null
+++ b/users/config/initializers/add_controller_methods.rb
@@ -0,0 +1,3 @@
+ActiveSupport.on_load(:application_controller) do
+  include ControllerExtension::Authentication
+end
-- 
cgit v1.2.3