ruby_everywhere 0.3.0 → 0.4.0

data/support/mobile/ios/App/SceneDelegate.swift

@@ -1,3 +1,4 @@
+import AuthenticationServices
 import HotwireNative
 import UIKit
 import WebKit
@@ -43,6 +44,18 @@ final class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     /// until the first navigator/tab bar is built, then routed.
     private var pendingUniversalLinkURL: URL?
 
+    /// Third-party sign-in, run in the system browser (everywhere.yml `auth:`).
+    /// Held for the scene's lifetime — the session inside it must outlive the
+    /// call that started it.
+    private lazy var authFlow = AuthFlow { [weak self] in
+        self?.window ?? ASPresentationAnchor()
+    }
+
+    /// Set while the web view is spending a handoff token. The visit that
+    /// follows carries the Set-Cookie headers that sign the app in, so the
+    /// auth-gated tab bar can only be fetched once it has finished.
+    private var awaitingAuthHandoff = false
+
     func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
         guard let windowScene = scene as? UIWindowScene else { return }
 
@@ -75,6 +88,9 @@ final class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         NotificationCenter.default.addObserver(
             self, selector: #selector(handleNativeVisit(_:)),
             name: .everywhereNativeVisit, object: nil)
+        NotificationCenter.default.addObserver(
+            self, selector: #selector(handleAuthFlow(_:)),
+            name: .everywhereAuthFlow, object: nil)
 
         // Cookie hydration BEFORE the first visit: after a force-kill relaunch
         // (iOS kills the app when a Settings permission changes) the first
@@ -182,6 +198,10 @@ final class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     ///   3. refresh the auth-aware server config, which rebuilds the tab bar
     ///      back in if (and only if) the user is now signed in.
     private func resetApp(to target: URL) {
+        // A sign-in sheet still up is answering a question the app no longer
+        // has — the reset is re-rooting or re-authing underneath it.
+        authFlow.cancel()
+        awaitingAuthHandoff = false
         clearWebContentCache()
         rebuildRoot(entries: [], routeTo: target)
         loadedTabsFingerprint = "" // matches the empty tab set we just built
@@ -203,6 +223,75 @@ final class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         activeNavigator.route(url)
     }
 
+    // MARK: Third-party sign-in
+
+    /// `{action: "authFlow", to: "/auth/github"}` from the gem's
+    /// /everywhere/auth/native page — the fallback for visits the proposal
+    /// handler never sees (a `data-turbo="false"` link, or OmniAuth 2's POST).
+    @objc private func handleAuthFlow(_ note: Notification) {
+        guard let to = note.userInfo?["to"] as? String, to.hasPrefix("/"), !to.hasPrefix("//") else { return }
+        startAuthFlow(to: to)
+    }
+
+    /// Open a provider sign-in in the system browser. Nothing is loaded in the
+    /// web view: the whole point is that this URL never touches it.
+    private func startAuthFlow(to: String) {
+        guard let scheme = config.authScheme,
+              let start = config.authStartURL(to: to, returnTo: currentPath)
+        else { return }
+
+        #if DEBUG
+        NSLog("authFlow: %@", start.absoluteString)
+        #endif
+
+        authFlow.start(url: start, scheme: scheme) { [weak self] result in
+            guard let self else { return }
+            switch result {
+            case .success(let token):
+                self.finishAuthFlow(token: token)
+            case .failure(.canceled):
+                break // they closed the sheet; they're still on the page they started from
+            case .failure(let error):
+                self.presentAuthFailure(error)
+            }
+        }
+    }
+
+    /// Spend the handoff token in the web view and rebuild around whatever it
+    /// signs the app in as. Deliberately the reset sequence, in order:
+    ///   1. drop cached web content — the pre-auth pages are all stale now,
+    ///   2. drop to a single navigator aimed at the handoff, which sets the
+    ///      session cookie in the WEB VIEW's jar (the browser's jar, where the
+    ///      flow actually happened, is unreachable from here) and redirects on
+    ///      to the app's post-sign-in page,
+    ///   3. once that request has finished — and only then, or the fetch races
+    ///      the cookie — re-read the auth-gated config, which brings the tab
+    ///      bar back for the user who just signed in.
+    private func finishAuthFlow(token: String) {
+        guard let handoff = config.authHandoffURL(token: token) else { return }
+
+        clearWebContentCache()
+        rebuildRoot(entries: [], routeTo: handoff)
+        loadedTabsFingerprint = "" // matches the empty tab set we just built
+        awaitingAuthHandoff = true
+    }
+
+    private func presentAuthFailure(_ error: AuthFlow.Failure) {
+        NSLog("authFlow failed: %@", String(describing: error))
+
+        let alert = UIAlertController(title: "Sign-in didn't finish",
+                                      message: "Something went wrong on the way back to the app. Please try again.",
+                                      preferredStyle: .alert)
+        alert.addAction(UIAlertAction(title: "OK", style: .default))
+        activeNavigator.activeNavigationController.present(alert, animated: true)
+    }
+
+    /// The path the user is currently on, for the flow to come back to when the
+    /// app's own sign-in doesn't name a destination.
+    private var currentPath: String? {
+        activeNavigator.currentVisitableURL.map { config.pathAndQuery(of: $0) }
+    }
+
     // MARK: Instance switching (multi-instance apps)
 
     /// `Everywhere.instance.set(url)`: persist the picked instance as the
@@ -444,6 +533,13 @@ extension SceneDelegate: NavigatorDelegate {
             resetApp(to: resetTarget(from: proposal.url))
             return .reject
         }
+        // A provider sign-in: hand it to the system browser instead of loading
+        // it here. Rejecting leaves the user on the page they tapped from, which
+        // is where they belong if they close the sheet.
+        if let target = config.authTarget(for: proposal.url) {
+            startAuthFlow(to: target)
+            return .reject
+        }
         // App-provided native screens: a path rule's `view_controller`
         // identifier resolves through the extension registry (everywhere.yml
         // native.ios.screens). Unknown identifiers fall through to the web.
@@ -460,6 +556,13 @@ extension SceneDelegate: NavigatorDelegate {
 
     func requestDidFinish(at url: URL) {
         dismissSplash()
+
+        // The handoff has landed, so its cookies are in the web view's jar:
+        // now the tab bar can be fetched as the signed-in user.
+        if awaitingAuthHandoff {
+            awaitingAuthHandoff = false
+            loadPathConfiguration(serverOnly: true)
+        }
     }
 
     func visitableDidFailRequest(_ visitable: any Visitable, error: HotwireNativeError, retryHandler: RetryBlock?) {

data/support/mobile/ios/App.xcodeproj/project.pbxproj

@@ -18,6 +18,7 @@
 		EBE000000000000000000060 /* StorageComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBE000000000000000000059 /* StorageComponent.swift */; };
 		EBE000000000000000000068 /* MenuComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBE000000000000000000067 /* MenuComponent.swift */; };
 		EBE000000000000000000063 /* EverywhereHost.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBE000000000000000000062 /* EverywhereHost.swift */; };
+		EBE000000000000000000070 /* AuthFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBE000000000000000000069 /* AuthFlow.swift */; };
 		EBE000000000000000000036 /* everywhere.json in Resources */ = {isa = PBXBuildFile; fileRef = EBE000000000000000000018 /* everywhere.json */; };
 		EBE000000000000000000037 /* path-configuration.json in Resources */ = {isa = PBXBuildFile; fileRef = EBE000000000000000000019 /* path-configuration.json */; };
 		EBE000000000000000000038 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EBE000000000000000000020 /* Assets.xcassets */; };
@@ -45,6 +46,7 @@
 		EBE000000000000000000020 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		EBE000000000000000000021 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		EBE000000000000000000062 /* EverywhereHost.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EverywhereHost.swift; sourceTree = "<group>"; };
+		EBE000000000000000000069 /* AuthFlow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthFlow.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFileSystemSynchronizedRootGroup section */
@@ -89,6 +91,7 @@
 				EBE000000000000000000015 /* EverywhereConfig.swift */,
 				EBE000000000000000000016 /* ErrorViewController.swift */,
 				EBE000000000000000000062 /* EverywhereHost.swift */,
+				EBE000000000000000000069 /* AuthFlow.swift */,
 				EBE000000000000000000005 /* Bridge */,
 				EBE000000000000000000061 /* Extensions */,
 				EBE000000000000000000023 /* Resources */,
@@ -215,6 +218,7 @@
 				EBE000000000000000000060 /* StorageComponent.swift in Sources */,
 				EBE000000000000000000068 /* MenuComponent.swift in Sources */,
 				EBE000000000000000000063 /* EverywhereHost.swift in Sources */,
+				EBE000000000000000000070 /* AuthFlow.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

data/support/mobile/ios/README.md

@@ -19,7 +19,10 @@ this template, it overwrites **exactly** these files and nothing else:
 4. `App/Assets.xcassets/AppIcon.appiconset/AppIcon.png` — the app icon (1024×1024 opaque PNG)
 5. *(optionally)* `App/Assets.xcassets/AccentColor.colorset/Contents.json` and
    `App/Assets.xcassets/LaunchBackground.colorset/Contents.json` — brand colors
-6. *(optionally)* `App/App.entitlements` — the Associated Domains entitlement,
+6. *(optionally)* `App/Info.plist`'s `CFBundleURLTypes` — the sign-in callback
+   scheme, written **only** when `auth:` is set in `everywhere.yml` (alongside
+   the permission usage strings, which are stamped the same way)
+7. *(optionally)* `App/App.entitlements` — the Associated Domains entitlement,
    written **only** when `deep_linking:` is set in `everywhere.yml`. The matching
    `CODE_SIGN_ENTITLEMENTS` is added to the xcconfig in the same case, so the
    default build stays entitlement-free and the frozen template still compiles

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_everywhere
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Andrea Fomera
@@ -76,6 +76,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE.txt
+- README.md
 - bridge/LICENSE
 - bridge/README.md
 - bridge/everywhere/bridge.js
@@ -85,8 +86,14 @@ files:
 - exe/every
 - exe/rbe
 - lib/everywhere.rb
+- lib/everywhere/android_resources.rb
+- lib/everywhere/android_sdk.rb
+- lib/everywhere/asset_catalog.rb
+- lib/everywhere/auth_handoff.rb
+- lib/everywhere/auth_token.rb
 - lib/everywhere/blake2b.rb
 - lib/everywhere/boot.rb
+- lib/everywhere/builders/android.rb
 - lib/everywhere/builders/ios.rb
 - lib/everywhere/cli.rb
 - lib/everywhere/commands/build.rb
@@ -107,6 +114,7 @@ files:
 - lib/everywhere/commands/updates_keygen.rb
 - lib/everywhere/config.rb
 - lib/everywhere/database.rb
+- lib/everywhere/emulator.rb
 - lib/everywhere/engine.rb
 - lib/everywhere/framework.rb
 - lib/everywhere/icon.rb
@@ -116,6 +124,7 @@ files:
 - lib/everywhere/mobile_config_endpoint.rb
 - lib/everywhere/mobile_configs_controller.rb
 - lib/everywhere/native_helper.rb
+- lib/everywhere/omniauth.rb
 - lib/everywhere/paths.rb
 - lib/everywhere/platform/client.rb
 - lib/everywhere/platform/credentials.rb
@@ -133,6 +142,62 @@ files:
 - support/github/build.yml
 - support/macos/entitlements.plist
 - support/macos/notarize.sh
+- support/mobile/android/README.md
+- support/mobile/android/app/build.gradle.kts
+- support/mobile/android/app/everywhere.properties
+- support/mobile/android/app/native-packages.gradle.kts
+- support/mobile/android/app/proguard-rules.pro
+- support/mobile/android/app/src/debug/res/xml/network_security_config.xml
+- support/mobile/android/app/src/main/AndroidManifest.xml
+- support/mobile/android/app/src/main/assets/everywhere.json
+- support/mobile/android/app/src/main/assets/fonts/MaterialIcons-Regular.codepoints
+- support/mobile/android/app/src/main/assets/fonts/MaterialIcons-Regular.ttf
+- support/mobile/android/app/src/main/assets/json/path-configuration.json
+- support/mobile/android/app/src/main/java/com/rubyeverywhere/shell/AuthFlow.kt
+- support/mobile/android/app/src/main/java/com/rubyeverywhere/shell/EverywhereApplication.kt
+- support/mobile/android/app/src/main/java/com/rubyeverywhere/shell/EverywhereConfig.kt
+- support/mobile/android/app/src/main/java/com/rubyeverywhere/shell/EverywhereEvents.kt
+- support/mobile/android/app/src/main/java/com/rubyeverywhere/shell/EverywhereHost.kt
+- support/mobile/android/app/src/main/java/com/rubyeverywhere/shell/IconFont.kt
+- support/mobile/android/app/src/main/java/com/rubyeverywhere/shell/MainActivity.kt
+- support/mobile/android/app/src/main/java/com/rubyeverywhere/shell/MainTabs.kt
+- support/mobile/android/app/src/main/java/com/rubyeverywhere/shell/WebBottomSheetFragment.kt
+- support/mobile/android/app/src/main/java/com/rubyeverywhere/shell/WebFragment.kt
+- support/mobile/android/app/src/main/java/com/rubyeverywhere/shell/bridge/BiometricsComponent.kt
+- support/mobile/android/app/src/main/java/com/rubyeverywhere/shell/bridge/HapticsComponent.kt
+- support/mobile/android/app/src/main/java/com/rubyeverywhere/shell/bridge/MenuComponent.kt
+- support/mobile/android/app/src/main/java/com/rubyeverywhere/shell/bridge/NotificationComponent.kt
+- support/mobile/android/app/src/main/java/com/rubyeverywhere/shell/bridge/PermissionsComponent.kt
+- support/mobile/android/app/src/main/java/com/rubyeverywhere/shell/bridge/StorageComponent.kt
+- support/mobile/android/app/src/main/java/com/rubyeverywhere/shell/bridge/WebControlChannel.kt
+- support/mobile/android/app/src/main/java/com/rubyeverywhere/shell/extensions/EverywhereExtensions.kt
+- support/mobile/android/app/src/main/res/color/bottom_navigation_active_indicator.xml
+- support/mobile/android/app/src/main/res/color/bottom_navigation_item.xml
+- support/mobile/android/app/src/main/res/drawable/ic_launcher_foreground.xml
+- support/mobile/android/app/src/main/res/drawable/ic_tab_placeholder.xml
+- support/mobile/android/app/src/main/res/layout/activity_main.xml
+- support/mobile/android/app/src/main/res/layout/bridge_menu_sheet.xml
+- support/mobile/android/app/src/main/res/layout/bridge_menu_sheet_item.xml
+- support/mobile/android/app/src/main/res/layout/tab_more_sheet.xml
+- support/mobile/android/app/src/main/res/layout/tab_more_sheet_item.xml
+- support/mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+- support/mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+- support/mobile/android/app/src/main/res/values-night/colors.xml
+- support/mobile/android/app/src/main/res/values-night/themes.xml
+- support/mobile/android/app/src/main/res/values/colors.xml
+- support/mobile/android/app/src/main/res/values/ic_launcher_background.xml
+- support/mobile/android/app/src/main/res/values/strings.xml
+- support/mobile/android/app/src/main/res/values/styles.xml
+- support/mobile/android/app/src/main/res/values/themes.xml
+- support/mobile/android/app/src/main/res/xml/network_security_config.xml
+- support/mobile/android/app/src/stamped/AndroidManifest.xml
+- support/mobile/android/build.gradle.kts
+- support/mobile/android/gradle.properties
+- support/mobile/android/gradle/wrapper/gradle-wrapper.jar
+- support/mobile/android/gradle/wrapper/gradle-wrapper.properties
+- support/mobile/android/gradlew
+- support/mobile/android/gradlew.bat
+- support/mobile/android/settings.gradle.kts
 - support/mobile/ios/App.xcodeproj/project.pbxproj
 - support/mobile/ios/App.xcodeproj/project.xcworkspace/contents.xcworkspacedata
 - support/mobile/ios/App.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -144,6 +209,7 @@ files:
 - support/mobile/ios/App/Assets.xcassets/AppIcon.appiconset/Contents.json
 - support/mobile/ios/App/Assets.xcassets/Contents.json
 - support/mobile/ios/App/Assets.xcassets/LaunchBackground.colorset/Contents.json
+- support/mobile/ios/App/AuthFlow.swift
 - support/mobile/ios/App/Base.lproj/LaunchScreen.storyboard
 - support/mobile/ios/App/Bridge/BiometricsComponent.swift
 - support/mobile/ios/App/Bridge/HapticsComponent.swift