sequel_simple_oauth2 0.0.0 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdc8cea8d123da0b5cd1b63b0aa769de4b69ce9917823f464089bdebd77558fe
-  data.tar.gz: 9120d637e4ae1e1613ba07494266f3e267edc79e67395e3a17570886216dbb73
+  metadata.gz: 53006a40c16c0f2b5bf90b71cb711cf846581e36c042e3d61ad62d5612c82ff2
+  data.tar.gz: c3c0b7aa1f2df17d89d9180beb9ad85325de46499d61889127355bff86246679
 SHA512:
-  metadata.gz: 19f7de1cb63d8315b73c9a7f95176bcdb9f54d2e3f1449e44fbd81a78375007bef543c3b22e3a8f5af2004aa3f38b963b3a2f7b17ad2163f1da9659a785d6512
-  data.tar.gz: 90ba8f192d7701304ce43ceda4cf0cccf987092a9fb621c0423cae67f22cb0456b2428f6a604a9c6b80ce50b10f82f992cd856d15701243d0752e8293055c49c
+  metadata.gz: 3144794a8c449f6be7bf2270264d3b10cf5ec3a0e75823a0886fdf6b1f12c763108ee81f1ece101a9b9528182a4ef249ff294357f4534a7a1a70e6d02b1ade85
+  data.tar.gz: 2e165f47922a377258e8aebe98fff39e7f5fe42d7d50d36e9c099c747f8f3182b2b57271094851ef8fae907f7123468c0b12b6209a2516d32b2f14a37fe41eaf

data/lib/sequel_simple_oauth2/mixins/resource_owner.rb

@@ -1,3 +1,4 @@
+# rubocop:disable Style/GuardClause
 module Sequel
   module Simple
     module OAuth2
@@ -6,20 +7,95 @@ module Sequel
       module ResourceOwner
         extend ActiveSupport::Concern
 
-        included do
+        included do # rubocop:disable Metrics/BlockLength
+          include BCrypt
+
+          attr_accessor :password_confirmation
+
+          # BCrypt hash function can handle maximum 72 characters, and if we pass
+          # password of length more than 72 characters it ignores extra characters.
+          # Hence need to put a restriction on password length.
+          MAX_PASSWORD_LENGTH_ALLOWED = 72
+
+          plugin :validation_helpers
           plugin :timestamps, force: true, update_on_create: true
 
-          # Searches for ResourceOwner record with the specific params.
+          # Required fields!
+          def validate
+            super
+            validates_presence :password
+            validates_max_length MAX_PASSWORD_LENGTH_ALLOWED, :password_confirmation, allow_nil: true
+
+            if password_confirmation.present? && password != password_confirmation
+              errors.add(:password_confirmation, 'must match with password')
+            end
+          end
+
+          # Returns resource if the password is correct, otherwise +false+.
+          #
+          # @param pass [String] Password value.
+          #
+          # @return [Object, false] ResourceOwner object or false if password is incorrect.
+          #
+          # @example
+          #   user = User.new(password: 'foo')
+          #   user.save
+          #   user.authenticate('notfoo') # => false
+          #   user.authenticate('foo')    # => user
+          #
+          def authenticate(pass)
+            password.is_password?(pass) && self
+            # BCrypt::Password.new(encrypted_password).is_password?(pass) && self
+          end
+
+          # Returns encrypted password if encrypted_password is not empty.
           #
-          # @param _client [Object] Client instance.
-          # @param username [String, #to_s] username value (any object that responds to `#to_s`).
-          # @param password [String] password value.
+          # @return [String] Encrypted password.
           #
-          # @return [Object, nil] ResourceOwner object or nil if there is no record with such params.
+          # @example
+          #   user = User.new
+          #   user.password = 'foo'
+          #   user.password          #=> "$2a$10$4LEA7r4YmNHtvlAvHhsYAeZmk/xeUVtMTYqwIvYY76EW5GUqDiP4."
+          #   user.password == 'foo' #=> true
           #
-          def self.oauth_authenticate(_client, username, password)
-            user = find(username: username.to_s)
-            user if user && user.encrypted_password == password
+          def password
+            @password ||= BCrypt::Password.new(encrypted_password) if encrypted_password
+          end
+
+          # Allows to increase the amount of work required to hash a password as computers get faster.
+          # Old passwords will still work fine, but new passwords can keep up with the times.
+          # If true returns BCrypt::Engine::MIN_COST otherwise BCrypt::Engine.cost.
+          #
+          # @example
+          #   user = User.new
+          #   user.min_cost? #=> false
+          #
+          def min_cost?
+            false
+          end
+
+          # Encrypts the password into the encrypted_password attribute, only if the new password is not empty.
+          #
+          # @param pass [String] Password value.
+          #
+          # @return [String] Encrypted password.
+          #
+          # @example
+          #   user = User.new
+          #   user.password = nil
+          #   user.encrypted_password #=> nil
+          #   user.password = 'foo'
+          #   user.encrypted_password #=> "$2a$10$4LEA7r4YmNHtvlAvHhsYAeZmk/xeUVtMTYqwIvYY76EW5GUqDiP4."
+          #
+          def password=(pass)
+            if pass.present? && pass.length >= MAX_PASSWORD_LENGTH_ALLOWED
+              raise(ArgumentError, "Password is longer than #{MAX_PASSWORD_LENGTH_ALLOWED} characters")
+            elsif pass.present?
+              cost = min_cost? ? BCrypt::Engine::MIN_COST : BCrypt::Engine.cost
+              new_password = BCrypt::Password.create(pass, cost: cost)
+            end
+
+            self.encrypted_password = new_password
           end
         end
       end

data/lib/sequel_simple_oauth2/version.rb

@@ -16,7 +16,7 @@ module Sequel
         # Level changes for implementation level detail changes, such as small bug fixes
         PATCH = 0
         # Level changes for any backwards compatible API changes, such as new functionality/features
-        MINOR = 0
+        MINOR = 1
         # Level changes for backwards incompatible API changes,
         # such as changes that will break existing users code if they update
         MAJOR = 0

data/lib/sequel_simple_oauth2.rb

@@ -1,4 +1,5 @@
 require 'simple_oauth2'
+require 'bcrypt'
 
 require 'sequel_simple_oauth2/mixins/access_token'
 require 'sequel_simple_oauth2/mixins/access_grant'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel_simple_oauth2
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.1.0
 platform: ruby
 authors:
 - Volodimir Partytskyi