Route app links and Google sign-in through the in-app browser.

Made-with: Cursor

classroom_app/Auth/GoogleOAuthService.swift

@@ -2,6 +2,7 @@ import Foundation
 import CryptoKit
 import AppKit
 import Network
+import WebKit
 
 struct GoogleOAuthTokens: Codable, Equatable {
     var accessToken: String
@@ -30,6 +31,7 @@ enum GoogleOAuthError: Error {
 
 final class GoogleOAuthService: NSObject {
     static let shared = GoogleOAuthService()
+    private var inAppOAuthWindowController: InAppOAuthWindowController?
 
     // Stored in UserDefaults so you can configure without rebuilding.
     // Put your OAuth Desktop client ID here (from Google Cloud Console).
@@ -152,7 +154,12 @@ final class GoogleOAuthService: NSObject {
         ]
 
         guard let authURL = components.url else { throw GoogleOAuthError.invalidCallbackURL }
-        guard NSWorkspace.shared.open(authURL) else { throw GoogleOAuthError.unableToOpenBrowser }
+        guard await openAuthURLInApp(authURL) else { throw GoogleOAuthError.unableToOpenBrowser }
+        defer {
+            Task { @MainActor [weak self] in
+                self?.closeInAppOAuthWindow()
+            }
+        }
         let callbackURL = try await loopback.waitForCallback()
 
         guard let returnedState = URLComponents(url: callbackURL, resolvingAgainstBaseURL: false)?
@@ -176,6 +183,29 @@ final class GoogleOAuthService: NSObject {
         )
     }
 
+    @MainActor
+    private func openAuthURLInApp(_ url: URL) -> Bool {
+        let controller: InAppOAuthWindowController
+        if let existing = inAppOAuthWindowController {
+            controller = existing
+        } else {
+            controller = InAppOAuthWindowController()
+            inAppOAuthWindowController = controller
+        }
+        controller.load(url: url)
+        controller.showWindow(nil)
+        controller.window?.makeKeyAndOrderFront(nil)
+        controller.window?.orderFrontRegardless()
+        NSApp.activate(ignoringOtherApps: true)
+        return true
+    }
+
+    @MainActor
+    private func closeInAppOAuthWindow() {
+        inAppOAuthWindowController?.close()
+        inAppOAuthWindowController = nil
+    }
+
     private func exchangeCodeForTokens(code: String, codeVerifier: String, redirectURI: String, clientId: String, clientSecret: String) async throws -> GoogleOAuthTokens {
         var request = URLRequest(url: URL(string: "https://oauth2.googleapis.com/token")!)
         request.httpMethod = "POST"
@@ -459,3 +489,84 @@ extension GoogleOAuthError: LocalizedError {
     }
 }
 
+@MainActor
+private final class InAppOAuthWindowController: NSWindowController, WKNavigationDelegate, WKUIDelegate {
+    private let webView: WKWebView
+
+    init() {
+        let config = WKWebViewConfiguration()
+        if #available(macOS 11.0, *) {
+            config.defaultWebpagePreferences.allowsContentJavaScript = true
+        }
+        self.webView = WKWebView(frame: .zero, configuration: config)
+        webView.translatesAutoresizingMaskIntoConstraints = false
+
+        let container = NSView()
+        container.translatesAutoresizingMaskIntoConstraints = false
+        container.addSubview(webView)
+        NSLayoutConstraint.activate([
+            webView.leadingAnchor.constraint(equalTo: container.leadingAnchor),
+            webView.trailingAnchor.constraint(equalTo: container.trailingAnchor),
+            webView.topAnchor.constraint(equalTo: container.topAnchor),
+            webView.bottomAnchor.constraint(equalTo: container.bottomAnchor)
+        ])
+
+        let window = NSWindow(
+            contentRect: NSRect(x: 0, y: 0, width: 980, height: 760),
+            styleMask: [.titled, .closable, .miniaturizable, .resizable],
+            backing: .buffered,
+            defer: false
+        )
+        window.title = "Google Sign-In"
+        window.contentView = container
+        window.center()
+        super.init(window: window)
+        webView.navigationDelegate = self
+        webView.uiDelegate = self
+    }
+
+    @available(*, unavailable)
+    required init?(coder: NSCoder) {
+        nil
+    }
+
+    func load(url: URL) {
+        webView.load(URLRequest(url: url))
+    }
+
+    func webView(
+        _ webView: WKWebView,
+        decidePolicyFor navigationAction: WKNavigationAction,
+        decisionHandler: @escaping (WKNavigationActionPolicy) -> Void
+    ) {
+        guard let url = navigationAction.request.url else {
+            decisionHandler(.allow)
+            return
+        }
+        let scheme = (url.scheme ?? "").lowercased()
+        if scheme == "http" || scheme == "https" {
+            decisionHandler(.allow)
+            return
+        }
+        NSWorkspace.shared.open(url)
+        decisionHandler(.cancel)
+    }
+
+    func webView(
+        _ webView: WKWebView,
+        createWebViewWith configuration: WKWebViewConfiguration,
+        for navigationAction: WKNavigationAction,
+        windowFeatures: WKWindowFeatures
+    ) -> WKWebView? {
+        if navigationAction.targetFrame == nil, let requestURL = navigationAction.request.url {
+            let scheme = (requestURL.scheme ?? "").lowercased()
+            if scheme == "http" || scheme == "https" {
+                webView.load(URLRequest(url: requestURL))
+            } else {
+                NSWorkspace.shared.open(requestURL)
+            }
+        }
+        return nil
+    }
+}
+

classroom_app/ViewController.swift

@@ -577,7 +577,7 @@ private extension ViewController {
             return
         }
 
-        openInDefaultBrowser(url: url)
+        openURL(url)
     }
 
     @objc private func joinWithLinkCardClicked(_ sender: NSClickGestureRecognizer) {
@@ -599,27 +599,27 @@ private extension ViewController {
             showSimpleAlert(title: "Invalid address", message: "Enter a valid http or https URL.")
             return
         }
-        openInAppBrowser(with: url, policy: inAppBrowserDefaultPolicy)
+        openURL(url)
     }
 
     @objc private func browseQuickLinkMeetClicked(_ sender: Any?) {
         guard let url = URL(string: "https://classroom.google.com/") else { return }
-        openInDefaultBrowser(url: url)
+        openURL(url)
     }
 
     @objc private func browseQuickLinkMeetHelpClicked(_ sender: Any?) {
         guard let url = URL(string: "https://support.google.com/classroom") else { return }
-        openInAppBrowser(with: url, policy: inAppBrowserDefaultPolicy)
+        openURL(url)
     }
 
     @objc private func browseQuickLinkZoomHelpClicked(_ sender: Any?) {
         guard let url = URL(string: "https://support.zoom.us") else { return }
-        openInAppBrowser(with: url, policy: inAppBrowserDefaultPolicy)
+        openURL(url)
     }
 
     @objc private func instantMeetClicked(_ sender: NSClickGestureRecognizer) {
         guard let url = URL(string: "https://classroom.google.com/") else { return }
-        openInDefaultBrowser(url: url)
+        openURL(url)
     }
 
     private func normalizedURLString(from value: String) -> String {
@@ -705,6 +705,15 @@ private extension ViewController {
         }
     }
 
