devise_pam_authenticatable2 7.0.0 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 966160894cd8d15cd2e1bc0ebcb139cd278a37711920678a5b9d8502abaea7ca
-  data.tar.gz: 6b200c6f8a5c925b43b3a1b5de7a217ae916c56a42329847cdbf91058e0e66cf
+  metadata.gz: ed80e89e22bcab5812a8e0988be73284e18e13c3298e29b8d32c1fc93896dde9
+  data.tar.gz: a53fb17c6844fad88d17d97f17d57962f680855ce6855821528ecb928332280d
 SHA512:
-  metadata.gz: 8ac0af36a708b480290686ffba144019c27dcc130a9ceb67d964bba768aba20cf7f9095ff850081dccc0c08b0fa36a37dac7e5efa05b3b1b3b43286525dd1b54
-  data.tar.gz: 55b4a51494f4e595c76d63bbc063dcd279741bf84ecb76a6d764b21b161cdea2d01db62e8270f81b7fd40a961d145bfb852bfd689a28ec836e10f24ecd3fae26
+  metadata.gz: 606e8b5a00a4334aecb25e1d224f3baf225af7466baac49d35ea10b946ba778da95d0a8b3788b1b2e0e818c2504490c0bd9d8d65ec395509fd3628fd9461e220
+  data.tar.gz: cb6f8d03645e2a1e055be4fa5bccbd082656c2a8d3846c0e7aad9f5d93b7d8d6f08270f0feb5a555271d67121d4739aa4272559cbb04fa55c09ff1532a67f378

data/VERSION

@@ -1 +1 @@
-7.0.0
+8.0.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 7.0.0 ruby lib
+# stub: devise_pam_authenticatable2 8.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "devise_pam_authenticatable2".freeze
-  s.version = "7.0.0"
+  s.version = "8.0.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

@@ -4,21 +4,28 @@ module Devise
   module Models
     module PamAuthenticatable
 
-      def get_pam_service
+      def find_pam_service
         return self.class.pam_service if self.class.instance_variable_defined?('@pam_service')
         ::Devise.pam_default_service
       end
 
-      def get_pam_suffix
+      def find_pam_suffix
         return self.class.pam_suffix if self.class.instance_variable_defined?('@pam_suffix')
         ::Devise.pam_default_suffix
       end
 
-      def pam_conflict(_attributes)
-        # solve conflict between other and pam related user accounts
-        # to disable login with pam return nil elsewise return a (different?) user object
-        # as default assume there is never a conflict and return user object unchanged
-        self
+      def pam_get_name
+        return self[::Devise.usernamefield] if ::Devise.usernamefield && self[::Devise.usernamefield]
+        return nil unless ::Devise.emailfield && (suffix = find_pam_suffix)
+        email = "#{self[::Devise.emailfield]}\n"
+        pos = email.index("@#{suffix}\n")
+        return nil unless pos
+        email.slice(0, pos)
+      end
+
+      def is_pam_account?
+        return false unless pam_get_name
+        Rpam2.account(find_pam_service, pam_get_name)
       end
 
       def pam_conflict?
@@ -27,31 +34,24 @@ module Devise
         resource.respond_to?('password') && resource.password.present? && is_pam_account?
       end
 
-      def is_pam_account?
-        return false unless get_pam_name
-        Rpam2.account(get_pam_service, get_pam_name)
+      def pam_conflict(_attributes)
+        # solve conflict between other and pam related user accounts
+        # to disable login with pam return nil elsewise return a (different?) user object
+        # as default assume the conflict ok and return user object unchanged
+        self
       end
 
       def pam_setup(attributes)
         return unless ::Devise.emailfield && ::Devise.usernamefield
-        self[::Devise.emailfield] = Rpam2.getenv(get_pam_service, get_pam_name, attributes[:password], 'email', false)
+        self[::Devise.emailfield] = Rpam2.getenv(find_pam_service, pam_get_name, attributes[:password], 'email', false)
         self[::Devise.emailfield] = attributes[::Devise.emailfield] if self[::Devise.emailfield].nil?
-        self[::Devise.emailfield] = "#{self[::Devise.usernamefield]}@#{get_pam_suffix}" if self[::Devise.emailfield].nil? && get_pam_suffix
-      end
-
-      def get_pam_name
-        return self[::Devise.usernamefield] if ::Devise.usernamefield && self[::Devise.usernamefield]
-        return nil unless ::Devise.emailfield && (suffix = get_pam_suffix)
-        email = "#{self[::Devise.emailfield]}\n"
-        pos = email.index("@#{suffix}\n")
-        return nil unless pos
-        email.slice(0, pos)
+        self[::Devise.emailfield] = "#{self[::Devise.usernamefield]}@#{find_pam_suffix}" if self[::Devise.emailfield].nil? && find_pam_suffix
       end
 
       # Checks if a resource is valid upon authentication.
-      def valid_pam_authentication?(pw)
-        return nil unless get_pam_name
-        Rpam2.auth(get_pam_service, get_pam_name, pw)
+      def pam_authentication(pw)
+        return nil unless pam_get_name
+        Rpam2.auth(find_pam_service, pam_get_name, pw)
       end
 
       module ClassMethods
@@ -62,12 +62,11 @@ module Devise
             resource = find_by(::Devise.usernamefield => attributes[:username])
 
             if resource.blank?
-              resource = new
-              resource[::Devise.usernamefield] = attributes[:username]
+              resource = new(::Devise.usernamefield => attributes[:username])
             end
-            return resource
+            resource
           elsif ::Devise.emailfield && attributes[:email]
-            if ::Devise.check_at_sign && ::Devise.usernamefield && attributes[:email].index('@').nil?
+            if ::Devise.check_at_sign && ::Devise.usernamefield && !attributes[:email].index('@')
               resource = find_by(::Devise.usernamefield => attributes[:email])
             else
               resource = find_by(::Devise.emailfield => attributes[:email])
@@ -75,14 +74,14 @@ module Devise
 
             if resource.blank?
               resource = new
-              if ::Devise.check_at_sign && ::Devise.usernamefield && attributes[:email].index('@').nil?
+              if ::Devise.check_at_sign && ::Devise.usernamefield && !attributes[:email].index('@')
                 # use email as username
                 resource[::Devise.usernamefield] = attributes[:email]
               else
                 resource[::Devise.emailfield] = attributes[:email]
               end
             end
-            return resource
+            resource
           end
         end
 
@@ -94,7 +93,7 @@ module Devise
           # potential conflict detected
           resource = resource.pam_conflict(attributes) if resource.pam_conflict?
 
-          return nil unless resource && resource.try(:valid_pam_authentication?, attributes[:password])
+          return nil unless resource && resource.try(:pam_authentication, attributes[:password])
           if resource.new_record?
             resource.pam_setup(attributes)
             resource.save!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise_pam_authenticatable2
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 8.0.0
 platform: ruby
 authors:
 - James Wilson