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

Revert "rector: arrrrr"

Browse Source 
This reverts commit 16c0cd10d8.
This commit is contained in:
Andras Bacsai
2025-01-07 15:31:43 +01:00
parent da07b4fdcf
commit 1fe4dd722b
349 changed files with 3689 additions and 4184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
app/Models/User.php
View File

@@ -48,6 +48,12 @@ class User extends Authenticatable implements SendsEmail
'two_factor_secret',
];
protected $casts = [
'email_verified_at' => 'datetime',
'force_password_reset' => 'boolean',
'show_boarding' => 'boolean',
];
protected static function boot()
{
parent::boot();
@@ -61,7 +67,7 @@ class User extends Authenticatable implements SendsEmail
$team['id'] = 0;
$team['name'] = 'Root Team';
}
$new_team = Team::query()->create($team);
$new_team = Team::create($team);
$user->teams()->attach($new_team, ['role' => 'owner']);
});
}
@@ -77,7 +83,7 @@ class User extends Authenticatable implements SendsEmail
$team['id'] = 0;
$team['name'] = 'Root Team';
}
$new_team = Team::query()->create($team);
$new_team = Team::create($team);
$this->teams()->attach($new_team, ['role' => 'owner']);
return $new_team;
@@ -92,7 +98,7 @@ class User extends Authenticatable implements SendsEmail
hash('crc32b', $tokenEntropy)
);
$personalAccessToken = $this->tokens()->create([
$token = $this->tokens()->create([
'name' => $name,
'token' => hash('sha256', $plainTextToken),
'abilities' => $abilities,
@@ -100,7 +106,7 @@ class User extends Authenticatable implements SendsEmail
'team_id' => session('currentTeam')->id,
]);
return new NewAccessToken($personalAccessToken, $personalAccessToken->getKey().'|'.$plainTextToken);
return new NewAccessToken($token, $token->getKey().'|'.$plainTextToken);
}
public function teams()
@@ -115,7 +121,7 @@ class User extends Authenticatable implements SendsEmail
public function sendVerificationEmail()
{
$mailMessage = new MailMessage;
$mail = new MailMessage;
$url = Url::temporarySignedRoute(
'verify.verify',
Carbon::now()->addMinutes(Config::get('auth.verification.expire', 60)),
@@ -124,11 +130,11 @@ class User extends Authenticatable implements SendsEmail
'hash' => sha1($this->getEmailForVerification()),
]
);
$mailMessage->view('emails.email-verification', [
$mail->view('emails.email-verification', [
'url' => $url,
]);
$mailMessage->subject('Coolify: Verify your email.');
send_user_an_email($mailMessage, $this->email);
$mail->subject('Coolify: Verify your email.');
send_user_an_email($mail, $this->email);
}
public function sendPasswordResetNotification($token): void
@@ -138,11 +144,7 @@ class User extends Authenticatable implements SendsEmail
public function isAdmin()
{
if ($this->role() === 'admin') {
return true;
}
return $this->role() === 'owner';
return $this->role() === 'admin' || $this->role() === 'owner';
}
public function isOwner()
@@ -179,7 +181,11 @@ class User extends Authenticatable implements SendsEmail
{
$found_root_team = Auth::user()->teams->filter(function ($team) {
if ($team->id == 0) {
return (bool) Auth::user()->isAdmin();
if (! Auth::user()->isAdmin()) {
return false;
}
return true;
}
return false;
@@ -195,7 +201,7 @@ class User extends Authenticatable implements SendsEmail
return Auth::user()->teams[0];
}
return Team::query()->find(session('currentTeam')->id);
return Team::find(session('currentTeam')->id);
});
}
@@ -215,13 +221,4 @@ class User extends Authenticatable implements SendsEmail
return data_get($user, 'pivot.role');
}
protected function casts(): array
{
return [
'email_verified_at' => 'datetime',
'force_password_reset' => 'boolean',
'show_boarding' => 'boolean',
];
}
}