devise_aaf_rc_authenticatable 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8c8316d40e6717db312043028f643936e63df4b
-  data.tar.gz: 6a3965d4d29bd690efe8a80fe012a44761018b2a
+  metadata.gz: 285a9e9754e0d3ef979ed675cbf16f58134c47c4
+  data.tar.gz: cc389d65ce2c20a99f888ea6798bfe6dc44dedcd
 SHA512:
-  metadata.gz: 5f13faa43dcaeae522d76dc04954393a557b9c4a6a935a2b106e4205fb9ca902c272d36af53c46087b8eb78a716e91c9287b3731b1259013c733268a15f83ceb
-  data.tar.gz: 7b18f1a94c315776a5422b58378c9e8c8be37b80cb2fa5a70cb404c2b2b2ece6df92a3636b20cb4499af04e5bc7eb20696a2667777edebb0d0ff39b554abb891
+  metadata.gz: 7dd21b18754f9c340d396f824b8de3354a64e4f35e677778938c328845963da39e745386e14e41827de648889a791ac30a41ce0cb8e7687f0cce086170a29a9f
+  data.tar.gz: ca3481787de3f54e6502cad2dc9ecb637abc3f97531ddcaf55a13a54b001845391a792c1949e2f47d975ed7494c05c33c06e84365337d9ecaa6ffb55831913bc

data/Rakefile

@@ -33,7 +33,7 @@ begin
     gemspec.homepage = "http://github.com/IntersectAustralia/devise_aaf_rc_authenticatable"
     gemspec.authors = ["Gabriel Gasser Noblia", "Shuqian Hon", "Daniel Theodosius", "Jake Farrell"]
     gemspec.add_runtime_dependency "devise", ">= 2.2.4"
-    gemspec.version = "0.1.0"
+    gemspec.version = "0.1.2"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.2

data/devise_aaf_rc_authenticatable.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_aaf_rc_authenticatable 0.1.0 ruby lib
+# stub: devise_aaf_rc_authenticatable 0.1.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "devise_aaf_rc_authenticatable"
-  s.version = "0.1.0"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Gabriel Gasser Noblia", "Shuqian Hon", "Daniel Theodosius", "Jake Farrell"]
-  s.date = "2014-10-16"
+  s.date = "2014-10-29"
   s.description = "Devise AAF Rapid Connect Authenticatable is an authentication strategy for the Devise[http://github.com/plataformatec/devise] authentication framework."
   s.email = ["gabriel@intersect.org.au", "shuqian@intersect.org.au", "danielt@intersect.org.au", "jake@intersect.org.au"]
   s.extra_rdoc_files = [

data/lib/devise_aaf_rc_authenticatable/model.rb

@@ -36,15 +36,15 @@ module Devise
 
           auth_key_value = (self.case_insensitive_keys || []).include?(auth_key) ? attributes['mail'].downcase : attributes['mail']
 
-          resource = where(auth_key => auth_key_value).first
+          resource = find_for_authentication(auth_key => auth_key_value)
 
           if (resource.nil? && !Devise.aaf_rc_create_user)
-            logger.info("User(#{auth_key_value}) not found.  Not configured to create the user.")
+            Rails.logger.info("User(#{auth_key_value}) not found.  Not configured to create the user.")
             return nil
           end
 
           if (resource.nil? && Devise.aaf_rc_create_user)
-            logger.info("Creating user(#{auth_key_value}).")
+            Rails.logger.info("Creating user(#{auth_key_value}).")
             resource = new
             save_user_aaf_rc_attributes(resource, attributes)
             resource.aaf_rc_before_save if resource.respond_to?(:aaf_rc_before_save)
@@ -58,7 +58,7 @@ module Devise
         def save_user_aaf_rc_attributes(resource, attributes)
           config = YAML.load(ERB.new(File.read(::Devise.aaf_rc_config || "#{Rails.root}/config/aaf_rc.yml")).result)[Rails.env]
           config['user-mapping'].each do |aaf_attr, db_field|
-            logger.info("Saving #{attributes[aaf_attr]} to #{db_field}")
+            Rails.logger.info("Saving #{attributes[aaf_attr]} to #{db_field}")
             field = "#{db_field}="
             value = attributes[aaf_attr]
             resource.send(field, value.to_s) if resource.respond_to?(field)

data/lib/devise_aaf_rc_authenticatable/strategy.rb

@@ -19,7 +19,6 @@ module Devise
             config = YAML.load(ERB.new(File.read(::Devise.aaf_rc_config || "#{Rails.root}/config/aaf_rc.yml")).result)[Rails.env]
 
             jwt = JSON::JWT.decode(jws.to_s, config['secret_token'])
-
             # determines between test and production federation
             # based on the login URL provided during registration
 
@@ -48,6 +47,11 @@ module Devise
 
         resource = mapping.to.authenticate_with_aaf_rc(session[:attributes])
 
+        if resource.nil?
+          fail(:invalid_user_attributes)
+          return
+        end
+
         if validate(resource)
           begin
             resource.after_aaf_rc_authentication

data/lib/devise_aaf_rc_authenticatable/version.rb

@@ -1,4 +1,4 @@
 module DeviseAafRcAuthenticatable
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise_aaf_rc_authenticatable
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Gabriel Gasser Noblia
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-16 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-jwt