token_authenticate_me 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 335a9e636eed767d73c726efbab33ae3ab92241f
-  data.tar.gz: ff36f8fdd86b29d26a1f8af6213a3ac9d5e9ee14
+  metadata.gz: acd64a495fdc9e206c3ae27f49b0dc6886f9085d
+  data.tar.gz: 5b1cb379dd26241a1cf626a88cdc2e46ae8e5ad0
 SHA512:
-  metadata.gz: bfab316dbc8efa72f6661623262e7c55d983fc27e82010e5e5b8761ebacff19a85f284f92c08bc11bb81f0a69bd0c65a9d8b80ac82f1c615a3fd3a8fc8383620
-  data.tar.gz: 6917cb2e8de37e7530bd5958ac4ea992f24393169ae77b5e8e591b93045a41ac0fe0853c53e9e81b0c59c94ef5f1516767185acba058b190165fedd6e47b79ac
+  metadata.gz: 2e094a61e62bff61586fec854175a17b0a71debcff1c9d717bf13a1a406fa4a9275e997c311560d96ac65a7704f2d36d1e4f76b4b7d359a3a63e21fa78fe6077
+  data.tar.gz: 9a6a433e85da4e5d0eb9a7d4c1f5875e2a97748f5a92e2a92c4cbcdafb197d02fd042ab230de91538b410f04e0b1c86a4861e65c6c02b00075b7dc5cbb5e6406

data/README.md

@@ -54,10 +54,12 @@ end
 ````
 
 ## Authentication Model
