complete signup, login, logout workflow

3 files changed, 18 insertions, 2 deletions

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index e8065d9..693bd86 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,3 +1,10 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
+
+  helper_method :current_user
+
+  private
+  def current_user
+    @current_user ||= User.find(session[:user_id]) if session[:user_id]
+  end
 end
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index 11f18de..68e39bb 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -2,3 +2,14 @@
 
 Try to fetch a 
 = link_to "cert", cert_path
+
+-if current_user
+  %p 
+    logged in as
+    = current_user.login
+    = link_to "logout", logout_path
+-else
+  %p
+    = link_to "login", login_path
+    or 
+    = link_to "signup", signup_path
diff --git a/users/app/views/users/new.html.haml b/users/app/views/users/new.html.haml
index f6ece3a..af53331 100644
--- a/users/app/views/users/new.html.haml
+++ b/users/app/views/users/new.html.haml
@@ -4,7 +4,5 @@
   = f.input :login, :input_html => { :id => :srp_username }
   = f.input :password, :required => true, :input_html => { :id => :srp_password }
   = f.input :password_confirmation, :required => true, :input_html => { :id => :srp_password_confirmation }
-  = f.input :password_verifier, :as => :hidden, :input_html => { :id => :srp_password_verifier }
-  = f.input :password_salt, :as => :hidden, :input_html => { :id => :srp_salt }
   = f.button :submit, :value => t(:signup), :class => 'btn-primary' 
   = link_to t(:cancel), root_url, :class => :btn