gds-sso 0.5.4 → 0.6.0

data/Gemfile

@@ -1,4 +1,5 @@
 source "http://rubygems.org"
+source 'https://gems.gemfury.com/vo6ZrmjBQu5szyywDszE/'
 
 # Specify your gem's dependencies in gds-sso.gemspec
 gemspec

data/lib/gds-sso.rb

@@ -1,8 +1,8 @@
 require 'rails'
 
 require 'gds-sso/config'
-require 'gds-sso/omniauth_strategy'
 require 'gds-sso/warden_config'
+require 'omniauth-gds'
 
 module GDS
   module SSO
@@ -24,7 +24,13 @@ module GDS
       config.before_eager_load { |app| app.reload_routes! }
 
       config.app_middleware.use ::OmniAuth::Builder do
-        provider :gds, GDS::SSO::Config.oauth_id, GDS::SSO::Config.oauth_secret
+        provider :gds, GDS::SSO::Config.oauth_id, GDS::SSO::Config.oauth_secret,
+          client_options: {
+            site: GDS::SSO::Config.oauth_root_url,
+            authorize_url: "#{GDS::SSO::Config.oauth_root_url}/oauth/authorize",
+            token_url: "#{GDS::SSO::Config.oauth_root_url}/oauth/access_token",
+            ssl: { verify: false }
+          }
       end
 
       def self.use_mock_strategies?

data/lib/gds-sso/user.rb

@@ -14,7 +14,7 @@ module GDS
 
     module User
       def self.user_params_from_auth_hash(auth_hash)
-        {'uid' => auth_hash['uid'], 'email' => auth_hash['user_info']['email'], 'name' => auth_hash['user_info']['name'], 'version' => auth_hash['extra']['user_hash']['version']}
+        {'uid' => auth_hash['uid'], 'email' => auth_hash['info']['email'], 'name' => auth_hash['info']['name']}
       end
 
       extend ActiveSupport::Concern

data/lib/gds-sso/version.rb

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

data/lib/gds-sso/warden_config.rb

@@ -1,5 +1,4 @@
 require 'warden'
-require 'omniauth/oauth'
 
 Warden::Manager.serialize_into_session do |user|
   user.respond_to?(:uid) ? user.uid : nil

data/spec/fixtures/integration/signonotron2.sql

@@ -6,4 +6,4 @@ DELETE FROM `users`;
 
 -- Setup fixture data
 INSERT INTO `oauth_applications` VALUES (1,'GDS_SSO integration test','gds-sso-test','secret','http://www.example-client.com/auth/gds/callback','2012-04-19 13:26:54','2012-04-19 13:26:54');
-INSERT INTO `users` VALUES (1,'test@example-client.com','$2a$04$MdMkVFwTq5GLJJkHS8GLIe6dK1.C4ozzba5ZS5Ks2b/NenVsMGGRW',NULL,NULL,0,NULL,NULL,NULL,NULL,0,NULL,'2012-04-19 13:26:54','2012-04-19 13:26:54',NULL,'Test User','integration-uid');
+INSERT INTO `users` (id, email, encrypted_password, created_at, updated_at, name, uid, is_admin) VALUES (1,'test@example-client.com','$2a$04$MdMkVFwTq5GLJJkHS8GLIe6dK1.C4ozzba5ZS5Ks2b/NenVsMGGRW','2012-04-19 13:26:54','2012-04-19 13:26:54','Test User','integration-uid', 0);

data/spec/internal/log/test.log

@@ -1389,3 +1389,339 @@ Started GET "/restricted" for 127.0.0.1 at 2012-05-11 15:59:02 +0000
   Processing by ExampleController#restricted as JSON
 Authenticating with gds_sso_api_access strategy
 Completed 200 OK in 1ms (Views: 0.5ms)
