thincloud-authentication 0.6.2 → 0.6.3

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

@@ -8,7 +8,7 @@ module Thincloud::Authentication
     validates :name, presence: true
     validates :email, presence: true, uniqueness: true, format: /@/
     validates :password, presence: { if: :password_required? },
-      confirmation: { if: :password_required? }
+      confirmation: { if: :password_confirmation_required? }
 
     # Ensure that a `verification_token` exists for new records.
     after_initialize do
@@ -42,13 +42,14 @@ module Thincloud::Authentication
     #
     # Returns: An instance of the found `Identity`.
     # Raises: ActiveRecord::RecordNotFound if the `token` cannot be retrieved.
+    #         ActiveRecord::RecordInvalid if the record cannot be saved.
     def self.verify!(token)
       find_by_verification_token!(token).tap do |identity|
         # ensure 'uid' exists, needed for 'identity' provider
         identity.uid = identity.id if identity.uid.blank?
         identity.verification_token = nil
         identity.verified_at = Time.zone.now
-        identity.save
+        identity.save!
       end
     end
 
@@ -85,12 +86,23 @@ module Thincloud::Authentication
     # Returns: true
     #
     # Raises: ActiveRecord::RecordInvalid
-    def generate_password_token!
+    def generate_password_reset!
       self.password_reset_token = SecureRandom.urlsafe_base64
       self.password_reset_sent_at = Time.zone.now
       save!
     end
 
+    # Public: Clear password reset fields, reset password_required? requirement
+    #
+    # Returns: true
+    #
+    # Raises: ActiveRecord::RecordInvalid
+    def clear_password_reset!
+      self.password_reset_token = nil
+      self.password_reset_sent_at = nil
+      save!
+    end
+
     # Public: Determine if the provider is 'identity'
     #
     # Returns: true or false
@@ -102,7 +114,16 @@ module Thincloud::Authentication
     #
     # Returns: true or false
     def password_required?
-      identity_provider? && password_reset_token.blank?
+      identity_provider? && (new_record? || password_reset_token.present?)
+    end
+
+    # Public: Determine if the password confirmation must be provided
+    #
+    # Returns: true or false
+    def password_confirmation_required?
+      password_required? || (
+        password.present? || password_confirmation.present?
+      )
     end
   end
 end

data/app/services/thincloud/authentication/create_invitation_for_user.rb

@@ -9,7 +9,7 @@ module Thincloud::Authentication
                                   email: params[:email], password: password,
                                   password_confirmation: password)
       Identity.verify!(identity.verification_token)
-      identity.generate_password_token!
+      identity.generate_password_reset!
       InvitationsMailer.new_invitation(identity.id).deliver
       true
     rescue ActiveRecord::RecordInvalid

data/app/services/thincloud/authentication/password_reset_workflow.rb

@@ -3,7 +3,7 @@ module Thincloud::Authentication
   class PasswordResetWorkflow
     def self.call(email)
       return unless identity = Identity.find_by_email(email)
-      identity.generate_password_token!
+      identity.generate_password_reset!
       PasswordsMailer.password_reset(identity.id).deliver
     end
   end

data/app/services/thincloud/authentication/update_identity_password.rb

@@ -5,9 +5,8 @@ module Thincloud::Authentication
     def self.call(identity, params)
       identity.password = params[:password]
       identity.password_confirmation = params[:password_confirmation]
-      identity.password_reset_token = nil
-      identity.password_reset_sent_at = nil
       identity.save!
+      identity.clear_password_reset!
     rescue ActiveRecord::RecordInvalid
       identity.reload
       false

data/lib/thincloud/authentication/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thincloud-authentication
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-17 00:00:00.000000000 Z
+date: 2013-05-21 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: -1681311068432426013
+      hash: -4365408844162385494
 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: -1681311068432426013
+      hash: -4365408844162385494
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23