refactoring, tiny methods...

mistersourcerer · Mar 16, 2012 · 96bcf0a · 96bcf0a
1 parent 5869479
commit 96bcf0a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
@@ -4,6 +4,7 @@ class SessionsController < ApplicationController
 
   def create
     auth.authenticate
+
     if current_user
       redirect_to projects_path
     else

diff --git a/app/models/authenticator.rb b/app/models/authenticator.rb
@@ -14,18 +14,24 @@ def initialize(
   def authenticate
     return false unless @info
 
-    user = @all_users.find_or_initialize_by_email(@info["info"] && @info["info"]["email"])
-    auth = @all_auths.find_or_initialize_by_uid(@info["uid"])
-    user.add_authentication auth
-    @all_users.add_or_update(user)
+    @session[:user] = user_for_info(@info)
 
-    @session[:user] = user
-
-    return true
+    true
   end
 
   def current(key)
     @session[key]
   end
 
+  private
+  def user_for_info(info)
+    user = @all_users.find_or_initialize_by_email(@info["info"] && @info["info"]["email"])
+    auth = @all_auths.find_or_initialize_by_uid(@info["uid"])
+    user.add_authentication auth
+
+    @all_users.add_or_update(user)
+
+    user
+  end
+
 end