+
+
+Started GET "/" for 127.0.0.1 at 2012-06-11 16:13:57 +0000
+  Processing by ExampleController#index as HTML
+Rendered text template (0.0ms)
+Completed 200 OK in 48ms (Views: 47.5ms)
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-06-11 16:13:58 +0000
+  Processing by ExampleController#restricted as HTML
+Authenticating with gds_sso strategy
+Completed   in 1ms
+
+
+Started GET "/auth/gds" for 127.0.0.1 at 2012-06-11 16:13:58 +0000
+
+
+Started GET "/auth/gds/callback?code=p73LMkRgOXEF8ErideRXIEK6EnHPPkoCFopUg65tMpng51lb" for 127.0.0.1 at 2012-06-11 16:13:59 +0000
+  Processing by AuthenticationsController#callback as HTML
+  Parameters: {"code"=>"p73LMkRgOXEF8ErideRXIEK6EnHPPkoCFopUg65tMpng51lb"}
+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-11 16:13:59 +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-11 16:13:59 +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-11 16:13:59 +0000
+
+
+Started GET "/auth/gds/callback?code=1QYBpw8JIMJ4IxPWKwOnx3g2WVN62Sl89CQsBUYOwopsYuXX" for 127.0.0.1 at 2012-06-11 16:13:59 +0000
+  Processing by AuthenticationsController#callback as HTML
+  Parameters: {"code"=>"1QYBpw8JIMJ4IxPWKwOnx3g2WVN62Sl89CQsBUYOwopsYuXX"}
+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-11 16:13:59 +0000
+  Processing by ExampleController#restricted as HTML
+Completed 200 OK in 1ms (Views: 0.6ms)
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-06-11 16:13:59 +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-11 16:13:59 +0000
+
+
+Started GET "/auth/gds/callback?code=VPCSnPRSAac6iZp9Wbrpae83Gw15fjc0N0u08MFBToGSTtCv" for 127.0.0.1 at 2012-06-11 16:13:59 +0000
+  Processing by AuthenticationsController#callback as HTML
+  Parameters: {"code"=>"VPCSnPRSAac6iZp9Wbrpae83Gw15fjc0N0u08MFBToGSTtCv"}
+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-11 16:13:59 +0000
+  Processing by ExampleController#restricted as HTML
+Completed 200 OK in 1ms (Views: 0.4ms)
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-06-11 16:13:59 +0000
+  Processing by ExampleController#restricted as JSON
+Authenticating with gds_sso_api_access strategy
+Completed   in 69ms
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-06-11 16:13:59 +0000
+  Processing by ExampleController#restricted as JSON
+Authenticating with gds_sso_api_access strategy
+Completed 200 OK in 1ms (Views: 0.5ms)
+
+
+Started GET "/" for 127.0.0.1 at 2012-06-11 16:14:34 +0000
+  Processing by ExampleController#index as HTML
+Rendered text template (0.0ms)
+Completed 200 OK in 48ms (Views: 47.8ms)
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-06-11 16:14:35 +0000
+  Processing by ExampleController#restricted as HTML
+Authenticating with gds_sso strategy
+Completed   in 1ms
+
+
+Started GET "/auth/gds" for 127.0.0.1 at 2012-06-11 16:14:35 +0000
+
+
+Started GET "/auth/gds/callback?code=7e49b29c459a8f21d98adeb9d257a4d87928bf1fab1da079ee6b15355f9f6a1d" for 127.0.0.1 at 2012-06-11 16:14:36 +0000
+  Processing by AuthenticationsController#callback as HTML
+  Parameters: {"code"=>"7e49b29c459a8f21d98adeb9d257a4d87928bf1fab1da079ee6b15355f9f6a1d"}
+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-11 16:14:36 +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-11 16:14:36 +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-11 16:14:36 +0000
+
+
+Started GET "/auth/gds/callback?code=a379d659afad615d0c8f53618942cf7ec5745c9807dd56f74bf8299720f33017" for 127.0.0.1 at 2012-06-11 16:14:36 +0000
+  Processing by AuthenticationsController#callback as HTML
+  Parameters: {"code"=>"a379d659afad615d0c8f53618942cf7ec5745c9807dd56f74bf8299720f33017"}
+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-11 16:14:36 +0000
+  Processing by ExampleController#restricted as HTML
+Completed 200 OK in 1ms (Views: 0.6ms)
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-06-11 16:14:36 +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-11 16:14:36 +0000
+
+
+Started GET "/auth/gds/callback?code=0c262328cc615d4c88e4e2435e9ee63a5502f4baa8f80438a07ecf1ed57c1eed" for 127.0.0.1 at 2012-06-11 16:14:36 +0000
+  Processing by AuthenticationsController#callback as HTML
+  Parameters: {"code"=>"0c262328cc615d4c88e4e2435e9ee63a5502f4baa8f80438a07ecf1ed57c1eed"}
+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-11 16:14:36 +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-11 16:14:36 +0000
+  Processing by ExampleController#restricted as JSON
+Authenticating with gds_sso_api_access strategy
+Completed   in 57ms
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-06-11 16:14:36 +0000
+  Processing by ExampleController#restricted as JSON
+Authenticating with gds_sso_api_access strategy
+Completed 200 OK in 1ms (Views: 0.5ms)
+
+
+Started GET "/" for 127.0.0.1 at 2012-06-12 15:18:24 +0000
+  Processing by ExampleController#index as HTML
+Rendered text template (0.0ms)
+Completed 200 OK in 48ms (Views: 47.8ms)
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-06-12 15:18:25 +0000
+  Processing by ExampleController#restricted as HTML
+Authenticating with gds_sso strategy
+Completed   in 89ms
+
+
+Started GET "/auth/gds" for 127.0.0.1 at 2012-06-12 15:18:25 +0000
+
+
+Started GET "/auth/gds/callback?code=I9YRVyM5xAFBIWdzgJXzFdp0m393iBveFAfEqAlXrsYwl1Bd" for 127.0.0.1 at 2012-06-12 15:18:26 +0000
+  Processing by AuthenticationsController#callback as HTML
+  Parameters: {"code"=>"I9YRVyM5xAFBIWdzgJXzFdp0m393iBveFAfEqAlXrsYwl1Bd"}
+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-12 15:18:26 +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-12 15:18:26 +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-12 15:18:26 +0000
+
+
+Started GET "/auth/gds/callback?code=hrttBREqJ5jCLBLwSiBEDmCKakeyZsHtbxpCDzcfC2Lk6FpI" for 127.0.0.1 at 2012-06-12 15:18:26 +0000
+  Processing by AuthenticationsController#callback as HTML
+  Parameters: {"code"=>"hrttBREqJ5jCLBLwSiBEDmCKakeyZsHtbxpCDzcfC2Lk6FpI"}
+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-12 15:18:26 +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-12 15:18:26 +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-12 15:18:26 +0000
+
+
+Started GET "/auth/gds/callback?code=mc9tvDPRt34yjVFlxzpW1YeypbgXVYHwDDBHub84G2ZjNCBh" for 127.0.0.1 at 2012-06-12 15:18:26 +0000
+  Processing by AuthenticationsController#callback as HTML
+  Parameters: {"code"=>"mc9tvDPRt34yjVFlxzpW1YeypbgXVYHwDDBHub84G2ZjNCBh"}
+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-12 15:18:26 +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-12 15:18:26 +0000
+  Processing by ExampleController#restricted as JSON
+Authenticating with gds_sso_api_access strategy
+Completed   in 14ms
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-06-12 15:18:27 +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-12 15:18:56 +0000
+  Processing by ExampleController#index as HTML
+Rendered text template (0.0ms)
+Completed 200 OK in 49ms (Views: 48.2ms)
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-06-12 15:18:57 +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-12 15:18:57 +0000
+
+
+Started GET "/auth/gds/callback?code=69abba163874fae835038e580701ba8f309d1b701c275e715f3b83c0046dcd26" for 127.0.0.1 at 2012-06-12 15:18:57 +0000
+  Processing by AuthenticationsController#callback as HTML
+  Parameters: {"code"=>"69abba163874fae835038e580701ba8f309d1b701c275e715f3b83c0046dcd26"}
+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-12 15:18:58 +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-12 15:18:58 +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-12 15:18:58 +0000
+
+
+Started GET "/auth/gds/callback?code=cce3e9f06747fcfc99186a68f9dbf912524d7a187e75de000f7f69a03658ace2" for 127.0.0.1 at 2012-06-12 15:18:58 +0000
+  Processing by AuthenticationsController#callback as HTML
+  Parameters: {"code"=>"cce3e9f06747fcfc99186a68f9dbf912524d7a187e75de000f7f69a03658ace2"}
+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-12 15:18:58 +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-12 15:18:58 +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-12 15:18:58 +0000
+
+
+Started GET "/auth/gds/callback?code=a60940acfd9e76e7cedc9d07cf00ddf37fc47b1b38e9f8bc15939cebc09b4a1e" for 127.0.0.1 at 2012-06-12 15:18:58 +0000
+  Processing by AuthenticationsController#callback as HTML
+  Parameters: {"code"=>"a60940acfd9e76e7cedc9d07cf00ddf37fc47b1b38e9f8bc15939cebc09b4a1e"}
+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-12 15:18:58 +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-12 15:18:58 +0000
+  Processing by ExampleController#restricted as JSON
+Authenticating with gds_sso_api_access strategy
+Completed   in 12ms
+
+
+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)

