error page handling fixes

This commit is contained in:
Jan Prochazka
2024-08-06 14:59:09 +02:00
parent 399298d3bb
commit a7444a1475
7 changed files with 31 additions and 27 deletions

View File

@@ -106,7 +106,7 @@
// }`
// );
internalRedirectTo(
`connections/dblogin?conid=${selectedConnection?.conid}&state=${encodeURIComponent(state)}&redirectUri=${
`/connections/dblogin?conid=${selectedConnection?.conid}&state=${encodeURIComponent(state)}&redirectUri=${
location.origin + location.pathname
}`
);
@@ -130,7 +130,7 @@
isTesting = false;
if (resp.accessToken) {
localStorage.setItem('accessToken', resp.accessToken);
internalRedirectTo('?');
internalRedirectTo('/');
} else {
sqlConnectResult = resp;
}
@@ -140,7 +140,7 @@
conid: selectedConnection.conid,
});
localStorage.setItem('accessToken', resp.accessToken);
internalRedirectTo('?');
internalRedirectTo('/');
}
}}
/>
@@ -155,7 +155,7 @@
});
if (resp.error) {
internalRedirectTo(
`?page=not-logged&error=${encodeURIComponent(resp.error)}&is-admin=${isAdminPage ? 'true' : ''}`
`/?page=not-logged&error=${encodeURIComponent(resp.error)}&is-admin=${isAdminPage ? 'true' : ''}`
);
return;
}
@@ -163,13 +163,13 @@
if (accessToken) {
localStorage.setItem(isAdminPage ? 'adminAccessToken' : 'accessToken', accessToken);
if (isAdminPage) {
internalRedirectTo('?page=admin');
internalRedirectTo('/?page=admin');
} else {
internalRedirectTo('?');
internalRedirectTo('/');
}
return;
}
internalRedirectTo(`?page=not-logged`);
internalRedirectTo(`/?page=not-logged`);
}}
/>
{/if}