gds-sso 15.0.0 → 16.0.2

data/spec/unit/mock_bearer_token_spec.rb

@@ -1,5 +1,5 @@
-require 'spec_helper'
-require 'gds-sso/bearer_token'
+require "spec_helper"
+require "gds-sso/bearer_token"
 
 describe GDS::SSO::MockBearerToken do
   it "updates the permissions of the user" do
@@ -7,7 +7,7 @@ describe GDS::SSO::MockBearerToken do
     # call .locate to create the dummy user initially
     GDS::SSO::Config.additional_mock_permissions_required = nil
     dummy_user = subject.locate("ABC")
-    expect(dummy_user.permissions).to match_array(["signin"])
+    expect(dummy_user.permissions).to match_array(%w[signin])
 
     # add an extra permission
     GDS::SSO::Config.additional_mock_permissions_required = "extra_permission"
@@ -17,6 +17,6 @@ describe GDS::SSO::MockBearerToken do
 
     # call .locate again...this should update our permissions
     dummy_user_two = subject.locate("ABC")
-    expect(dummy_user_two.permissions).to match_array(["signin", "extra_permission"])
+    expect(dummy_user_two.permissions).to match_array(%w[signin extra_permission])
   end
 end

data/spec/unit/railtie_spec.rb

@@ -0,0 +1,14 @@
+require "rails"
+require "spec_helper"
+
+RSpec.describe GDS::SSO::Railtie do
+  let(:cache) { double(:cache) }
+
+  it "re-uses the Rails cache" do
+    expect(GDS::SSO::Config.cache).to eq Rails.cache
+  end
+
+  it "honours API only setting" do
+    expect(GDS::SSO::Config.api_only).to eq false
+  end
+end

data/spec/unit/session_serialisation_spec.rb

@@ -1,11 +1,7 @@
-require 'spec_helper'
-require 'active_record'
+require "spec_helper"
+require "active_record"
 
 describe Warden::SessionSerializer do
-  class SerializableUser
-    include GDS::SSO::User
-  end
-
   before :each do
     @old_user_model = GDS::SSO::Config.user_model
     GDS::SSO::Config.user_model = SerializableUser
@@ -35,7 +31,7 @@ describe Warden::SessionSerializer do
 
   describe "deserialize a user" do
     it "should return the user if the timestamp is current and a Time" do
-      expect(SerializableUser).to receive(:where).with(:uid => 1234, :remotely_signed_out => false).and_return(double(:first => :a_user))
+      expect(SerializableUser).to receive(:where).with(uid: 1234, remotely_signed_out: false).and_return(double(first: :a_user))
 
       result = @serializer.deserialize [1234, Time.now.utc - GDS::SSO::Config.auth_valid_for + 3600]
 
@@ -43,7 +39,7 @@ describe Warden::SessionSerializer do
     end
 
     it "should return the user if the timestamp is current and is an ISO 8601 string" do
-      expect(SerializableUser).to receive(:where).with(:uid => 1234, :remotely_signed_out => false).and_return(double(:first => :a_user))
+      expect(SerializableUser).to receive(:where).with(uid: 1234, remotely_signed_out: false).and_return(double(first: :a_user))
 
       result = @serializer.deserialize [1234, (Time.now.utc - GDS::SSO::Config.auth_valid_for + 3600).iso8601]
 
@@ -69,7 +65,7 @@ describe Warden::SessionSerializer do
     it "should return nil for a user with a badly formatted timestamp" do
       expect(SerializableUser).not_to receive(:where)
 
-      result = @serializer.deserialize [1234, 'this is not a timestamp']
+      result = @serializer.deserialize [1234, "this is not a timestamp"]
 
       expect(result).to be_nil
     end

data/spec/unit/user_spec.rb

@@ -1,67 +1,36 @@
-require 'spec_helper'
-require 'gds-sso/user'
-require 'gds-sso/lint/user_spec'
+require "spec_helper"
+require "gds-sso/user"
+require "gds-sso/lint/user_spec"
 
-require 'ostruct'
+require "ostruct"
 
 describe GDS::SSO::User do
   before :each do
     @auth_hash = {
-      'provider' => 'gds',
-      'uid' => 'abcde',
-      'credentials' => {'token' => 'abcdefg', 'secret' => 'abcdefg'},
-      'info' => {'name' => 'Matt Patterson', 'email' => 'matt@alphagov.co.uk'},
-      'extra' => {
-        'user' => {
-          'permissions' => [], 'organisation_slug' => nil, "organisation_content_id" => nil, 'disabled' => false
-        }
-      }
+      "provider" => "gds",
+      "uid" => "abcde",
+      "credentials" => { "token" => "abcdefg", "secret" => "abcdefg" },
+      "info" => { "name" => "Matt Patterson", "email" => "matt@alphagov.co.uk" },
+      "extra" => {
+        "user" => {
+          "permissions" => [], "organisation_slug" => nil, "organisation_content_id" => nil, "disabled" => false
+        },
+      },
     }
   end
 
   it "should extract the user params from the oauth hash" do
