scimitar 1.5.0 → 2.0.0

data/spec/apps/dummy/app/models/mock_user.rb

@@ -5,7 +5,7 @@ class MockUser < ActiveRecord::Base
   # ===========================================================================
 
   READWRITE_ATTRS = %w{
-    primary_key
+    id
     scim_uid
     username
     first_name
@@ -38,7 +38,7 @@ class MockUser < ActiveRecord::Base
 
   def self.scim_attributes_map
     return {
-      id:         :primary_key,
+      id:         :id,
       externalId: :scim_uid,
       userName:   :username,
       name:       {
@@ -92,14 +92,11 @@ class MockUser < ActiveRecord::Base
 
   def self.scim_queryable_attributes
     return {
-      'id'                => { column: :primary_key },
-      'externalId'        => { column: :scim_uid },
-      'meta.lastModified' => { column: :updated_at },
-      'name.givenName'    => { column: :first_name },
-      'name.familyName'   => { column: :last_name  },
-      'emails'            => { columns: [ :work_email_address, :home_email_address ] },
-      'emails.value'      => { columns: [ :work_email_address, :home_email_address ] },
-      'emails.type'       => { ignore: true } # We can't filter on that; it'll just search all e-mails
+      'name.givenName'  => { column: :first_name },
+      'name.familyName' => { column: :last_name  },
+      'emails'          => { columns: [ :work_email_address, :home_email_address ] },
+      'emails.value'    => { columns: [ :work_email_address, :home_email_address ] },
+      'emails.type'     => { ignore: true } # We can't filter on that; it'll just search all e-mails
     }
   end
 

data/spec/apps/dummy/config/application.rb

@@ -12,6 +12,7 @@ require 'scimitar'
 
 module Dummy
   class Application < Rails::Application
+    config.load_defaults 7.0
   end
 end
 

data/spec/apps/dummy/config/environments/test.rb

@@ -1,15 +1,38 @@
+require 'active_support/core_ext/integer/time'
+
 Rails.application.configure do
   config.cache_classes = true
   config.eager_load = false
-  config.serve_static_files = true
-  config.static_cache_control = 'public, max-age=3600'
-  config.consider_all_requests_local = true
 
-  config.action_dispatch.show_exceptions = false
+  # Configure public file server for tests with Cache-Control for performance.
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = {
+    'Cache-Control' => "public, max-age=#{1.hour.to_i}"
+  }
 
+  # Show full error reports and disable caching.
+  config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
+  config.cache_store = :null_store
+
+  # Raise exceptions instead of rendering exception templates.
+  config.action_dispatch.show_exceptions = false
+
+  # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false
 
-  config.active_support.test_order = :random
+  # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
+
+  # Raise exceptions for disallowed deprecations.
+  config.active_support.disallowed_deprecation = :raise
+
+  # Tell Active Support which deprecation messages to disallow.
+  config.active_support.disallowed_deprecation_warnings = []
+
+  # Raises error for missing translations.
+  config.i18n.raise_on_missing_translations = true
+
+  # Annotate rendered view with file names.
+  # config.action_view.annotate_rendered_view_with_filenames = true
 end

data/spec/apps/dummy/config/initializers/scimitar.rb

@@ -1,14 +1,16 @@
 # Test app configuration.
 #
-Scimitar.engine_configuration = Scimitar::EngineConfiguration.new({
+Rails.application.config.to_prepare do
+  Scimitar.engine_configuration = Scimitar::EngineConfiguration.new({
 
-  application_controller_mixin: Module.new do
-    def self.included(base)
-      base.class_eval do
-        def test_hook; end
-        before_action :test_hook
+    application_controller_mixin: Module.new do
+      def self.included(base)
+        base.class_eval do
+          def test_hook; end
+          before_action :test_hook
+        end
       end
     end
-  end
 
-})
+  })
+end

data/spec/apps/dummy/config/routes.rb

@@ -13,10 +13,6 @@ Rails.application.routes.draw do
   patch  'Users/:id', to: 'mock_users#update'
   delete 'Users/:id', to: 'mock_users#destroy'
 
-  get    'Groups',     to: 'mock_groups#index'
-  get    'Groups/:id', to: 'mock_groups#show'
-  patch  'Groups/:id', to: 'mock_groups#update'
-
   # For testing blocks passed to ActiveRecordBackedResourcesController#destroy
   #
   delete 'CustomDestroyUsers/:id', to: 'custom_destroy_mock_users#destroy'

data/spec/apps/dummy/db/migrate/20210304014602_create_mock_users.rb

@@ -1,7 +1,6 @@
 class CreateMockUsers < ActiveRecord::Migration[6.1]
   def change
-    create_table :mock_users, id: :uuid, primary_key: :primary_key do |t|
-      t.timestamps
+    create_table :mock_users do |t|
 
       t.text :scim_uid
       t.text :username
@@ -10,6 +9,7 @@ class CreateMockUsers < ActiveRecord::Migration[6.1]
       t.text :work_email_address
       t.text :home_email_address
       t.text :work_phone_number
+
     end
   end
 end

data/spec/apps/dummy/db/migrate/20210308044214_create_join_table_mock_groups_mock_users.rb

@@ -1,13 +1,8 @@
 class CreateJoinTableMockGroupsMockUsers < ActiveRecord::Migration[6.1]
   def change
-    create_table :mock_groups_users, id: false do | t |
-      t.references :mock_group, foreign_key: true, type: :int8, index: true, null: false
-      t.references :mock_user,                     type: :uuid, index: true, null: false, primary_key: :primary_key
-
-      # The 'foreign_key:' option (used above) only works for 'id' column names
-      # but the test data has a column named 'primary_key' for 'mock_users'.
-      #
-      t.foreign_key :mock_users, primary_key: :primary_key
+    create_join_table :mock_groups, :mock_users do |t|
+      t.index [:mock_group_id, :mock_user_id]
+      t.index [:mock_user_id, :mock_group_id]
     end
   end
 end

data/spec/apps/dummy/db/schema.rb

@@ -24,14 +24,12 @@ ActiveRecord::Schema.define(version: 2021_03_08_044214) do
 
   create_table "mock_groups_users", id: false, force: :cascade do |t|
     t.bigint "mock_group_id", null: false
-    t.uuid "mock_user_id", null: false
-    t.index ["mock_group_id"], name: "index_mock_groups_users_on_mock_group_id"
-    t.index ["mock_user_id"], name: "index_mock_groups_users_on_mock_user_id"
+    t.bigint "mock_user_id", null: false
+    t.index ["mock_group_id", "mock_user_id"], name: "index_mock_groups_users_on_mock_group_id_and_mock_user_id"
+    t.index ["mock_user_id", "mock_group_id"], name: "index_mock_groups_users_on_mock_user_id_and_mock_group_id"
   end
 
-  create_table "mock_users", primary_key: "primary_key", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+  create_table "mock_users", force: :cascade do |t|
     t.text "scim_uid"
     t.text "username"
     t.text "first_name"
@@ -41,6 +39,4 @@ ActiveRecord::Schema.define(version: 2021_03_08_044214) do
     t.text "work_phone_number"
   end
 
-  add_foreign_key "mock_groups_users", "mock_groups"
-  add_foreign_key "mock_groups_users", "mock_users", primary_key: "primary_key"
 end

data/spec/controllers/scimitar/application_controller_spec.rb

@@ -169,74 +169,5 @@ RSpec.describe Scimitar::ApplicationController do
       expect(parsed_body).to include('status' => '500')
       expect(parsed_body).to include('detail' => 'Bang')
     end
-
-    context 'with an exception reporter' do
-      around :each do | example |
-        original_configuration = Scimitar.engine_configuration.exception_reporter
-        Scimitar.engine_configuration.exception_reporter = Proc.new do | exception |
-          @exception = exception
-        end
-        example.run()
-      ensure
-        Scimitar.engine_configuration.exception_reporter = original_configuration
-      end
-
-      context 'and "internal server error"' do
-        it 'is invoked' do
-          get :index, params: { format: :scim }
-
-          expect(@exception).to be_a(RuntimeError)
-          expect(@exception.message).to eql('Bang')
-        end
-      end
-
-      context 'and "not found"' do
-        controller do
-          def index
-            handle_resource_not_found(ActiveRecord::RecordNotFound.new(42))
-          end
-        end
-
-        it 'is invoked' do
-          get :index, params: { format: :scim }
-
-          expect(@exception).to be_a(ActiveRecord::RecordNotFound)
-          expect(@exception.message).to eql('42')
-        end
-      end
-
-      context 'and bad JSON' do
-        controller do
-          def index
-            begin
-              raise 'Hello'
-            rescue
-              raise ActionDispatch::Http::Parameters::ParseError
-            end
-          end
-        end
-
-        it 'is invoked' do
-          get :index, params: { format: :scim }
-
-          expect(@exception).to be_a(ActionDispatch::Http::Parameters::ParseError)
-          expect(@exception.message).to eql('Hello')
-        end
-      end
-
-      context 'and a bad content type' do
-        controller do
-          def index; end
-        end
-
-        it 'is invoked' do
-          request.headers['Content-Type'] = 'text/plain'
-          get :index
-
-          expect(@exception).to be_a(Scimitar::ErrorResponse)
-          expect(@exception.message).to eql('Only application/scim+json type is accepted.')
-        end
-      end
-    end # "context 'exception reporter' do"
-  end # "context 'error handling' do"
+  end
 end

data/spec/models/scimitar/complex_types/email_spec.rb

@@ -18,4 +18,6 @@ RSpec.describe Scimitar::ComplexTypes::Email do
       expect(described_class.new(value: 'a@b.c').as_json).to eq('value' => 'a@b.c')
     end
   end
+
 end
+

data/spec/models/scimitar/lists/query_parser_spec.rb

@@ -405,19 +405,19 @@ RSpec.describe Scimitar::Lists::QueryParser do
       query = @instance.to_activerecord_query(MockUser.all)
 
       expect(query.count).to eql(1)
-      expect(query.pluck(:primary_key)).to eql([user_1.id])
+      expect(query.pluck(:id)).to eql([user_1.id])
 
       @instance.parse('name.givenName sw J') # First name starts with 'J'
       query = @instance.to_activerecord_query(MockUser.all)
 
       expect(query.count).to eql(2)
-      expect(query.pluck(:primary_key)).to match_array([user_1.primary_key, user_2.primary_key])
+      expect(query.pluck(:id)).to match_array([user_1.id, user_2.id])
 
       @instance.parse('name.familyName ew he') # Last name ends with 'he'
       query = @instance.to_activerecord_query(MockUser.all)
 
       expect(query.count).to eql(1)
-      expect(query.pluck(:primary_key)).to eql([user_2.primary_key])
+      expect(query.pluck(:id)).to eql([user_2.id])
 
       # Test presence
 
@@ -425,7 +425,7 @@ RSpec.describe Scimitar::Lists::QueryParser do
       query = @instance.to_activerecord_query(MockUser.all)
 
       expect(query.count).to eql(2)
-      expect(query.pluck(:primary_key)).to match_array([user_1.primary_key, user_2.primary_key])
+      expect(query.pluck(:id)).to match_array([user_1.id, user_2.id])
 
       # Test a simple not-equals, but use a custom starting scope. Note that
       # the query would find "user_3" *except* there is no first name defined
@@ -435,7 +435,7 @@ RSpec.describe Scimitar::Lists::QueryParser do
       query = @instance.to_activerecord_query(MockUser.where.not('first_name' => 'John'))
 
       expect(query.count).to eql(1)
-      expect(query.pluck(:primary_key)).to match_array([user_1.primary_key])
+      expect(query.pluck(:id)).to match_array([user_1.id])
     end
 
     context 'when mapped to multiple columns' do
@@ -499,7 +499,7 @@ RSpec.describe Scimitar::Lists::QueryParser do
           query = @instance.to_activerecord_query(MockUser.all)
 
           expect(query.count).to eql(1)
-          expect(query.pluck(:primary_key)).to match_array([user_2.primary_key])
+          expect(query.pluck(:id)).to match_array([user_2.id])
         end
       end # "context 'simple AND' do"
 
@@ -520,7 +520,7 @@ RSpec.describe Scimitar::Lists::QueryParser do
           query = @instance.to_activerecord_query(MockUser.all)
 
           expect(query.count).to eql(2)
-          expect(query.pluck(:primary_key)).to match_array([user_1.primary_key, user_2.primary_key])
+          expect(query.pluck(:id)).to match_array([user_1.id, user_2.id])
         end
       end # "context 'simple OR' do"
 
@@ -546,7 +546,7 @@ RSpec.describe Scimitar::Lists::QueryParser do
           query = @instance.to_activerecord_query(MockUser.all)
 
           expect(query.count).to eql(3)
-          expect(query.pluck(:primary_key)).to match_array([user_1.primary_key, user_2.primary_key, user_3.primary_key])
+          expect(query.pluck(:id)).to match_array([user_1.id, user_2.id, user_3.id])
         end
       end # "context 'combined AND and OR' do"
 
@@ -590,7 +590,7 @@ RSpec.describe Scimitar::Lists::QueryParser do
       end
 
       it 'complains if there is no column mapping available' do
-        expect { @instance.send(:activerecord_columns, 'userName') }.to raise_error(Scimitar::FilterError)
+        expect { @instance.send(:activerecord_columns, 'externalId') }.to raise_error(Scimitar::FilterError)
       end
 
       it 'complains about malformed declarations' do

data/spec/models/scimitar/resources/base_validation_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 RSpec.describe Scimitar::Resources::Base do
+
   context '#valid?' do
     MyCustomSchema = Class.new(Scimitar::Schema::Base) do
       def self.id
@@ -20,9 +21,6 @@ RSpec.describe Scimitar::Resources::Base do
           ),
           Scimitar::Schema::Attribute.new(
             name: 'complexNames', complexType: Scimitar::ComplexTypes::Name, multiValued:true, required: false
-          ),
-          Scimitar::Schema::Attribute.new(
-            name: 'vdtpTestByEmail', complexType: Scimitar::ComplexTypes::Email, required: false
           )
         ]
       end
@@ -59,28 +57,5 @@ RSpec.describe Scimitar::Resources::Base do
       expect(resource.valid?).to be(false)
       expect(resource.errors.full_messages).to match_array(["Complexnames has to follow the complexType format.", "Complexnames familyname has the wrong type. It has to be a(n) string."])
     end
-
-    context 'configuration of required values in VDTP schema' do
-      around :each do | example |
-        original_configuration = Scimitar.engine_configuration.optional_value_fields_required
-        Scimitar::Schema::Email.instance_variable_set('@scim_attributes', nil)
-        example.run()
-      ensure
-        Scimitar.engine_configuration.optional_value_fields_required = original_configuration
-        Scimitar::Schema::Email.instance_variable_set('@scim_attributes', nil)
-      end
-
-      it 'requires a value by default' do
-        resource = MyCustomResource.new(vdtpTestByEmail: { value: nil }, enforce: false)
-        expect(resource.valid?).to be(false)
-        expect(resource.errors.full_messages).to match_array(['Vdtptestbyemail value is required'])
-      end
-
-      it 'can be configured for optional values' do
-        Scimitar.engine_configuration.optional_value_fields_required = false
-        resource = MyCustomResource.new(vdtpTestByEmail: { value: nil }, enforce: false)
-        expect(resource.valid?).to be(true)
-      end
-    end # "context 'configuration of required values in VDTP schema' do"
-  end # "context '#valid?' do"
+  end
 end