thincloud-authentication 0.6.3 → 0.6.4

data/app/models/thincloud/authentication/identity.rb

@@ -13,6 +13,7 @@ module Thincloud::Authentication
     # Ensure that a `verification_token` exists for new records.
     after_initialize do
       self.verification_token = SecureRandom.urlsafe_base64 if new_record?
+      self.resetting_identity_password = false
     end
 
     # Only validate password if the 'provider' is 'identity'.
@@ -89,7 +90,7 @@ module Thincloud::Authentication
     def generate_password_reset!
       self.password_reset_token = SecureRandom.urlsafe_base64
       self.password_reset_sent_at = Time.zone.now
-      save!
+      save_with_identity_password_reset!
     end
 
     # Public: Clear password reset fields, reset password_required? requirement
@@ -114,7 +115,9 @@ module Thincloud::Authentication
     #
     # Returns: true or false
     def password_required?
-      identity_provider? && (new_record? || password_reset_token.present?)
+      (identity_provider? && check_identity_password?) && (
+        new_record? || password_reset_token.present?
+      )
     end
 
     # Public: Determine if the password confirmation must be provided
@@ -125,5 +128,21 @@ module Thincloud::Authentication
         password.present? || password_confirmation.present?
       )
     end
+
+    private
+
+    attr_accessor :resetting_identity_password
+
+    def check_identity_password?
+      !resetting_identity_password
+    end
+
+    def save_with_identity_password_reset!
+      self.resetting_identity_password = true
+      save!
+    ensure
+      self.resetting_identity_password = false
+    end
+
   end
 end

data/lib/thincloud/authentication/version.rb

@@ -1,5 +1,5 @@
 module Thincloud
   module Authentication
-    VERSION = "0.6.3"
+    VERSION = "0.6.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thincloud-authentication
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -150,7 +150,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4365408844162385494
+      hash: -688498285375769564
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4365408844162385494
+      hash: -688498285375769564
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23