authentasaurus 0.6.5 → 0.6.6

data/lib/active_record/acts_as_authenticatable.rb

@@ -19,11 +19,15 @@ module ActiveRecord::ActsAsAuthenticatable
     
     
     ## Authenticates the username and password
-    def authenticate(username, password)
+    def authenticate(username, password, remember = false)
       user=self.find_by_username username
       if user
         expected_password=encrypt_password(password, user.password_seed)
-        user = nil unless expected_password == user.hashed_password && user.active
+        unless expected_password == user.hashed_password && user.active
+          user = nil 
+        else
+          user.create_remember_me_token if remember
+        end
       end
       return user
     end

data/lib/active_record/acts_as_authenticatable_validatable.rb

@@ -8,11 +8,15 @@ module ActiveRecord::ActsAsAuthenticatableValidatable
   
   module ClassMethods
     ## Authenticates the username and password
-    def authenticate(username, password)
+    def authenticate(username, password, remember = false)
       user=self.find_by_username username
       if user
         expected_password=encrypt_password(password, user.password_seed)
-        user = nil unless expected_password == user.hashed_password && user.active && user.validation.nil?    
+        unless expected_password == user.hashed_password && user.active && user.validation.nil?    
+          user = nil 
+        else
+          user.create_remember_me_token if remember
+        end
       end
       return user
     end

data/lib/active_resource/acts_as_authenticatable.rb

@@ -6,14 +6,14 @@ module ActiveResource::ActsAsAuthenticatable
   
   module ClassMethods
     ## Authenticates the username and password
-    def authenticate(username, password)
+    def authenticate(username, password, remember = false)
       case(self.format)
       when ActiveResource::Formats::XmlFormat
-        user = self.new Hash.from_xml(self.post(:signin,:username => username, :password => password).body).values.first
+        user = self.new Hash.from_xml(self.post(:signin,:username => username, :password => password, :remember => remember).body).values.first
       when ActiveResource::Formats::JsonFormat
-        user = self.new ActiveSupport::JSON.decode(self.post(:signin,:username => username, :password => password).body)
+        user = self.new ActiveSupport::JSON.decode(self.post(:signin,:username => username, :password => password, :remember => remember).body)
       else
-        user = self.new Hash.from_xml(self.post(:signin,:username => username, :password => password).body).values.first
+        user = self.new Hash.from_xml(self.post(:signin,:username => username, :password => password, :remember => remember).body).values.first
       end
       
       unless user.nil?
@@ -25,6 +25,7 @@ module ActiveResource::ActsAsAuthenticatable
             last_update_datetime = (last_update.kind_of?(String)) ? (DateTime.parse(last_update)) : (last_update)
             
             if local_user.updated_at < last_update_datetime
+              
               local_user.update_attributes user.attributes            
             end
           else
@@ -43,7 +44,11 @@ module ActiveResource::ActsAsAuthenticatable
         last_update = user.attributes.delete "updated_at"
         local_user = self.class.sync_to.find_or_initialize_by_username user.username, user.attributes
         
-        local_user.update_attributes user.attributes            
+        unless local_user.new_record?
+          local_user.update_attributes user.attributes            
+        else
+          local_user.save
+        end
       else
         false
       end

data/lib/authentasaurus/models/session.rb

@@ -52,12 +52,11 @@ module Authentasaurus::Models::Session
       
       ret = true
       session_types.each do |type|
-        @user = type.to_s.camelize.constantize.authenticate(self.username, self.password)
+        @user = type.to_s.camelize.constantize.authenticate(self.username, self.password, self.remember == "1")
         if @user.nil?
           self.errors.add_to_base I18n.t(:invalid_login, :scope => [:authentasaurus, :messages, :sessions]) 
           ret &= false
         else
-          @user.create_remember_me_token if self.remember == "1"
           ret = true
           break
         end

data/lib/authentasaurus/sessions_controller.rb

@@ -28,7 +28,7 @@ module Authentasaurus::SessionsController
           end
           session[:user_id] = @session.user.id
           session[:user_permissions] =   {:read => @session.user.permissions.collect{|per| per.area.name if per.read}, :write => @session.user.permissions.collect{|per| per.area.name if per.write}}
-          format.html { redirect_to session[:original_url] || root_url }
+          format.html { redirect_to session[:original_url] || (defined?(signin_redirect_path).nil? ?  root_path : signin_redirect_path) }
         else
           format.html { render :action => :new }
         end
@@ -48,7 +48,9 @@ module Authentasaurus::SessionsController
     
     private
     def check_is_logged_in
-      redirect_to root_path if session[:user_id]
+      if is_logged_in?
+        redirect_to defined?(signin_redirect_path).nil? ?  root_path : signin_redirect_path
+      end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: authentasaurus
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 6
-  - 5
-  version: 0.6.5
+  - 6
+  version: 0.6.6
 platform: ruby
 authors: 
 - Omar Mekky
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-12 00:00:00 +02:00
+date: 2010-08-16 00:00:00 +02:00
 default_executable: 
 dependencies: []