-The model has 3 concerns:
+The model has 4 concerns:
 * [Authenticatable](https://github.com/wildland/token_authenticate_me/blob/master/lib/token_authenticate_me/concerns/models/authenticatable.rb)
 * [Invitable](https://github.com/wildland/token_authenticate_me/blob/master/lib/token_authenticate_me/concerns/models/invitable.rb)
 * [Sessionable](https://github.com/wildland/token_authenticate_me/blob/master/lib/token_authenticate_me/concerns/models/sessionable.rb)
+*
+[Passwordable](https://github.com/wildland/token_authenticate_me/blob/master/lib/token_authenticate_me/concerns/models/passwordable.rb)
 
 *tl;dr*:
 * `email` is required, can't be blank, is unique (case insensitive), and must look like an email address.

data/lib/token_authenticate_me.rb

@@ -22,6 +22,7 @@ module TokenAuthenticateMe
       autoload :Authenticatable, 'token_authenticate_me/concerns/models/authenticatable'
       autoload :Invitable, 'token_authenticate_me/concerns/models/invitable'
       autoload :Sessionable, 'token_authenticate_me/concerns/models/sessionable'
+      autoload :Passwordable, 'token_authenticate_me/concerns/models/passwordable'
     end
   end
 

data/lib/token_authenticate_me/concerns/controllers/authenticateable.rb

@@ -6,6 +6,10 @@ module TokenAuthenticateMe
     module Controllers
       module Authenticateable
         extend ActiveSupport::Concern
+        
+        included do
+          before_action :authenticate # By default authenticate every action
+        end
 
         # Standard authentication routine, override to implement different auth strategies.
         def token_handler(token, options)

data/lib/token_authenticate_me/concerns/controllers/token_authenticateable.rb

@@ -11,11 +11,6 @@ module TokenAuthenticateMe
 
         include TokenAuthenticateMe::Concerns::Controllers::Authenticateable
 
-        included do
-          before_action :authenticate # By default authenticate every action
-        end
-
-
         protected
 
         def authenticated_session

data/lib/token_authenticate_me/concerns/models/authenticatable.rb

@@ -1,14 +1,14 @@
 require 'active_support/concern'
+require 'token_authenticate_me/concerns/models/passwordable'
 
 module TokenAuthenticateMe
   module Concerns
     module Models
       module Authenticatable
         extend ActiveSupport::Concern
+          include TokenAuthenticateMe::Concerns::Models::Passwordable
 
         included do
-          has_secure_password validations: false
-          attr_accessor :current_password
 
           has_many :sessions, dependent: :destroy
           has_many :invites, inverse_of: 'creator', foreign_key: 'creator_id'
@@ -30,19 +30,6 @@ module TokenAuthenticateMe
             uniqueness: { case_sensitive: false }
           )
 
-          validates(
-            :password,
-            presence: true,
-            length: { in: 8..72 },
-            confirmation: true,
-            if: :password_required?
-          )
-
-          validate(
-            :current_password_correct,
-            if: :current_password_required?
-          )
-
           def attributes
             {
               'id' => id,
@@ -56,46 +43,6 @@ module TokenAuthenticateMe
           def as_json(options = nil)
             { user: super(options) }
           end
-
-          def create_reset_token!
-            # rubocop:disable Lint/Loop
-            begin
-              self.reset_password_token = SecureRandom.hex
-            end while self.class.exists?(reset_password_token: reset_password_token)
-
-            self.reset_password_token_exp = password_expiration_hours.hours.from_now
-            save!
-          end
-
-          def password_expiration_hours
-            8
-          end
-
-          def password=(unencrypted_password)
-            super(unencrypted_password) unless unencrypted_password.blank? && !password_required?
-          end
-
-          def current_password_correct
-            user_with_old_password = self.class.find_by_id(id)
-            errors.add(:current_password, 'is required to change email and/or password') if current_password.blank? # rubocop:disable Metrics/LineLength
-            errors.add(:current_password, 'is incorrect') unless user_with_old_password.authenticate(current_password)
-          end
-
-          def current_password_required?
-            !new_record? && (email_changed? || attempting_to_change_password?) && !password_resetting?
-          end
-
-          def password_resetting?
-            reset_password_token_changed? && reset_password_token_exp_changed?
-          end
-
-          def password_required?
-            attempting_to_change_password? || new_record?
-          end
-
-          def attempting_to_change_password?
-            (!password.blank? || !password_confirmation.blank?) && password_digest_changed?
-          end
         end
       end
     end

data/lib/token_authenticate_me/concerns/models/passwordable.rb

@@ -0,0 +1,70 @@
+require 'active_support/concern'
+
+module TokenAuthenticateMe
+  module Concerns
+    module Models
+      module Passwordable
+        extend ActiveSupport::Concern
+
+        included do
+
+          has_secure_password validations: false
+          attr_accessor :current_password
+
+          validates(
+            :password,
+            presence: true,
+            length: { in: 8..72 },
+            confirmation: true,
+            if: :password_required?
+          )
+
+          validate(
+            :current_password_correct,
+            if: :current_password_required?
+          )
+
+          def create_reset_token!
+            # rubocop:disable Lint/Loop
+            begin
+              self.reset_password_token = SecureRandom.hex
+            end while self.class.exists?(reset_password_token: reset_password_token)
+
+            self.reset_password_token_exp = password_expiration_hours.hours.from_now
+            save!
+          end
+
+          def password_expiration_hours
+            8
+          end
+
+          def password=(unencrypted_password)
+            super(unencrypted_password) unless unencrypted_password.blank? && !password_required?
+          end
+
+          def current_password_correct
+            user_with_old_password = self.class.find_by_id(id)
+            errors.add(:current_password, 'is required to change email and/or password') if current_password.blank? # rubocop:disable Metrics/LineLength
+            errors.add(:current_password, 'is incorrect') unless user_with_old_password.authenticate(current_password)
+          end
+
+          def current_password_required?
+            !new_record? && (email_changed? || attempting_to_change_password?) && !password_resetting?
+          end
+
+          def password_resetting?
+            reset_password_token_changed? && reset_password_token_exp_changed?
+          end
+
+          def password_required?
+            attempting_to_change_password? || new_record?
+          end
+
+          def attempting_to_change_password?
+            (!password.blank? || !password_confirmation.blank?) && password_digest_changed?
+          end
+        end
+      end
+    end
+  end
+end

data/lib/token_authenticate_me/version.rb

@@ -1,3 +1,3 @@
 module TokenAuthenticateMe
-  VERSION = '0.6.0'.freeze
+  VERSION = '0.7.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: token_authenticate_me
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Sam Clopton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-07 00:00:00.000000000 Z
+date: 2017-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -125,6 +125,7 @@ files:
 - lib/token_authenticate_me/concerns/controllers/token_sessionable.rb
 - lib/token_authenticate_me/concerns/models/authenticatable.rb
 - lib/token_authenticate_me/concerns/models/invitable.rb
+- lib/token_authenticate_me/concerns/models/passwordable.rb
 - lib/token_authenticate_me/concerns/models/sessionable.rb
 - lib/token_authenticate_me/configuration.rb
 - lib/token_authenticate_me/engine.rb