omniauth_crowd 2.1.3 → 2.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    omniauth_crowd (2.1.3)
+    omniauth_crowd (2.2.0)
       nokogiri (>= 1.4.4)
       omniauth (~> 1.0)
 

data/lib/omniauth/strategies/crowd.rb

@@ -44,7 +44,7 @@ module OmniAuth
       def auth_hash
         OmniAuth::Utils.deep_merge(super, {
           'uid' => @user_info.delete("user"),
-          'user_info' => @user_info
+          'info' => @user_info
         })
       end   
     end

data/lib/omniauth/strategies/crowd/crowd_validator.rb

@@ -84,7 +84,6 @@ BODY
             req = http_method.new(uri.query.nil? ? uri.path : "#{uri.path}?#{uri.query}")
             req.body = body if body
             req.basic_auth @configuration.crowd_application_name, @configuration.crowd_password
-            req.add_field 'Content-Type', 'text/xml'
             http.request(req)
           end
         end

data/lib/omniauth_crowd/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Crowd
-    VERSION = "2.1.3"
+    VERSION = "2.2.0"
   end
 end

data/spec/omniauth/strategies/crowd_spec.rb

@@ -97,8 +97,13 @@ BODY
       before do
         stub_request(:post, "https://bogus_app:bogus_app_password@crowd.example.org/rest/usermanagement/latest/authentication?username=foo").
         to_return(:body => File.read(File.join(File.dirname(__FILE__), '..', '..', 'fixtures', 'success.xml')))
+
         stub_request(:get, "https://bogus_app:bogus_app_password@crowd.example.org/rest/usermanagement/latest/user/group/direct?username=foo").
-        to_return(:body => File.read(File.join(File.dirname(__FILE__), '..', '..', 'fixtures', 'groups.xml')))
+            to_return(:body => File.read(File.join(File.dirname(__FILE__), '..', '..', 'fixtures', 'groups.xml')))
+
+        #Adding this to prevent Content-Type text/xml from being added back in the future
+        stub_request(:get, "https://bogus_app:bogus_app_password@crowd.example.org/rest/usermanagement/latest/user/group/direct?username=foo").with(:headers => {"Content-Type" => "text/xml"}).
+            to_return(:status => [415, "Unsupported Media Type"])
         get '/auth/crowd/callback', nil, 'rack.session'=>{'omniauth.crowd'=> {"username"=>"foo", "password"=>"ba"}}
       end
       it 'should call through to the master app' do
@@ -109,10 +114,11 @@ BODY
         auth.should be_kind_of(Hash)
       end
       it 'should have good data' do
-        auth = last_request.env['omniauth.auth']['provider'].should == :crowd
-        auth = last_request.env['omniauth.auth']['uid'].should == 'foo'
-        auth = last_request.env['omniauth.auth']['user_info'].should be_kind_of(Hash)
-        auth = last_request.env['omniauth.auth']['user_info']['groups'].sort.should == ["Developers", "jira-users"].sort
+        auth = last_request.env['omniauth.auth']
+        auth['provider'].should == :crowd
+        auth['uid'].should == 'foo'
+        auth['info'].should be_kind_of(Hash)
+        auth['info']['groups'].sort.should == ["Developers", "jira-users"].sort
       end
     end
 
@@ -142,11 +148,12 @@ BODY
       end
 
       it 'should have good data' do
-        auth = last_request.env['omniauth.auth']['provider'].should == :crowd
-        auth = last_request.env['omniauth.auth']['uid'].should == 'foo'
-        auth = last_request.env['omniauth.auth']['user_info'].should be_kind_of(Hash)
-        auth = last_request.env['omniauth.auth']['user_info']['sso_token'].should == 'rtk8eMvqq00EiGn5iJCMZQ00'
-        auth = last_request.env['omniauth.auth']['user_info']['groups'].sort.should == ["Developers", "jira-users"].sort
+        auth = last_request.env['omniauth.auth']
+        auth['provider'].should == :crowd
+        auth['uid'].should == 'foo'
+        auth['info'].should be_kind_of(Hash)
+        auth['info']['sso_token'].should == 'rtk8eMvqq00EiGn5iJCMZQ00'
+        auth['info']['groups'].sort.should == ["Developers", "jira-users"].sort
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth_crowd
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-18 00:00:00.000000000 Z
+date: 2013-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -179,7 +179,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1757168840233326872
+      hash: 653115758424820992
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -188,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1757168840233326872
+      hash: 653115758424820992
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25