data/spec/requests/authentication_soot2.rb

@@ -8,7 +8,7 @@ describe "authenticating with sign-on-o-tron" do
 
     describe "a protected page" do
       it "redirects to /auth/gds" do
-        get "/"
+        get "/restricted"
 
         response.code.should == "302"
         response.location.should == "http://www.example.com/auth/gds"
@@ -20,7 +20,7 @@ describe "authenticating with sign-on-o-tron" do
         get "/auth/gds"
 
         response.code.should == "302"
-        response.location.should =~ /^http:\/\/localhost:3000\/oauth\/authorize/
+        response.location.should =~ /^http:\/\/localhost:4567\/oauth\/authorize/
       end
 
       it "authenticates with a username and password and redirects back to the app" do

data/test/user_test.rb

@@ -7,13 +7,13 @@ class TestUser < Test::Unit::TestCase
       'provider' => 'gds',
       'uid' => 'abcde',
       'credentials' => {'token' => 'abcdefg', 'secret' => 'abcdefg'},
-      'user_info' => {'name' => 'Matt Patterson', 'email' => 'matt@alphagov.co.uk'},
-      'extra' => {'user_hash' => {'uid' => 'abcde', 'version' => 1, 'name' => 'Matt Patterson', 'email' => 'matt@alphagov.co.uk', 'github' => 'fidothe', 'twitter' => 'fidothe'}}
+      'info' => {'name' => 'Matt Patterson', 'email' => 'matt@alphagov.co.uk'},
+      'extra' => {'user' => {'uid' => 'abcde', 'name' => 'Matt Patterson', 'email' => 'matt@alphagov.co.uk'}}
     }
   end
 
   def test_user_params_creation
