From d2f0961787e997ccd64a35a6e455f464630f31c9 Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <guillaume.rousse@renater.fr>
Date: Tue, 11 Dec 2018 12:42:53 +0100
Subject: [PATCH] pass IdP name to template
---
conf/manager.conf.in | 2 +-
lib/AccountManager/App.pm | 1 +
templates/web/edugain/create_accounts.tt2.html | 2 +-
templates/web/renater/create_accounts.tt2.html | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/conf/manager.conf.in b/conf/manager.conf.in
index 922fe20..44b453b 100644
--- a/conf/manager.conf.in
+++ b/conf/manager.conf.in
@@ -48,7 +48,7 @@ options = mysql_enable_utf8
[idp]
scope = my.fqdn
entityid = https://my.fqdn/simplesaml/saml2/idp/metadata.php
-displayname = eduGAIN Access Check
+name = eduGAIN Access Check
# default parameters for all services
[service]
diff --git a/lib/AccountManager/App.pm b/lib/AccountManager/App.pm
index 57f1307..e5acaa4 100644
--- a/lib/AccountManager/App.pm
+++ b/lib/AccountManager/App.pm
@@ -646,6 +646,7 @@ sub req_create_accounts {
action => 'create_accounts',
accounts => \@accounts,
entityid => $entityid,
+ idp => $self->{configuration}->{idp}->{name},
url => $sp->information_url(),
email => $email,
key => $key,
diff --git a/templates/web/edugain/create_accounts.tt2.html b/templates/web/edugain/create_accounts.tt2.html
index f8d3e03..4fed7df 100644
--- a/templates/web/edugain/create_accounts.tt2.html
+++ b/templates/web/edugain/create_accounts.tt2.html
@@ -8,7 +8,7 @@
<h2>[% lh.maketext("Test accounts created") %]</h2>
<p>
[% lh.maketext("You can now use these test accounts to login at your <a href=\"[_1]\">service provider</a>.", url) %]
-[% lh.maketext("To do so, select <strong>[_1]</strong> when choosing an identity provider.", idp_displayname) %]
+[% lh.maketext("To do so, select <strong>[_1]</strong> when choosing an identity provider.", idp) %]
</p>
<p><a class="button" href="[% app.url %]?action=download_accounts&entityid=[% entityid %]&token=[% token %]&key=[% key %]">[% lh.maketext("Download in CSV format") %]</a></p>
diff --git a/templates/web/renater/create_accounts.tt2.html b/templates/web/renater/create_accounts.tt2.html
index c3e3b78..10d9798 100644
--- a/templates/web/renater/create_accounts.tt2.html
+++ b/templates/web/renater/create_accounts.tt2.html
@@ -10,7 +10,7 @@
<h2>[% lh.maketext("Test accounts created") %]</h2>
<p>
[% lh.maketext("You can now use these test accounts to login at your <a href=\"[_1]\">service provider</a>.", url) %]
-[% lh.maketext("To do so, select <strong>[_1]</strong> when choosing an identity provider.", idp_displayname) %]
+[% lh.maketext("To do so, select <strong>[_1]</strong> when choosing an identity provider.", idp) %]
</p>
<p><a class="button" href="[% app.url %]?action=download_accounts&entityid=[% entityid %]&token=[% token %]&key=[% key %]">[% lh.maketext("Download in CSV format") %]</a></p>
--
GitLab