devise_saml_authenticatable 1.2 → 1.2.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 4e32069c983d434236aec40263991ce6d9bdd0ad
-  data.tar.gz: 8b5f3ee9018059f85338d6c2131a0bed9320af99
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YzUzNzQwNTZmMTVkNDAyZDc5NmM1OTUxMzIyNGJjYTdlOTJkZDljZQ==
+  data.tar.gz: !binary |-
+    MDY1NTJiZTA4NjhlOTc2YmM2ZjlhYWMxNDcyMDNiMzUxMTBiNTBkNA==
 SHA512:
-  metadata.gz: 181201e680b151a438bf8a7a2e999a773a231951003ab4fc77d014e83340d40634645fdec3f5270ce7f26a0506c19e0d6f87b90627c160db85aa60646f06e6d4
-  data.tar.gz: 5fd315b55da27314594ca7cd152c85ddd74947a6d0dca2c2dce1e29999ca2ead9aa07873ce4f0e729d9c00e0dd77bb4ca03ec2803d11af585057ea99459f639b
+  metadata.gz: !binary |-
+    MDkxOWU4OTc5NWNhNDQ4ZDc3NThhZDc1ZDhkZjc2MzNlMTZmYTI0NTk3MGJk
+    NjMwMTg4YWVhMDQyM2NhNWVkYzNiY2JmYWViNzY5ZWJjN2FkMzk2ZGExNzlh
+    ZGMzNzU0NWU2MDZiZjM5MTMxNTNkZjA1MGUxZTgwOTljYTNhODE=
+  data.tar.gz: !binary |-
+    ZDYzODA0NzBlMWFmMjNhMjZmNzE4ZjBmMDllYzkyMzM3YWYxOGY4NTNiMTEy
+    ZTJhYjZmYTg4MDY5MDAyZmVmYzkzYWMzNjY0YzRkZGQxMzZlOWJkMzkwMzQx
+    NDYxMzAwMDU0OTE1ZTZlYWI5MTE3YzJlZjU1YzM4NjkxY2M3YmE=

data/README.md

@@ -41,6 +41,9 @@ In config/initializers/devise.rb
     # Create user if the user does not exist. (Default is false)
     config.saml_create_user = true
 
+    # Update the attributes of the user after a successful login. (Default is false)
+    config.saml_update_user = true
+
     # Set the default user key. The user will be looked up by this key. Make
     # sure that the Authentication Response includes the attribute.
     config.saml_default_user_key = :email

data/lib/devise_saml_authenticatable.rb

@@ -26,6 +26,10 @@ module Devise
   mattr_accessor :saml_create_user
   @@saml_create_user = false
 
+  # Update user attributes after login
+  mattr_accessor :saml_update_user
+  @@saml_update_user = false
+
   mattr_accessor :saml_default_user_key
   @@saml_default_user_key
 
@@ -48,9 +52,7 @@ end
 # Add saml_authenticatable strategy to defaults.
 #
 Devise.add_module(:saml_authenticatable,
-                  :route => :saml_authenticatable, 
+                  :route => :saml_authenticatable,
                   :strategy   => true,
                   :controller => :saml_sessions,
                   :model  => 'devise_saml_authenticatable/model')
-
-

data/lib/devise_saml_authenticatable/model.rb

@@ -14,7 +14,7 @@ module Devise
       def update_with_password(params={})
         params.delete(:current_password)
         self.update_without_password(params)
-      end	
+      end
 
       def update_without_password(params={})
         params.delete(:password)
@@ -51,15 +51,19 @@ module Devise
             auth_value.try(:downcase!) if Devise.case_insensitive_keys.include?(key)
           end
           resource = where(key => auth_value).first
-          if (resource.nil? && !Devise.saml_create_user)
-            logger.info("User(#{auth_value}) not found.  Not configured to create the user.")
-            return nil 
+
+          if resource.nil?
+            if Devise.saml_create_user
+              logger.info("Creating user(#{auth_value}).")
+              resource = new
+            else
+              logger.info("User(#{auth_value}) not found.  Not configured to create the user.")
+              return nil
+            end
           end
 
-          if (resource.nil? && Devise.saml_create_user)
-            logger.info("Creating user(#{auth_value}).")
-            resource = new
-            set_user_saml_attributes(resource,attributes)
+          if Devise.saml_update_user || (resource.new_record? && Devise.saml_create_user)
+            set_user_saml_attributes(resource, attributes)
             if (Devise.saml_use_subject)
               resource.send "#{key}=", auth_value
             end

data/lib/devise_saml_authenticatable/version.rb

@@ -1,3 +1,3 @@
 module DeviseSamlAuthenticatable
-  VERSION = "1.2"
+  VERSION = "1.2.1"
 end

data/spec/devise_saml_authenticatable/model_spec.rb

@@ -4,6 +4,16 @@ describe Devise::Models::SamlAuthenticatable do
   class Model
     include Devise::Models::SamlAuthenticatable
     attr_accessor :email, :name, :saved
