From d38bf2f909e5a4b73acedb83b37fb3117a286b0b Mon Sep 17 00:00:00 2001 From: Hemachandar Date: Tue, 20 Jan 2026 18:07:18 +0530 Subject: [PATCH] append variables --- app/controllers/api/account.php | 10 +++++----- app/controllers/api/teams.php | 2 +- src/Appwrite/Event/Mail.php | 11 +++++------ .../Account/Http/Account/MFA/Challenges/Create.php | 2 +- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php index ce655bfe18..ac7a62eb5e 100644 --- a/app/controllers/api/account.php +++ b/app/controllers/api/account.php @@ -195,7 +195,7 @@ function sendSessionAlert(Locale $locale, Document $user, Document $project, arr ->setPreview($preview) ->setBody($body) ->setBodyTemplate($bodyTemplate) - ->setVariables($emailVariables) + ->appendVariables($emailVariables) ->setRecipient($email); // since this is console project, set email sender name! @@ -2301,7 +2301,7 @@ App::post('/v1/account/tokens/magic-url') ->setSubject($subject) ->setPreview($preview) ->setBody($body) - ->setVariables($emailVariables) + ->appendVariables($emailVariables) ->setRecipient($email); if ($project->getId() === 'console') { @@ -2602,7 +2602,7 @@ App::post('/v1/account/tokens/email') ->setPreview($preview) ->setBody($body) ->setBodyTemplate($bodyTemplate) - ->setVariables($emailVariables) + ->appendVariables($emailVariables) ->setRecipient($email); // since this is console project, set email sender name! @@ -3678,7 +3678,7 @@ App::post('/v1/account/recovery') ->setRecipient($profile->getAttribute('email', '')) ->setName($profile->getAttribute('name', '')) ->setBody($body) - ->setVariables($emailVariables) + ->appendVariables($emailVariables) ->setSubject($subject) ->setPreview($preview); @@ -4009,7 +4009,7 @@ App::post('/v1/account/verifications/email') ->setPreview($preview) ->setBody($body) ->setBodyTemplate($bodyTemplate) - ->setVariables($emailVariables) + ->appendVariables($emailVariables) ->setRecipient($user->getAttribute('email')) ->setName($user->getAttribute('name') ?? ''); diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php index 2cee394a9c..63783e6e12 100644 --- a/app/controllers/api/teams.php +++ b/app/controllers/api/teams.php @@ -772,7 +772,7 @@ App::post('/v1/teams/:teamId/memberships') ->setPreview($preview) ->setRecipient($invitee->getAttribute('email')) ->setName($invitee->getAttribute('name', '')) - ->setVariables($emailVariables) + ->appendVariables($emailVariables) ->trigger(); } elseif (!empty($phone)) { if (empty(System::getEnv('_APP_SMS_PROVIDER'))) { diff --git a/src/Appwrite/Event/Mail.php b/src/Appwrite/Event/Mail.php index 2bd615f7da..2d12aa542c 100644 --- a/src/Appwrite/Event/Mail.php +++ b/src/Appwrite/Event/Mail.php @@ -365,15 +365,14 @@ class Mail extends Event } /** - * Add a variable to the email event. - - * @param string $key - * @param mixed $value + * Append variables to the email event. + * + * @param array $variables * @return self */ - public function addVariable(string $key, mixed $value): self + public function appendVariables(array $variables): self { - $this->variables[$key] = $value; + $this->variables = \array_merge($this->variables, $variables); return $this; } diff --git a/src/Appwrite/Platform/Modules/Account/Http/Account/MFA/Challenges/Create.php b/src/Appwrite/Platform/Modules/Account/Http/Account/MFA/Challenges/Create.php index 517963bbda..cde6b90fd6 100644 --- a/src/Appwrite/Platform/Modules/Account/Http/Account/MFA/Challenges/Create.php +++ b/src/Appwrite/Platform/Modules/Account/Http/Account/MFA/Challenges/Create.php @@ -327,7 +327,7 @@ class Create extends Action ->setPreview($preview) ->setBody($body) ->setBodyTemplate($bodyTemplate) - ->setVariables($emailVariables) + ->appendVariables($emailVariables) ->setRecipient($user->getAttribute('email')); // since this is console project, set email sender name!