spid-es 0.0.32 → 0.0.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afd826c70f90739045be11c8bfc34e703e2fdf45cb4059fbff53863b34f80126
-  data.tar.gz: eb412f78bb1ad1e5498f7e7f2a3ed8683b2d527571327b71595b3a01fe01af6d
+  metadata.gz: b485b1feeb1b83e2924dd51120876189dbe5640bca45b8130213203b5790c495
+  data.tar.gz: a60a8b7a7179fbae9b10f5c4ee2fe447605127e37bf8ca4b80945683e2594d2b
 SHA512:
-  metadata.gz: edb1f2460b97716cbf230cd319364cf015b06cee61af607b031925787c4cc04ddaebfb742e4ad504f24cdb595a82d6b7ad5551dc3fcfaf4e5c12247edd164bb5
-  data.tar.gz: 126404ab5a6bc21ced03cc974f5ffb8947b1d6e0d2cf61045b9d2c2dbff03a34aafb13082de63004e7b568f640dfe4f2a937e8a777bf52386157fc15f690b852
+  metadata.gz: 9760018b318d2e972e6e6ad4c3d10c27bf40f44e0387bf8c7e3e6fc7852e646f847c4e1c747bd95aa47f6e8dd88d0a84105eba1781880d203221c4af287796e4
+  data.tar.gz: cd6e83e3eb023f934f1947dbd21e18637f79a9961960c99935ca7f3ea4e1b3ff28bd4cd015737265704eff08e01629b37131e4bab7c3998b53c30a856c8918fa

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

@@ -54,20 +54,20 @@ 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
+        #tolto NameQualifier, con aggregatore non mettendolo corrispondente all'entity_id non funziona...
+        #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", {
@@ -276,21 +276,34 @@ module Spid
           }
 
           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']
 
-          company = contact_person_aggregato.add_element "md:Company"
-          company.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
 

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.32'
+  s.version = '0.0.37'
 
   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.32
+  version: 0.0.37
 platform: ruby
 authors:
 - Fabiano Pavan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-28 00:00:00.000000000 Z
+date: 2020-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: canonix