spid-es 0.0.30 → 0.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef4d9da8e2a6d3b9e6f0b70a8970010864b1cc98a9b3ca7461717512ec6a04b4
-  data.tar.gz: 18c491970d8215cb051c0a505cf33a65b2f0a1170735d27b527a0c1b2777b5bf
+  metadata.gz: cd806ece973eeb83d2bbd5a741b0ff52635f12ef5d07df84f969fae840b88f85
+  data.tar.gz: 5387f01ec5f551b616e7addf8ebea520863540565891b13571aa3232703b254a
 SHA512:
-  metadata.gz: 83e2246e5c07bc0b143c02a72db90dd75f67c0035f2265c524d82d0c5a9db1226fbf84e27bbda03fe58b71d03c0cd8329a451fc69d7097d03b07c2c0b1d3c482
-  data.tar.gz: e71257e4fe2e3627d25d880b392527d9f9b4e5a29e3900f2161d584cff4fde9cbafe79f130b5cb09890e7b5a37e8476eeee459aa30197751c533cf284d3bd109
+  metadata.gz: 77c67ffbaf85e3e0037d9096ea517a73b978cbeeee8f959a7c09cd09484149ec2c19f8abee03a35e7c0986874b8cbeac2788953e1443134820d659769f5b2714
+  data.tar.gz: dec84c9240468a66c36c3bc5a298386435f2bb020a9f962de6e2ef995dc0e019ada6645b6b57dd8fa8adc5be27d4c8d515df092531c6d03c0ae7df2715cdd435

data/lib/spid/ruby-saml/authrequest.rb

@@ -54,10 +54,9 @@ module Spid::Saml
 
       unless @settings.issuer.blank?
         issuer = root.add_element "saml:Issuer"
-        issuer.attributes['NameQualifier'] =  @settings.issuer #non metto @settings.sp_name_qualifier, questo valore deve essere uguale al 
-        #entityID dei metadata che usa @settings.issuer
-        issuer.attributes['Format'] =  "urn:oasis:names:tc:SAML:2.0:nameid-format:entity"
-        issuer.text = @settings.issuer
+        issuer.attributes['NameQualifier'] = ( @settings.aggregato ? @settings.sp_name_qualifier : @settings.issuer )
+        issuer.attributes['Format'] = "urn:oasis:names:tc:SAML:2.0:nameid-format:entity"
+        issuer.text = @settings.issuer #questo valore deve essere uguale al #entityID dei metadata che usa @settings.issuer
       end
 
       #opzionale

data/lib/spid/ruby-saml/metadata.rb

@@ -235,20 +235,6 @@ module Spid
             "contactType" => "other",
             "spid:entityType" => "spid:aggregator"
           }
-          unless settings.hash_aggregatore['soggetto_aggregatore'].blank?
-            company = contact_person_aggregatore.add_element "md:Company"
-            company.text = settings.hash_aggregatore['soggetto_aggregatore']
-          end
-
-          unless settings.hash_aggregatore['email_aggregatore'].blank?
-            email_address = contact_person_aggregatore.add_element "md:EmailAddress"
-            email_address.text = settings.hash_aggregatore['email_aggregatore']
-          end
-
-          unless settings.hash_aggregatore['telefono_aggregatore'].blank?
-            telephone_number = contact_person_aggregatore.add_element "md:TelephoneNumber"
-            telephone_number.text = settings.hash_aggregatore['telefono_aggregatore']
-          end
 
           extensions_aggregatore = contact_person_aggregatore.add_element "md:Extensions"
 
@@ -269,26 +255,56 @@ module Spid
 
           tipo_aggregatore = extensions_aggregatore.add_element "spid:PublicServicesFullAggregator"
 
+          unless settings.hash_aggregatore['soggetto_aggregatore'].blank?
+            company_aggregatore = contact_person_aggregatore.add_element "md:Company"
+            company_aggregatore.text = settings.hash_aggregatore['soggetto_aggregatore']
+          end
+
+          unless settings.hash_aggregatore['email_aggregatore'].blank?
+            email_address_aggregatore = contact_person_aggregatore.add_element "md:EmailAddress"
+            email_address_aggregatore.text = settings.hash_aggregatore['email_aggregatore']
+          end
+
+          unless settings.hash_aggregatore['telefono_aggregatore'].blank?
+            telephone_number_aggregatore = contact_person_aggregatore.add_element "md:TelephoneNumber"
+            telephone_number_aggregatore.text = settings.hash_aggregatore['telefono_aggregatore']
+          end
+
           contact_person_aggregato = root.add_element "md:ContactPerson", {
             "contactType" => "other",
             "spid:entityType" => "spid:aggregated"
           }
-          company = contact_person_aggregato.add_element "md:Company"
-          company.text = settings.organization['org_name']
 
           extensions_aggregato = contact_person_aggregato.add_element "md:Extensions"
-          unless settings.hash_aggregatore['soggetto_aggregato']['vat_number'].blank?
-            vat_number_aggregato = extensions_aggregato.add_element "spid:VATNumber"
-            vat_number_aggregato.text = settings.hash_aggregatore['soggetto_aggregato']['vat_number']
-          end
           unless settings.hash_aggregatore['soggetto_aggregato']['ipa_code'].blank?
             ipa_code_aggregato = extensions_aggregato.add_element "spid:IPACode" 
             ipa_code_aggregato.text = settings.hash_aggregatore['soggetto_aggregato']['ipa_code']
           end
+          unless settings.hash_aggregatore['soggetto_aggregato']['vat_number'].blank?
+            vat_number_aggregato = extensions_aggregato.add_element "spid:VATNumber"
+            vat_number_aggregato.text = settings.hash_aggregatore['soggetto_aggregato']['vat_number']
+          end
           unless settings.hash_aggregatore['soggetto_aggregato']['fiscal_code'].blank?
             fiscal_code_aggregato = extensions_aggregato.add_element "spid:FiscalCode" 
             fiscal_code_aggregato.text = settings.hash_aggregatore['soggetto_aggregato']['fiscal_code']
           end
+          unless settings.hash_aggregatore['soggetto_aggregato']['ipa_code'].blank?
+            tipo_aggregato = extensions_aggregato.add_element "spid:Public" 
+          end
+
+          company_aggregato = contact_person_aggregato.add_element "md:Company"
+          company_aggregato.text = settings.organization['org_name']
+
+          unless settings.hash_aggregatore['soggetto_aggregato']['email_address'].blank?
+            email_address_aggregato = contact_person_aggregato.add_element "md:EmailAddress"
+            email_address_aggregato.text = settings.hash_aggregatore['soggetto_aggregato']['email_address']
+          end
+
+          unless settings.hash_aggregatore['soggetto_aggregato']['telephone_number'].blank?
+            telephone_number_aggregato = contact_person_aggregato.add_element "md:TelephoneNumber"
+            telephone_number_aggregato.text = settings.hash_aggregatore['soggetto_aggregato']['telephone_number']
+          end
+          
         end
 
         #meta_doc << REXML::XMLDecl.new(version='1.0', encoding='UTF-8')

data/spid-es.gemspec

@@ -2,7 +2,7 @@ $LOAD_PATH.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name = 'spid-es'
-  s.version = '0.0.30'
+  s.version = '0.0.35'
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Fabiano Pavan"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spid-es
 version: !ruby/object:Gem::Version
-  version: 0.0.30
+  version: 0.0.35
 platform: ruby
 authors:
 - Fabiano Pavan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-22 00:00:00.000000000 Z
+date: 2020-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: canonix