gds-sso 0.4.2 → 0.4.3

data/lib/gds-sso/version.rb

@@ -1,5 +1,5 @@
 module GDS
   module SSO
-    VERSION = "0.4.2"
+    VERSION = "0.4.3"
   end
-end
+end

data/lib/gds-sso/warden_config.rb

@@ -46,11 +46,6 @@ Warden::Strategies.add(:gds_sso_api_access) do
   def authenticate!
     Rails.logger.debug("Authenticating with gds_sso_api_access strategy")
 
-    if ! basic_auth_configured?
-      Rails.logger.debug("Basic auth not configured, not requiring authentication")
-      success!(api_user)
-    end
-
     auth = Rack::Auth::Basic::Request.new(env)
 
     return custom!(unauthorized) unless auth.provided?
@@ -63,10 +58,6 @@ Warden::Strategies.add(:gds_sso_api_access) do
     end
   end
 
-  def basic_auth_configured?
-    ! ::GDS::SSO::Config.basic_auth_user.nil?
-  end
-
   def valid_api_user?(username, password)
     username.to_s.strip != '' &&
       password.to_s.strip != '' &&
@@ -93,7 +84,7 @@ Warden::Strategies.add(:mock_gds_sso) do
   end
 
   def authenticate!
-    Rails.logger.debug("Authenticating with mock_gds_sso strategy")
+    Rails.logger.warn("Authenticating with mock_gds_sso strategy")
     test_user = GDS::SSO.test_user || GDS::SSO::Config.user_klass.first
     if test_user
       success!(test_user)

metadata

@@ -1,142 +1,145 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: gds-sso
-version: !ruby/object:Gem::Version
-  version: 0.4.2
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.4.3
 platform: ruby
-authors:
+authors: 
 - Matt Patterson
 - James Stewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-24 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-01-25 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rails
-  requirement: &70147169913100 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70147169913100
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: warden
-  requirement: &70147169912600 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
         version: 1.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70147169912600
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: oauth2
-  requirement: &70147169912140 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70147169912140
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: oa-oauth
-  requirement: &70147169911680 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
         version: 0.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70147169911680
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: oa-core
-  requirement: &70147169911220 !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
         version: 0.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70147169911220
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: rack-accept
-  requirement: &70147169910760 !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *70147169910760
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: plek
-  requirement: &70147169910380 !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *70147169910380
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &70147169909840 !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70147169909840
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: &70147169909340 !ruby/object:Gem::Requirement
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *70147169909340
-- !ruby/object:Gem::Dependency
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: capybara
-  requirement: &70147169908960 !ruby/object:Gem::Requirement
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *70147169908960
+  version_requirements: *id010
 description: Client for GDS' OAuth 2-based SSO
-email:
+email: 
 - matt@constituentparts.com
 - james.stewart@digital.cabinet-office.gov.uk
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - app/controllers/authentications_controller.rb
 - config/routes.rb
 - lib/gds-sso/api_access.rb
 - lib/gds-sso/config.rb
 - lib/gds-sso/controller_methods.rb
 - lib/gds-sso/failure_app.rb
-- lib/gds-sso/generators/gds_sso_setup.rb
 - lib/gds-sso/omniauth_strategy.rb
 - lib/gds-sso/routes.rb
 - lib/gds-sso/user.rb
@@ -153,29 +156,38 @@ files:
 - test/test_user.rb
 homepage: https://github.com/alphagov/gds-sso
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: -535713269746465567
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: -535713269746465567
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: gds-sso
-rubygems_version: 1.8.10
+rubygems_version: 1.8.13
 signing_key: 
 specification_version: 3
 summary: Client for GDS' OAuth 2-based SSO
-test_files:
+test_files: 
 - test/test_gds_sso_strategy.rb
 - test/test_helper.rb
 - test/test_http_strategy.rb

data/lib/gds-sso/generators/gds_sso_setup.rb

@@ -1,22 +0,0 @@
-class GdsSsoSetupGenerator < Rails::Generators::Base
-
-  def create_initializer_file
-    create_file "config/initializers/gds_sso.rb", <<-FILE
-GDS::SSO.config do |config|
-  config.user_model   = "User"
-  config.oauth_id     = 'set_me'
-  config.oauth_secret = 'set_me'
-  config.oauth_root_url = Plek.current.find("authentication")
-end
-
-    FILE
-  end
-
-  def create_model
-    create_file "app/models/user.rb", <<-FILE
-class User
-  include GDS::SSO::User
-end
-    FILE
-  end
-end