-    expected = {'uid' => 'abcde',
-      'name' => 'Matt Patterson',
-      'email' => 'matt@alphagov.co.uk',
-      "permissions" => [],
-      "organisation_slug" => nil,
-      "organisation_content_id" => nil,
-      'disabled' => false,
-    }
+    expected = { "uid" => "abcde",
+                 "name" => "Matt Patterson",
+                 "email" => "matt@alphagov.co.uk",
+                 "permissions" => [],
+                 "organisation_slug" => nil,
+                 "organisation_content_id" => nil,
+                 "disabled" => false }
     expect(GDS::SSO::User.user_params_from_auth_hash(@auth_hash)).to eq(expected)
   end
 
   context "making sure that the lint spec is valid" do
-    class TestUser < OpenStruct
-      include GDS::SSO::User
-
-      def self.where(opts)
-        []
-      end
-
-      def self.create!(options, scope = {})
-        new(options)
-      end
-
-      def update_attribute(key, value)
-        send("#{key}=".to_sym, value)
-      end
-
-      def update!(options)
-        options.each do |key, value|
-          update_attribute(key, value)
-        end
-      end
-
-      def remotely_signed_out?
-        remotely_signed_out
-      end
-
-      def disabled?
-        disabled
-      end
-    end
-
     let(:described_class) { TestUser }
     it_behaves_like "a gds-sso user class"
   end

metadata

@@ -1,85 +1,119 @@
 --- !ruby/object:Gem::Specification
 name: gds-sso
 version: !ruby/object:Gem::Version
-  version: 15.0.0
+  version: 16.0.2
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-12 00:00:00.000000000 Z
+date: 2021-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: warden
+  name: oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: omniauth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: oauth2
+  name: omniauth-gds
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: omniauth
+  name: plek
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: omniauth-gds
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: warden
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: warden-oauth2
   requirement: !ruby/object:Gem::Requirement
@@ -95,89 +129,89 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.1
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
+        version: '2'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: capybara-mechanize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: capybara-mechanize
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: combustion
+  name: rubocop-govuk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -231,6 +265,7 @@ files:
 - lib/gds-sso/failure_app.rb
 - lib/gds-sso/lint/user_spec.rb
 - lib/gds-sso/lint/user_test.rb
+- lib/gds-sso/railtie.rb
 - lib/gds-sso/user.rb
 - lib/gds-sso/version.rb
 - lib/gds-sso/warden_config.rb
@@ -253,12 +288,16 @@ files:
 - spec/requests/end_to_end_spec.rb
 - spec/spec_helper.rb
 - spec/support/backport_controller_test_params.rb
+- spec/support/controller_spy.rb
+- spec/support/serializable_user.rb
 - spec/support/signon_integration_helpers.rb
+- spec/support/test_user.rb
 - spec/support/timecop.rb
 - spec/unit/api_access_spec.rb
 - spec/unit/bearer_token_spec.rb
 - spec/unit/config_spec.rb
 - spec/unit/mock_bearer_token_spec.rb
+- spec/unit/railtie_spec.rb
 - spec/unit/session_serialisation_spec.rb
 - spec/unit/user_spec.rb
 homepage: https://github.com/alphagov/gds-sso
@@ -280,35 +319,39 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Client for GDS' OAuth 2-based SSO
 test_files:
-- spec/fixtures/integration/signon.sql
-- spec/fixtures/integration/authorize_api_users.sql
-- spec/support/timecop.rb
-- spec/support/signon_integration_helpers.rb
-- spec/support/backport_controller_test_params.rb
-- spec/controller/controller_methods_spec.rb
-- spec/controller/api_user_controller_spec.rb
-- spec/unit/bearer_token_spec.rb
-- spec/unit/mock_bearer_token_spec.rb
-- spec/unit/session_serialisation_spec.rb
-- spec/unit/config_spec.rb
-- spec/unit/api_access_spec.rb
-- spec/unit/user_spec.rb
-- spec/spec_helper.rb
 - spec/requests/end_to_end_spec.rb
-- spec/internal/app/controllers/application_controller.rb
+- spec/internal/app/models/user.rb
 - spec/internal/app/controllers/example_controller.rb
+- spec/internal/app/controllers/application_controller.rb
 - spec/internal/app/assets/config/manifest.js
-- spec/internal/app/models/user.rb
-- spec/internal/log/test.log
+- spec/internal/db/combustion_test.sqlite
+- spec/internal/db/schema.rb
 - spec/internal/public/favicon.ico
-- spec/internal/config/database.yml
+- spec/internal/log/test.log
 - spec/internal/config/routes.rb
-- spec/internal/config/initializers/gds-sso.rb
 - spec/internal/config/storage.yml
-- spec/internal/db/combustion_test.sqlite
-- spec/internal/db/schema.rb
+- spec/internal/config/initializers/gds-sso.rb
+- spec/internal/config/database.yml
+- spec/fixtures/integration/authorize_api_users.sql
+- spec/fixtures/integration/signon.sql
+- spec/spec_helper.rb
+- spec/controller/api_user_controller_spec.rb
+- spec/controller/controller_methods_spec.rb
+- spec/unit/bearer_token_spec.rb
+- spec/unit/api_access_spec.rb
+- spec/unit/config_spec.rb
+- spec/unit/session_serialisation_spec.rb
+- spec/unit/railtie_spec.rb
+- spec/unit/user_spec.rb
+- spec/unit/mock_bearer_token_spec.rb
+- spec/support/test_user.rb
+- spec/support/controller_spy.rb
+- spec/support/timecop.rb
+- spec/support/serializable_user.rb
+- spec/support/backport_controller_test_params.rb
+- spec/support/signon_integration_helpers.rb