Merge pull request #12113 from nextcloud/fix/oauth/close-popup-parent

ChristophWurst · web-flow · commit 215de88eca20 · 2025-12-02T12:48:04.000+01:00
fix(oauth): close popup window in parent window
diff --git a/src/integration/oauth.js b/src/integration/oauth.js
@@ -22,6 +22,7 @@ export async function getUserConsent(redirectUrl) {
 
 			if (data === 'DONE') {
 				logger.info('OAUTH2 user consent given')
+				ssoWindow.close()
 				resolve()
 			}
 		})
diff --git a/src/main-oauth-popup.js b/src/main-oauth-popup.js
@@ -20,5 +20,4 @@ new View({}).$mount('#mail-oauth-done')
 
 if (window.opener) {
 	window.opener.postMessage('DONE')
-	window.close()
 }

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ export async function getUserConsent(redirectUrl) {`
`22`	`22`
`23`	`23`	`if (data === 'DONE') {`
`24`	`24`	`logger.info('OAUTH2 user consent given')`
	`25`	`+ ssoWindow.close()`
`25`	`26`	`resolve()`
`26`	`27`	`}`
`27`	`28`	`})`
Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,4 @@ new View({}).$mount('#mail-oauth-done')`
`20`	`20`
`21`	`21`	`if (window.opener) {`
`22`	`22`	`window.opener.postMessage('DONE')`
`23`		`- window.close()`
`24`	`23`	`}`