refac
This commit is contained in:
1 parent
2e6d61e6d0
commit
7198e9d0df
3 files changed
+11
-1
No files matched your search
@@ -572,9 +572,13 @@ export const initiateOAuthRedirect = (tool: {
|
|||||||
}) => {
|
}) => {
|
||||||
sessionStorage.setItem('pendingOAuthToolId', tool.id);
|
sessionStorage.setItem('pendingOAuthToolId', tool.id);
|
||||||
sessionStorage.setItem('oauthRedirectInProgressToolId', tool.id);
|
sessionStorage.setItem('oauthRedirectInProgressToolId', tool.id);
|
||||||
|
localStorage.setItem('pendingOAuthToolId', tool.id);
|
||||||
|
localStorage.setItem('oauthRedirectInProgressToolId', tool.id);
|
||||||
const authUrl = getOAuthClientAuthorizationUrl(tool.serverId, tool.authType ?? 'mcp');
|
const authUrl = getOAuthClientAuthorizationUrl(tool.serverId, tool.authType ?? 'mcp');
|
||||||
const tab = window.open(authUrl, '_blank');
|
const tab = window.open(authUrl, '_blank');
|
||||||
if (!tab) {
|
if (!tab) {
|
||||||
|
localStorage.removeItem('pendingOAuthToolId');
|
||||||
|
localStorage.removeItem('oauthRedirectInProgressToolId');
|
||||||
window.open(authUrl, '_self', 'noopener');
|
window.open(authUrl, '_self', 'noopener');
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1419,12 +1419,15 @@
|
|||||||
|
|
||||||
if (event.data.error) {
|
if (event.data.error) {
|
||||||
sessionStorage.removeItem('oauthRedirectInProgressToolId');
|
sessionStorage.removeItem('oauthRedirectInProgressToolId');
|
||||||
|
localStorage.removeItem('oauthRedirectInProgressToolId');
|
||||||
toast.error(event.data.error);
|
toast.error(event.data.error);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
sessionStorage.removeItem('pendingOAuthToolId');
|
sessionStorage.removeItem('pendingOAuthToolId');
|
||||||
sessionStorage.removeItem('oauthRedirectInProgressToolId');
|
sessionStorage.removeItem('oauthRedirectInProgressToolId');
|
||||||
|
localStorage.removeItem('pendingOAuthToolId');
|
||||||
|
localStorage.removeItem('oauthRedirectInProgressToolId');
|
||||||
const updatedTools = await getTools(localStorage.token).catch(() => null);
|
const updatedTools = await getTools(localStorage.token).catch(() => null);
|
||||||
if (updatedTools) {
|
if (updatedTools) {
|
||||||
tools.set(updatedTools);
|
tools.set(updatedTools);
|
||||||
|
|||||||
@@ -1069,7 +1069,8 @@
|
|||||||
|
|
||||||
window.addEventListener('message', windowMessageEventHandler);
|
window.addEventListener('message', windowMessageEventHandler);
|
||||||
|
|
||||||
const pendingOAuthToolId = sessionStorage.getItem('pendingOAuthToolId');
|
const pendingOAuthToolId =
|
||||||
|
sessionStorage.getItem('pendingOAuthToolId') ?? localStorage.getItem('pendingOAuthToolId');
|
||||||
if (window.opener && window.location.pathname === '/' && pendingOAuthToolId) {
|
if (window.opener && window.location.pathname === '/' && pendingOAuthToolId) {
|
||||||
window.opener.postMessage(
|
window.opener.postMessage(
|
||||||
{
|
{
|
||||||
@@ -1081,6 +1082,8 @@
|
|||||||
);
|
);
|
||||||
sessionStorage.removeItem('pendingOAuthToolId');
|
sessionStorage.removeItem('pendingOAuthToolId');
|
||||||
sessionStorage.removeItem('oauthRedirectInProgressToolId');
|
sessionStorage.removeItem('oauthRedirectInProgressToolId');
|
||||||
|
localStorage.removeItem('pendingOAuthToolId');
|
||||||
|
localStorage.removeItem('oauthRedirectInProgressToolId');
|
||||||
window.close();
|
window.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user