From a4377301992cd3fe44c0d70d97ba5da8d21295f6 Mon Sep 17 00:00:00 2001
From: Menco Bolt <macmenco@users.noreply.github.com>
Date: Mon, 16 Sep 2019 16:18:07 +0100
Subject: [PATCH] Add authData (#1106)
---
modules/core/lib/Controller.php | 4 ++++
templates/auth_status.twig | 34 +++++++++++++++++++++++++++++++++
2 files changed, 38 insertions(+)
diff --git a/modules/core/lib/Controller.php b/modules/core/lib/Controller.php
index efc1799d5..913fe4ec7 100644
--- a/modules/core/lib/Controller.php
+++ b/modules/core/lib/Controller.php
@@ -82,6 +82,8 @@ class Controller
}
$attributes = $auth->getAttributes();
+
+ $session = Session::getSessionFromRequest();
$t = new Template($this->config, 'auth_status.twig', 'attributes');
$l = $t->getLocalization();
@@ -91,6 +93,8 @@ class Controller
$t->data['nameid'] = !is_null($auth->getAuthData('saml:sp:NameID'))
? $auth->getAuthData('saml:sp:NameID')
: false;
+ $t->data['authData'] = $auth->getAuthDataArray();
+ $t->data['trackid'] = $session->getTrackID();
$t->data['logouturl'] = Module::getModuleURL('core/logout/'.urlencode($as));
$t->data['remaining'] = $this->session->getAuthData($as, 'Expire') - time();
$t->setStatusCode(200);
diff --git a/templates/auth_status.twig b/templates/auth_status.twig
index bb56e9a47..9965dd376 100644
--- a/templates/auth_status.twig
+++ b/templates/auth_status.twig
@@ -67,6 +67,40 @@
{% endif %}
+ <dl>
+ <dt>{% trans %}Debug information to be used by your support staff{% endtrans %}</dt>
+ {%- embed "includes/expander.twig" %}
+ {%- block content %}
+
+ <dl>
+ <dd>{% trans %}Tracking number{% endtrans %}</dd>
+ <dd class="code-box hljs">
+ <div class="pure-button-group top-right-corner">
+ <a class="pure-button copy hljs" data-clipboard-target="#trackid"
+ title="{% trans %}Copy to clipboard{% endtrans %}"><span class="fa fa-copy"></span></a>
+ </div>
+ <code id="trackid" class="code-box-content">{{ trackid }}</code>
+ </dd>
+ {%- if authData %}
+
+ <dd>{% trans %}Information about your current session{% endtrans %}</dd>
+ <dd class="code-box hljs">
+ <div class="pure-button-group top-right-corner">
+ <a class="pure-button copy hljs" data-clipboard-target="#authdata"
+ title="{% trans %}Copy to clipboard{% endtrans %}"><span class="fa fa-copy"></span></a>
+ </div>
+ <div id="authdata" class="code-box-content php">
+ {{- authData|json_encode(constant('JSON_UNESCAPED_SLASHES') b-or constant('JSON_PRETTY_PRINT')) |raw -}}
+ </div>
+ </dd>
+ {%- endif %}
+
+ </dl>
+ {%- endblock content %}
+ {%- endembed %}
+
+ </dl>
+ <br>
{% if logout %}
<h2>{% trans %}Logout{% endtrans %}</h2>
--
GitLab