gds-sso 0.6.0 → 0.6.1

data/lib/gds-sso/api_access.rb

@@ -5,7 +5,7 @@ module GDS
     class ApiAccess
       def self.api_call?(env)
         request = Rack::Accept::Request.new(env)
-        request.best_media_type(%w{application/json text/html}) == 'application/json'
+        request.best_media_type(%w{text/html application/json}) == 'application/json'
       end
     end
   end

data/lib/gds-sso/version.rb

@@ -1,5 +1,5 @@
 module GDS
   module SSO
-    VERSION = "0.6.0"
+    VERSION = "0.6.1"
   end
 end

data/spec/internal/log/test.log

@@ -1725,3 +1725,171 @@ Started GET "/restricted" for 127.0.0.1 at 2012-06-12 15:18:58 +0000
   Processing by ExampleController#restricted as JSON
 Authenticating with gds_sso_api_access strategy
 Completed 200 OK in 1ms (Views: 0.6ms)
+
+
+Started GET "/" for 127.0.0.1 at 2012-06-14 15:19:20 +0000
+  Processing by ExampleController#index as HTML
+Rendered text template (0.0ms)
+Completed 200 OK in 48ms (Views: 47.9ms)
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-06-14 15:19:20 +0000
+  Processing by ExampleController#restricted as HTML
+Authenticating with gds_sso strategy
+Completed   in 55ms
+
+
+Started GET "/auth/gds" for 127.0.0.1 at 2012-06-14 15:19:21 +0000
+
+
+Started GET "/auth/gds/callback?code=3X9gxCoo1mdLjmIAGLUYXi53DmrLJvQMZr7LpNsUnBP40D6D" for 127.0.0.1 at 2012-06-14 15:19:21 +0000
+  Processing by AuthenticationsController#callback as HTML
+  Parameters: {"code"=>"3X9gxCoo1mdLjmIAGLUYXi53DmrLJvQMZr7LpNsUnBP40D6D"}
+Authenticating with gds_sso strategy
+Redirected to http://www.example-client.com/restricted
+Completed 302 Found in 1ms
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-06-14 15:19:22 +0000
+  Processing by ExampleController#restricted as HTML
+Completed 200 OK in 1ms (Views: 0.5ms)
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-06-14 15:19:22 +0000
+  Processing by ExampleController#restricted as HTML
+Authenticating with gds_sso strategy
+Completed   in 0ms
+
+
+Started GET "/auth/gds" for 127.0.0.1 at 2012-06-14 15:19:22 +0000
+
+
+Started GET "/auth/gds/callback?code=7ssiO5k4uoxn3ATRiEXLVwyAGuKbBUBY1zH8yiVx5NE0tWWL" for 127.0.0.1 at 2012-06-14 15:19:22 +0000
+  Processing by AuthenticationsController#callback as HTML
+  Parameters: {"code"=>"7ssiO5k4uoxn3ATRiEXLVwyAGuKbBUBY1zH8yiVx5NE0tWWL"}
+Authenticating with gds_sso strategy
+Redirected to http://www.example-client.com/restricted
+Completed 302 Found in 1ms
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-06-14 15:19:22 +0000
+  Processing by ExampleController#restricted as HTML
+Completed 200 OK in 1ms (Views: 0.5ms)
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-06-14 15:19:22 +0000
+  Processing by ExampleController#restricted as HTML
+Authenticating with gds_sso strategy
+Completed   in 0ms
+
+
+Started GET "/auth/gds" for 127.0.0.1 at 2012-06-14 15:19:22 +0000
+
+
+Started GET "/auth/gds/callback?code=vqxBHSpDRQB8aXNWxz4XuZSKGiDn7TeoT8BtjrOdiR3T2enX" for 127.0.0.1 at 2012-06-14 15:19:22 +0000
+  Processing by AuthenticationsController#callback as HTML
+  Parameters: {"code"=>"vqxBHSpDRQB8aXNWxz4XuZSKGiDn7TeoT8BtjrOdiR3T2enX"}
+Authenticating with gds_sso strategy
+Redirected to http://www.example-client.com/restricted
+Completed 302 Found in 1ms
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-06-14 15:19:22 +0000
+  Processing by ExampleController#restricted as HTML
+Completed 200 OK in 1ms (Views: 0.3ms)
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-06-14 15:19:22 +0000
+  Processing by ExampleController#restricted as JSON
+Authenticating with gds_sso_api_access strategy
+Completed   in 32ms
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-06-14 15:19:22 +0000
+  Processing by ExampleController#restricted as JSON
+Authenticating with gds_sso_api_access strategy
+Completed 200 OK in 1ms (Views: 0.6ms)
+
+
+Started GET "/" for 127.0.0.1 at 2012-06-14 15:20:01 +0000
+  Processing by ExampleController#index as HTML
+Rendered text template (0.0ms)
+Completed 200 OK in 46ms (Views: 45.4ms)
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-06-14 15:20:01 +0000
+  Processing by ExampleController#restricted as HTML
+Authenticating with gds_sso strategy
+Completed   in 56ms
+
+
+Started GET "/auth/gds" for 127.0.0.1 at 2012-06-14 15:20:01 +0000
+
+
+Started GET "/auth/gds/callback?code=d920cd289e61160ef8333ea385bb435a01bd160b06cd5ffa6d3bd8ec763bce88" for 127.0.0.1 at 2012-06-14 15:20:02 +0000
+  Processing by AuthenticationsController#callback as HTML
+  Parameters: {"code"=>"d920cd289e61160ef8333ea385bb435a01bd160b06cd5ffa6d3bd8ec763bce88"}
+Authenticating with gds_sso strategy
+Redirected to http://www.example-client.com/restricted
+Completed 302 Found in 1ms
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-06-14 15:20:02 +0000
+  Processing by ExampleController#restricted as HTML
+Completed 200 OK in 1ms (Views: 0.5ms)
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-06-14 15:20:02 +0000
+  Processing by ExampleController#restricted as HTML
+Authenticating with gds_sso strategy
+Completed   in 0ms
+
+
+Started GET "/auth/gds" for 127.0.0.1 at 2012-06-14 15:20:02 +0000
+
+
+Started GET "/auth/gds/callback?code=2b3f0cd0044671101c4d8c13ae636a8f5d85f809927ada683e4c401db0a519d2" for 127.0.0.1 at 2012-06-14 15:20:03 +0000
+  Processing by AuthenticationsController#callback as HTML
+  Parameters: {"code"=>"2b3f0cd0044671101c4d8c13ae636a8f5d85f809927ada683e4c401db0a519d2"}
+Authenticating with gds_sso strategy
+Redirected to http://www.example-client.com/restricted
+Completed 302 Found in 1ms
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-06-14 15:20:03 +0000
+  Processing by ExampleController#restricted as HTML
+Completed 200 OK in 1ms (Views: 0.7ms)
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-06-14 15:20:03 +0000
+  Processing by ExampleController#restricted as HTML
+Authenticating with gds_sso strategy
+Completed   in 0ms
+
+
+Started GET "/auth/gds" for 127.0.0.1 at 2012-06-14 15:20:03 +0000
+
+
+Started GET "/auth/gds/callback?code=60b650e78f074bb9cf48e31b1e4b328057eb32bcf8a34d3b809e847816e05522" for 127.0.0.1 at 2012-06-14 15:20:03 +0000
+  Processing by AuthenticationsController#callback as HTML
+  Parameters: {"code"=>"60b650e78f074bb9cf48e31b1e4b328057eb32bcf8a34d3b809e847816e05522"}
+Authenticating with gds_sso strategy
+Redirected to http://www.example-client.com/restricted
+Completed 302 Found in 1ms
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-06-14 15:20:03 +0000
+  Processing by ExampleController#restricted as HTML
+Completed 200 OK in 1ms (Views: 0.3ms)
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-06-14 15:20:03 +0000
+  Processing by ExampleController#restricted as JSON
+Authenticating with gds_sso_api_access strategy
+Completed   in 11ms
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-06-14 15:20:03 +0000
+  Processing by ExampleController#restricted as JSON
+Authenticating with gds_sso_api_access strategy
+Completed 200 OK in 1ms (Views: 0.6ms)

