authlogic_crowd 0.3.2 → 0.3.3

data/lib/authlogic_crowd/session.rb

@@ -10,6 +10,15 @@ module AuthlogicCrowd
         persist :persist_by_crowd, :if => :authenticating_with_crowd?
         validate :validate_by_crowd, :if => [:authenticating_with_crowd?, :needs_crowd_validation?]
         before_destroy :logout_of_crowd, :if => :authenticating_with_crowd?
+        before_persisting {|s| s.instance_variable_set('@persisted_by_crowd', false)}
+        after_persisting(:if => [:authenticating_with_crowd?, :persisted_by_crowd?, :explicit_login_from_crowd_token?], :unless => :new_registration?) do |s|
+          # The user was persisted via a crowd token (not an explicit login via username/password).
+          # Simulate explicit login by executing "save" callbacks.
+          s.before_save
+          s.new_session? ? s.before_create : s.before_update
+          s.new_session? ? s.after_create : s.after_update
+          s.after_save
+        end
         after_create(:if => :authenticating_with_crowd?, :unless => :new_registration?) do |s|
           synchronizer = s.crowd_synchronizer
           synchronizer.local_record = s.record
@@ -40,6 +49,16 @@ module AuthlogicCrowd
         rw_config(:auto_register,value,true)
       end
       alias_method :auto_register=, :auto_register
+
+      # Should login via a crowd token be treated as an explicit login?
+      # If true, explicit login callbacks ({before,after}_{create,update,save})
+      # will be triggered when a user is persisted.  If false, the user is
+      # persisted but explicit login callbacks do not fire.
+      # Default false
+      def explicit_login_from_crowd_token(value=nil)
+        rw_config(:explicit_login_from_crowd_token, value, false)
+      end
+      alias_method :explicit_login_from_crowd_token=, :explicit_login_from_crowd_token
     end
 
     module InstanceMethods
@@ -63,6 +82,10 @@ module AuthlogicCrowd
         auto_register?
       end
 
+      def explicit_login_from_crowd_token?
+        !!self.class.explicit_login_from_crowd_token
+      end
+
       def crowd_record
         if @valid_crowd_user[:user_token] && !@valid_crowd_user.has_key?(:record)
           @valid_crowd_user[:record] = crowd_client.find_user_by_token(@valid_crowd_user[:user_token])
@@ -101,7 +124,9 @@ module AuthlogicCrowd
         clear_crowd_auth_cache
         return false unless has_crowd_user_token? && valid_crowd_user_token? && crowd_username
         self.unauthorized_record = find_or_create_record_from_crowd
-        valid?
+        return false unless valid?
+        @persisted_by_crowd = true
+        true
       rescue SimpleCrowd::CrowdError => e
         Rails.logger.warn "CROWD[#{__method__}]: Unexpected error.  #{e}"
         return false
@@ -339,6 +364,10 @@ module AuthlogicCrowd
         !!controller.session[:"crowd.last_user_token"]
       end
 
+      def persisted_by_crowd?
+        !!@persisted_by_crowd
+      end
+
       def has_crowd_user_token?
         !!crowd_user_token
       end

data/lib/authlogic_crowd/version.rb

@@ -1,3 +1,3 @@
 module AuthlogicCrowd
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: authlogic_crowd
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Paul Strong
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-24 00:00:00 Z
+date: 2012-08-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement