gds-sso 0.3.0 → 0.4.0

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

@@ -0,0 +1,22 @@
+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

data/lib/gds-sso/version.rb

@@ -1,5 +1,5 @@
 module GDS
   module SSO
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

data/lib/gds-sso/warden_config.rb

@@ -41,6 +41,11 @@ 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')
+    end
     
     auth = Rack::Auth::Basic::Request.new(env)
 
@@ -54,6 +59,10 @@ 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 != '' && 

metadata

@@ -1,121 +1,118 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gds-sso
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.4.0
   prerelease: 
-  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - Matt Patterson
 - James Stewart
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-10 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-17 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70228864568980 !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: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70228864568980
+- !ruby/object:Gem::Dependency
   name: warden
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70228864566860 !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: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70228864566860
+- !ruby/object:Gem::Dependency
   name: oauth2
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70228864564820 !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: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70228864564820
+- !ruby/object:Gem::Dependency
   name: oa-oauth
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &70228864563740 !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: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70228864563740
+- !ruby/object:Gem::Dependency
   name: oa-core
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &70228864558980 !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: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70228864558980
+- !ruby/object:Gem::Dependency
   name: rack-accept
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &70228864558480 !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: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70228864558480
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &70228864558000 !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: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70228864558000
+- !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &70228864557420 !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: *id008
+  version_requirements: *70228864557420
 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:
 - 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
@@ -130,38 +127,29 @@ 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 
-      hash: -376516686123011262
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -376516686123011262
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: gds-sso
-rubygems_version: 1.8.13
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Client for GDS' OAuth 2-based SSO
-test_files: 
+test_files:
 - test/test_helper.rb
 - test/test_omniauth_strategy.rb
 - test/test_user.rb