Commit 8636a75

@@ -14,17 +14,14 @@ module Saml
         attr_accessor :issuer, :version
         attr_accessor :default_name_id_format
 
-        def initialize(user, request, embed_signature, configuration: Saml::Kit.configuration, now: Time.now.utc, destination: nil, signing_key_pair: nil, issuer: nil)
+        def initialize(user, request, configuration: Saml::Kit.configuration)
           @user = user
           @request = request
-          @destination = destination
           @configuration = configuration
-          @issuer = issuer || configuration.entity_id
+          @issuer = configuration.entity_id
           @reference_id = ::Xml::Kit::Id.generate
           @version = '2.0'
-          @now = now
-          @signing_key_pair = signing_key_pair
-          self.embed_signature = embed_signature
+          @now = Time.now.utc
           self.default_name_id_format = Saml::Kit::Namespaces::UNSPECIFIED_NAMEID
         end
 

@@ -45,12 +45,12 @@ module Saml
         def assertion
           @assertion ||=
             begin
-              assertion = Assertion.new(user, request, embed_signature,
-                configuration: configuration,
-                now: now,
-                destination: destination,
-                signing_key_pair: signing_key_pair,
-                issuer: issuer)
+              assertion = Assertion.new(user, request, configuration: configuration)
+              assertion.sign_with(@signing_key_pair) if @signing_key_pair
+              assertion.embed_signature = embed_signature unless embed_signature.nil?
+              assertion.now = now
+              assertion.destination = destination
+              assertion.issuer = issuer
               encrypt ? EncryptedAssertion.new(self, assertion) : assertion
             end
         end

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 RSpec.describe Saml::Kit::Builders::Assertion do
   describe '#build' do
-    subject { described_class.new(user, authn_request, true, configuration: configuration) }
+    subject { described_class.new(user, authn_request, configuration: configuration) }
 
     let(:email) { FFaker::Internet.email }
     let(:assertion_consumer_service_url) { FFaker::Internet.uri('https') }

@@ -2,7 +2,7 @@
 
 RSpec.describe Saml::Kit::Assertion do
   subject do
-    described_class.build(user, request, true) do |x|
+    described_class.build(user, request) do |x|
       x.issuer = entity_id
     end
   end
@@ -259,7 +259,7 @@ RSpec.describe Saml::Kit::Assertion do
     before { allow(registry).to receive(:metadata_for).with(configuration.entity_id).and_return(metadata) }
 
     it 'parses a raw xml assertion' do
-      saml = described_class.build_xml(user, saml_request, true, configuration: configuration)
+      saml = described_class.build_xml(user, saml_request, configuration: configuration)
       expect(described_class.new(saml, configuration: configuration)).to be_valid
     end
   end