dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

feat: make user owner

Browse Source 
fix: ownership check
This commit is contained in:
Andras Bacsai
2024-02-23 12:34:36 +01:00
parent ea0a9763bf
commit f931ebece8
6 changed files with 131 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Livewire/Team/Member.php
View File

@@ -16,6 +16,11 @@ class Member extends Component
$this->dispatch('reloadWindow');
}
public function makeOwner()
{
$this->member->teams()->updateExistingPivot(currentTeam()->id, ['role' => 'owner']);
$this->dispatch('reloadWindow');
}
public function makeReadonly()
{
$this->member->teams()->updateExistingPivot(currentTeam()->id, ['role' => 'member']);
@@ -26,7 +31,7 @@ class Member extends Component
{
$this->member->teams()->detach(currentTeam());
Cache::forget("team:{$this->member->id}");
Cache::remember('team:' . $this->member->id, 3600, function() {
Cache::remember('team:' . $this->member->id, 3600, function () {
return $this->member->teams()->first();
});
$this->dispatch('reloadWindow');

10
app/Models/User.php
View File

@@ -67,7 +67,7 @@ class User extends Authenticatable implements SendsEmail
'team_id' => session('currentTeam')->id
]);
return new NewAccessToken($token, $token->getKey().'|'.$plainTextToken);
return new NewAccessToken($token, $token->getKey() . '|' . $plainTextToken);
}
public function teams()
{
@@ -103,9 +103,13 @@ class User extends Authenticatable implements SendsEmail
public function isAdmin()
{
return data_get($this->pivot, 'role') === 'admin' || data_get($this->pivot, 'role') === 'owner';
return $this->role() === 'admin' || $this->role() === 'owner';
}
public function isOwner()
{
return $this->role() === 'owner';
}
public function isAdminFromSession()
{
if (auth()->user()->id === 0) {
@@ -155,6 +159,6 @@ class User extends Authenticatable implements SendsEmail
public function role()
{
return session('currentTeam')->pivot->role;
return auth()->user()->teams->where('id', currentTeam()->id)->first()->pivot->role;
}
}