fix: add redirecturl to auth.attemptsignup [#241] (#242)

shinyford · web-flow · commit 20ac2ba2612f · 2025-08-20T16:49:14.000+01:00
* fix: add redirecturl to auth.attemptsignup [#241] * fix: make email link sign up work properly [#241] * fix: re-enable email link in signin [#241]
diff --git a/packages/clerk_auth/lib/src/clerk_api/api.dart b/packages/clerk_auth/lib/src/clerk_api/api.dart
@@ -264,11 +264,13 @@ class Api with Logging {
   Future<ApiResponse> prepareSignUp(
     SignUp signUp, {
     required Strategy strategy,
+    String? redirectUrl,
   }) async {
     return await _fetchApiResponse(
       '/client/sign_ups/${signUp.id}/prepare_verification',
       params: {
         'strategy': strategy,
+        'redirect_url': redirectUrl,
       },
     );
   }
diff --git a/packages/clerk_auth/lib/src/clerk_auth/auth.dart b/packages/clerk_auth/lib/src/clerk_auth/auth.dart
@@ -500,6 +500,7 @@ class Auth {
     String? passwordConfirmation,
     String? code,
     String? signature,
+    String? redirectUrl,
     bool? legalAccepted,
   }) async {
     final hasVerificationCredential = code is String || signature is String;
@@ -547,26 +548,45 @@ class Auth {
             when signUp.status == Status.missingRequirements &&
                 signUp.missingFields.isEmpty &&
                 signUp.unverifiedFields.isNotEmpty:
-          for (final field in signUp.unverifiedFields) {
+          if (env.supportsPhoneCode && signUp.unverified(Field.phoneNumber)) {
             await _api
-                .prepareSignUp(signUp, strategy: Strategy.forField(field))
+                .prepareSignUp(signUp, strategy: Strategy.phoneCode)
                 .then(_housekeeping);
           }
 
+          if (signUp.unverified(Field.emailAddress)) {
+            if (env.supportsEmailCode) {
+              await _api
+                  .prepareSignUp(signUp, strategy: Strategy.emailCode)
+                  .then(_housekeeping);
+            }
+            if (env.supportsEmailLink && redirectUrl is String) {
+              await _api
+                  .prepareSignUp(
+                    signUp,
+                    strategy: Strategy.emailLink,
+                    redirectUrl: redirectUrl,
+                  )
+                  .then(_housekeeping);
+            }
+          }
+
         case SignUp signUp
             when signUp.status == Status.missingRequirements &&
                 signUp.missingFields.isEmpty:
           await _api
               .prepareSignUp(signUp, strategy: strategy)
               .then(_housekeeping);
-          await _api
-              .attemptSignUp(
-                client.signUp!,
-                strategy: strategy,
-                code: code,
-                signature: signature,
-              )
-              .then(_housekeeping);
+          if (code is String || signature is String) {
+            await _api
+                .attemptSignUp(
+                  client.signUp!,
+                  strategy: strategy,
+                  code: code,
+                  signature: signature,
+                )
+                .then(_housekeeping);
+          }
       }
     }
 
diff --git a/packages/clerk_auth/lib/src/models/client/field.dart b/packages/clerk_auth/lib/src/models/client/field.dart
@@ -26,10 +26,14 @@ class Field {
   /// username
   static const username = Field._('username');
 
+  /// password
+  static const password = Field._('password');
+
   static final _values = <String, Field>{
     phoneNumber.name: phoneNumber,
     emailAddress.name: emailAddress,
     username.name: username,
+    password.name: password,
   };
 
   /// The [values] of the Fields
diff --git a/packages/clerk_auth/lib/src/models/client/strategy.dart b/packages/clerk_auth/lib/src/models/client/strategy.dart
@@ -3,8 +3,6 @@ import 'package:clerk_auth/src/models/enums.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:meta/meta.dart';
 
-import 'field.dart';
-
 /// [Strategy] Clerk object
 ///
 /// A [Strategy] has a [name]. The various oAuth strategies ('oauth',
@@ -240,21 +238,6 @@ class Strategy {
     return null;
   }
 
-  /// For a given [Field], return an appropriate [Strategy], or
-  /// throw an error
-  ///
-  static Strategy forField(Field field) {
-    return switch (field) {
-      Field.phoneNumber => Strategy.phoneCode,
-      Field.emailAddress => Strategy.emailCode,
-      _ => throw AuthError(
-          message: 'No strategy associated with {arg}',
-          argument: field.name,
-          code: AuthErrorCode.noAssociatedStrategy,
-        ),
-    };
-  }
-
   /// For a given [UserAttribute], return an appropriate [Strategy], or
   /// throw an error
   ///
diff --git a/packages/clerk_auth/lib/src/models/environment/environment.dart b/packages/clerk_auth/lib/src/models/environment/environment.dart
@@ -1,8 +1,4 @@
-import 'package:clerk_auth/src/models/client/strategy.dart';
-import 'package:clerk_auth/src/models/environment/config.dart';
-import 'package:clerk_auth/src/models/environment/display_config.dart';
-import 'package:clerk_auth/src/models/environment/organization_settings.dart';
-import 'package:clerk_auth/src/models/environment/user_settings.dart';
+import 'package:clerk_auth/clerk_auth.dart';
 import 'package:clerk_auth/src/models/informative_to_string_mixin.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:meta/meta.dart';
@@ -75,6 +71,21 @@ class Environment with InformativeToStringMixin {
   /// Do we have oauth strategies?
   bool get hasOauthStrategies => oauthStrategies.isNotEmpty;
 
+  bool _supports(UserAttribute attr, Strategy strategy) =>
+      user.attributes[attr]?.verifications.contains(strategy) == true;
+
+  /// Can we verify email verification with [Strategy.emailCode]?
+  bool get supportsEmailCode =>
+      _supports(UserAttribute.emailAddress, Strategy.emailCode);
+
+  /// Can we verify email verification with [Strategy.emailLink]?
+  bool get supportsEmailLink =>
+      _supports(UserAttribute.emailAddress, Strategy.emailLink);
+
+  /// Can we verify phone verification with [Strategy.phoneCode]?
+  bool get supportsPhoneCode =>
+      _supports(UserAttribute.phoneNumber, Strategy.phoneCode);
+
   /// [Iterable] of other strategies
   /// i.e. strategies that are neither oauth nor password-based
   Iterable<Strategy> get otherStrategies =>
diff --git a/packages/clerk_flutter/example/lib/main.dart b/packages/clerk_flutter/example/lib/main.dart
@@ -46,7 +46,7 @@ class ExampleApp extends StatelessWidget {
   /// contain a [clerk.Strategy], to use in preference to a strategy
   /// inferred from the [Uri]
   ClerkDeepLink? createClerkLink(Uri uri) {
-    if (uri.pathSegments.first == 'sign_in') {
+    if (uri.pathSegments.first == 'auth') {
       return ClerkDeepLink(uri: uri);
     }
 
@@ -59,7 +59,7 @@ class ExampleApp extends StatelessWidget {
   /// redirect for a given [clerk.Strategy], or [null] if redirection should
   /// be handled in-app
   Uri? generateDeepLink(BuildContext context, clerk.Strategy strategy) {
-    return Uri.parse('clerk://example.com/sign_in/$strategy');
+    return Uri.parse('clerk://example.com/auth/$strategy');
 
     // if you want to use the default in-app SSO, just remove the
     // [redirectionGenerator] parameter from the [ClerkAuthConfig] object
diff --git a/packages/clerk_flutter/example/lib/pages/clerk_sign_in_example.dart b/packages/clerk_flutter/example/lib/pages/clerk_sign_in_example.dart
@@ -18,16 +18,19 @@ class ClerkSignInExample extends StatelessWidget {
       ),
       body: SafeArea(
         child: ClerkErrorListener(
-          child: ClerkAuthBuilder(
-            signedInBuilder: (context, authState) {
-              if (authState.env.organization.isEnabled == false) {
-                return const ClerkUserButton();
-              }
-              return const _UserAndOrgTabs();
-            },
-            signedOutBuilder: (context, authState) {
-              return const ClerkAuthentication();
-            },
+          child: Padding(
+            padding: const EdgeInsets.all(16),
+            child: ClerkAuthBuilder(
+              signedInBuilder: (context, authState) {
+                if (authState.env.organization.isEnabled == false) {
+                  return const ClerkUserButton();
+                }
+                return const _UserAndOrgTabs();
+              },
+              signedOutBuilder: (context, authState) {
+                return const ClerkAuthentication();
+              },
+            ),
           ),
         ),
       ),
diff --git a/packages/clerk_flutter/l10n/en.arb b/packages/clerk_flutter/l10n/en.arb
@@ -68,14 +68,6 @@
   "emailAddressConcise": "email",
   "enrollment": "Enrollment",
   "enrollmentMode": "Enrollment mode:",
-  "enterCodeSentTo": "Enter code sent to {identifier}",
-  "@enterCodeSentTo": {
-    "placeholders": {
-      "identifier": {
-        "type": "String"
-      }
-    }
-  },
   "enterTheCodeSentTo": "Enter the code sent to {identifier}",
   "@enterTheCodeSentTo": {
     "placeholders": {
diff --git a/packages/clerk_flutter/lib/generated/clerk_sdk_localizations.dart b/packages/clerk_flutter/lib/generated/clerk_sdk_localizations.dart
@@ -318,12 +318,6 @@ abstract class ClerkSdkLocalizations {
   /// **'Enrollment mode:'**
   String get enrollmentMode;
 
-  /// No description provided for @enterCodeSentTo.
-  ///
-  /// In en, this message translates to:
-  /// **'Enter code sent to {identifier}'**
-  String enterCodeSentTo(String identifier);
-
   /// No description provided for @enterTheCodeSentTo.
   ///
   /// In en, this message translates to:
diff --git a/packages/clerk_flutter/lib/generated/clerk_sdk_localizations_en.dart b/packages/clerk_flutter/lib/generated/clerk_sdk_localizations_en.dart
@@ -129,11 +129,6 @@ class ClerkSdkLocalizationsEn extends ClerkSdkLocalizations {
   @override
   String get enrollmentMode => 'Enrollment mode:';
 
-  @override
-  String enterCodeSentTo(String identifier) {
-    return 'Enter code sent to $identifier';
-  }
-
   @override
   String enterTheCodeSentTo(String identifier) {
     return 'Enter the code sent to $identifier';
diff --git a/packages/clerk_flutter/lib/src/clerk_auth_state.dart b/packages/clerk_flutter/lib/src/clerk_auth_state.dart
@@ -168,6 +168,16 @@ class ClerkAuthState extends clerk.Auth with ChangeNotifier {
     }
   }
 
+  /// Return a redirect url for email verification, or null if
+  /// not appropriate
+  Uri? emailVerificationRedirectUri(BuildContext context) {
+    if (env.supportsEmailLink) {
+      return config.redirectionGenerator
+          ?.call(context, clerk.Strategy.emailLink);
+    }
+    return null;
+  }
+
   /// Parse a [Uri] played into the app by a deep link, and complete
   /// sign in accordingly. Returns [true] if parsing was successful,
   /// else [false]
@@ -176,20 +186,31 @@ class ClerkAuthState extends clerk.Auth with ChangeNotifier {
   /// final element of the [uri.path] will be the name of the strategy to use
   Future<bool> parseDeepLink(ClerkDeepLink link) async {
     final uri = link.uri;
-    final token = uri.queryParameters[_kRotatingTokenNonce];
-    if (token case String token) {
-      final strategy = switch (link.strategy) {
-        clerk.Strategy strategy when strategy.isKnown => strategy,
-        _ => clerk.Strategy.fromJson(uri.pathSegments.last),
-      };
-      if (strategy.isUnknown) {
-        return false;
-      }
 
-      await attemptSignIn(strategy: strategy, token: token);
-    } else {
+    final strategy = switch (link.strategy) {
+      clerk.Strategy strategy when strategy.isKnown => strategy,
+      _ => clerk.Strategy.fromJson(uri.pathSegments.last),
+    };
+    if (strategy.isUnknown) {
+      return false;
+    } else if (strategy == clerk.Strategy.emailLink) {
       await refreshClient();
-      await transfer();
+    } else if (strategy.isOauth) {
+      final token = uri.queryParameters[_kRotatingTokenNonce];
+      if (token case String token) {
+        final strategy = switch (link.strategy) {
+          clerk.Strategy strategy when strategy.isKnown => strategy,
+          _ => clerk.Strategy.fromJson(uri.pathSegments.last),
+        };
+        if (strategy.isUnknown) {
+          return false;
+        }
+
+        await attemptSignIn(strategy: strategy, token: token);
+      } else {
+        await refreshClient();
+        await transfer();
+      }
     }
 
     return true;
@@ -236,7 +257,7 @@ class ClerkAuthState extends clerk.Auth with ChangeNotifier {
     final l10ns = ClerkAuth.localizationsOf(context);
 
     if (password?.isNotEmpty != true) {
-      return l10ns.passwordMustBeSupplied;
+      return null;
     }
 
     if (password != confirmation) {
diff --git a/packages/clerk_flutter/lib/src/widgets/authentication/clerk_forgotten_password_panel.dart b/packages/clerk_flutter/lib/src/widgets/authentication/clerk_forgotten_password_panel.dart
@@ -175,7 +175,7 @@ class _ClerkForgottenPasswordPanelState
                 ClerkCodeInput(
                   key: const Key('code'),
                   code: _code,
-                  subtitle: l10ns.enterCodeSentTo(_identifier),
+                  subtitle: l10ns.enterTheCodeSentTo(_identifier),
                   onSubmit: _setCode,
                 ),
                 Closeable(
diff --git a/packages/clerk_flutter/lib/src/widgets/authentication/clerk_sign_in_panel.dart b/packages/clerk_flutter/lib/src/widgets/authentication/clerk_sign_in_panel.dart
@@ -61,13 +61,18 @@ class _ClerkSignInPanelState extends State<ClerkSignInPanel>
         });
       }
 
+      final redirectUri = strategy == clerk.Strategy.emailLink
+          ? authState.emailVerificationRedirectUri(context)
+          : null;
+
       await authState.safelyCall(
         context,
         () => authState.attemptSignIn(
           strategy: newStrategy,
           identifier: _identifier,
           password: _password.orNullIfEmpty,
           code: newCode.orNullIfEmpty,
+          redirectUrl: redirectUri?.toString(),
         ),
         onError: _onError,
       );
@@ -92,7 +97,8 @@ class _ClerkSignInPanelState extends State<ClerkSignInPanel>
     final factor = authState.client.signIn?.supportedFirstFactors
         .firstWhereOrNull((f) => f.strategy == _strategy);
     final safeIdentifier = factor?.safeIdentifier;
-    final otherStrategies = env.otherStrategies.where(StrategyButton.supports);
+    final otherStrategies =
+        env.config.firstFactors.where(StrategyButton.supports);
     final canResetPassword =
         env.config.firstFactors.any((f) => f.isPasswordResetter);
 
diff --git a/packages/clerk_flutter/lib/src/widgets/authentication/clerk_sign_up_panel.dart b/packages/clerk_flutter/lib/src/widgets/authentication/clerk_sign_up_panel.dart
diff --git a/packages/clerk_flutter/lib/src/widgets/ui/clerk_vertical_card.dart b/packages/clerk_flutter/lib/src/widgets/ui/clerk_vertical_card.dart
diff --git a/packages/clerk_flutter/lib/src/widgets/user/clerk_user_profile.dart b/packages/clerk_flutter/lib/src/widgets/user/clerk_user_profile.dart
