spid-es 0.0.27 → 0.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac5fe88ff8fc1b1e1ce805390dac2966a3ce7c3f81b115b27e09919302861946
-  data.tar.gz: 27348c4b761fdd9d27782aca48f526626393a4b5c9355de6bcb286d2d03a27d3
+  metadata.gz: afd826c70f90739045be11c8bfc34e703e2fdf45cb4059fbff53863b34f80126
+  data.tar.gz: eb412f78bb1ad1e5498f7e7f2a3ed8683b2d527571327b71595b3a01fe01af6d
 SHA512:
-  metadata.gz: c3078fe9caacc3f5e00269c27cff19af793e9a150eff0b9d9760bb9d80eabac6de0e86d7e47c48e653bdb1495ef344f71b618395857134b4ddcb6d26a618d390
-  data.tar.gz: 954ca35eb3d5bed16a2e044b708b7bccec3162cf55ff7dbb5af8e5dacdcd5e1fb377e8cc01c909f84ea6f99081956ef1a7ebb49a78412836856aabebb3860d7b
+  metadata.gz: edb1f2460b97716cbf230cd319364cf015b06cee61af607b031925787c4cc04ddaebfb742e4ad504f24cdb595a82d6b7ad5551dc3fcfaf4e5c12247edd164bb5
+  data.tar.gz: 126404ab5a6bc21ced03cc974f5ffb8947b1d6e0d2cf61045b9d2c2dbff03a34aafb13082de63004e7b568f640dfe4f2a937e8a777bf52386157fc15f690b852

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

@@ -5,7 +5,6 @@ require "uri"
 require "digest/md5"
 require "nokogiri"
 require_relative "../xml_security_new" #fa il require della nokogiri
-require "uuid"
 
 # Class to return SP metadata based on the settings requested.
 # Return this XML in a controller, then give that URL to the the 
@@ -50,7 +49,7 @@ module Spid
         #Tolto per non far cambiare sempre il metadata
         #uuid = "_" + UUID.new.generate
         #genero l'id come hash dell'entityID
-        uuid = "_" + settings.issuer.hash.abs.to_s
+        uuid = "_"+Digest::MD5.hexdigest(settings.issuer)
         self.uuid = uuid
         root.attributes["ID"] = uuid
 
@@ -224,7 +223,7 @@ module Spid
             "xml:lang" => "it"
         }
     
-        org_display_name.text = settings.organization['org_display_name']+(settings.aggregato ? " tramite #{settings.hash_aggregatore['soggetto_aggregatore']}" : '')
+        org_display_name.text = settings.organization['org_display_name'] #+(settings.aggregato ? " tramite #{settings.hash_aggregatore['soggetto_aggregatore']}" : '')
         org_url = organization.add_element "md:OrganizationURL", {
             "xml:lang" => "it"
         }
@@ -236,25 +235,45 @@ module Spid
             "contactType" => "other",
             "spid:entityType" => "spid:aggregator"
           }
-          company = contact_person_aggregatore.add_element "md:Company"
-          company.text = settings.hash_aggregatore['soggetto_aggregatore']
 
           extensions_aggregatore = contact_person_aggregatore.add_element "md:Extensions"
-          vat_number_aggregatore = extensions_aggregatore.add_element "spid:VATNumber"
-          vat_number_aggregatore.text = settings.hash_aggregatore['piva_aggregatore']
-          
-          ipa_code_aggregatore = extensions_aggregatore.add_element "spid:IPACode"
-          ipa_code_aggregatore.text = settings.hash_aggregatore['cipa_aggregatore']
 
-          fiscal_code_aggregatore = extensions_aggregatore.add_element "spid:FiscalCode"
-          fiscal_code_aggregatore.text = settings.hash_aggregatore['cf_aggregatore']
+          unless settings.hash_aggregatore['piva_aggregatore'].blank?
+            vat_number_aggregatore = extensions_aggregatore.add_element "spid:VATNumber"
+            vat_number_aggregatore.text = settings.hash_aggregatore['piva_aggregatore']
+          end
+
+          unless settings.hash_aggregatore['cipa_aggregatore'].blank?
+            ipa_code_aggregatore = extensions_aggregatore.add_element "spid:IPACode"
+            ipa_code_aggregatore.text = settings.hash_aggregatore['cipa_aggregatore']
+          end
+
+          unless settings.hash_aggregatore['cf_aggregatore'].blank?
+            fiscal_code_aggregatore = extensions_aggregatore.add_element "spid:FiscalCode"
+            fiscal_code_aggregatore.text = settings.hash_aggregatore['cf_aggregatore']
+          end 
+
+          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']
+          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
 
           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?
@@ -269,6 +288,10 @@ module Spid
             fiscal_code_aggregato = extensions_aggregato.add_element "spid:FiscalCode" 
             fiscal_code_aggregato.text = settings.hash_aggregatore['soggetto_aggregato']['fiscal_code']
           end
+
+          company = contact_person_aggregato.add_element "md:Company"
+          company.text = settings.organization['org_name']
+          
         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.27'
+  s.version = '0.0.32'
 
   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.27
+  version: 0.0.32
 platform: ruby
 authors:
 - Fabiano Pavan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-08 00:00:00.000000000 Z
+date: 2020-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: canonix
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: SAML Ruby Tookit Spid