-    expected = {'uid' => 'abcde', 'version' => 1, 'name' => 'Matt Patterson', 'email' => 'matt@alphagov.co.uk'}
+    expected = {'uid' => 'abcde', 'name' => 'Matt Patterson', 'email' => 'matt@alphagov.co.uk'}
     assert_equal expected, GDS::SSO::User.user_params_from_auth_hash(@auth_hash)
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: gds-sso
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.4
+  version: 0.6.0
 platform: ruby
 authors: 
 - Matt Patterson
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-11 00:00:00 Z
+date: 2012-06-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -29,48 +29,26 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.6
+        version: "1.2"
   type: :runtime
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: oauth2
+  name: omniauth-gds
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.5.2
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: oa-oauth
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.3.2
-  type: :runtime
-  prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: oa-core
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.3.2
-  type: :runtime
-  prerelease: false
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rack-accept
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -78,10 +56,10 @@ dependencies:
         version: 0.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rack
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -89,10 +67,10 @@ dependencies:
         version: 1.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -100,10 +78,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -111,10 +89,10 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: capybara
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -122,10 +100,10 @@ dependencies:
         version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *id010
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -133,10 +111,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *id011
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: capybara-mechanize
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -144,10 +122,10 @@ dependencies:
         version: 0.3.0
   type: :development
   prerelease: false
-  version_requirements: *id012
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: combustion
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -155,10 +133,10 @@ dependencies:
         version: 0.3.2
   type: :development
   prerelease: false
-  version_requirements: *id013
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: gem_publisher
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -166,10 +144,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id014
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: thor
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -177,7 +155,7 @@ dependencies:
         version: 0.14.6
   type: :development
   prerelease: false
-  version_requirements: *id015
+  version_requirements: *id013
 description: Client for GDS' OAuth 2-based SSO
 email: 
 - matt@constituentparts.com
@@ -199,14 +177,11 @@ files:
 - lib/gds-sso/user.rb
 - lib/gds-sso/warden_config.rb
 - lib/gds-sso/api_access.rb
-- lib/gds-sso/omniauth_strategy.rb
 - lib/gds-sso/version.rb
 - README.md
 - Gemfile
 - Rakefile
 - test/test_helper.rb
-- test/omniauth_strategy_test.rb
-- test/gds_sso_strategy_test.rb
 - test/user_test.rb
 - spec/requests/end_to_end_spec.rb
 - spec/requests/authentication_soot2.rb
@@ -239,7 +214,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4356684067939052907
+      hash: 2754881002430173909
       segments: 
       - 0
       version: "0"
@@ -248,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4356684067939052907
+      hash: 2754881002430173909
       segments: 
       - 0
       version: "0"
@@ -261,8 +236,6 @@ specification_version: 3
 summary: Client for GDS' OAuth 2-based SSO
 test_files: 
 - test/test_helper.rb
-- test/omniauth_strategy_test.rb
-- test/gds_sso_strategy_test.rb
 - test/user_test.rb
 - spec/requests/end_to_end_spec.rb
 - spec/requests/authentication_soot2.rb

