spid-es 0.0.31 → 0.0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45a2021698f17c419eff32d26d8ce5a49cad6b73aa011448a8457d1a3e94d964
-  data.tar.gz: aa22c0c52bc2cc16d91403d32465df43ff880302444d500f99d7bfd816787048
+  metadata.gz: fc35f70eafa1275d69403829c39f7d6ace54a22e774c32bff48d3c0184f329b6
+  data.tar.gz: 096eb602ed50f1dd766ca82c3c937a62fc07f37afe358a9f5d668abdf0c67557
 SHA512:
-  metadata.gz: 780073b1f2b9c1a8735725d365fcec406c70772c712c5338780be0d3073cd679802f274a2b497a569f64b3df99b5972c4f579a6785622a9bbb8f805b25efc934
-  data.tar.gz: 3c0ee1bba5171de914b7b173ed0eacfa76ae91d3c9211dc515e4ef34568db574cb5ac9efab403bbd11b69e9f4f23593f956084ecd69f242ece239373215e3492
+  metadata.gz: 3ea7feab8387cc5a089af4ea50fee7674ff0c01c6069e300f1c7b443b510fdc2e07d40f5842f980671b4b0009379dbef6415ac9a8497231f2ff0169d03ed2b06
+  data.tar.gz: 4a48fe9e74c6e39359fc9159f3d5ffec662b066daaacf1118cad50ead9c9ca51dcf72a33fd7b240c5195e36fff34c1edaf305d9d6bba37444afb0b90c989196c

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

@@ -54,20 +54,19 @@ 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
-      unless @settings.sp_name_qualifier.blank?
-        subject = root.add_element "saml:Subject"
-        name_id = subject.add_element "saml:NameID"
-        name_id.attributes['Format'] = "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified"
-        name_id.attributes['NameQualifier'] = @settings.sp_name_qualifier
-        name_id.text = @settings.sp_name_identifier
-      end
+      # #opzionale
+      # unless @settings.sp_name_qualifier.blank?
+      #   subject = root.add_element "saml:Subject"
+      #   name_id = subject.add_element "saml:NameID"
+      #   name_id.attributes['Format'] = "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified"
+      #   name_id.attributes['NameQualifier'] = @settings.sp_name_qualifier
+      #   name_id.text = @settings.sp_name_identifier
+      # end
 
 
 

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

@@ -256,18 +256,18 @@ module Spid
           tipo_aggregatore = extensions_aggregatore.add_element "spid:PublicServicesFullAggregator"
 
           unless settings.hash_aggregatore['soggetto_aggregatore'].blank?
-            company = contact_person_aggregatore.add_element "md:Company"
-            company.text = settings.hash_aggregatore['soggetto_aggregatore']
+            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 = contact_person_aggregatore.add_element "md:EmailAddress"
-            email_address.text = settings.hash_aggregatore['email_aggregatore']
+            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 = contact_person_aggregatore.add_element "md:TelephoneNumber"
-            telephone_number.text = settings.hash_aggregatore['telefono_aggregatore']
+            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", {
@@ -275,22 +275,36 @@ module Spid
             "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.31'
+  s.version = '0.0.36'
 
   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.31
+  version: 0.0.36
 platform: ruby
 authors:
 - Fabiano Pavan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-28 00:00:00.000000000 Z
+date: 2020-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: canonix