spid-es 0.0.25 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0df53e9cf72fafa24ceafecf84eeecaeac2ad41ae3fde626427db9015ba066c6
-  data.tar.gz: 4df05a87667e7e38f788c8a80852290020853a576b9fdd64408adb0e7d84af19
+  metadata.gz: ef4d9da8e2a6d3b9e6f0b70a8970010864b1cc98a9b3ca7461717512ec6a04b4
+  data.tar.gz: 18c491970d8215cb051c0a505cf33a65b2f0a1170735d27b527a0c1b2777b5bf
 SHA512:
-  metadata.gz: c9443aeb32bbeb10038ba9acb6033617c9b2a0f2c5e759bddcb98d0252a41d19248776d2fb0fa2295f6572ecba6fc6eaeb6129ac564c86caed0b2aed929caa87
-  data.tar.gz: 1ae7d5cec32f6b0a8007c0c27bec008dec9d27c4f4fdd0e20c8d88922ebe32918eedae9260a377da55a304d7380b8073ca730ba4b3d9108c2bbf144f0e87b56a
+  metadata.gz: 83e2246e5c07bc0b143c02a72db90dd75f67c0035f2265c524d82d0c5a9db1226fbf84e27bbda03fe58b71d03c0cd8329a451fc69d7097d03b07c2c0b1d3c482
+  data.tar.gz: e71257e4fe2e3627d25d880b392527d9f9b4e5a29e3900f2161d584cff4fde9cbafe79f130b5cb09890e7b5a37e8476eeee459aa30197751c533cf284d3bd109

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
+        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,18 +235,39 @@ module Spid
             "contactType" => "other",
             "spid:entityType" => "spid:aggregator"
           }
-          company = contact_person_aggregatore.add_element "md:Company"
-          company.text = settings.hash_aggregatore['soggetto_aggregatore']
+          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"
-          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"
 
           contact_person_aggregato = root.add_element "md:ContactPerson", {
             "contactType" => "other",

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