feat(scloud): a5db0ff4eff3e79c5d16e6ed5aaedb766b13f3e4

Author: serverpod_cloud

ground_control_client/lib/src/test_tools/builders/project_builder.dart

@@ -8,7 +8,6 @@ class ProjectBuilder {
   DateTime? _archivedAt;
   String _cloudProjectId;
   Owner? _owner;
-  Subscription? _subscription;
   List<Role>? _roles;
   List<Capsule>? _capsules;
 
@@ -18,7 +17,6 @@ class ProjectBuilder {
         _updatedAt = DateTime.now(),
         _archivedAt = null,
         _cloudProjectId = 'test-project',
-        _subscription = null,
         _roles = [],
         _capsules = [] {
     withUserOwner(UserBuilder().build());
@@ -72,11 +70,6 @@ class ProjectBuilder {
     return this;
   }
 
-  ProjectBuilder withSubscription(final Subscription? subscription) {
-    _subscription = subscription;
-    return this;
-  }
-
   ProjectBuilder withRoles(final List<Role>? roles) {
     _roles = roles;
     return this;
@@ -96,7 +89,6 @@ class ProjectBuilder {
       cloudProjectId: _cloudProjectId,
       owner: _owner,
       ownerId: _owner?.id ?? Uuid().v4obj(),
-      subscription: _subscription,
       roles: _roles,
       capsules: _capsules,
     );

ground_control_client/lib/src/test_tools/builders/user_builder.dart

@@ -10,7 +10,6 @@ class UserBuilder {
   String? _userAuthId;
   String _email;
   List<UserRoleMembership>? _memberships;
-  int? _maxOwnedProjects;
   _i1.UuidValue? _ownerId;
   Owner? _owner;
 
@@ -22,8 +21,7 @@ class UserBuilder {
         _accountStatus = UserAccountStatus.registered,
         _userAuthId = 'auth-user-123',
         _email = 'test@example.com',
-        _memberships = [],
-        _maxOwnedProjects = null {
+        _memberships = [] {
     _ownerId = Uuid().v4obj();
   }
 
@@ -67,11 +65,6 @@ class UserBuilder {
     return this;
   }
 
-  UserBuilder withMaxOwnedProjects(final int? maxOwnedProjects) {
-    _maxOwnedProjects = maxOwnedProjects;
-    return this;
-  }
-
   UserBuilder withOwnerId(final _i1.UuidValue? ownerId) {
     _ownerId = ownerId;
     return this;
@@ -92,7 +85,6 @@ class UserBuilder {
       userAuthId: _userAuthId,
       email: _email,
       memberships: _memberships,
-      maxOwnedProjects: _maxOwnedProjects,
       ownerId: _owner?.id ?? _ownerId,
       owner: _owner,
     );

ground_control_client/lib/src/test_tools/mocks/client.dart

@@ -38,6 +38,8 @@ class EndpointAdminProjectsMock extends Mock implements EndpointAdminProjects {}
 
 class EndpointBillingMock extends Mock implements EndpointBilling {}
 
+class EndpointPlansMock extends Mock implements EndpointPlans {}
+
 /// Modules mocks
 class ModulesMock extends Mock implements Modules {}
 
@@ -138,4 +140,7 @@ class ClientMock extends Mock implements Client {
 
   @override
   final EndpointBilling billing = EndpointBillingMock();
+
+  @override
+  final EndpointPlans plans = EndpointPlansMock();
 }

serverpod_cloud_cli/lib/command_runner/commands/admin/admin_users_commands.dart

@@ -74,14 +74,6 @@ enum AdminInviteUserOption<V> implements OptionDefinition<V> {
       mandatory: true,
       customValidator: _emailValidator,
     ),
-  ),
-  maxOwnedProjects(
-    IntOption(
-      argName: 'max-owned-projects',
-      helpText:
-          'The number of projects the user may own. If unspecified, the default value is used.',
-      min: 0,
-    ),
   );
 
   const AdminInviteUserOption(this.option);
@@ -105,14 +97,11 @@ class AdminInviteUserCommand extends CloudCliCommand<AdminInviteUserOption> {
     final Configuration<AdminInviteUserOption> commandConfig,
   ) async {
     final email = commandConfig.value(AdminInviteUserOption.user);
-    final maxOwnedProjects =
-        commandConfig.optionalValue(AdminInviteUserOption.maxOwnedProjects);
 
     await UserAdminCommands.inviteUser(
       runner.serviceProvider.cloudApiClient,
       logger: logger,
       email: email,
-      maxOwnedProjectsQuota: maxOwnedProjects,
     );
   }
 }

serverpod_cloud_cli/lib/commands/admin/user_admin.dart

@@ -25,14 +25,12 @@ abstract class UserAdminCommands {
       headers: [
         'User',
         'Account status',
-        'Max owned projects',
         'Created at ($timezoneName)',
         'Archived at ($timezoneName)',
       ],
       rows: users.map((final user) => [
             user.email,
             user.accountStatus.toString(),
-            user.maxOwnedProjects?.toString(),
             user.createdAt.toTzString(inUtc, 19),
             user.archivedAt?.toTzString(inUtc, 19),
           ]),
@@ -44,12 +42,10 @@ abstract class UserAdminCommands {
     final Client cloudApiClient, {
     required final CommandLogger logger,
     required final String email,
-    final int? maxOwnedProjectsQuota,
   }) async {
     try {
       await cloudApiClient.adminUsers.inviteUser(
         email: email,
-        maxOwnedProjectsQuota: maxOwnedProjectsQuota,
       );
     } on Exception catch (e, s) {
       throw FailureException.nested(e, s, 'Failed to invite user');

serverpod_cloud_cli/lib/commands/project/project.dart

@@ -24,6 +24,17 @@ abstract class ProjectCommands {
   }) async {
     logger.init('Creating Serverpod Cloud project "$projectId".');
 
+    // Check that the user is on a plan and automatically procure one if not.
+    // This behavior will be changed in the future.
+    final planNames = await cloudApiClient.plans.listProcuredPlanNames();
+    if (planNames.isEmpty) {
+      const defaultPlanName = 'closed-beta';
+      await cloudApiClient.plans.procurePlan(planName: defaultPlanName);
+      logger.info('On plan: $defaultPlanName');
+    } else {
+      logger.debug('On plan: ${planNames.first}');
+    }
+
     try {
       await logger.progress(
         'Registering Serverpod Cloud project.',

serverpod_cloud_cli/lib/shared/helpers/common_exceptions_handler.dart

@@ -42,9 +42,9 @@ void processCommonClientExceptions(
         stackTrace,
       );
 
-    case ForbiddenException():
+    case ResourceDeniedException():
       logger.error(
-        'The action was not allowed.',
+        'The resource was not allowed.',
         hint: e.message,
       );
 

serverpod_cloud_cli/test/common_exceptions_handler_test.dart

@@ -62,13 +62,13 @@ void main() {
   });
 
   test(
-      'Given a ForbiddenException '
+      'Given a ResourceDeniedException '
       'when calling processCommonClientExceptions '
       'then should throw ExitErrorException and log error message', () {
     expect(
       () => processCommonClientExceptions(
           logger,
-          ForbiddenException(
+          ResourceDeniedException(
             message:
                 'The maximum number of projects that can be created has been reached (5).',
           ),
@@ -79,7 +79,7 @@ void main() {
     expect(
       logger.errorCalls.last,
       equalsErrorCall(
-        message: 'The action was not allowed.',
+        message: 'The resource was not allowed.',
         hint:
             'The maximum number of projects that can be created has been reached (5).',
       ),

serverpod_cloud_cli/test_integration/commands/admin/admin_user_invite_cmd_test.dart

@@ -74,7 +74,6 @@ void main() {
       setUp(() async {
         when(() => client.adminUsers.inviteUser(
               email: any(named: 'email'),
-              maxOwnedProjectsQuota: any(named: 'maxOwnedProjectsQuota'),
             )).thenAnswer(
           (final invocation) async => Future.value(),
         );
@@ -84,8 +83,6 @@ void main() {
           'invite-user',
           '--user',
           'test@example.com',
-          '--max-owned-projects',
-          '5',
         ]);
       });
 

serverpod_cloud_cli/test_integration/commands/admin/admin_user_list_cmd_test.dart

@@ -81,13 +81,11 @@ void main() {
             UserBuilder()
                 .withEmail('test@example.com')
                 .withCreatedAt(DateTime.parse('2025-07-02T11:00:00'))
-                .withMaxOwnedProjects(5)
                 .withAccountStatus(UserAccountStatus.registered)
                 .build(),
             UserBuilder()
                 .withEmail('test2@example.com')
                 .withCreatedAt(DateTime.parse('2025-07-02T12:00:00'))
-                .withMaxOwnedProjects(5)
                 .withAccountStatus(UserAccountStatus.invited)
                 .withArchivedAt(DateTime.parse('2025-07-02T12:10:00'))
                 .build(),
@@ -113,16 +111,16 @@ void main() {
           containsAllInOrder([
             equalsLineCall(
                 line:
-                    'User              | Account status | Max owned projects | Created at (local)  | Archived at (local)'),
+                    'User              | Account status | Created at (local)  | Archived at (local)'),
             equalsLineCall(
                 line:
-                    '------------------+----------------+--------------------+---------------------+--------------------'),
+                    '------------------+----------------+---------------------+--------------------'),
             equalsLineCall(
                 line:
-                    'test@example.com  | registered     | 5                  | 2025-07-02 11:00:00 |                    '),
+                    'test@example.com  | registered     | 2025-07-02 11:00:00 |                    '),
             equalsLineCall(
                 line:
-                    'test2@example.com | invited        | 5                  | 2025-07-02 12:00:00 | 2025-07-02 12:10:00'),
+                    'test2@example.com | invited        | 2025-07-02 12:00:00 | 2025-07-02 12:10:00'),
           ]),
         );
       });