Fixed mobile site logout when using with &key=xxx (#4420)

Ylian Saint-Hilaire committed Aug 24, 2022 at 13:06 UTC f1b8af8ac494d3b3e0dae1c48c25fd017df95508
1 file changed +6 -1
views/default-mobile.handlebars
+6 -1
@@ -1186,7 +1186,7 @@
1186 <div id=topMenu style="z-index:1000;background-color:#EEE;box-shadow:0px 0px 15px #666;font-family:Arial,Helvetica,sans-serif;border-radius:0px 0px 5px 5px;position:fixed;top:50px;right:5px;width:170px;display:none">
1187 <div style="padding:12px;border-top:1px solid gray;color:black;cursor:pointer" onclick=topMenu(2)>My Files</div>
1188 <div style="padding:12px;border-top:1px solid gray;color:black;cursor:pointer" onclick=topMenu(1)>My Account</div>
1189 - <div id="logoutMenuOption"><a href=/logout><div style="padding:12px;border-top:1px solid gray;color:black;cursor:pointer">Logout</div></a></div>
1189 + <div id="logoutMenuOption"><a id="logoutMenuOptionRef" href=/logout><div style="padding:12px;border-top:1px solid gray;color:black;cursor:pointer">Logout</div></a></div>
1190 </div>
1191 <audio id="chimes"><source src="sounds/chimes.mp3" type="audio/mp3" /></audio>
1192 <iframe name="fileUploadFrame" style=display:none></iframe>
@@ -1227,6 +1227,8 @@
1227 var domainUrl = '{{{domainurl}}}';
1228 var authCookie = '{{{authCookie}}}';
1229 var authRelayCookie = '{{{authRelayCookie}}}';
1230 + var logoutControls = JSON.parse(decodeURIComponent('{{{logoutControls}}}'));
1231 + console.log(logoutControls);
1232 var authCookieRenewTimer = null;
1233 var webRelayPort = parseInt('{{{webRelayPort}}}');
1234 var webRelayDns = '{{{webRelayDns}}}';
@@ -1300,6 +1302,9 @@
1302 // Setup stared devices
1303 try { stars = JSON.parse(getstore('stars', '{}')); } catch (ex) { }
1304
1305 + // Setup logout control
1306 + if (logoutControls && logoutControls.logoutUrl) { Q('logoutMenuOptionRef').href = logoutControls.logoutUrl; }
1307 +
1308 // Load desktop settings
1309 var t = localStorage.getItem('desktopsettings');
1310 if (t != null) { desktopsettings = JSON.parse(t); }