Enable popup windows during login

Signed-off-by: Laurin Brandner <[email protected]>
lbrndnr · Feb 25, 2021 · 18c63bc · 18c63bc
1 parent 723745a
commit 18c63bc
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 5 deletions.
diff --git a/Nuage/Info.plist b/Nuage/Info.plist
@@ -20,5 +20,10 @@
 	<string>1</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 </dict>
 </plist>
diff --git a/Nuage/Views/LoginView.swift b/Nuage/Views/LoginView.swift
@@ -14,13 +14,12 @@ struct LoginView: View {
     private var onLogin: (String, Date?) -> ()
 
     var body: some View {
-        WebView(url: URL(string: "https://soundcloud.com")!)
+        WebView(url: URL(string: "https://soundcloud.com/signin")!)
             .cookie(name: "oauth_token") { cookie in
                 onLogin(cookie.value, cookie.expiresDate)
             }
-            .frame(minWidth: 300, minHeight: 300)
-    //        .fixedSize()
-            .padding()
+            .frame(minWidth: 1000, minHeight: 700)
+            .navigationTitle("Login")
     }
 
     init(onLogin: @escaping (String, Date?) -> ()) {

diff --git a/Nuage/Views/WebView.swift b/Nuage/Views/WebView.swift
@@ -31,6 +31,7 @@ struct WebView: NSViewRepresentable {
         let view = WKWebView(frame: .zero, configuration: conf)
         view.load(URLRequest(url: url))
         view.navigationDelegate = context.coordinator
+        view.uiDelegate = context.coordinator
 
         return view
     }
@@ -44,7 +45,7 @@ struct WebView: NSViewRepresentable {
 
 }
 
-class WebViewCoordinator: NSObject, WKNavigationDelegate {
+class WebViewCoordinator: NSObject, WKNavigationDelegate, WKUIDelegate {
 
     var handlers = [(String, CookieHandler)]()
 
@@ -63,4 +64,23 @@ class WebViewCoordinator: NSObject, WKNavigationDelegate {
         decisionHandler(.allow)
     }
 
+    func webView(_ webView: WKWebView, createWebViewWith configuration: WKWebViewConfiguration, for navigationAction: WKNavigationAction, windowFeatures: WKWindowFeatures) -> WKWebView? {
+        let view = WKWebView(frame: .zero, configuration: configuration)
+        view.navigationDelegate = self
+        view.uiDelegate = self
+
+        let size = NSSize(width: windowFeatures.width?.doubleValue ?? 500, height: windowFeatures.height?.doubleValue ?? 500)
+        let window = NSWindow(contentRect: NSRect(origin: .zero, size: size), styleMask: [.closable, .titled], backing: .buffered, defer: false)
+        window.isReleasedWhenClosed = false
+        window.contentView = view
+        window.makeKeyAndOrderFront(nil)
+        window.center()
+
+        return view
+    }
+
+    func webViewDidClose(_ webView: WKWebView) {
+        webView.window?.close()
+    }
+
 }