Beautiful Open-Source Form Builder
Refactor EmailIntegration error logging and Workspace risky user check
JhumanJ99b0d4aa7451
diff --git a/api/app/Integrations/Handlers/EmailIntegration.php b/api/app/Integrations/Handlers/EmailIntegration.phpindex 62b0edfe0..9d0b84336 100644--- a/api/app/Integrations/Handlers/EmailIntegration.php+++ b/api/app/Integrations/Handlers/EmailIntegration.php@@ -78,7 +78,7 @@ class EmailIntegration extends AbstractIntegrationHandler// This is a per-workspace limit for risky workspacesif ($this->form->workspace->is_risky) {if ($this->form->workspace->submissions_count >= self::RISKY_USERS_LIMIT) {- Log::error('!!!DANGER!!! Dangerous user detected! Attempting many email sending.', [+ Log::channel('slack_errors')->error('🚨 Dangerous new user detected! Attempting many email sending.', ['form_id' => $this->form->id,'workspace_id' => $this->form->workspace->id,]);diff --git a/api/app/Models/Workspace.php b/api/app/Models/Workspace.phpindex 7e9039db9..e82bcdc9f 100644--- a/api/app/Models/Workspace.php+++ b/api/app/Models/Workspace.php@@ -168,12 +168,7 @@ class Workspace extends Model implements CachableAttributespublic function getIsRiskyAttribute(){return $this->remember('is_risky', 15 * 60, function (): bool {- // A workspace is risky if all of his users are risky- $owners = $this->relationLoaded('users')- ? $this->users->where('pivot.role', 'admin')- : $this->owners()->get();-- foreach ($owners as $owner) {+ foreach ($this->owners as $owner) {if (!$owner->is_risky) {return false;}