Commit 5b1c0f7

mo <mo.khan@gmail.com>
2018-01-27 18:20:06
upgrade to saml-kit 1.0.0 and scim-shady 0.2.0
1 parent b5ea24a
config/initializers/saml_kit.rb
@@ -9,7 +9,7 @@ class OnDemandRegistry < SimpleDelegator
 end
 
 Saml::Kit.configure do |configuration|
-  configuration.issuer = ENV['ISSUER']
+  configuration.entity_id = ENV['ISSUER']
   configuration.registry = OnDemandRegistry.new(configuration.registry)
   configuration.logger = Rails.logger
   5.times { configuration.generate_key_pair_for(use: :signing) }
spec/requests/metadata_controller_spec.rb
@@ -7,7 +7,7 @@ describe MetadataController do
     it 'returns the metadata' do
       expect(response).to have_http_status(:ok)
       metadata = Saml::Kit::Metadata.from(response.body)
-      expect(metadata.entity_id).to eql(Saml::Kit.configuration.issuer)
+      expect(metadata.entity_id).to eql(Saml::Kit.configuration.entity_id)
     end
 
     it 'uses the correct content type' do
spec/requests/sessions_controller_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
 
 describe SessionsController do
   let(:registry) { Saml::Kit::DefaultRegistry.new }
-  let(:issuer) { Saml::Kit.configuration.issuer }
+  let(:issuer) { Saml::Kit.configuration.entity_id }
   let(:sp_metadata) do
     Saml::Kit::ServiceProviderMetadata.build do |x|
       x.add_assertion_consumer_service(FFaker::Internet.uri("https"), binding: :http_post)
Gemfile
@@ -61,12 +61,12 @@ end
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 gem 'dotenv-rails'
-gem 'saml-kit', '0.3.2'
+gem 'saml-kit', "1.0.0"
 gem 'rails-assets-jquery', source: 'https://rails-assets.org'
 gem 'rails-assets-bootstrap', source: 'https://rails-assets.org'
 gem 'jwt'
 gem 'activerecord-session_store'
 gem "email_validator"
-gem 'scim-shady', path: '../scim-shady'
+gem 'scim-shady', "0.2.0"
 gem 'spank'
 gem 'webpacker'
Gemfile.lock
@@ -1,9 +1,3 @@
-PATH
-  remote: ../scim-shady
-  specs:
-    scim-shady (0.1.0)
-      activesupport (>= 4.2.0)
-
 GEM
   remote: https://rubygems.org/
   remote: https://rails-assets.org/
@@ -192,10 +186,9 @@ GEM
     ruby_dep (1.5.0)
     rubyzip (1.2.1)
     safe_yaml (1.0.4)
-    saml-kit (0.3.2)
+    saml-kit (1.0.0)
       activemodel (>= 4.2.0)
-      nokogiri (~> 1.8)
-      xml-kit (>= 0.1.1)
+      xml-kit (~> 0.1)
     sass (3.5.2)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
@@ -207,6 +200,8 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
+    scim-shady (0.2.0)
+      activesupport (>= 4.2.0)
     selenium-webdriver (3.6.0)
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
@@ -253,11 +248,11 @@ GEM
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
-    xml-kit (0.1.1)
+    xml-kit (0.1.3)
       activemodel (>= 4.2.0)
       builder (~> 3.2)
-      nokogiri (~> 1.8)
-      tilt (~> 2.0)
+      nokogiri (>= 1.8.1)
+      tilt (>= 1.4.1)
       xmldsig (~> 0.6)
     xmldsig (0.6.5)
       nokogiri (>= 1.6.8, < 2.0.0)
@@ -288,9 +283,9 @@ DEPENDENCIES
   rails-controller-testing
   rails_12factor
   rspec-rails (~> 3.6)
-  saml-kit (= 0.3.2)
+  saml-kit (= 1.0.0)
   sass-rails (~> 5.0)
-  scim-shady!
+  scim-shady (= 0.2.0)
   selenium-webdriver
   spank
   spring