service_provider_metadata.rb in saml-kit-0.2.7

- old
+ new

@@ -1,22 +1,24 @@
 module Saml
   module Kit
     module Builders
       class ServiceProviderMetadata
         include Saml::Kit::Templatable
-        attr_accessor :id, :entity_id, :acs_urls, :logout_urls, :name_id_formats
-        attr_accessor :organization_name, :organization_url, :contact_email
+        extend Forwardable
+        attr_accessor :acs_urls, :logout_urls, :name_id_formats
         attr_accessor :want_assertions_signed
         attr_reader :configuration
+        attr_reader :metadata
+        def_delegators :metadata, :id, :id=, :entity_id, :entity_id=, :organization_name, :organization_name=, :organization_url, :organization_url=, :contact_email, :contact_email=, :to_xml
 
         def initialize(configuration: Saml::Kit.configuration)
           @acs_urls = []
           @configuration = configuration
-          @entity_id = configuration.issuer
-          @id = Id.generate
           @logout_urls = []
           @name_id_formats = [Namespaces::PERSISTENT]
           @want_assertions_signed = true
+          @metadata = Saml::Kit::Builders::Metadata.new(configuration: configuration)
+          @metadata.service_provider = self
         end
 
         def add_assertion_consumer_service(url, binding: :http_post)
           @acs_urls.push(location: url, binding: Bindings.binding_for(binding))
         end