mirror of
https://github.com/open-webui/open-webui.git
synced 2026-10-08 03:08:02 +00:00
refac
This commit is contained in:
parent
2e6d61e6d0
commit
7198e9d0df
3 changed files with 11 additions and 1 deletions
|
|
@ -572,9 +572,13 @@ export const initiateOAuthRedirect = (tool: {
|
|||
}) => {
|
||||
sessionStorage.setItem('pendingOAuthToolId', 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 tab = window.open(authUrl, '_blank');
|
||||
if (!tab) {
|
||||
localStorage.removeItem('pendingOAuthToolId');
|
||||
localStorage.removeItem('oauthRedirectInProgressToolId');
|
||||
window.open(authUrl, '_self', 'noopener');
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1419,12 +1419,15 @@
|
|||
|
||||
if (event.data.error) {
|
||||
sessionStorage.removeItem('oauthRedirectInProgressToolId');
|
||||
localStorage.removeItem('oauthRedirectInProgressToolId');
|
||||
toast.error(event.data.error);
|
||||
return;
|
||||
}
|
||||
|
||||
sessionStorage.removeItem('pendingOAuthToolId');
|
||||
sessionStorage.removeItem('oauthRedirectInProgressToolId');
|
||||
localStorage.removeItem('pendingOAuthToolId');
|
||||
localStorage.removeItem('oauthRedirectInProgressToolId');
|
||||
const updatedTools = await getTools(localStorage.token).catch(() => null);
|
||||
if (updatedTools) {
|
||||
tools.set(updatedTools);
|
||||
|
|
|
|||
|
|
@ -1069,7 +1069,8 @@
|
|||
|
||||
window.addEventListener('message', windowMessageEventHandler);
|
||||
|
||||
const pendingOAuthToolId = sessionStorage.getItem('pendingOAuthToolId');
|
||||
const pendingOAuthToolId =
|
||||
sessionStorage.getItem('pendingOAuthToolId') ?? localStorage.getItem('pendingOAuthToolId');
|
||||
if (window.opener && window.location.pathname === '/' && pendingOAuthToolId) {
|
||||
window.opener.postMessage(
|
||||
{
|
||||
|
|
@ -1081,6 +1082,8 @@
|
|||
);
|
||||
sessionStorage.removeItem('pendingOAuthToolId');
|
||||
sessionStorage.removeItem('oauthRedirectInProgressToolId');
|
||||
localStorage.removeItem('pendingOAuthToolId');
|
||||
localStorage.removeItem('oauthRedirectInProgressToolId');
|
||||
window.close();
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue