From b8458ad67c816b58e57eb700153dbaeca56c371e Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <guillaume.rousse@renater.fr>
Date: Mon, 6 Nov 2017 17:59:07 +0100
Subject: [PATCH] fix parameters name
---
lib/IdPAccountManager/WebRequest.pm | 3 ++-
templates/web/select_sp.tt2.html | 8 ++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/lib/IdPAccountManager/WebRequest.pm b/lib/IdPAccountManager/WebRequest.pm
index f906069..333eca0 100755
--- a/lib/IdPAccountManager/WebRequest.pm
+++ b/lib/IdPAccountManager/WebRequest.pm
@@ -12,6 +12,7 @@ use IdPAccountManager::Data::TestAccount;
use IdPAccountManager::Data::AuthenticationToken;
use IdPAccountManager::Data::ServiceProvider;
use IdPAccountManager::SAMLMetadata;
+use IdPAccountManager::Tools;
## Defining parameters format
my $urn_or_url_regex = '(http(s?):\/\/|urn:)[^\\\$\*\"\'\`\^\|\<\>\n\s]+'
@@ -214,7 +215,7 @@ sub req_account_wizard {
return undef;
}
- $self->{out} = $metadata->parse();
+ $self->{out}->{metadata} = $metadata->parse();
$self->{out}->{subtitle} = 'Select your Service Provider';
diff --git a/templates/web/select_sp.tt2.html b/templates/web/select_sp.tt2.html
index 0d17803..03a7e36 100644
--- a/templates/web/select_sp.tt2.html
+++ b/templates/web/select_sp.tt2.html
@@ -2,14 +2,14 @@
[% IF serviceprovider.displayname %]
[% SET sp_display_name = serviceprovider.displayname %]
[% ELSE %]
-[% SET sp_display_name = sp_metadata_as_hashref.entityid %]
+[% SET sp_display_name = metadata.entityid %]
[% END %]
<div>
Before you can create test accounts at this Identity Provider, we need to ensure you are a legitimate administrator of "[% sp_display_name %]".
</div>
<fieldset class="scrollable">
-[% IF sp_metadata_as_hashref.contacts.defined %]
+[% IF metadata.contacts.defined %]
<legend>Select your email address</legend>
<label for="sp_entityid">The email addresses below have been extracted from your SP SAML metadata.<br/>Please select the email address where an email challenge
can be sent to validate your identity</label>
@@ -19,7 +19,7 @@ Before you can create test accounts at this Identity Provider, we need to ensure
[% FOREACH email IN serviceprovider.list_contacts_as_array.sort %]
<input name="email_address" value="[% email %]" type="radio" class="required"/><label for="email_address">[% email %]</label><br/>
-<input type="hidden" name="sp_entityid" value="[% sp_metadata_as_hashref.entityid %]" id="sp_entityid"/>
+<input type="hidden" name="sp_entityid" value="[% metadata.entityid %]" id="sp_entityid"/>
[% END %]
</div>
@@ -38,4 +38,4 @@ administrator to add ContactPerson information to the SAML metadata.
input.val([input.attr('value')]);
});
});
-</script>
\ No newline at end of file
+</script>
--
GitLab