Merge pull request #9 from CESNET/WIP

fixes

lib/Auth/Source/Campusidp.php

@@ -13,6 +13,7 @@ use SimpleSAML\Error;
 use SimpleSAML\Logger;
 use SimpleSAML\Module;
 use SimpleSAML\Module\core\Auth\UserPassBase;
+use SimpleSAML\Error\UnserializableException;
 use SimpleSAML\Session;
 use SimpleSAML\Utils;
 

locales/cs/LC_MESSAGES/campusmultiauth.po

@@ -60,3 +60,6 @@ msgstr "Vyhledat"
 
 msgid "{campusmultiauth:undefined}"
 msgstr "neznámé"
+
+msgid "{campusmultiauth:localLogin_title}"
+msgstr "Login with username and password"

locales/en/LC_MESSAGES/campusmultiauth.po

@@ -60,3 +60,6 @@ msgstr "Search"
 
 msgid "{campusmultiauth:undefined}"
 msgstr "undefined"
+
+msgid "{campusmultiauth:localLogin_title}"
+msgstr "Přihlásit se uživatelským jménem a heslem"

templates/includes/local-login.twig

@@ -4,6 +4,14 @@
 
 <form id="userpass" action="{{ currentUrl }}" method="post" name="f">
 
+    <h4 class="text-left {% if muni_jvs %}color-{{ configuration.priority }}{% elseif configuration.priority == 'primary' %}text-dark{% else %}text-muted{% endif %}">
+        {% if attribute(configuration.title, currentLanguage) is defined %}{{ attribute(configuration.title, currentLanguage) }}
+        {% elseif configuration.title is defined and configuration.title is iterable and configuration.title is not empty %}{{ configuration.title | first }}
+        {% elseif configuration.title is defined and configuration.title is not iterable %}{{ configuration.title }}
+        {% else %}{{ '{campusmultiauth:localLogin_title}'|trans }}
+        {% endif %}
+    </h4>
+
     {% if wrongUserPass == true %}
         {% if muni_jvs %}
             <div class="message message--error" role="alert">

www/resources/campus-idp.css

@@ -114,16 +114,6 @@ html, body {
     background-color: #FFFFFF;
 }
 
-.individual-identity-logo-box {
-    flex-shrink: 0;
-    display: inline-block;
-    overflow: hidden;
-    padding: 5px;
-    width: 50px;
-    height: 50px;
-    border-right: 1px solid #757575;
-}
-
 .individual-identity-logo {
     width: 50px;
     height: 50px;

www/selectsource.php

@@ -124,7 +124,6 @@ $t->data['idps'] = $idps;
 $t->data['no_js_display_index'] = !empty($_POST['componentIndex']) ? $_POST['componentIndex'] : null;
 $t->data['user_pass_source_name'] = $state[Campusidp::USER_PASS_SOURCE_NAME];
 $t->data['sp_source_name'] = $state[Campusidp::SP_SOURCE_NAME];
-$t->data['prev_idps'] = json_decode(gzinflate(base64_decode(Campusidp::getCookie(Campusidp::COOKIE_PREVIOUS_IDPS))));
 $t->data['cookie_username'] = Campusidp::getCookie(Campusidp::COOKIE_USERNAME);
 $t->data['cookie_password'] = Campusidp::getCookie(Campusidp::COOKIE_PASSWORD);
 $t->data['searchbox_indexes'] = json_encode(array_values(array_filter(array_map(function($config, $index) {
@@ -147,5 +146,11 @@ $t->data['searchbox_placeholders'] = json_encode(array_map(function($config) use
     return null;
 }, $wayfConfig['components']));
 
+if (Campusidp::getCookie(Campusidp::COOKIE_PREVIOUS_IDPS) === null) {
+    $t->data['prev_idps'] = [];
+} else {
+    $t->data['prev_idps'] = json_decode(gzinflate(base64_decode(Campusidp::getCookie(Campusidp::COOKIE_PREVIOUS_IDPS))));
+}
+
 $t->show();
 exit();