+    private func openURLWithRouting(_ url: URL, policy: InAppBrowserURLPolicy = .allowAll) {
+        let scheme = (url.scheme ?? "").lowercased()
+        if scheme == "http" || scheme == "https" {
+            openInAppBrowser(with: url, policy: policy)
+            return
+        }
+        openInDefaultBrowser(url: url)
+    }
+
     private func openRateUsDestination() {
         let configured = (Bundle.main.object(forInfoDictionaryKey: "RateUsURL") as? String)?
             .trimmingCharacters(in: .whitespacesAndNewlines)
@@ -767,7 +776,7 @@ private extension ViewController {
             showSimpleAlert(title: "Unable to Open Subscriptions", message: "The subscriptions URL is invalid.")
             return
         }
-        openInDefaultBrowser(url: url)
+        openURL(url)
     }
 
     private func shareAppURL() -> URL? {
@@ -895,7 +904,7 @@ private extension ViewController {
         case .moreApps:
             if let moreAppsURL = Bundle.main.object(forInfoDictionaryKey: "MoreAppsURL") as? String,
                let url = URL(string: moreAppsURL) {
-                openInAppBrowser(with: url, policy: inAppBrowserDefaultPolicy)
+                openURL(url)
             }
         case .shareApp:
             shareAppFromSettingsMenu(sourceView: sourceView, clickLocationInSourceView: clickLocationInSourceView)
@@ -908,7 +917,7 @@ private extension ViewController {
         let defaultURL = (Bundle.main.object(forInfoDictionaryKey: "AppLaunchPlaceholderURL") as? String) ?? "https://example.com/app-link-coming-soon"
         let urlString = (Bundle.main.object(forInfoDictionaryKey: infoKey) as? String) ?? defaultURL
         guard let url = URL(string: urlString) else { return }
-        openInAppBrowser(with: url, policy: inAppBrowserDefaultPolicy)
+        openURL(url)
     }
 
     private func showSimpleAlert(title: String, message: String) {
@@ -1113,7 +1122,7 @@ private extension ViewController {
             "Terms of Services": (Bundle.main.object(forInfoDictionaryKey: "TermsOfServiceURL") as? String) ?? defaultURL
         ]
         if let urlString = map[text], let url = URL(string: urlString) {
-            openInAppBrowser(with: url, policy: inAppBrowserDefaultPolicy)
+            openURL(url)
             return
         }
         showSimpleAlert(title: text, message: "\(text) tapped.")
@@ -6710,7 +6719,7 @@ private extension ViewController {
     }
 
     private func openURL(_ url: URL) {
-        NSWorkspace.shared.open(url)
+        openURLWithRouting(url, policy: inAppBrowserDefaultPolicy)
     }
 
     private func renderEnrolledClassCards(_ courses: [ClassroomCourse]) {
@@ -8273,6 +8282,10 @@ private final class InAppBrowserContainerViewController: NSViewController, WKNav
         alert.runModal()
     }
 
+    private func openExternally(_ url: URL) {
+        NSWorkspace.shared.open(url)
+    }
+
     func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
         processTerminateRetryCount = 0
         syncAddressFieldFromWebView()
@@ -8326,7 +8339,8 @@ private final class InAppBrowserContainerViewController: NSViewController, WKNav
             return
         }
         let scheme = (url.scheme ?? "").lowercased()
-        if scheme == "mailto" || scheme == "tel" {
+        if scheme != "http" && scheme != "https" {
+            openExternally(url)
             decisionHandler(.cancel)
             return
         }
@@ -8349,7 +8363,10 @@ private final class InAppBrowserContainerViewController: NSViewController, WKNav
         windowFeatures: WKWindowFeatures
     ) -> WKWebView? {
         if navigationAction.targetFrame == nil, let requestURL = navigationAction.request.url {
-            if inAppBrowserURLAllowed(requestURL, policy: navigationPolicy) {
+            let scheme = (requestURL.scheme ?? "").lowercased()
+            if scheme != "http" && scheme != "https" {
+                openExternally(requestURL)
+            } else if inAppBrowserURLAllowed(requestURL, policy: navigationPolicy) {
                 webView.load(URLRequest(url: requestURL))
             } else {
                 presentBlockedHostAlert()