data/test/api_access_test.rb

@@ -0,0 +1,16 @@
+require 'test_helper'
+require 'gds-sso/api_access'
+
+class ApiAccessTest < Test::Unit::TestCase
+  def test_internet_explorer_7_accept_header_is_not_considered_to_be_api_call
+    ie7_accept_header = 'image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, ' +
+      'application/x-shockwave-flash, application/xaml+xml, application/x-ms-xbap, ' +
+      'application/x-ms-application, */*'
+    refute GDS::SSO::ApiAccess.api_call?('HTTP_ACCEPT' => ie7_accept_header)
+  end
+
+  def test_application_json_accept_header_is_considered_to_be_api_call
+    assert GDS::SSO::ApiAccess.api_call?('HTTP_ACCEPT' => 'application/json')
+  end
+
+end

metadata

@@ -2,7 +2,7 @@
 name: gds-sso
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors: 
 - Matt Patterson
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-12 00:00:00 Z
+date: 2012-06-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -181,6 +181,7 @@ files:
 - README.md
 - Gemfile
 - Rakefile
+- test/api_access_test.rb
 - test/test_helper.rb
 - test/user_test.rb
 - spec/requests/end_to_end_spec.rb
@@ -214,7 +215,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2754881002430173909
+      hash: -3744157965083249395
       segments: 
       - 0
       version: "0"
@@ -223,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2754881002430173909
+      hash: -3744157965083249395
       segments: 
       - 0
       version: "0"
@@ -235,6 +236,7 @@ signing_key:
 specification_version: 3
 summary: Client for GDS' OAuth 2-based SSO
 test_files: 
+- test/api_access_test.rb
 - test/test_helper.rb
 - test/user_test.rb
 - spec/requests/end_to_end_spec.rb