update ios custom flows code examples (#2004)

Author: mikepitre

docs/custom-flows/add-email.mdx

@@ -151,7 +151,7 @@ The following example demonstrates how to build a custom user interface that all
   <Tab>
     ```swift {{ filename: 'AddEmailView.swift', collapsible: true }}
     import SwiftUI
-    import ClerkSDK
+    import Clerk
 
     struct AddEmailView: View {
       @State private var email = ""
@@ -185,13 +185,11 @@ The following example demonstrates how to build a custom user interface that all
         do {
           guard let user = Clerk.shared.user else { return }
 
-          // Add an unverified email address to user
-          self.newEmailAddress = try await user.createEmailAddress(email)
-
-          guard let newEmailAddress = self.newEmailAddress else { return }
-
-          // Send the user an email with the verification code
-          try await newEmailAddress.prepareVerification(strategy: .emailCode)
+          // Add an unverified email address to user,
+          // then send the user an email with the verification code
+          self.newEmailAddress = try await user
+            .createEmailAddress(email)
+            .prepareVerification(strategy: .emailCode)
 
           // Set to true to display second form
           // and capture the OTP code

docs/custom-flows/add-phone.mdx

@@ -152,7 +152,7 @@ The following example demonstrates how to build a custom user interface that all
   <Tab>
     ```swift {{ filename: 'AddPhoneView.swift', collapsible: true }}
     import SwiftUI
-    import ClerkSDK
+    import Clerk
 
     struct AddPhoneView: View {
       @State private var phone = ""
@@ -186,13 +186,11 @@ The following example demonstrates how to build a custom user interface that all
         do {
           guard let user = Clerk.shared.user else { return }
 
-          // Add an unverified phone number to user
-          self.newPhoneNumber = try await user.createPhoneNumber(phone)
-
-          guard let newphoneNumber = self.newPhoneNumber else { return }
-
-          // Send the user an sms message with the verification code
-          try await newphoneNumber.prepareVerification()
+          // Add an unverified phone number to user,
+          // then send the user an sms message with the verification code
+          self.newPhoneNumber = try await user
+            .createPhoneNumber(phone)
+            .prepareVerification()
 
           // Set to true to display second form
           // and capture the OTP code

docs/custom-flows/email-password-mfa.mdx

@@ -459,7 +459,7 @@ This guide will walk you through how to build a custom email/password sign-in fl
     <Tab>
       ```swift {{ filename: 'MFASignInView.swift', collapsible: true }}
       import SwiftUI
-      import ClerkSDK
+      import Clerk
 
       struct MFASignInView: View {
         @State private var email = ""

docs/custom-flows/email-password.mdx

@@ -391,7 +391,7 @@ This guide will walk you through how to build a custom email/password sign-up an
     <Tab>
       ```swift {{ filename: 'EmailPasswordSignUpView.swift', collapsible: true }}
       import SwiftUI
-      import ClerkSDK
+      import Clerk
 
       struct EmailPasswordSignUpView: View {
         @State private var email = ""
@@ -712,7 +712,7 @@ This guide will walk you through how to build a custom email/password sign-up an
     <Tab>
       ```swift {{ filename: 'EmailPasswordSignInView.swift', collapsible: true }}
       import SwiftUI
-      import ClerkSDK
+      import Clerk
 
       struct EmailPasswordSignInView: View {
         @State private var email = ""

docs/custom-flows/email-sms-otp.mdx

@@ -234,7 +234,7 @@ This guide will walk you through how to build a custom SMS OTP sign-up and sign-
     <Tab>
       ```swift {{ filename: 'SMSOTPSignUpView.swift', collapsible: true }}
       import SwiftUI
-      import ClerkSDK
+      import Clerk
 
       struct SMSOTPSignUpView: View {
         @State private var phoneNumber = ""
@@ -554,7 +554,7 @@ This guide will walk you through how to build a custom SMS OTP sign-up and sign-
     <Tab>
       ```swift {{ filename: 'SMSOTPSignInView.swift', collapsible: true }}
       import SwiftUI
-      import ClerkSDK
+      import Clerk
 
       struct SMSOTPSignInView: View {
         @State private var phoneNumber = ""
@@ -583,8 +583,18 @@ This guide will walk you through how to build a custom SMS OTP sign-up and sign-
             // Start the sign-in process using the phone number method.
             let signIn = try await SignIn.create(strategy: .identifier(phoneNumber))
 
+            // Find the phoneNumberId from all the available first factors for the current sign-in
+            guard
+              let phoneNumberFactor = signIn.supportedFirstFactors?.first(where: { factor in
+                factor.strategy == "phone_code"
+              }),
+              let phoneNumberId = phoneNumberFactor.phoneNumberId
+            else {
+              return
+            }
+
             // Send the OTP code to the user.
-            try await signIn.prepareFirstFactor(for: .phoneCode)
+            try await signIn.prepareFirstFactor(for: .phoneCode(phoneNumberId: phoneNumberId))
 
             // Set isVerifying to true to display second form
             // and capture the OTP code.

docs/custom-flows/forgot-password.mdx

@@ -150,10 +150,10 @@ In the following example, the user is asked to provide their email address. Afte
 
   ```swift {{ filename: 'ForgotPasswordView.swift', collapsible: true }}
   import SwiftUI
-  import ClerkSDK
+  import Clerk
 
   struct ForgotPasswordView: View {
-    @ObservedObject private var clerk = Clerk.shared
+    @Environment(Clerk.self) private var clerk
     @State private var email = ""
     @State private var code = ""
     @State private var newPassword = ""
@@ -162,15 +162,9 @@ In the following example, the user is asked to provide their email address. Afte
     var body: some View {
       switch clerk.client?.signIn?.status {
       case .needsFirstFactor:
-        if isVerifying {
-          TextField("Enter your code", text: $code)
-          Button("Verify") {
-            Task { await verify(code: code) }
-          }
-        } else {
-          Button("Forgot password?") {
-            Task { await sendResetCode() }
-          }
+        TextField("Enter your code", text: $code)
+        Button("Verify") {
+          Task { await verify(code: code) }
         }
 
       case .needsSecondFactor:
@@ -187,7 +181,7 @@ In the following example, the user is asked to provide their email address. Afte
           Text("Active Session: \(session.id)")
         } else {
           TextField("Email", text: $email)
-          Button("Continue") {
+          Button("Forgot password?") {
             Task { await createSignIn(email: email) }
           }
         }
@@ -199,25 +193,8 @@ In the following example, the user is asked to provide their email address. Afte
 
     func createSignIn(email: String) async {
       do {
-        // Start the sign in process
-        try await SignIn.create(strategy: .identifier(email))
-      } catch {
-        // See https://clerk.com/docs/custom-flows/error-handling
-        // for more info on error handling
-        dump(error)
-      }
-    }
-
-    func sendResetCode() async {
-      do {
-        // Access the in progress sign in stored on the client object.
-        guard let inProgressSignIn = clerk.client?.signIn else { return }
-
-        // Send the password reset code to the user's email
-        try await inProgressSignIn.prepareFirstFactor(for: .resetPasswordEmailCode)
-
-        // Set isVerifying to true to capture the OTP code.
-        isVerifying = true
+        // Start the sign in reset password process
+        try await SignIn.create(strategy: .identifier(email, strategy: "reset_password_email_code"))
       } catch {
         // See https://clerk.com/docs/custom-flows/error-handling
         // for more info on error handling

docs/custom-flows/oauth-connections.mdx

@@ -76,7 +76,7 @@ You must configure your application instance through the Clerk Dashboard for the
   <Tab>
     ```swift {{ filename: 'OAuthView.swift', collapsible: true }}
     import SwiftUI
-    import ClerkSDK
+    import Clerk
 
     struct OAuthView: View {
       var body: some View {
@@ -93,18 +93,15 @@ You must configure your application instance through the Clerk Dashboard for the
       func signInWithOAuth(provider: OAuthProvider) async {
         do {
           // Start the sign-in process using the selected OAuth provider.
-          let signIn = try await SignIn.create(strategy: .oauth(provider))
-
-          // Start the OAuth process
-          let externalAuthResult = try await signIn.authenticateWithRedirect()
+          let result = try await SignIn.authenticateWithRedirect(strategy: .oauth(provider: provider))
 
           // It is common for users who are authenticating with OAuth to use
           // a sign-in button when they mean to sign-up, and vice versa.
           // Clerk will handle this transfer for you if possible.
-          // Therefore, an ExternalAuthResult can contain either a SignIn or SignUp.
+          // Therefore, a TransferFlowResult can be either a SignIn or SignUp.
 
-          // Check if the result of the OAuth was a sign in
-          if let signIn = externalAuthResult?.signIn {
+          switch result {
+          case .signIn(let signIn):
             switch signIn.status {
             case .complete:
               // If sign-in process is complete, navigate the user as needed.
@@ -114,10 +111,7 @@ You must configure your application instance through the Clerk Dashboard for the
               // complete further steps.
               dump(signIn.status)
             }
-          }
-
-          // Check if the result of the OAuth was a sign up
-          if let signUp = externalAuthResult?.signUp {
+          case .signUp(let signUp):
             switch signUp.status {
             case .complete:
               // If sign-up process is complete, navigate the user as needed.
@@ -128,6 +122,7 @@ You must configure your application instance through the Clerk Dashboard for the
               dump(signUp.status)
             }
           }
+
         } catch {
           // See https://clerk.com/docs/custom-flows/error-handling
           // for more info on error handling.

docs/custom-flows/sign-out.mdx

@@ -106,10 +106,10 @@ The `signOut()` function signs a user out of all sessions in a [multi-session ap
   <Tab>
     ```swift {{ filename: 'SignOutView.swift', collapsible: true }}
     import SwiftUI
-    import ClerkSDK
+    import Clerk
 
     struct SignOutView: View {
-      @ObservedObject private var clerk = Clerk.shared
+      @Environment(Clerk.self) private var clerk
 
       var body: some View {
         if let session = clerk.session {