data/lib/gds-sso/omniauth_strategy.rb

@@ -1,54 +0,0 @@
-require 'omniauth/oauth'
-require 'multi_json'
-
-# Authenticate to GDS with OAuth 2.0 and retrieve
-# basic user information.
-#
-# @example Basic Usage
-#     use OmniAuth::Builder :gds, 'API Key', 'Secret Key'
-
-class OmniAuth::Strategies::Gds < OmniAuth::Strategies::OAuth2
-
-  # @param [Rack Application] app standard middleware application parameter
-  # @param [String] api_key the application id as [provided by GDS]
-  # @param [String] secret_key the application secret as [provided by Bitly]
-  def initialize(app, api_key = nil, secret_key = nil, options = {}, &block)
-    client_options = {
-      :site => "#{GDS::SSO::Config.oauth_root_url}/",
-      :authorize_url => "#{GDS::SSO::Config.oauth_root_url}/oauth/authorize",
-      :token_url => "#{GDS::SSO::Config.oauth_root_url}/oauth/access_token",
-      :access_token_url => "#{GDS::SSO::Config.oauth_root_url}/oauth/access_token",
-      :ssl => {
-        :verify => false
-      }
-    }
-
-    super(app, :gds, api_key, secret_key, client_options, options, &block)
-  end
-
-  def call(env)
-    if GDS::SSO::ApiAccess.api_call?(env)
-      @app.call(env)
-    else
-      super
-    end
-  end
-
-  protected
-
-  def fetch_user_data
-    @access_token.get('/user.json').body
-  end
-
-  def user_hash
-    @user_hash ||= MultiJson.decode(fetch_user_data)['user']
-  end
-
-  def build_auth_hash
-    {'uid' => user_hash['uid'], 'user_info' => {'name' => user_hash['name'], 'email' => user_hash['email']}, 'extra' => {'user_hash' => user_hash}}
-  end
-
-  def auth_hash
-    OmniAuth::Utils.deep_merge(super, build_auth_hash)
-  end
-end

data/test/gds_sso_strategy_test.rb

@@ -1,19 +0,0 @@
-require 'test_helper'
-require 'json'
-require 'gds-sso'
-require 'gds-sso/omniauth_strategy'
-require 'capybara/dsl'
-
-class TestGdsSsoStrategy < Test::Unit::TestCase
-  include OmniAuth::Test::StrategyTestCase
-  include Capybara::DSL
-
-  def strategy
-    # return the parameters to a Rack::Builder map call:
-    [OmniAuth::Strategies::Gds.new, 'client_id', 'client_secret']
-  end
-
-  def setup
-    # post '/auth/gds_sso/callback', :user => { 'name' => 'Dylan', 'id' => '445' }
-  end
-end

data/test/omniauth_strategy_test.rb

@@ -1,35 +0,0 @@
-require 'test_helper'
-require 'json'
-require 'gds-sso'
-require 'gds-sso/omniauth_strategy'
-
-class TestOmniAuthStrategy < Test::Unit::TestCase
-  def setup
-    @app = stub("app")
-    @strategy = OmniAuth::Strategies::Gds.new(@app, :gds, 'client_id', 'client_secret')
-    @strategy.stubs(:fetch_user_data).returns({ 'user' => {
-      'uid' => 'abcde',
-      'version' => 1,
-      'name' => 'Matt Patterson',
-      'email' => 'matt@alphagov.co.uk',
-      'github' => 'fidothe',
-      'twitter' => 'fidothe'
-    }}.to_json)
-  end
-
-  def test_build_auth_hash_returns_name_and_email
-    assert_equal 'Matt Patterson', @strategy.send(:build_auth_hash)['user_info']['name']
-    assert_equal 'matt@alphagov.co.uk', @strategy.send(:build_auth_hash)['user_info']['email']
-  end
-
-  def test_build_auth_hash_contains_extra_info
-    expected = {'uid' => 'abcde', 'version' => 1, 'name' => 'Matt Patterson', 'email' => 'matt@alphagov.co.uk', 'github' => 'fidothe', 'twitter' => 'fidothe'}
-    assert_equal expected, @strategy.send(:build_auth_hash)['extra']['user_hash']
-  end
-
-  def test_oauth_bypassed_if_json_is_accepted_by_request
-    @app.expects(:call)
-    rack_env = { "HTTP_ACCEPT" => 'application/json' }
-    @strategy.call(rack_env)
-  end
-end