Merge pull request #129 from RIPAGlobal/feature/fix-user-name-required

Address #113 - user.givenName / user.familyName are *not* mandatory
RIPAGlobal · Jun 12, 2024 · 0c8a088 · 0c8a088
2 parents 1634db5 + a449c26
commit 0c8a088
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 16 deletions.
diff --git a/app/models/scimitar/schema/name.rb b/app/models/scimitar/schema/name.rb
@@ -6,8 +6,8 @@ class Name < Base
 
       def self.scim_attributes
         @scim_attributes ||= [
-          Attribute.new(name: 'familyName',       type: 'string', required: true),
-          Attribute.new(name: 'givenName',        type: 'string', required: true),
+          Attribute.new(name: 'familyName',       type: 'string'),
+          Attribute.new(name: 'givenName',        type: 'string'),
           Attribute.new(name: 'middleName',       type: 'string'),
           Attribute.new(name: 'formatted',        type: 'string'),
           Attribute.new(name: 'honorificPrefix',  type: 'string'),

diff --git a/app/models/scimitar/schema/user.rb b/app/models/scimitar/schema/user.rb
@@ -20,7 +20,7 @@ def self.scim_attributes
         [
           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 @@ def self.scim_attributes
 
           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
 

diff --git a/spec/models/scimitar/resources/base_validation_spec.rb b/spec/models/scimitar/resources/base_validation_spec.rb
@@ -7,6 +7,19 @@ def self.id
         'custom-id'
       end
 
+      class NameWithRequirementsSchema < Scimitar::Schema::Base
+        def self.scim_attributes
+          @scim_attributes ||= [
+            Scimitar::Schema::Attribute.new(name: 'familyName', type: 'string', required: true),
+            Scimitar::Schema::Attribute.new(name: 'givenName',  type: 'string', required: true),
+          ]
+        end
+      end
+
+      class NameWithRequirementsComplexType < Scimitar::ComplexTypes::Base
+        set_schema NameWithRequirementsSchema
+      end
+
       def self.scim_attributes
         [
           Scimitar::Schema::Attribute.new(
@@ -16,10 +29,10 @@ def self.scim_attributes
             name: 'enforce', type: 'boolean', required: true
           ),
           Scimitar::Schema::Attribute.new(
-            name: 'complexName', complexType: Scimitar::ComplexTypes::Name, required: false
+            name: 'complexName', complexType: NameWithRequirementsComplexType, required: false
           ),
           Scimitar::Schema::Attribute.new(
-            name: 'complexNames', complexType: Scimitar::ComplexTypes::Name, multiValued:true, required: false
+            name: 'complexNames', complexType: Scimitar::ComplexTypes::Name, multiValued: true, required: false
           ),
           Scimitar::Schema::Attribute.new(
             name: 'vdtpTestByEmail', complexType: Scimitar::ComplexTypes::Email, required: false

diff --git a/spec/models/scimitar/schema/user_spec.rb b/spec/models/scimitar/schema/user_spec.rb
@@ -27,7 +27,7 @@
         "subAttributes": [
           {
             "multiValued": false,
-            "required": true,
+            "required": false,
             "caseExact": false,
             "mutability": "readWrite",
             "uniqueness": "none",
@@ -37,7 +37,7 @@
           },
           {
             "multiValued": false,
-            "required": true,
+            "required": false,
             "caseExact": false,
             "mutability": "readWrite",
             "uniqueness": "none",