spid-es 0.0.26 → 0.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22bca7fc7ffffb1f963e39275f6026c15d41ef5b86de646a1b88fc812afeefa0
-  data.tar.gz: 2b633c95a520a05e7dbcc64adba2137fd1bfaaf781d5236e9bcf391095aa3aac
+  metadata.gz: 45a2021698f17c419eff32d26d8ce5a49cad6b73aa011448a8457d1a3e94d964
+  data.tar.gz: aa22c0c52bc2cc16d91403d32465df43ff880302444d500f99d7bfd816787048
 SHA512:
-  metadata.gz: b0b0dd8e38e3ef358a148de182d9d38a5aa6332da952815c6a92dec1f93d54948271a8eb096ac56cbbec0f856ae3cb00e4dffcdc3094c819140e58a5714ab003
-  data.tar.gz: '006628db995c81787c38d3b4dd0d46f545287125aca2ab770a68383caffec515e32e6bdb3a6d52a7bb684cbbd10ee0355535bbc7a5e8c83449dcf69d3e15b4b0'
+  metadata.gz: 780073b1f2b9c1a8735725d365fcec406c70772c712c5338780be0d3073cd679802f274a2b497a569f64b3df99b5972c4f579a6785622a9bbb8f805b25efc934
+  data.tar.gz: 3c0ee1bba5171de914b7b173ed0eacfa76ae91d3c9211dc515e4ef34568db574cb5ac9efab403bbd11b69e9f4f23593f956084ecd69f242ece239373215e3492

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.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,23 +235,46 @@ 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']
 

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.26'
+  s.version = '0.0.31'
 
   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.26
+  version: 0.0.31
 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