diff --git a/bin/account-manager-web.pl b/bin/account-manager-web.pl
index e9aca924f62deb1710dca80629cffcde04bbe50f..e3e0b16a72a997eb2a953ce284c2a8f297f51c74 100755
--- a/bin/account-manager-web.pl
+++ b/bin/account-manager-web.pl
@@ -36,7 +36,7 @@ my %format = (
my %actions = ('select_sp' => {'title_en' => 'Select your Service Provider' },
'account_wizard' => {'title_en' => 'Select your Service Provider' },
'generate_token' => {'title_en' => 'Generate an authentication token'},
- 'validate_token' => {'title_en' => 'Validate an authentication token'},
+ 'validate_token' => {'title_en' => 'Complete Email Challenge'},
'home' => {'title_en' => 'eduGAIN Test Identity Provider'},
);
diff --git a/templates/mail/send_authentication_token.tt2.eml b/templates/mail/send_authentication_token.tt2.eml
index f883134080971fbbc27ba2e6fb1e488856e9ef2c..4ef4494349454c288e19d8e36b2cbf3a44544c95 100644
--- a/templates/mail/send_authentication_token.tt2.eml
+++ b/templates/mail/send_authentication_token.tt2.eml
@@ -3,9 +3,16 @@ To: [% to %]
Subject: [% conf.app_name %] - Test accounts request
Content-type: text/plain; charset=UTF-8; format=flowed
-This is an email challenge automatically sent to you by [% conf.app_name %]. Somebody has requested creation of test accounts for the service provider with entityid [% sp_entityid %]. This SAML entity is registered with eduGAIN interfederation. You are identified as a contact for this service provider within eduGAIN metadata.
+This is an email challenge automatically sent to you by [% conf.app_name %]. Somebody with IP address [% env.REMOTE_ADDR %] has requested to create test accounts for eduGAIN Service Provider with entityID [% sp_entityid %].
+The address [% to %] is mentioned in the eduGAIN metadata as a contact for this Service Provider.
+
+To complete the creation of test accounts, paste the following validation token in the [% conf.app_name %] web form.
-To complete these test accounts creation, paste the following validation token on the [% conf.app_name %] web form.
Validation token: [% authentication_token %]
-[% conf.app_name %]: [% conf.app_url %]
\ No newline at end of file
+[% conf.app_name %]: [% conf.app_url %]
+
+If the creation of test accounts was not initiated by you or a fellow administrator for the above Service Provider, please forward this email and contact [% conf.support_email %] to inform them about a potential abuse of the [% conf.app_name %] service.
+
+Best Regards
+[% conf.app_name %] Bot
\ No newline at end of file
diff --git a/templates/web/account_wizard.tt2.html b/templates/web/account_wizard.tt2.html
index 657c46990939e1f4539a4fd42e865d4744d587d1..44b26f785049db2ea32389e40e23ad37fb839329 100644
--- a/templates/web/account_wizard.tt2.html
+++ b/templates/web/account_wizard.tt2.html
@@ -32,7 +32,7 @@ jQuery(document).ready(function($){
{
form.steps("remove", 2);
form.steps("insert", 2, {
- title: "Validate challenge",
+ title: "Complete Email Challenge",
contentMode: "async",
contentUrl: "https://dev-edugain.renater.fr/accountmanager?action=generate_token&style=nobanner&sp_entityid="+
encodeURIComponent($('#sp_entityid').val())+"&email_address="+encodeURIComponent($("input:checked[name='email_address']").val())
@@ -45,7 +45,7 @@ jQuery(document).ready(function($){
{
form.steps("remove", 3);
form.steps("insert", 3, {
- title: "Get test accounts",
+ title: "Test Accounts",
contentMode: "async",
contentUrl: "https://dev-edugain.renater.fr/accountmanager?action=validate_token&style=nobanner&sp_entityid="+
encodeURIComponent($('#sp_entityid').val())+"&authentication_token="+encodeURIComponent($('#authentication_token').val())
@@ -106,12 +106,13 @@ $(function() {
<fieldset>
<h3>Select your Service Provider</h3>
<div>
-This Test Identity Provider allows you to create test accounts with different profiles to validate the behaviour of your own Service Provider registered
-in eduGAIN inter-federation. Note that only a Service Provider administrator can create accounts here.
+Please search and select the Service Provider that you want to test in
+the list below. You must be an administrator of that Service Provider to
+continue afterwards.
<br/><br/>
-<label for="sp_entityid">Please select your Service Provider in the list below:</label><br/>
-(Note that a search is performed while you type the SP name)<br/>
+<label for="sp_entityid">Type the SP name or entityID to search for it.</label>
+Note that only Service Providers are in the list which are included in the eduGAIN metadata.<br/>
<select id="sp_entityid" name="sp_entityid" class="required">
@@ -129,10 +130,10 @@ in eduGAIN inter-federation. Note that only a Service Provider administrator can
<div data-mode="async" data-url="/rest/service/0"></div>
</fieldset>
-<h3>Validate challenge</h3>
+<h3>Complete Email Challenge</h3>
<fieldset></fieldset>
-<h3>Get test accounts</h3>
+<h3>Test Accounts</h3>
<fieldset></fieldset>
diff --git a/templates/web/generate_token.tt2.html b/templates/web/generate_token.tt2.html
index 83581d919625da3e14595d141abb87216c99c59f..c1be141e478bd2483f509a0dfec3064df78c7937 100644
--- a/templates/web/generate_token.tt2.html
+++ b/templates/web/generate_token.tt2.html
@@ -1,11 +1,11 @@
-<h3>Validate challenge</h3>
+<h3>Complete Email Challenge</h3>
<div>
-An email challenge including a validation token has been emailed to you at [% email_address %]. You need to copy and paste this token in the form below.</div>
+An email challenge including a validation token has been emailed to you at [% email_address %]. Please copy and paste the validation token in the form below to proof that you are administrator of this service.</div>
<fieldset>
- <legend>Provide token</legend>
- <label for="authentication_token">Please provide the secret token here :</label>
+ <legend>Validation Token</legend>
+ <label for="authentication_token">Please provide the validation token here:</label>
<input name="authentication_token" value="" id="authentication_token" type="text" class="required"/>
diff --git a/templates/web/validate_token.tt2.html b/templates/web/validate_token.tt2.html
index 705fa5d406d7aef794d04fd2db5fb2d1de1d3859..48d9b5e4c05d0c915653b3c152138fce3043cb5b 100644
--- a/templates/web/validate_token.tt2.html
+++ b/templates/web/validate_token.tt2.html
@@ -1,4 +1,4 @@
-<h3>Get test accounts</h3>
+<h3>Test Accounts</h3>
<script type="text/javascript">
@@ -27,11 +27,9 @@ jQuery(document).ready(function($){
<div>
-Your identity has been checked successfully.
-
-Test accounts with different profiles have been created for you, see details below. Note that these accounts will automatically
-expire in [% conf.accounts_validity_period %] days. Note also that these test accounts can only be used to login on your SP [% sp_entityid %].
-
+Your identity as administrator of the Service Provider with entityID [% sp_entityid %] could successfully be validated!
+<br/><br/>
+The following test accounts with different profiles were created for you:
<ol>
[% FOREACH account IN test_accounts %]
<li>account profile: [% account.get('account_profile') %]
@@ -61,10 +59,11 @@ expire in [% conf.accounts_validity_period %] days. Note also that these test ac
</ol>
-You can now use these accounts to login at your federated service.
-To do so, you should select "[% conf.idp_displayname %]" in your service discovery service menu.
-
-You should keep a record of these user names and passwords since we don't provide any mecanism to remind you the credentials. If
-you forget the credentials you can however ask for new test accounts via this service.
-
-Thank you for using the [% conf.app_name %]
\ No newline at end of file
+Note that these test accounts will automatically expire in [% conf.accounts_validity_period %] days and that they can only be used to test federated login to your eduGAIN-enabled Service Provider with entityID [% sp_entityid %].
+<br/><br/>
+You can now use these test accounts to login at your federated service.<br/>
+To do so, select the "[% conf.idp_displayname %]" when choosing an organisation to login at.
+<br/><br/>
+Please keep a record of the above user names and passwords because currently there is no mecanism to retrieve the above credentials once you close this page. If you forget the username and passowrds, you can however request new test accounts.
+<br/><br/>
+Thank you for using the [% conf.app_name %]