appoxy_sessions 0.0.2 → 0.0.3

data/lib/sessions/sessions_controller.rb

@@ -18,9 +18,9 @@ module Appoxy
                 end
 
                 if @has_password == "true"
-                    user = User.authenticate(@email, params[:password])
-
-                    if user
+                    @user = User.find_by_email(@email)
+#                    user = User.authenticate(@email, params[:password])
+                    if @user && @user.authenticate(params[:password])
                         self.current_user = user
                         flash[:info] = "Logged in successfully."
                         orig_url = session[:return_to]

data/lib/sessions/user.rb

@@ -4,6 +4,11 @@ module Appoxy
 
         class User < SimpleRecord::Base
 
+            def self.included(base)
+                puts self.class.name + " included in " + base.class.name
+            end
+
+
             has_strings    :email,
                            {:name => :password, :hashed=>true},
                            :first_name,
@@ -36,21 +41,21 @@ module Appoxy
             end
 
 
-            def self.authenticate(email, password)
+            def authenticate(password)
                 #RAILS_DEFAULT_LOGGER.info "-------authenticating password------"
 
-                u = self.find :first, :conditions => ["email = ?", email]
-                return nil unless u
-                return nil unless u.is_active?
-                return nil if u.attributes["password"].nil? # if the user has no password (will this happen?  maybe for invites...)
+#                u = self.find :first, :conditions => ["email = ?", email]
+#                return nil unless u
+                return nil unless is_active?
+                return nil if attributes["password"].nil? # if the user has no password (will this happen?  maybe for invites...)
 
                 # This is a normal unencrypted password
-                if u.attributes["password"][0].length < 100
-                    u.password = u.attributes["password"][0]
-                    u.save
+                if attributes["password"][0].length < 100
+                    self.password = attributes["password"][0]
+                    self.save
                 end
 
-                (u.password == password) ? u : nil
+                (self.password == password) ? u : nil
             end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: appoxy_sessions
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Travis Reeder