devise_pam_authenticatable2 6.0.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9612c985b409e41235b25bff4a0c9110aab3f632
-  data.tar.gz: 9e2a2918a8de29a63d495efb211ce46074086767
+SHA256:
+  metadata.gz: 5745cc55b3ccebdf26683d92c40f957763aa11427c857ae389c3a9ab4ff68f6b
+  data.tar.gz: a6fe0983a958d2e9bacd098d5896eba3af22f4fd7871c23e0f0aa69b335b8361
 SHA512:
-  metadata.gz: 55ec5e1245044b87712279ce487134b5d17e71efe802f6f30301b067e997a2674b520fc6d7391bec42e4cb0246a194bd008ce01c3f3b6ca08684c708018cd6c7
-  data.tar.gz: 7df42cbbc2df9263b44c829f784a4c6f5aa177841b5d8bd0b7014e9574db1583a1dc8b4eaf0cfd6d41a46db020f39351110262566f64475b10f97164b8b766e2
+  metadata.gz: 6ff5f1a174b2f0aed9022f6c9ba137fbaa98eec91c168a622773cd702a21b1e1e3092e287d4059961137f8ab7b4b8f246a945fd0bbefac88fa58fdb8a5d413a0
+  data.tar.gz: 28f19cf3c0d2db216d5671744d5ec8d885d7806b747718169f91db34d47f1f0d6c299a3a4beb03febef903c22a9b5b3533d9a79fd1399bdf8c3d4508cbfe9f54

data/VERSION

@@ -1 +1 @@
-6.0.0
+6.1.0

data/devise_pam_authenticatable2.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: devise_pam_authenticatable2 6.0.0 ruby lib
+# stub: devise_pam_authenticatable2 6.1.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "devise_pam_authenticatable2".freeze
-  s.version = "6.0.0"
+  s.version = "6.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

data/lib/devise_pam_authenticatable/model.rb

@@ -62,8 +62,7 @@ module Devise
       module ClassMethods
         Devise::Models.config(self, :pam_service, :pam_suffix)
 
-        def authenticate_with_pam(attributes = {})
-          return nil unless attributes[:password]
+        def pam_find_user(attributes = {})
           if ::Devise.usernamefield && attributes[:username]
             resource = find_by(::Devise.usernamefield => attributes[:username])
 
@@ -71,9 +70,13 @@ module Devise
               resource = new
               resource[::Devise.usernamefield] = attributes[:username]
             end
-          elsif ::Devise.emailfield
-            return nil unless attributes[:email]
-            resource = find_by(::Devise.emailfield => attributes[:email])
+            return resource
+          elsif ::Devise.emailfield && attributes[:email]
+            if ::Devise.check_at_sign && ::Devise.usernamefield && attributes[:email].index('@').nil?
+              resource = find_by(::Devise.usernamefield => attributes[:email])
+            else
+              resource = find_by(::Devise.emailfield => attributes[:email])
+            end
 
             if resource.blank?
               resource = new
@@ -84,9 +87,14 @@ module Devise
                 resource[::Devise.emailfield] = attributes[:email]
               end
             end
-          else
-            return nil
+            return resource
           end
+        end
+
+        def authenticate_with_pam(attributes = {})
+          return nil unless attributes[:password]
+
+          return nil unless (resource = pam_find_user(attributes))
 
           # potential conflict detected
           resource = resource.pam_conflict(attributes) if resource.pam_conflict?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise_pam_authenticatable2
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.1.0
 platform: ruby
 authors:
 - James Wilson
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Devise PAM authentication module using rpam2