handle team invitation for non registered user

This commit is contained in:
Čarodej
2022-02-12 11:28:08 +01:00
parent 4498461e70
commit 00c6562719
18 changed files with 216 additions and 51 deletions
@@ -81,8 +81,9 @@ class StoreEnvironmentSettingsController extends Controller
'APP_DEBUG' => 'false',
],
'local' => [
'APP_ENV' => 'local',
'APP_DEBUG' => 'true',
'APP_ENV' => 'local',
'APP_DEBUG' => 'true',
'QUEUE_CONNECTION' => 'sync',
],
];
@@ -2,6 +2,7 @@
namespace Domain\Teams\Controllers;
use App\Users\Models\User;
use Domain\Teams\Models\TeamFolderMember;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\DB;
use App\Http\Controllers\Controller;
@@ -13,7 +14,7 @@ class InvitationsController extends Controller
{
public function show(TeamFolderInvitation $invitation)
{
if ($invitation->status === 'accepted') {
if ($invitation->status !== 'pending') {
abort(410);
}
@@ -23,19 +24,24 @@ class InvitationsController extends Controller
public function update(
TeamFolderInvitation $invitation
): ResponseFactory | Response {
$user = User::where('email', $invitation->email)
->firstOrFail();
$user = User::where('email', $invitation->email);
$invitation->update([
'status' => 'accepted',
]);
if ($user->exists()) {
$invitation->accept();
DB::table('team_folder_members')
->insert([
// Store team member
TeamFolderMember::create([
'user_id' => $user->first()->id,
'parent_id' => $invitation->parent_id,
'user_id' => $user->id,
'permission' => 'can-edit',
'permission' => $invitation->permission,
]);
}
if ($user->doesntExist()) {
$invitation->update([
'status' => 'waiting-for-registration',
]);
}
return response('Done', 204);
}
@@ -43,9 +49,7 @@ class InvitationsController extends Controller
public function destroy(
TeamFolderInvitation $invitation
): ResponseFactory | Response {
$invitation->update([
'status' => 'rejected',
]);
$invitation->reject();
return response('Done', 204);
}
@@ -31,6 +31,18 @@ class TeamFolderInvitation extends Model
protected $keyType = 'string';
public function accept() {
$this->update([
'status' => 'accepted',
]);
}
public function reject() {
$this->update([
'status' => 'rejected',
]);
}
protected static function newFactory(): TeamFolderInvitationFactory
{
return TeamFolderInvitationFactory::new();
@@ -1,6 +1,7 @@
<?php
namespace Domain\Teams\Resources;
use App\Users\Models\User;
use Illuminate\Http\Resources\Json\JsonResource;
class TeamInvitationResource extends JsonResource
@@ -17,6 +18,7 @@ class TeamInvitationResource extends JsonResource
'color' => $this->color,
'status' => $this->status,
'permission' => $this->permission,
'isExistedUser' => User::where('email', $this->email)->exists(),
],
'relationships' => [
$this->mergeWhen($this->inviter, fn () => [