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

refactor

Browse Source
This commit is contained in:
Andras Bacsai
2023-07-28 10:55:26 +02:00
parent e9bd1f88c0
commit 7e4b1a8f8f
30 changed files with 198 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Models/InstanceSettings.php
View File

@@ -15,9 +15,9 @@ class InstanceSettings extends Model implements SendsEmail
protected $casts = [
'resale_license' => 'encrypted',
];
public function routeNotificationForEmail(string $attribute = 'test_recipients')
public function getRecepients($notification)
{
$recipients = data_get($this,'smtp','');
$recipients = data_get($notification,'emails',null);
if (is_null($recipients) || $recipients === '') {
return [];
}

11
app/Models/Team.php
View File

@@ -23,11 +23,14 @@ class Team extends Model implements SendsDiscord, SendsEmail
{
return data_get($this, 'discord_webhook_url', null);
}
public function routeNotificationForEmail(string $attribute = 'recipients')
public function getRecepients($notification)
{
$recipients = data_get($this, 'smtp_recipients', '');
if (is_null($recipients) || $recipients === '') {
return [];
$recipients = data_get($notification,'emails',null);
ray($recipients);
if (is_null($recipients)) {
$recipients = $this->members()->pluck('email')->toArray();
ray($recipients);
return $recipients;
}
return explode(',', $recipients);
}

7
app/Models/User.php
View File

@@ -10,6 +10,7 @@ use Illuminate\Notifications\Notifiable;
use Laravel\Sanctum\HasApiTokens;
use Visus\Cuid2\Cuid2;
use Laravel\Fortify\TwoFactorAuthenticatable;
use App\Notifications\TrnsactionalEmails\ResetPassword;
class User extends Authenticatable implements SendsEmail
{
@@ -43,10 +44,14 @@ class User extends Authenticatable implements SendsEmail
$user->teams()->attach($new_team, ['role' => 'owner']);
});
}
public function routeNotificationForEmail()
public function getRecepients($notification)
{
return $this->email;
}
public function sendPasswordResetNotification($token): void
{
$this->notify(new ResetPassword($token));
}
public function isAdmin()
{
return $this->pivot->role === 'admin' || $this->pivot->role === 'owner';