feat: force user to create org when required on log in [#271]

Author: shinyford

packages/clerk_auth/lib/src/models/environment/environment.dart

@@ -62,6 +62,14 @@ class Environment with InformativeToStringMixin {
         ].contains(i),
       );
 
+  /// [List] of available social connections i.e. oAuth sign in possibilites
+  List<SocialConnection> get socialConnections => user.socialSettings.values
+      .where((s) => oauthStrategies.contains(s.strategy))
+      .toList(growable: false);
+
+  /// Do we have social connections?
+  bool get hasSocialConnections => socialConnections.isNotEmpty;
+
   /// Do we have identification strategies?
   bool get hasIdentificationStrategies => identificationStrategies.isNotEmpty;
 

packages/clerk_auth/lib/src/models/environment/organization_settings.dart

@@ -18,6 +18,7 @@ class OrganizationSettings with InformativeToStringMixin {
     this.actions = OrganizationActions.empty,
     this.domains = DomainSettings.empty,
     this.isEnabled = false,
+    this.forceOrganizationSelection = false,
   });
 
   /// max allowed memberships
@@ -32,9 +33,15 @@ class OrganizationSettings with InformativeToStringMixin {
   /// organization actions
   final OrganizationActions actions;
 
+  /// force organization selection
+  final bool forceOrganizationSelection;
+
   /// empty [OrganizationSettings]
   static const empty = OrganizationSettings();
 
+  /// do we allow personal orgs?
+  bool get allowsPersonalOrgs => forceOrganizationSelection == false;
+
   /// is enabled?
   @JsonKey(name: 'enabled')
   final bool isEnabled;

packages/clerk_auth/lib/src/models/environment/organization_settings.g.dart

@@ -22,7 +22,8 @@ class ClerkSignInExample extends StatelessWidget {
             padding: const EdgeInsets.all(16),
             child: ClerkAuthBuilder(
               signedInBuilder: (context, authState) {
-                if (authState.env.organization.isEnabled == false) {
+                if (authState.env.organization.isEnabled == false ||
+                    authState.user!.hasOrganizations == false) {
                   return const ClerkUserButton();
                 }
                 return const _UserAndOrgTabs();

packages/clerk_flutter/example/lib/pages/clerk_sign_in_example.dart

@@ -61,6 +61,7 @@
   "connectedAccounts": "Connected accounts",
   "cont": "Continue",
   "createOrganization": "Create organization",
+  "developmentMode": "Development mode",
   "didntReceiveCode": "Didn't receive the code?",
   "domainName": "Domain name",
   "dontHaveAnAccount": "Don’t have an account?",
@@ -78,6 +79,7 @@
     }
   },
   "enterTheCodeSentToYou": "Enter the code sent to you",
+  "enterYourOrganizationDetailsToContinue": "Enter your organization details to continue",
   "expired": "expired",
   "failed": "failed",
   "firstName": "first name",
@@ -123,6 +125,7 @@
   "logo": "Logo",
   "manualInvitation": "Manual invitation",
   "missingRequirements": "missing requirements",
+  "myOrganization": "My Organization",
   "name": "Name",
   "needsFirstFactor": "needs first factor",
   "needsIdentifier": "needs identifier",
@@ -209,6 +212,7 @@
   "resetPassword": "Reset password and sign in",
   "selectAccount": "Select the account with which you wish to continue",
   "sendMeTheCode": "Send me the reset code",
+  "setUpYourOrganization": "Set up your organization",
   "signIn": "Sign in",
   "signInByClickingALinkSentToYouByEmail": "Sign in by clicking a link sent to you by email",
   "signInByEnteringACodeSentToYouByEmail": "Sign in by entering a code sent to you by email",
@@ -249,6 +253,7 @@
       }
     }
   },
+  "slug": "Slug",
   "slugUrl": "Slug URL",
   "switchTo": "Switch to",
   "termsAndConditions": "Terms & Conditions",

packages/clerk_flutter/l10n/en.arb

@@ -276,6 +276,12 @@ abstract class ClerkSdkLocalizations {
   /// **'Create organization'**
   String get createOrganization;
 
+  /// No description provided for @developmentMode.
+  ///
+  /// In en, this message translates to:
+  /// **'Development mode'**
+  String get developmentMode;
+
   /// No description provided for @didntReceiveCode.
   ///
   /// In en, this message translates to:
@@ -336,6 +342,12 @@ abstract class ClerkSdkLocalizations {
   /// **'Enter the code sent to you'**
   String get enterTheCodeSentToYou;
 
+  /// No description provided for @enterYourOrganizationDetailsToContinue.
+  ///
+  /// In en, this message translates to:
+  /// **'Enter your organization details to continue'**
+  String get enterYourOrganizationDetailsToContinue;
+
   /// No description provided for @expired.
   ///
   /// In en, this message translates to:
@@ -438,6 +450,12 @@ abstract class ClerkSdkLocalizations {
   /// **'missing requirements'**
   String get missingRequirements;
 
+  /// No description provided for @myOrganization.
+  ///
+  /// In en, this message translates to:
+  /// **'My Organization'**
+  String get myOrganization;
+
   /// No description provided for @name.
   ///
   /// In en, this message translates to:
@@ -702,6 +720,12 @@ abstract class ClerkSdkLocalizations {
   /// **'Send me the reset code'**
   String get sendMeTheCode;
 
+  /// No description provided for @setUpYourOrganization.
+  ///
+  /// In en, this message translates to:
+  /// **'Set up your organization'**
+  String get setUpYourOrganization;
+
   /// No description provided for @signIn.
   ///
   /// In en, this message translates to:
@@ -774,6 +798,12 @@ abstract class ClerkSdkLocalizations {
   /// **'Sign up to {name}'**
   String signUpTo(String name);
 
+  /// No description provided for @slug.
+  ///
+  /// In en, this message translates to:
+  /// **'Slug'**
+  String get slug;
+
   /// No description provided for @slugUrl.
   ///
   /// In en, this message translates to:

packages/clerk_flutter/lib/generated/clerk_sdk_localizations.dart

@@ -108,6 +108,9 @@ class ClerkSdkLocalizationsEn extends ClerkSdkLocalizations {
   @override
   String get createOrganization => 'Create organization';
 
+  @override
+  String get developmentMode => 'Development mode';
+
   @override
   String get didntReceiveCode => 'Didn\'t receive the code?';
 
@@ -140,6 +143,10 @@ class ClerkSdkLocalizationsEn extends ClerkSdkLocalizations {
   @override
   String get enterTheCodeSentToYou => 'Enter the code sent to you';
 
+  @override
+  String get enterYourOrganizationDetailsToContinue =>
+      'Enter your organization details to continue';
+
   @override
   String get expired => 'expired';
 
@@ -199,6 +206,9 @@ class ClerkSdkLocalizationsEn extends ClerkSdkLocalizations {
   @override
   String get missingRequirements => 'missing requirements';
 
+  @override
+  String get myOrganization => 'My Organization';
+
   @override
   String get name => 'Name';
 
@@ -349,6 +359,9 @@ class ClerkSdkLocalizationsEn extends ClerkSdkLocalizations {
   @override
   String get sendMeTheCode => 'Send me the reset code';
 
+  @override
+  String get setUpYourOrganization => 'Set up your organization';
+
   @override
   String get signIn => 'Sign in';
 
@@ -396,6 +409,9 @@ class ClerkSdkLocalizationsEn extends ClerkSdkLocalizations {
     return 'Sign up to $name';
   }
 
+  @override
+  String get slug => 'Slug';
+
   @override
   String get slugUrl => 'Slug URL';
 

packages/clerk_flutter/lib/generated/clerk_sdk_localizations_en.dart

@@ -63,6 +63,15 @@ abstract class ClerkSdkGrammar {
   /// Current locale can be derived from the [context]
   ///
   String toSentence(String item);
+
+  /// Return a slug from a given name
+  ///
+  /// This needs to return a string that is lowercase, and contains only
+  /// alphanumeric Latin/Arabic characters and hyphens (which typically replace
+  /// other characters). Languages that do not use Latin/Arabic characters
+  /// beware!
+  ///
+  String toSlug(String name);
 }
 
 /// A [ClerkSdkGrammar] default implementation, using English language
@@ -121,4 +130,12 @@ class ClerkSdkGrammarEn implements ClerkSdkGrammar {
   @override
   String toSentence(String item) =>
       item.isNotEmpty ? item[0].toUpperCase() + item.substring(1) : '';
+
+  static final _nonAlphaNum = RegExp(r'[^a-z0-9]+');
+
+  /// To make a name into a slug in English we lowercase it, remove
+  /// non-alphanumerics, and replace whitespace with hyphens
+  @override
+  String toSlug(String name) =>
+      name.toLowerCase().replaceAll(_nonAlphaNum, '-');
 }

packages/clerk_flutter/lib/src/utils/clerk_sdk_grammar.dart

@@ -149,7 +149,11 @@ class _ClerkSignInPanelState extends State<ClerkSignInPanel>
                     onStrategyChosen: (strategy) =>
                         _continue(authState, strategy: strategy),
                   ),
-                  const Padding(padding: verticalPadding24, child: OrDivider()),
+                  if (env.hasSocialConnections) //
+                    const Padding(
+                      padding: verticalPadding24,
+                      child: OrDivider(),
+                    ),
                   ClerkIdentifierInput(
                     initialValue: _identifier,
                     strategies: env.identificationStrategies.toList(),

packages/clerk_flutter/lib/src/widgets/authentication/clerk_sign_in_panel.dart

@@ -4,6 +4,7 @@ import 'package:clerk_flutter/src/utils/clerk_sdk_localization_ext.dart';
 import 'package:clerk_flutter/src/utils/clerk_telemetry.dart';
 import 'package:clerk_flutter/src/utils/localization_extensions.dart';
 import 'package:clerk_flutter/src/widgets/ui/clerk_code_input.dart';
+import 'package:clerk_flutter/src/widgets/ui/clerk_continue_button.dart';
 import 'package:clerk_flutter/src/widgets/ui/clerk_material_button.dart';
 import 'package:clerk_flutter/src/widgets/ui/clerk_phone_number_form_field.dart';
 import 'package:clerk_flutter/src/widgets/ui/clerk_text_form_field.dart';
@@ -303,19 +304,7 @@ class _ClerkSignUpPanelState extends State<ClerkSignUpPanel>
         Closeable(
           closed: (_state.isWaiting && isAwaitingCode == false) ||
               (_needsLegalAcceptance && _hasLegalAcceptance == false),
-          child: ClerkMaterialButton(
-            onPressed: () => _continue(attributes),
-            label: Row(
-              children: [
-                horizontalMargin16,
-                Expanded(child: Center(child: Text(l10ns.cont))),
-                const SizedBox(
-                  width: 16,
-                  child: Icon(Icons.arrow_right_sharp),
-                ),
-              ],
-            ),
-          ),
+          child: ClerkContinueButton(onPressed: () => _continue(attributes)),
         ),
         if (_needsLegalAcceptance) //
           Closeable(