From e8b4b0e8a7212ba45374147fa655d8e31a8a8ca3 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 28 Sep 2023 17:32:53 +0200
Subject: [PATCH] Fix login issue with macOS #1257

---
 www/common/sframe-common.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/www/common/sframe-common.js b/www/common/sframe-common.js
index 35f51ef03..9d76d7f9d 100644
--- a/www/common/sframe-common.js
+++ b/www/common/sframe-common.js
@@ -433,7 +433,11 @@ define([
     };
 
     funcs.setLoginRedirect = function (page) {
-        ctx.sframeChan.query('EV_SET_LOGIN_REDIRECT', page);
+        // We have to logout before redirecting because otherwise Safari might keep
+        // the guest SharedWorker alive
+        funcs.logout(() => {
+            ctx.sframeChan.event('EV_SET_LOGIN_REDIRECT', page);
+        });
     };
 
     funcs.isPresentUrl = function (cb) {