Merge branch 'feature/short-sso-trackid'

* feature/short-sso-trackid:
  Add the tracking identifier to the error message, so that we can track the logs and see what happened when someone gets this error.

modules/core/templates/short_sso_interval.php

@@ -25,6 +25,11 @@ $this->includeAtTemplateBase('includes/header.php');
 		}
 	?>
 	<p><?php echo $this->t('{core:short_sso_interval:warning}'); ?></p>
+    <div class="trackidtext"><p>
+        <?php echo $this->t('{errors:report_trackid}'); ?>
+        <span class="trackid"><?php echo $this->data['trackId']; ?></span>
+        </p>
+    </div>
 
 	<input type="submit" name="continue" id="contbutton" value="<?php echo htmlspecialchars($this->t('{core:short_sso_interval:retry}')) ?>" />
 

modules/core/www/short_sso_interval.php

@@ -19,6 +19,7 @@ if (!is_null($sid['url'])) {
 }
 
 $state = SimpleSAML_Auth_State::loadState($id, 'core:short_sso_interval');
+$session = SimpleSAML_Session::getSessionFromRequest();
 
 if (array_key_exists('continue', $_REQUEST)) {
 	/* The user has pressed the continue/retry-button. */
@@ -29,6 +30,7 @@ $globalConfig = SimpleSAML_Configuration::getInstance();
 $t = new SimpleSAML_XHTML_Template($globalConfig, 'core:short_sso_interval.php');
 $t->data['target'] = SimpleSAML_Module::getModuleURL('core/short_sso_interval.php');
 $t->data['params'] = array('StateId' => $id);
+$t->data['trackId'] = $session->getTrackID();
 $t->show();