Added member and invitation endpoints

app/Actions/Jetstream/AddOrganizationMember.php

@@ -4,20 +4,22 @@ declare(strict_types=1);
 
 namespace App\Actions\Jetstream;
 
+use App\Enums\Role;
 use App\Models\Organization;
 use App\Models\User;
+use App\Service\UserService;
 use Closure;
-use Illuminate\Contracts\Validation\Rule;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\Rule;
+use Illuminate\Validation\Rules\In;
 use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent;
 use Laravel\Jetstream\Contracts\AddsTeamMembers;
 use Laravel\Jetstream\Events\AddingTeamMember;
 use Laravel\Jetstream\Events\TeamMemberAdded;
-use Laravel\Jetstream\Jetstream;
-use Laravel\Jetstream\Rules\Role;
 
 class AddOrganizationMember implements AddsTeamMembers
 {
@@ -37,9 +39,15 @@ class AddOrganizationMember implements AddsTeamMembers
 
         AddingTeamMember::dispatch($organization, $newOrganizationMember);
 
-        $organization->users()->attach(
-            $newOrganizationMember, ['role' => $role]
-        );
+        DB::transaction(function () use ($organization, $newOrganizationMember, $role) {
+            $organization->users()->attach(
+                $newOrganizationMember, ['role' => $role]
+            );
+
+            if ($role === Role::Owner->value) {
+                app(UserService::class)->changeOwnership($organization, $newOrganizationMember);
+            }
+        });
 
         TeamMemberAdded::dispatch($organization, $newOrganizationMember);
     }
@@ -60,7 +68,7 @@ class AddOrganizationMember implements AddsTeamMembers
     /**
      * Get the validation rules for adding a team member.
      *
-     * @return array<string, array<ValidationRule|Rule|string>>
+     * @return array<string, array<ValidationRule|Rule|string|In>>
      */
     protected function rules(): array
     {
@@ -72,9 +80,16 @@ class AddOrganizationMember implements AddsTeamMembers
                     return $builder->where('is_placeholder', '=', false);
                 }))->withMessage(__('We were unable to find a registered user with this email address.')),
             ],
-            'role' => Jetstream::hasRoles()
-                            ? ['required', 'string', new Role]
-                            : null,
+            'role' => [
+                'required',
+                'string',
+                Rule::in([
+                    Role::Owner->value,
+                    Role::Admin->value,
+                    Role::Manager->value,
+                    Role::Employee->value,
+                ]),
+            ],
         ]);
     }
 

app/Actions/Jetstream/CreateOrganization.php

@@ -34,11 +34,19 @@ class CreateOrganization implements CreatesTeams
 
         AddingTeam::dispatch($user);
 
-        /** @var Organization $organization */
-        $organization = $user->ownedTeams()->create([
-            'name' => $input['name'],
-            'personal_team' => false,
-        ]);
+        $organization = new Organization();
+        $organization->name = $input['name'];
+        $organization->personal_team = false;
+        $organization->owner()->associate($user);
+        $organization->save();
+
+        $organization->users()->attach(
+            $user, [
+                'role' => 'owner',
+            ]
+        );
+
+        $user->ownedTeams()->save($organization);
 
         $user->switchTeam($organization);
 

app/Actions/Jetstream/InviteOrganizationMember.php

@@ -4,31 +4,36 @@ declare(strict_types=1);
 
 namespace App\Actions\Jetstream;
 
+use App\Enums\Role;
 use App\Models\Organization;
 use App\Models\OrganizationInvitation;
 use App\Models\User;
+use App\Service\PermissionStore;
 use Closure;
-use Illuminate\Contracts\Validation\Rule;
+use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\Rule;
+use Illuminate\Validation\Rules\In;
 use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
 use Laravel\Jetstream\Contracts\InvitesTeamMembers;
 use Laravel\Jetstream\Events\InvitingTeamMember;
-use Laravel\Jetstream\Jetstream;
 use Laravel\Jetstream\Mail\TeamInvitation;
-use Laravel\Jetstream\Rules\Role;
 
 class InviteOrganizationMember implements InvitesTeamMembers
 {
     /**
      * Invite a new team member to the given team.
+     *
+     * @throws AuthorizationException
      */
     public function invite(User $user, Organization $organization, string $email, ?string $role = null): void
     {
-        Gate::forUser($user)->authorize('addTeamMember', $organization);
+        if (! app(PermissionStore::class)->has($organization, 'invitations:create')) {
+            throw new AuthorizationException();
+        }
 
         $this->validate($organization, $email, $role);
 
@@ -59,7 +64,7 @@ class InviteOrganizationMember implements InvitesTeamMembers
     /**
      * Get the validation rules for inviting a team member.
      *
-     * @return array<string, array<ValidationRule|Rule|string>>
+     * @return array<string, array<ValidationRule|Rule|string|In>>
      */
     protected function rules(Organization $organization): array
     {
@@ -72,9 +77,16 @@ class InviteOrganizationMember implements InvitesTeamMembers
                     return $builder->whereBelongsTo($organization, 'organization');
                 }))->withMessage(__('This user has already been invited to the team.')),
             ],
-            'role' => Jetstream::hasRoles()
-                            ? ['required', 'string', new Role]
-                            : null,
+            'role' => [
+                'required',
+                'string',
+                Rule::in([
+                    Role::Owner->value,
+                    Role::Admin->value,
+                    Role::Manager->value,
+                    Role::Employee->value,
+                ]),
+            ],
         ]);
     }
 

app/Actions/Jetstream/UpdateMemberRole.php

@@ -0,0 +1,67 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions\Jetstream;
+
+use App\Enums\Role;
+use App\Models\Membership;
+use App\Models\Organization;
+use App\Models\User;
+use App\Service\PermissionStore;
+use App\Service\UserService;
+use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\Rule;
+use Illuminate\Validation\ValidationException;
+use Laravel\Jetstream\Events\TeamMemberUpdated;
+
+class UpdateMemberRole
+{
+    /**
+     * Update the role for the given team member.
+     *
+     * @throws AuthorizationException
+     * @throws ValidationException
+     */
+    public function update(User $actingUser, Organization $organization, string $userId, string $role): void
+    {
+        if (! app(PermissionStore::class)->has($organization, 'members:change-role')) {
+            throw new AuthorizationException();
+        }
+
+        $user = User::where('id', '=', $userId)->firstOrFail();
+        $member = Membership::whereBelongsTo($user)->whereBelongsTo($organization)->firstOrFail();
+        if ($member->role === Role::Placeholder->value) {
+            abort(403, 'Cannot update the role of a placeholder member.');
+        }
+
+        Validator::make([
+            'role' => $role,
+        ], [
+            'role' => [
+                'required',
+                'string',
+                Rule::in([
+                    Role::Owner->value,
+                    Role::Admin->value,
+                    Role::Manager->value,
+                    Role::Employee->value,
+                ]),
+            ],
+        ])->validate();
+
+        DB::transaction(function () use ($organization, $userId, $role, $user) {
+            $organization->users()->updateExistingPivot($userId, [
+                'role' => $role,
+            ]);
+
+            if ($role === Role::Owner->value) {
+                app(UserService::class)->changeOwnership($organization, $user);
+            }
+        });
+
+        TeamMemberUpdated::dispatch($organization->fresh(), User::findOrFail($userId));
+    }
+}