_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Disconnect and redirect to login on error page

Browse Source
This commit is contained in:
CEC 2022-04-19 17:31:43 +02:00
parent 163ee872bf
commit 71a0e18049
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
front/src/Components/UI/ErrorScreen.svelte
View File

@ -9,12 +9,17 @@
let logo = gameManager?.currentStartedRoom?.loginSceneLogo ?? logoImg; let logo = gameManager?.currentStartedRoom?.loginSceneLogo ?? logoImg;
import reload from "../images/reload.png"; import reload from "../images/reload.png";
import external from "../images/external-link.png"; import external from "../images/external-link.png";
import {connectionManager} from "../../Connexion/ConnectionManager";
let errorScreen = get(errorScreenStore); let errorScreen = get(errorScreenStore);
if(!errorScreen.buttonTitle && errorScreen.urlToRedirect) window.location.replace(errorScreen.urlToRedirect);
function click() { function click() {
if (errorScreen.urlToRedirect) window.location.replace(errorScreen.urlToRedirect); if (errorScreen.urlToRedirect){
else if (errorScreen.type === "redirect" && window.history.length > 2) history.back(); if(errorScreen.urlToRedirect === '/login') connectionManager.logout();
window.location.replace(errorScreen.urlToRedirect);
} else if (errorScreen.type === "redirect" && window.history.length > 2) history.back();
else window.location.reload(); else window.location.reload();
} }
let details = errorScreen.details; let details = errorScreen.details;
@ -41,7 +46,7 @@
<p class="details"> <p class="details">
{detailsStylized}{#if $errorScreenStore.type === "retry"}<div class="loading" />{/if} {detailsStylized}{#if $errorScreenStore.type === "retry"}<div class="loading" />{/if}
</p> </p>
{#if ($errorScreenStore.type === "retry" && $errorScreenStore.canRetryManual) || ($errorScreenStore.type === "redirect" && (window.history.length > 2 || $errorScreenStore.urlToRedirect))} {#if ($errorScreenStore.type === "retry" && $errorScreenStore.canRetryManual) || ($errorScreenStore.type === "unauthorized" && $errorScreenStore.urlToRedirect && $errorScreenStore.buttonTitle) || ($errorScreenStore.type === "redirect" && (window.history.length > 2 || $errorScreenStore.urlToRedirect))}
<button type="button" class="nes-btn is-primary button" on:click={click}> <button type="button" class="nes-btn is-primary button" on:click={click}>
<img src={$errorScreenStore.type === "retry" ? reload : external} alt="" class="reload" /> <img src={$errorScreenStore.type === "retry" ? reload : external} alt="" class="reload" />
{$errorScreenStore.buttonTitle} {$errorScreenStore.buttonTitle}

2
pusher/src/Services/SocketManager.ts
View File

@ -656,7 +656,7 @@ export class SocketManager implements ZoneEventListener {
if (error.urlToRedirect) errorMessage.setUrltoredirect(error.urlToRedirect); if (error.urlToRedirect) errorMessage.setUrltoredirect(error.urlToRedirect);
if (error.buttonTitle) errorMessage.setButtontitle(error.buttonTitle); if (error.buttonTitle) errorMessage.setButtontitle(error.buttonTitle);
if (!!error.canRetryManual) errorMessage.setCanretrymanual(error.canRetryManual); if (error.canRetryManual !== undefined && null !== error.canRetryManual) errorMessage.setCanretrymanual(error.canRetryManual);
if (error.timeToRetry && !isNaN(Number(error.timeToRetry))) if (error.timeToRetry && !isNaN(Number(error.timeToRetry)))
errorMessage.setTimetoretry(Number(error.timeToRetry)); errorMessage.setTimetoretry(Number(error.timeToRetry));