+    def initialize(params = {})
+      @email = params[:email]
+      @name = params[:name]
+      @new_record = params.fetch(:new_record, true)
+    end
+
+    def new_record?
+      @new_record
+    end
+
     def save!
       self.saved = true
     end
@@ -46,7 +56,7 @@ describe Devise::Models::SamlAuthenticatable do
   let(:name_id) { nil }
 
   it "looks up the user by the configured default user key" do
-    user = double(:user)
+    user = Model.new(new_record: false)
     expect(Model).to receive(:where).with(email: 'user@example.com').and_return([user])
     expect(Model.authenticate_with_saml(response)).to eq(user)
   end
@@ -65,7 +75,7 @@ describe Devise::Models::SamlAuthenticatable do
     end
 
     it "looks up the user by the configured default user key" do
-      user = double(:user)
+      user = Model.new(new_record: false)
       expect(Model).to receive(:where).with(email: 'user@example.com').and_return([user])
       expect(Model.authenticate_with_saml(response)).to eq(user)
     end
@@ -88,9 +98,24 @@ describe Devise::Models::SamlAuthenticatable do
         expect(model.saved).to be(true)
       end
     end
+
+    context "when configured to update a user and the user is found" do
+      before do
+        allow(Devise).to receive(:saml_update_user).and_return(true)
+      end
+
+      it "creates and returns a new user with the name identifier and given attributes" do
+        user = Model.new(email: "old_mail@mail.com", name: "old name", new_record: false)
+        expect(Model).to receive(:where).with(email: 'user@example.com').and_return([user])
+        model = Model.authenticate_with_saml(response)
+        expect(model.email).to eq('user@example.com')
+        expect(model.name).to  eq('A User')
+        expect(model.saved).to be(true)
+      end
+    end
   end
 
-  context "when configured to create a user and the user is not found" do
+  context "when configured to create an user and the user is not found" do
     before do
       allow(Devise).to receive(:saml_create_user).and_return(true)
     end
@@ -104,13 +129,34 @@ describe Devise::Models::SamlAuthenticatable do
     end
   end
 
+  context "when configured to update an user" do
+    before do
+      allow(Devise).to receive(:saml_update_user).and_return(true)
+    end
+
+    it "returns nil if the user is not found" do
+      expect(Model).to receive(:where).with(email: 'user@example.com').and_return([])
+      expect(Model.authenticate_with_saml(response)).to be_nil
+    end
+
+    it "updates the attributes if the user is found" do
+      user = Model.new(email: "old_mail@mail.com", name: "old name", new_record: false)
+      expect(Model).to receive(:where).with(email: 'user@example.com').and_return([user])
+      model = Model.authenticate_with_saml(response)
+      expect(model.email).to eq('user@example.com')
+      expect(model.name).to  eq('A User')
+      expect(model.saved).to be(true)
+    end
+  end
+
+
   context "when configured with a case-insensitive key" do
     before do
       allow(Devise).to receive(:case_insensitive_keys).and_return([:email])
     end
 
     it "looks up the user with a downcased value" do
-      user = double(:user)
+      user = Model.new(new_record: false)
       expect(Model).to receive(:where).with(email: 'user@example.com').and_return([user])
       expect(Model.authenticate_with_saml(response)).to eq(user)
     end

data/spec/features/saml_authentication_spec.rb

@@ -34,6 +34,19 @@ describe "SAML Authentication", type: :feature do
       expect(current_url).to eq("http://localhost:8020/")
     end
 
+    it "updates a user on the SP from the IdP attributes" do
+      create_user("you@example.com")
+
+      visit 'http://localhost:8020/'
+      expect(current_url).to match(%r(\Ahttp://localhost:8009/saml/auth\?SAMLRequest=))
+      fill_in "Email", with: "you@example.com"
+      fill_in "Password", with: "asdf"
+      click_on "Sign in"
+      expect(page).to have_content("you@example.com")
+      expect(page).to have_content("A User")
+      expect(current_url).to eq("http://localhost:8020/")
+    end
+
     it "logs a user out of the IdP via the SP" do
       sign_in
 

data/spec/support/sp_template.rb

@@ -36,6 +36,7 @@ after_bundle do
 
   config.saml_use_subject = #{use_subject_to_authenticate}
   config.saml_create_user = true
+  config.saml_update_user = true
 
   config.saml_configure do |settings|
     settings.assertion_consumer_service_url = "http://localhost:8020/users/saml/auth"
@@ -64,4 +65,4 @@ end
   rake "db:migrate"
 end
 
-create_file 'public/stylesheets/application.css', ''
+create_file 'public/stylesheets/application.css', ''

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: devise_saml_authenticatable
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: 1.2.1
 platform: ruby
 authors:
 - Josef Sauter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-25 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: ruby-saml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 description: SAML Authentication for devise
@@ -45,9 +45,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -84,12 +84,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []