Mike/clerk UI

.swift-format

@@ -1,10 +1,13 @@
 {
   "version": 1,
-  "lineLength": 200,
+  "indentConditionalCompilationBlocks" : false,
+  "multiElementCollectionTrailingCommas" : false,
+  "lineLength": 1000,
   "indentation": {
-    "spaces": 2
+    "spaces": 4
   },
   "rules": {
-    "OrderedImports": true,
+    "AllPublicDeclarationsHaveDocumentation" : true,
+    "OrderedImports": true
   }
 }

Package.swift

@@ -5,31 +5,38 @@ import PackageDescription
 
 let package = Package(
   name: "Clerk",
+  defaultLocalization: "en",
   platforms: [
     .iOS(.v17),
     .macCatalyst(.v17),
     .macOS(.v14),
     .watchOS(.v10),
     .tvOS(.v17),
-    .visionOS(.v1),
+    .visionOS(.v1)
   ],
   products: [
     .library(name: "Clerk", targets: ["Clerk"])
   ],
   dependencies: [
-    .package(url: "https://github.com/hmlongco/Factory", from: "2.0.0"),
-    .package(url: "https://github.com/kean/Get", .upToNextMajor(from: "2.2.1")),
+    .package(url: "https://github.com/apple/swift-algorithms", from: "1.2.0"),
+    .package(url: "https://github.com/hmlongco/Factory", from: "2.5.3"),
+    .package(url: "https://github.com/onevcat/Kingfisher.git", .upToNextMajor(from: "8.0.0")),
     .package(url: "https://github.com/WeTransfer/Mocker.git", .upToNextMajor(from: "3.0.0")),
+    .package(url: "https://github.com/marmelroy/PhoneNumberKit", .upToNextMajor(from: "4.0.0")),
+    .package(url: "https://github.com/hmlongco/RequestBuilder", branch: "main"),
     .package(url: "https://github.com/auth0/SimpleKeychain", .upToNextMajor(from: "1.0.0")),
-    .package(url: "https://github.com/pointfreeco/swift-concurrency-extras", .upToNextMajor(from: "1.3.1")),
+    .package(url: "https://github.com/pointfreeco/swift-concurrency-extras", .upToNextMajor(from: "1.3.1"))
   ],
   targets: [
     .target(
       name: "Clerk",
       dependencies: [
-        .product(name: "Factory", package: "Factory"),
-        .product(name: "Get", package: "Get"),
-        .product(name: "SimpleKeychain", package: "SimpleKeychain"),
+        .product(name: "Algorithms", package: "swift-algorithms"),
+        .product(name: "FactoryKit", package: "Factory"),
+        .product(name: "Kingfisher", package: "Kingfisher"),
+        .product(name: "PhoneNumberKit", package: "PhoneNumberKit"),
+        .product(name: "RequestBuilder", package: "RequestBuilder"),
+        .product(name: "SimpleKeychain", package: "SimpleKeychain")
       ],
       swiftSettings: [
         .enableExperimentalFeature("StrictConcurrency")
@@ -40,7 +47,7 @@ let package = Package(
       dependencies: [
         "Clerk",
         .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
-        .product(name: "Mocker", package: "Mocker"),
+        .product(name: "Mocker", package: "Mocker")
       ],
       swiftSettings: [
         .enableExperimentalFeature("StrictConcurrency")

README.md

@@ -10,25 +10,15 @@
 <h1 align="center">
   Official Clerk iOS SDK
 </h1>
-<p align="center">
-  <strong>
-    Clerk helps developers build user management. We provide streamlined user experiences for your users to sign up, sign in, and manage their profile.
-  </strong>
-</p>
+
 
 [![](https://img.shields.io/endpoint?url=https%3A%2F%2Fswiftpackageindex.com%2Fapi%2Fpackages%2Fclerk%2Fclerk-ios%2Fbadge%3Ftype%3Dswift-versions)](https://swiftpackageindex.com/clerk/clerk-ios)
 [![](https://img.shields.io/endpoint?url=https%3A%2F%2Fswiftpackageindex.com%2Fapi%2Fpackages%2Fclerk%2Fclerk-ios%2Fbadge%3Ftype%3Dplatforms)](https://swiftpackageindex.com/clerk/clerk-ios)
 [![chat on Discord](https://img.shields.io/discord/856971667393609759.svg?logo=discord)](https://clerk.com/discord)
 [![documentation](https://img.shields.io/badge/documentation-clerk-green.svg)](https://clerk.com/docs)
 [![twitter](https://img.shields.io/twitter/follow/ClerkDev?style=social)](https://twitter.com/intent/follow?screen_name=ClerkDev)
 
----
-
-**Clerk is Hiring!**
-
-Would you like to work on Open Source software and help maintain this repository? [Apply today!](https://jobs.ashbyhq.com/clerk)
-
----
+The Clerk iOS SDK gives you access to prebuilt SwiftUI components, observable state management, and helpers to make user management easier.
 
 ## 🚀 Get Started with Clerk
 
@@ -55,184 +45,12 @@ dependencies: [
 ]
 ```
 
-## 🛠️ Usage
-
-First, configure Clerk in your app's entry point:
-
-```swift
-import SwiftUI
-import Clerk
-
-@main
-struct ClerkQuickstartApp: App {
-  @State private var clerk = Clerk.shared
-
-  var body: some Scene {
-    WindowGroup {
-      ContentView()
-        .environment(clerk)
-        .task {
-          clerk.configure(publishableKey: "your_publishable_key")
-          try? await clerk.load()
-        }
-    }
-  }
-}
-```
-
-Now in your views, you can conditionally render content based on the user's session:
-
-```swift
-import SwiftUI
-import Clerk
-
-struct ContentView: View {
-  @Environment(Clerk.self) private var clerk
-
-  var body: some View {
-    VStack {
-      if let user = clerk.user {
-        Text("Hello, \(user.id)")
-      } else {
-        Text("You are signed out")
-      }
-    }
-  }
-}
-```
-
-### Authentication
-
-#### Sign Up with Email and Perform Verification
-```swift
-// Create a sign up
-var signUp = try await SignUp.create(
-  strategy: .standard(emailAddress: "user@example.com", password: "••••••••••••")
-)
-
-// Check if the SignUp needs the email address verified and send an OTP code via email.
-if signUp.unverifiedFields.contains("email_address") {
-  signUp = try await signUp.prepareVerification(strategy: .emailCode)
-}
-
-// After collecting the OTP code from the user, attempt verification
-signUp = try await signUp.attemptVerification(strategy: .emailCode(code: "12345"))
-```
-
-#### Passwordless Sign In
-```swift
-// Create the sign in
-var signIn = try await SignIn.create(
-  strategy: .identifier("user@example.com", strategy: .emailCode())
-)
-
-// After collecting the OTP code from the user, attempt verification
-signIn = try await signIn.attemptFirstFactor(strategy: .emailCode(code: "12345"))
-```
-
-#### Sign In with OAuth (e.g. Google, Github, etc.)
-```swift
-try await SignIn.authenticateWithRedirect(strategy: .oauth(provider: .google))
-```
-
-#### Native Sign in with Apple
-```swift
-// Use the Clerk SignInWithAppleHelper class to get your Apple credential
-let credential = try await SignInWithAppleHelper.getAppleIdCredential()
-
-// Convert the identityToken data to String format
-guard let idToken = credential.identityToken.flatMap({ String(data: $0, encoding: .utf8) }) else { return }
-
-// Authenticate with Clerk
-try await SignIn.authenticateWithIdToken(provider: .apple, idToken: idToken)
-```
-
-#### Forgot Password
-```swift
-// Create a sign in and send an OTP code to verify the user owns the email.
-var signIn = try await SignIn.create(
-  strategy: .identifier("user@example.com", strategy: .resetPasswordEmailCode())
-)
-
-// After collecting the OTP code from the user, attempt verification.
-signIn = try await signIn.attemptFirstFactor(strategy: .resetPasswordEmailCode(code: "12345"))
-
-// Set a new password to complete the process.
-signIn = try await signIn.resetPassword(.init(password: "••••••••••••", signOutOfOtherSessions: true))
-```
-
-#### Sign Out
-```swift
-try await clerk.signOut()
-```
-
-### User Management
-
-#### Update User Profile
-```swift
-try await user.update(.init(firstName: "John", lastName: "Appleseed"))
-```
-
-#### Update User Profile Image
-```swift 
-let imageData = try await photosPickerItem.loadTransferable(type: Data.self)
-try await user.setProfileImage(imageData: imageData)
-```
-
-#### Add Phone Number
-```swift
-// Create a new phone number on the user's account
-var newPhoneNumber = try await user.createPhoneNumber("5555550100")
-
-// Send an OTP verification code via SMS to the phone number
-newPhoneNumber = try await newPhoneNumber.prepareVerification()
-
-// After collecting the OTP code from the user, attempt verification.
-newPhoneNumber = try await newPhoneNumber.attemptVerification(code: "12345")
-```
-
-#### Link an External Account
-```swift
-let externalAccount = try await user.createExternalAccount(provider: .github)
-try await externalAccount.reauthorize()
-```
-
-### Session Tokens
-```swift
-if let token = try await Clerk.shared.session?.getToken()?.jwt {
-  headers["Authorization"] = "Bearer \(token)"
-}
-```
-
-For a full set of features and functionality, please see our docs!
 ## 🎓 Docs
 
 - [iOS SDK Reference](https://swiftpackageindex.com/clerk/clerk-ios/main/documentation/clerk)
-- [Clerk iOS](https://clerk.com/docs/references/ios/overview)
+- [Quickstart](https://clerk.com/docs/quickstarts/ios)
 - [Custom Flows](https://clerk.com/docs/custom-flows/overview)
 
-## ✅ Supported Features
-
-| Feature | iOS Support
---- | :---:
-Email/Phone/Username Authentication | ✅
-Email Code Verification | ✅
-SMS Code Verification | ✅
-Multi-Factor Authentication (TOTP / SMS) | ✅
-Sign in / Sign up with OAuth | ✅
-Native Sign in with Apple | ✅
-Session Management | ✅ 
-Multi-Session Applications | ✅ 
-Forgot Password | ✅
-User Management | ✅ 
-Passkeys | ✅
-Enterprise SSO (SAML) | ✅ 
-Device Attestation | ✅
-Organizations | ✅
-Prebuilt UI Components | 🚧 
-Magic Links | ❌ 
-Web3 Wallet | ❌
-
 ## 🚢 Release Notes
 
 Curious what we shipped recently? Check out our [changelog](https://clerk.com/changelog)!

Sources/Clerk/APIClient/ClerkAPIClient.swift

@@ -5,48 +5,15 @@
 //  Created by Mike Pitre on 10/2/23.
 //
 
-import Factory
+import FactoryKit
 import Foundation
-import Get
-
-final class ClerkAPIClientDelegate: APIClientDelegate, Sendable {
-
-  func client(_ client: APIClient, willSendRequest request: inout URLRequest) async throws {
-    await HeaderMiddleware.process(&request)
-    QueryItemMiddleware.process(&request)
-    try URLEncodedFormMiddleware.process(&request)
-  }
-
-  func client(_ client: APIClient, validateResponse response: HTTPURLResponse, data: Data, task: URLSessionTask) throws {
-    DeviceTokenSavingMiddleware.process(response)
-    ClientSyncingMiddleware.process(data)
-    EventEmitterMiddleware.process(data)
-    try ErrorThrowingMiddleware.process(response, data: data)
-  }
-
-  func client(_ client: APIClient, shouldRetry task: URLSessionTask, error: any Error, attempts: Int) async throws -> Bool {
-    guard attempts == 1 else {
-      return false
-    }
-
-    if try await DeviceAssertionMiddleware.process(task: task, error: error) {
-      return true
-    }
-
-    if try await InvalidAuthMiddleware.process(task: task, error: error) {
-      return true
-    }
-
-    return false
-  }
-
-}
+import RequestBuilder
 
 extension Container {
 
-  var apiClient: Factory<APIClient> {
-    self { APIClient(baseURL: URL(string: "")) }
-      .cached
-  }
+    var apiClient: Factory<URLSessionManager> {
+        self { BaseSessionManager(base: URL(string: ""), session: .shared) }
+            .cached
+    }
 
 }

Sources/Clerk/APIClient/Extensions/URLRequestBuilder+Ext.swift

@@ -0,0 +1,36 @@
+//
+//  URLRequestBuilder+Ext.swift
+//  Clerk
+//
+//  Created by Mike Pitre on 1/8/25.
+//
+
+import FactoryKit
+import Foundation
+import RequestBuilder
+
+extension URLRequestBuilder {
+
+    /// Adds the current Clerk session id to request URL.
+    @discardableResult @MainActor
+    func addClerkSessionId() -> Self {
+        map {
+            if let url = request.url, var components = URLComponents(url: url, resolvingAgainstBaseURL: false) {
+                components.queryItems = (components.queryItems ?? []) + [.init(name: "_clerk_session_id", value: Clerk.shared.session?.id)]
+                $0.request.url = components.url
+            }
+        }
+    }
+
+    /// Given an encodable data type, sets the request body to x-www-form-urlencoded data .
+    @discardableResult
+    public func body<DataType: Encodable>(formEncode data: DataType) -> Self {
+        return map {
+            if let data: Data = try? URLEncodedFormEncoder(keyEncoding: .convertToSnakeCase).encode(data) {
+                $0.add(value: "application/x-www-form-urlencoded", forHeader: "Content-Type")
+                $0.request.httpBody = data
+            }
+        }
+    }
+
+}