scimitar 1.10.0 → 2.0.0

data/app/models/scimitar/schema/address.rb

@@ -10,7 +10,6 @@ module Scimitar
       def self.scim_attributes
         @scim_attributes ||= [
           Attribute.new(name: 'type',          type: 'string'),
-          Attribute.new(name: 'primary',       type: 'boolean'),
           Attribute.new(name: 'formatted',     type: 'string'),
           Attribute.new(name: 'streetAddress', type: 'string'),
           Attribute.new(name: 'locality',      type: 'string'),

data/app/models/scimitar/schema/attribute.rb

@@ -93,23 +93,14 @@ module Scimitar
       end
 
       def valid_simple_type?(value)
-        if multiValued
-          valid = value.is_a?(Array) && value.all? { |v| simple_type?(v) }
-          errors.add(self.name, "or one of its elements has the wrong type. It has to be an array of #{self.type}s.") unless valid
-        else
-          valid = simple_type?(value)
-          errors.add(self.name, "has the wrong type. It has to be a(n) #{self.type}.") unless valid
-        end
+        valid = (type == 'string' && value.is_a?(String)) ||
+          (type == 'boolean' && (value.is_a?(TrueClass) || value.is_a?(FalseClass))) ||
+          (type == 'integer' && (value.is_a?(Integer))) ||
+          (type == 'dateTime' && valid_date_time?(value))
+        errors.add(self.name, "has the wrong type. It has to be a(n) #{self.type}.") unless valid
         valid
       end
 
-      def simple_type?(value)
-        (type == 'string' && value.is_a?(String)) ||
-        (type == 'boolean' && (value.is_a?(TrueClass) || value.is_a?(FalseClass))) ||
-        (type == 'integer' && (value.is_a?(Integer))) ||
-        (type == 'dateTime' && valid_date_time?(value))
-      end
-
       def valid_date_time?(value)
         !!Time.iso8601(value)
       rescue ArgumentError

data/app/models/scimitar/schema/base.rb

@@ -13,7 +13,7 @@ module Scimitar
 
       # Converts the schema to its json representation that will be returned by /SCHEMAS end-point of a SCIM service provider.
       def as_json(options = {})
-        @meta.location ||= Scimitar::Engine.routes.url_helpers.scim_schemas_path(name: id)
+        @meta.location = Scimitar::Engine.routes.url_helpers.scim_schemas_path(name: id)
         original = super
         original.merge('attributes' => original.delete('scim_attributes'))
       end

data/app/models/scimitar/schema/name.rb

@@ -6,8 +6,8 @@ module Scimitar
 
       def self.scim_attributes
         @scim_attributes ||= [
-          Attribute.new(name: 'familyName',       type: 'string'),
-          Attribute.new(name: 'givenName',        type: 'string'),
+          Attribute.new(name: 'familyName',       type: 'string', required: true),
+          Attribute.new(name: 'givenName',        type: 'string', required: true),
           Attribute.new(name: 'middleName',       type: 'string'),
           Attribute.new(name: 'formatted',        type: 'string'),
           Attribute.new(name: 'honorificPrefix',  type: 'string'),

data/app/models/scimitar/schema/user.rb

@@ -20,7 +20,7 @@ module Scimitar
         [
           Attribute.new(name: 'userName',          type: 'string', uniqueness: 'server', required: true),
 
-          Attribute.new(name: 'name',              complexType: Scimitar::ComplexTypes::Name),
+          Attribute.new(name: 'name', complexType: Scimitar::ComplexTypes::Name),
 
           Attribute.new(name: 'displayName',       type: 'string'),
           Attribute.new(name: 'nickName',          type: 'string'),
@@ -35,15 +35,15 @@ module Scimitar
 
           Attribute.new(name: 'password',          type: 'string', mutability: 'writeOnly', returned: 'never'),
 
-          Attribute.new(name: 'emails',            multiValued: true, complexType: Scimitar::ComplexTypes::Email),
-          Attribute.new(name: 'phoneNumbers',      multiValued: true, complexType: Scimitar::ComplexTypes::PhoneNumber),
-          Attribute.new(name: 'ims',               multiValued: true, complexType: Scimitar::ComplexTypes::Ims),
-          Attribute.new(name: 'photos',            multiValued: true, complexType: Scimitar::ComplexTypes::Photo),
-          Attribute.new(name: 'addresses',         multiValued: true, complexType: Scimitar::ComplexTypes::Address),
-          Attribute.new(name: 'groups',            multiValued: true, complexType: Scimitar::ComplexTypes::ReferenceGroup, mutability: 'readOnly'),
-          Attribute.new(name: 'entitlements',      multiValued: true, complexType: Scimitar::ComplexTypes::Entitlement),
-          Attribute.new(name: 'roles',             multiValued: true, complexType: Scimitar::ComplexTypes::Role),
-          Attribute.new(name: 'x509Certificates',  multiValued: true, complexType: Scimitar::ComplexTypes::X509Certificate),
+          Attribute.new(name: 'emails',           multiValued: true, complexType: Scimitar::ComplexTypes::Email),
+          Attribute.new(name: 'phoneNumbers',     multiValued: true, complexType: Scimitar::ComplexTypes::PhoneNumber),
+          Attribute.new(name: 'ims',              multiValued: true, complexType: Scimitar::ComplexTypes::Ims),
+          Attribute.new(name: 'photos',           multiValued: true, complexType: Scimitar::ComplexTypes::Photo),
+          Attribute.new(name: 'addresses',        multiValued: true, complexType: Scimitar::ComplexTypes::Address),
+          Attribute.new(name: 'groups',           multiValued: true, complexType: Scimitar::ComplexTypes::ReferenceGroup, mutability: 'readOnly'),
+          Attribute.new(name: 'entitlements',     multiValued: true, complexType: Scimitar::ComplexTypes::Entitlement),
+          Attribute.new(name: 'roles',            multiValued: true, complexType: Scimitar::ComplexTypes::Role),
+          Attribute.new(name: 'x509Certificates', multiValued: true, complexType: Scimitar::ComplexTypes::X509Certificate),
         ]
       end
 

data/app/models/scimitar/schema/vdtp.rb

@@ -7,7 +7,7 @@ module Scimitar
     class Vdtp < Base
       def self.scim_attributes
         @scim_attributes ||= [
-          Attribute.new(name: 'value',   type: 'string', required: Scimitar.engine_configuration.optional_value_fields_required),
+          Attribute.new(name: 'value',   type: 'string', required: true),
           Attribute.new(name: 'display', type: 'string', mutability: 'readOnly'),
           Attribute.new(name: 'type',    type: 'string'),
           Attribute.new(name: 'primary', type: 'boolean'),

data/app/models/scimitar/service_provider_configuration.rb

@@ -9,22 +9,11 @@ module Scimitar
   class ServiceProviderConfiguration
     include ActiveModel::Model
 
-    attr_accessor(
-      :uses_defaults,
-      :patch,
-      :bulk,
-      :filter,
-      :changePassword,
-      :sort,
-      :etag,
-      :authenticationSchemes,
-      :schemas,
-      :meta,
-    )
+    attr_accessor :patch, :bulk, :filter, :changePassword,
+      :sort, :etag, :authenticationSchemes,
+      :schemas, :meta
 
     def initialize(attributes = {})
-      @uses_defaults = attributes.empty?
-
       defaults = {
         bulk:           Supportable.unsupported,
         changePassword: Supportable.unsupported,

data/config/initializers/scimitar.rb

@@ -38,10 +38,9 @@ Rails.application.config.to_prepare do # (required for >= Rails 7 / Zeitwerk)
   Scimitar.engine_configuration = Scimitar::EngineConfiguration.new({
 
     # If you have filters you want to run for any Scimitar action/route, you
-    # can define them here. You can also override any shared controller methods
-    # here. For example, you might use a before-action to set up some
-    # multi-tenancy related state, skip Rails CSRF token verification, or
-    # customise how Scimitar generates URLs:
+    # can define them here. For example, you might use a before-action to set
+    # up some multi-tenancy related state, or skip Rails CSRF token
+    # verification. For example:
     #
     #     application_controller_mixin: Module.new do
     #       def self.included(base)
@@ -55,10 +54,6 @@ Rails.application.config.to_prepare do # (required for >= Rails 7 / Zeitwerk)
     #           prepend_before_action :setup_some_kind_of_multi_tenancy_data
     #         end
     #       end
-    #
-    #       def scim_schemas_url(options)
-    #         super(custom_param: 'value', **options)
-    #       end
     #     end, # ...other configuration entries might follow...
 
     # If you want to support username/password authentication:
@@ -86,67 +81,6 @@ Rails.application.config.to_prepare do # (required for >= Rails 7 / Zeitwerk)
     # Note that both basic and token authentication can be declared, with the
     # parameters in the inbound HTTP request determining which is invoked.
 
-    # Scimitar rescues certain error cases and exceptions, in order to return a
-    # JSON response to the API caller. If you want exceptions to also be
-    # reported to a third party system such as sentry.io or raygun.com, you can
-    # configure a Proc to do so. It is passed a Ruby exception subclass object.
-    # For example, a minimal sentry.io reporter might do this:
-    #
-    #     exception_reporter: Proc.new do | exception |
-    #       Sentry.capture_exception(exception)
-    #     end
-    #
-    # You will still need to configure your reporting system according to its
-    # documentation (e.g. via a Rails "config/initializers/<foo>.rb" file).
-
-    # Scimilar treats "VDTP" (Value, Display, Type, Primary) attribute values,
-    # used for e.g. e-mail addresses or phone numbers, as required by default.
-    # If you encounter a service which calls these with e.g. "null" value data,
-    # you can configure all values to be optional. You'll need to deal with
-    # whatever that means for you receiving system in your model code.
-    #
-    #     optional_value_fields_required: false
-
-    # The SCIM standard `/Schemas` endpoint lists, by default, all known schema
-    # definitions with the mutabilty (read-write, read-only, write-only) state
-    # described by those definitions, and includes all defined attributes. For
-    # user-defined schema, this will typically exactly match your underlying
-    # mapped attribute and model capability - it wouldn't make sense to define
-    # your own schema that misrepresented the implementation! For core SCIM RFC
-    # schema, though, you might want to only list actually mapped attributes.
-    # Further, if you happen to have a non-compliant implementation especially
-    # in relation to mutability of some attributes, you may want to report that
-    # accurately in the '/Schemas' list, for auto-discovery purposes. To switch
-    # to a significantly slower but more accurate render method for the list,
-    # driven by your resource subclasses and their attribute maps, set:
-    #
-    #     schema_list_from_attribute_mappings: [...array...]
-    #
-    # ...where you provide an Array of *models*, your classes that include the
-    # Scimitar::Resources::Mixin module and, therefore, define an attribute map
-    # translating SCIM schema attributes into actual implemented data. These
-    # must *uniquely* describe, via the Scimitar resources they each declare in
-    # their Scimitar::Resources::Mixin::scim_resource_type implementation, the
-    # set of schemas and extended schemas you want to render. Should resources
-    # share schema, the '/Schemas' endpoint will fail since it cannot determine
-    # which model attribute map it should use and it needs the map in order to
-    # resolve the differences (if any) between what the schema might say, and
-    # what the actual underlying model supports.
-    #
-    # It is further _very_ _strongly_ _recommended_ that, for any
-    # +scim_attributes_map+ containing a collection which has "list:" key (for
-    # an associative array of zero or more entities; the Groups to which a User
-    # might belong is a good example) then you should also specify the "class:"
-    # key, giving the class used for objects in that associated collection. The
-    # class *must* include Scimitar::Resources::Mixin, since its own attribute
-    # map is consulted in order to render the part of the schema describing
-    # those associated properties in the owning resource. If you don't do this,
-    # and if you're using ActiveRecord, then Scimitar attempts association
-    # reflection to determine the collection class - but that's more fragile
-    # than just being told the exact class in the attribute map. No matter how
-    # this class is determined, though, it must be possible to create a simple
-    # instance with +new+ and no parameters, since that's needed in order to
-    # call Scimitar::Resources::Mixin#scim_mutable_attributes.
   })
 
 end

data/lib/scimitar/engine.rb

@@ -1,38 +1,15 @@
-require 'rails/engine'
-
 module Scimitar
   class Engine < ::Rails::Engine
     isolate_namespace Scimitar
 
-    config.autoload_once_paths = %W(
-      #{root}/app/controllers
-      #{root}/app/models
-    )
-
     Mime::Type.register 'application/scim+json', :scim
 
     ActionDispatch::Request.parameter_parsers[Mime::Type.lookup('application/scim+json').symbol] = lambda do |body|
       JSON.parse(body)
     end
 
-    # Return an Array of all supported default and custom resource classes.
-    # See also :add_custom_resource and :set_default_resources.
-    #
     def self.resources
-      self.default_resources() + self.custom_resources()
-    end
-
-    # Returns a flat array of instances of all resource schema included in the
-    # resource classes returned by ::resources.
-    #
-    def self.schemas
-      self.resources().map(&:schemas).flatten.uniq.map(&:new)
-    end
-
-    # Returns the list of custom resources, if any.
-    #
-    def self.custom_resources
-      @custom_resources ||= []
+      default_resources + custom_resources
     end
 
     # Can be used to add a new resource type which is not provided by the gem.
@@ -53,7 +30,7 @@ module Scimitar
     #     Scimitar::Engine.add_custom_resource Scim::Resources::ShinyResource
     #
     def self.add_custom_resource(resource)
-      self.custom_resources() << resource
+      custom_resources << resource
     end
 
     # Resets the resource list to default. This is really only intended for use
@@ -63,45 +40,23 @@ module Scimitar
       @custom_resources = []
     end
 
-    # Returns the default resources added in this gem - by default, these are:
-    #
-    # * Scimitar::Resources::User
-    # * Scimitar::Resources::Group
-    #
-    # ...but if an implementation does not e.g. support Group, it can
-    # be overridden via ::set_default_resources to help with service
-    # auto-discovery.
+    # Returns the list of custom resources, if any.
     #
-    def self.default_resources
-      @standard_default_resources = [ Resources::User, Resources::Group ]
-      @default_resources        ||= @standard_default_resources.dup()
+    def self.custom_resources
+      @custom_resources ||= []
     end
 
-    # Override the resources returned by ::default_resources.
+    # Returns the default resources added in this gem:
     #
-    # +resource_array+:: An Array containing one or both of
-    #                    Scimitar::Resources::User and/or
-    #                    Scimitar::Resources::Group, and nothing else.
+    # * Scimitar::Resources::User
+    # * Scimitar::Resources::Group
     #
-    def self.set_default_resources(resource_array)
-      self.default_resources()
-      unrecognised_resources = resource_array - @standard_default_resources
-
-      if unrecognised_resources.any?
-        raise "Scimitar::Engine::set_default_resources: Only #{@standard_default_resources.map(&:name).join(', ')} are supported"
-      elsif resource_array.empty?
-        raise 'Scimitar::Engine::set_default_resources: At least one resource must be given'
-      end
-
-      @default_resources = resource_array
+    def self.default_resources
+      [ Resources::User, Resources::Group ]
     end
 
-    # Resets the default resource list. This is really only intended for use
-    # during testing, to avoid one test polluting another.
-    #
-    def self.reset_default_resources
-      self.default_resources()
-      @default_resources = @standard_default_resources
+    def self.schemas
+      resources.map(&:schemas).flatten.uniq.map(&:new)
     end
 
   end

data/lib/scimitar/support/hash_with_indifferent_case_insensitive_access.rb

@@ -23,8 +23,8 @@ class Hash
   #
   def self.deep_indifferent_case_insensitive_access(object)
     if object.is_a?(Hash)
-      new_hash = Scimitar::Support::HashWithIndifferentCaseInsensitiveAccess.new
-      object.each do | key, value |
+      new_hash = Scimitar::Support::HashWithIndifferentCaseInsensitiveAccess.new(object)
+      new_hash.each do | key, value |
         new_hash[key] = deep_indifferent_case_insensitive_access(value)
       end
       new_hash
@@ -49,164 +49,34 @@ module Scimitar
     # in a case-insensitive fashion too.
     #
     # During enumeration, Hash keys will always be returned in whatever case
-    # they were originally set. Just as with
-    # ActiveSupport::HashWithIndifferentAccess, though, the type of the keys is
-    # always returned as a String, even if originally set as a Symbol - only
-    # the upper/lower case nature of the original key is preserved.
-    #
-    # If a key is written more than once with the same effective meaning in a
-    # to-string, to-downcase form, then whatever case was used *first* wins;
-    # e.g. if you did hash['User'] = 23, then hash['USER'] = 42, the result
-    # would be {"User" => 42}.
-    #
-    # It's important to remember that Hash#merge is shallow and replaces values
-    # found at existing keys in the target ("this") hash with values in the
-    # inbound Hash. If that new value that is itself a Hash, this *replaces*
-    # the value. For example:
-    #
-    # * Original: <tt>'Foo' => { 'Bar' => 42 }</tt>
-    # * Merge:    <tt>'FOO' => { 'BAR' => 24 }</tt>
-    #
-    # ...results in "this" target hash's key +Foo+ being addressed in the merge
-    # by inbound key +FOO+, so the case doesn't change. But the value for +Foo+
-    # is _replaced_ by the merging-in Hash completely:
-    #
-    # * Result: <tt>'Foo' => { 'BAR' => 24 }</tt>
-    #
-    # ...and of course we might've replaced with a totally different type, such
-    # as +true+:
-    #
-    # * Original: <tt>'Foo' => { 'Bar' => 42 }</tt>
-    # * Merge:    <tt>'FOO' => true</tt>
-    # * Result:   <tt>'Foo' => true</tt>
-    #
-    # If you're intending to merge nested Hashes, then use ActiveSupport's
-    # #deep_merge or an equivalent. This will have the expected outcome, where
-    # the hash with 'BAR' is _merged_ into the existing value and, therefore,
-    # the original 'Bar' key case is preserved:
-    #
-    # * Original:   <tt>'Foo' => { 'Bar' => 42 }</tt>
-    # * Deep merge: <tt>'FOO' => { 'BAR' => 24 }</tt>
-    # * Result:     <tt>'Foo' => { 'Bar' => 24 }</tt>
+    # they were originally set.
     #
     class HashWithIndifferentCaseInsensitiveAccess < ActiveSupport::HashWithIndifferentAccess
       def with_indifferent_case_insensitive_access
         self
       end
 
-      def initialize(constructor = nil)
-        @scimitar_hash_with_indifferent_case_insensitive_access_key_map = {}
-        super
-      end
-
-      # It's vital that the attribute map is carried over when one of these
-      # objects is duplicated. Duplication of this ivar state does *not* happen
-      # when 'dup' is called on our superclass, so we have to do that manually.
-      #
-      def dup
-        duplicate = super
-        duplicate.instance_variable_set(
-          '@scimitar_hash_with_indifferent_case_insensitive_access_key_map',
-          @scimitar_hash_with_indifferent_case_insensitive_access_key_map
-        )
-
-        return duplicate
-      end
-
-      # Override the individual key writer.
-      #
-      def []=(key, value)
-        string_key      = scimitar_hash_with_indifferent_case_insensitive_access_string(key)
-        indifferent_key = scimitar_hash_with_indifferent_case_insensitive_access_downcase(string_key)
-        converted_value = convert_value(value, conversion: :assignment)
-
-        # Note '||=', as there might have been a prior use of the "same" key in
-        # a different case. The earliest one is preserved since the actual Hash
-        # underneath all this is already using that variant of the key.
-        #
-        key_for_writing = (
-          @scimitar_hash_with_indifferent_case_insensitive_access_key_map[indifferent_key] ||= string_key
-        )
-
-        regular_writer(key_for_writing, converted_value)
-      end
-
-      # Override #merge to express it in terms of #merge! (also overridden), so
-      # that merged hashes can have their keys treated indifferently too.
-      #
-      def merge(*other_hashes, &block)
-        dup.merge!(*other_hashes, &block)
-      end
-
-      # Modifies-self version of #merge, overriding Hash#merge!.
-      #
-      def merge!(*hashes_to_merge_to_self, &block)
-        if block_given?
-          hashes_to_merge_to_self.each do |hash_to_merge_to_self|
-            hash_to_merge_to_self.each_pair do |key, value|
-              value = block.call(key, self[key], value) if self.key?(key)
-              self[key] = value
-            end
-          end
-        else
-          hashes_to_merge_to_self.each do |hash_to_merge_to_self|
-            hash_to_merge_to_self.each_pair do |key, value|
-              self[key] = value
-            end
-          end
-        end
-
-        self
-      end
-
-      # =======================================================================
-      # PRIVATE INSTANCE METHODS
-      # =======================================================================
-      #
       private
 
         if Symbol.method_defined?(:name)
-          def scimitar_hash_with_indifferent_case_insensitive_access_string(key)
-            key.kind_of?(Symbol) ? key.name : key
+          def convert_key(key)
+            key.kind_of?(Symbol) ? key.name.downcase : key.downcase
           end
         else
-          def scimitar_hash_with_indifferent_case_insensitive_access_string(key)
-            key.kind_of?(Symbol) ? key.to_s : key
-          end
-        end
-
-        def scimitar_hash_with_indifferent_case_insensitive_access_downcase(key)
-          key.kind_of?(String) ? key.downcase : key
-        end
-
-        def convert_key(key)
-          string_key      = scimitar_hash_with_indifferent_case_insensitive_access_string(key)
-          indifferent_key = scimitar_hash_with_indifferent_case_insensitive_access_downcase(string_key)
-
-          @scimitar_hash_with_indifferent_case_insensitive_access_key_map[indifferent_key] || string_key
-        end
-
-        def convert_value(value, conversion: nil)
-          if value.is_a?(Hash)
-            if conversion == :to_hash
-              value.to_hash
-            else
-              value.with_indifferent_case_insensitive_access
-            end
-          else
-            super
+          def convert_key(key)
+            key.kind_of?(Symbol) ? key.to_s.downcase : key.downcase
           end
         end
 
         def update_with_single_argument(other_hash, block)
-          if other_hash.is_a?(HashWithIndifferentCaseInsensitiveAccess)
+          if other_hash.is_a? HashWithIndifferentCaseInsensitiveAccess
             regular_update(other_hash, &block)
           else
             other_hash.to_hash.each_pair do |key, value|
               if block && key?(key)
-                value = block.call(self.convert_key(key), self[key], value)
+                value = block.call(convert_key(key), self[key], value)
               end
-              self.[]=(key, value)
+              regular_writer(convert_key(key), convert_value(value))
             end
           end
         end

data/lib/scimitar/version.rb

@@ -3,11 +3,11 @@ module Scimitar
   # Gem version. If this changes, be sure to re-run "bundle install" or
   # "bundle update".
   #
-  VERSION = '1.10.0'
+  VERSION = '2.0.0'
 
   # Date for VERSION. If this changes, be sure to re-run "bundle install"
   # or "bundle update".
   #
-  DATE = '2024-06-27'
+  DATE = '2022-03-04'
 
 end

data/lib/scimitar.rb

@@ -1,13 +1,10 @@
 require 'scimitar/version'
 require 'scimitar/support/hash_with_indifferent_case_insensitive_access'
-require 'scimitar/support/utilities'
 require 'scimitar/engine'
 
 module Scimitar
   def self.service_provider_configuration=(custom_configuration)
-    if @service_provider_configuration.nil? || ! custom_configuration.uses_defaults
-      @service_provider_configuration = custom_configuration
-    end
+    @service_provider_configuration = custom_configuration
   end
 
   def self.service_provider_configuration(location:)
@@ -17,9 +14,7 @@ module Scimitar
   end
 
   def self.engine_configuration=(custom_configuration)
-    if @engine_configuration.nil? || ! custom_configuration.uses_defaults
-      @engine_configuration = custom_configuration
-    end
+    @engine_configuration = custom_configuration
   end
 
   def self.engine_configuration

data/spec/apps/dummy/app/controllers/mock_groups_controller.rb

@@ -1,4 +1,4 @@
-class MockGroupsController < Scimitar::ActiveRecordBackedResourcesController
+class MockUsersController < Scimitar::ActiveRecordBackedResourcesController
 
   protected
 

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

@@ -58,7 +58,7 @@ class MockGroup < ActiveRecord::Base
 
           case type.downcase
             when 'user'
-              MockUser.find_by_primary_key(id)
+              MockUser.find_by_id(id)
             when 'group'
               MockGroup.find_by_id(id)
             else