starred/windmill
1
0
Fork 0
mirror of https://github.com/windmill-labs/windmill.git synced 2026-09-12 00:06:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

window openeer nits

Browse Source
This commit is contained in:
Ruben Fiszel
2024-11-29 07:48:37 +01:00
parent 05416054bb
commit 8ebb1fe363
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/routes/(root)/(logged)/oauth/callback/[client_name]/+page.svelte
+7 -4
View File
@@ -14,7 +14,8 @@
onMount(async () => {
if (error) {
window.opener.postMessage(
sendUserToast(`Error trying to add ${client_name} connection: ${error}`, true)
window.opener?.postMessage(
{ type: 'error', error: `Error trying to add ${client_name} connection: ${error}` },
'*'
)
@@ -26,17 +27,19 @@
requestBody: { code, state }
})
sendUserToast('successful', false)
window.opener.postMessage({ type: 'success', res, resource_type: client_name }, '*')
window.opener?.postMessage({ type: 'success', res, resource_type: client_name }, '*')
// goto(`/resources?resource_type=${client_name}`)
} catch (e) {
window.opener.postMessage(
sendUserToast(`Error trying to add ${client_name} connection: ${e.body}`, true)
window.opener?.postMessage(
{ type: 'error', error: `Error parsing the response token, ${e.body}` },
'*'
)
// goto('/resources')
}
} else {
window.opener.postMessage(
sendUserToast('Missing code or state as query params', true)
window.opener?.postMessage(
{ type: 'error', error: 'Missing code or state as query params' },
'*'
)
frontend/src/routes/user/login_callback/[client_name]/+page.svelte
+12 -4
View File
@@ -45,8 +45,12 @@
if (rd?.startsWith('http')) {
if (closeUponLogin) {
window.opener.postMessage({ type: 'success' }, '*')
window.close()
if (window.opener) {
window.opener.postMessage({ type: 'success' }, '*')
window.close()
} else {
sendUserToast(`Logged in successfully, but can't communicate with main page. Close this window and refresh main page.`, false)
}
return
}
window.location.href = rd
@@ -72,8 +76,12 @@
if (allWorkspaces?.length == 1) {
$workspaceStore = allWorkspaces[0].id
if (closeUponLogin) {
window.opener.postMessage({ type: 'success' }, '*')
window.close()
if (window.opener) {
window.opener.postMessage({ type: 'success' }, '*')
window.close()
} else {
sendUserToast(`Logged in successfully, but can't communicate with main page. Close this window and refresh main page.`, false)
}
return
}
if (rd) {