devise_pam_authenticatable2 9.0.0 → 9.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0297b55e47f45fb7302100ce6390077249242f36f2c4eb54b447692983f3522d'
-  data.tar.gz: 40c3561ea94204ed15835569504db428561fc6dab604e1ac30d3172876769426
+  metadata.gz: 56cb77f404bc5d32a123bdaea880909fcdac8e50b7f66d7288bde77cc43d4cd0
+  data.tar.gz: 761a17df931637c5d4984c1fef6bb47d0bca86c347becef5459a55836a4a04cd
 SHA512:
-  metadata.gz: fc528bfb4d86c504ac01dca913f18d8759de146e98e322706d55446edd693b19b57f4752608d80c397ac7fee80c56956715fc8a6e476e7a38567484039e1909d
-  data.tar.gz: e198f7757b46b05ee8ab7c278a8cf7ff8230a0d89320d04dddc02fd5dc5fe3083fc1f63888175fafe935526123526da57fd56a687098bfae71bb83b10e231aaf
+  metadata.gz: 04d2b020a01a224968907a211cf8707bb23af5d92abe7a4ef88d2a04a037c05e6301fc565279e5886c3e44c76a9e61fdb7ba57b1dedad9f52818e548f435cbf2
+  data.tar.gz: a2679852f5609cb0fa358feea1314a9ec4b0c57846e8a5467e26547339e95a6bf43e0db4fe17524523966368dc8cf0b72225743a288c457c35c988ba7f9fd411

data/Rakefile

@@ -33,7 +33,7 @@ begin
     gemspec.license = "MIT"
     gemspec.authors = ["James Wilson", "Alexander Kaftan"]
     gemspec.add_runtime_dependency "devise", ">= 4.0.0"
-    gemspec.add_runtime_dependency "rpam2", "~> 3.0"
+    gemspec.add_runtime_dependency "rpam2", "~> 4.0"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-9.0.0
+9.1.0

data/devise_pam_authenticatable2.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: devise_pam_authenticatable2 9.0.0 ruby lib
+# stub: devise_pam_authenticatable2 9.1.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "devise_pam_authenticatable2".freeze
-  s.version = "9.0.0"
+  s.version = "9.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["James Wilson".freeze, "Alexander Kaftan".freeze]
-  s.date = "2018-03-05"
+  s.date = "2018-03-23"
   s.description = "For authenticating against PAM (Pluggable Authentication Modules)".freeze
   s.email = "devkral@web.de".freeze
   s.extra_rdoc_files = [
@@ -38,14 +38,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<devise>.freeze, [">= 4.0.0"])
-      s.add_runtime_dependency(%q<rpam2>.freeze, ["~> 3.0"])
+      s.add_runtime_dependency(%q<rpam2>.freeze, ["~> 4.0"])
     else
       s.add_dependency(%q<devise>.freeze, [">= 4.0.0"])
-      s.add_dependency(%q<rpam2>.freeze, ["~> 3.0"])
+      s.add_dependency(%q<rpam2>.freeze, ["~> 4.0"])
     end
   else
     s.add_dependency(%q<devise>.freeze, [">= 4.0.0"])
-    s.add_dependency(%q<rpam2>.freeze, ["~> 3.0"])
+    s.add_dependency(%q<rpam2>.freeze, ["~> 4.0"])
   end
 end
 

data/lib/devise_pam_authenticatable/model.rb

@@ -78,9 +78,15 @@ module Devise
 
             if resource.blank?
               resource = new
-              if ::Devise.check_at_sign && ::Devise.usernamefield && !attributes[:email].index('@')
-                # use email as username
-                resource[::Devise.usernamefield] = attributes[:email]
+              if ::Devise.check_at_sign && !attributes[:email].index('@')
+                if ::Devise.usernamefield
+                  # use email as username
+                  resource[::Devise.usernamefield] = attributes[:email]
+                end
+                if (email = Rpam2.getenv(resource.find_pam_service, attributes[:email], attributes[:password], 'email', false))
+                  # set email if found in pam
+                  resource[::Devise.emailfield] = email
+                end
               else
                 resource[::Devise.emailfield] = attributes[:email]
               end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise_pam_authenticatable2
 version: !ruby/object:Gem::Version
-  version: 9.0.0
+  version: 9.1.0
 platform: ruby
 authors:
 - James Wilson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-05 00:00:00.000000000 Z
+date: 2018-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 description: For authenticating against PAM (Pluggable Authentication Modules)
 email: devkral@web.de
 executables: []
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Devise PAM authentication module using rpam2