Team functionality (#459)
* add api enpoints for adding, removing, updating user to workspace and leaving workspace * feat: updates client site workspace settings * refactor and add domain setting ui in modal * move workspace user functionality to its own component * adds tests * fix linting * updates select input to FlatSelectInput * moves workspace user role edit to seperated component * move user adding to its own component * adds check to usure users exist before checking is admin * fix loading users * feat: invite user to team functionality * fix token coulmn * fix self host mode changes * tests for user invite * Refactor back-end * Rename variables * Improve some styling elements + refactor workspace settings * More styling * More UI polishing * More UI fixes * PHP linting * Implemented most of the logic for team-functionnality * Fix user avatar URL * WIP remove users on cancellation * Finished pricing for team functionality * Fix tests * Fix linting * Added pricing_enabled helper * Fix pricing_enabled shortcut * Debug CI * Disable pricing when testing --------- Co-authored-by: LL-Etiane <lukongleinyuyetiane@gmail.com> Co-authored-by: Lukong Etiane <83535251+LL-Etiane@users.noreply.github.com> Co-authored-by: Julien Nahum <julien@nahum.net>
This commit is contained in:
@@ -4,7 +4,10 @@ namespace App\Policies;
|
||||
|
||||
use App\Models\User;
|
||||
use App\Models\Workspace;
|
||||
use App\Models\UserWorkspace;
|
||||
use App\Service\UserHelper;
|
||||
use Illuminate\Auth\Access\HandlesAuthorization;
|
||||
use Illuminate\Auth\Access\Response;
|
||||
|
||||
class WorkspacePolicy
|
||||
{
|
||||
@@ -57,7 +60,7 @@ class WorkspacePolicy
|
||||
*/
|
||||
public function delete(User $user, Workspace $workspace)
|
||||
{
|
||||
return ! $workspace->owners->where('id', $user->id)->isEmpty() && $user->workspaces()->count() > 1;
|
||||
return !$workspace->owners->where('id', $user->id)->isEmpty() && $user->workspaces()->count() > 1;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -79,4 +82,44 @@ class WorkspacePolicy
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
public function inviteUser(User $user, Workspace $workspace)
|
||||
{
|
||||
if (!$this->adminAction($user, $workspace)) {
|
||||
return Response::deny('You need to be an admin of this workspace to do this.');
|
||||
}
|
||||
|
||||
// If self-hosted, allow
|
||||
if (!pricing_enabled()) {
|
||||
return Response::allow();
|
||||
}
|
||||
|
||||
if (!$workspace->is_pro) {
|
||||
return Response::deny('You need a Pro subscription to invite a user.');
|
||||
}
|
||||
|
||||
// In case of special license, check license limit
|
||||
$billingOwner = $workspace->billingOwners()->first();
|
||||
if ($license = $billingOwner->activeLicense()) {
|
||||
$userActiveMembers = (new UserHelper($billingOwner))->getActiveMembersCount();
|
||||
if ($userActiveMembers >= $license->max_users_limit_count) {
|
||||
return Response::deny('You have reached the maximum number of users allowed with your license.');
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine whether the user is an admin in the workspace.
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
public function adminAction(User $user, Workspace $workspace)
|
||||
{
|
||||
$userWorkspace = UserWorkspace::where('user_id', $user->id)
|
||||
->where('workspace_id', $workspace->id)
|
||||
->first();
|
||||
return $userWorkspace && $userWorkspace->role === 'admin';
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user