YunoHost/SSOwat
1
0
Fork 0
mirror of https://github.com/YunoHost/SSOwat.git synced 2024-09-03 20:06:27 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix handling of the logout button when inside the iframe

Browse source
This commit is contained in:
Alexandre Aubin 2019-02-22 23:56:01 +01:00
parent ad27933f54
commit 3385732263
5 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
portal/assets/js/ynhpanel.js
View file

@ -347,6 +347,7 @@ function tweak_portal_when_in_iframe()
// Set class to body to show we're in overlay // Set class to body to show we're in overlay
document.body.classList.add('in_app_overlay'); document.body.classList.add('in_app_overlay');
let userContainer = document.querySelector('a.user-container'); let userContainer = document.querySelector('a.user-container');
if (userContainer) {
userContainer.classList.replace('user-container-info', 'user-container-edit'); userContainer.classList.replace('user-container-info', 'user-container-edit');
userContainer.setAttribute('href', userContainer userContainer.setAttribute('href', userContainer
.getAttribute('href') .getAttribute('href')
@ -357,3 +358,16 @@ function tweak_portal_when_in_iframe()
window.parent.location.href = userContainer.getAttribute('href'); window.parent.location.href = userContainer.getAttribute('href');
}); });
} }
let logoutButton = document.getElementById('ynh-logout');
if (logoutButton)
{
// We force to do the logout "globally", not just in the
// iframe, otherwise after login out the url might still be
// domain.tld/app which is weird ...
window.addEvent(logoutButton, 'click', function(e) {
e.preventDefault();
e.stopPropagation();
window.parent.location.href = logoutButton.getAttribute("href");
});
}
}

0
portal/assets/themes/vapor/global.js → portal/assets/themes/vapor/custom.js
View file

2
portal/edit.html
View file

@ -1,6 +1,6 @@
<div class="ynh-wrapper user"> <div class="ynh-wrapper user">
<ul class="user-menu"> <ul class="user-menu">
<li><a class="icon icon-connexion" href="?action=logout">{{t_logout}}</a></li> <li><a id="ynh-logout" class="icon icon-connexion" href="?action=logout">{{t_logout}}</a></li>
</ul> </ul>
<a class="user-container user-container-edit" href="info.html"> <a class="user-container user-container-edit" href="info.html">

2
portal/info.html
View file

@ -1,6 +1,6 @@
<div class="ynh-wrapper user"> <div class="ynh-wrapper user">
<ul class="user-menu"> <ul class="user-menu">
<li><a class="icon icon-connexion" href="?action=logout">{{t_logout}}</a></li> <li><a id="ynh-logout" class="icon icon-connexion" href="?action=logout">{{t_logout}}</a></li>
</ul> </ul>
<a class="user-container user-container-info" href="edit.html"> <a class="user-container user-container-info" href="edit.html">

2
portal/password.html
View file

@ -1,6 +1,6 @@
<div class="ynh-wrapper user"> <div class="ynh-wrapper user">
<ul class="user-menu"> <ul class="user-menu">
<li><a class="icon icon-connexion" href="?action=logout">{{t_logout}}</a></li> <li><a id="ynh-logout" class="icon icon-connexion" href="?action=logout">{{t_logout}}</a></li>
</ul> </ul>
<a class="user-container user-container-password" href="info.html"> <a class="user-container user-container-password" href="info.html">
<h2 class="user-username">{{{uid}}}</h2> <h2 class="user-username">{{{uid}}}</h2>