From afaa64b54bac6151d00d33fe64f19a9708d65a60 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Fri, 13 Jan 2023 06:05:16 +0000
Subject: [PATCH] fix invitation after merge

---
 app/controllers/api/teams.php | 68 +++++++++++++++++++----------------
 1 file changed, 37 insertions(+), 31 deletions(-)

diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php
index d84be2181e..b9a5d4096b 100644
--- a/app/controllers/api/teams.php
+++ b/app/controllers/api/teams.php
@@ -459,44 +459,50 @@ App::post('/v1/teams/:teamId/memberships')
             } catch (Duplicate $th) {
                 throw new Exception(Exception::TEAM_INVITE_ALREADY_EXISTS);
             }
-            
+
             $url = Template::parseURL($url);
             $url['query'] = Template::mergeQuery(((isset($url['query'])) ? $url['query'] : ''), ['membershipId' => $membership->getId(), 'userId' => $invitee->getId(), 'secret' => $secret, 'teamId' => $teamId]);
             $url = Template::unParseURL($url);
+            if (!empty($email)) {
+                $projectName = $project->isEmpty() ? 'Console' : $project->getAttribute('name', '[APP-NAME]');
 
-            $projectName = $project->isEmpty() ? 'Console' : $project->getAttribute('name', '[APP-NAME]');
+                $from = $project->isEmpty() || $project->getId() === 'console' ? '' : \sprintf($locale->getText('emails.sender'), $projectName);
+                $body = Template::fromFile(__DIR__ . '/../../config/locale/templates/email-base.tpl');
+                $subject = \sprintf($locale->getText("emails.invitation.subject"), $team->getAttribute('name'), $projectName);
+                $body->setParam('{{owner}}', $user->getAttribute('name'));
+                $body->setParam('{{team}}', $team->getAttribute('name'));
 
-            $from = $project->isEmpty() || $project->getId() === 'console' ? '' : \sprintf($locale->getText('emails.sender'), $projectName);
-            $body = Template::fromFile(__DIR__ . '/../../config/locale/templates/email-base.tpl');
-            $subject = \sprintf($locale->getText("emails.invitation.subject"), $team->getAttribute('name'), $projectName);
-            $body->setParam('{{owner}}', $user->getAttribute('name'));
-            $body->setParam('{{team}}', $team->getAttribute('name'));
+                $body
+                    ->setParam('{{subject}}', $subject)
+                    ->setParam('{{hello}}', $locale->getText("emails.invitation.hello"))
+                    ->setParam('{{name}}', $user->getAttribute('name'))
+                    ->setParam('{{body}}', $locale->getText("emails.invitation.body"))
+                    ->setParam('{{redirect}}', $url)
+                    ->setParam('{{footer}}', $locale->getText("emails.invitation.footer"))
+                    ->setParam('{{thanks}}', $locale->getText("emails.invitation.thanks"))
+                    ->setParam('{{signature}}', $locale->getText("emails.invitation.signature"))
+                    ->setParam('{{project}}', $projectName)
+                    ->setParam('{{direction}}', $locale->getText('settings.direction'))
+                    ->setParam('{{bg-body}}', '#f7f7f7')
+                    ->setParam('{{bg-content}}', '#ffffff')
+                    ->setParam('{{text-content}}', '#000000');
 
-            $body
-                ->setParam('{{subject}}', $subject)
-                ->setParam('{{hello}}', $locale->getText("emails.invitation.hello"))
-                ->setParam('{{name}}', $user->getAttribute('name'))
-                ->setParam('{{body}}', $locale->getText("emails.invitation.body"))
-                ->setParam('{{redirect}}', $url)
-                ->setParam('{{footer}}', $locale->getText("emails.invitation.footer"))
-                ->setParam('{{thanks}}', $locale->getText("emails.invitation.thanks"))
-                ->setParam('{{signature}}', $locale->getText("emails.invitation.signature"))
-                ->setParam('{{project}}', $projectName)
-                ->setParam('{{direction}}', $locale->getText('settings.direction'))
-                ->setParam('{{bg-body}}', '#f7f7f7')
-                ->setParam('{{bg-content}}', '#ffffff')
-                ->setParam('{{text-content}}', '#000000');
+                $body = $body->render();
 
-            $body = $body->render();
-
-            $mails
-                ->setSubject($subject)
-                ->setBody($body)
-                ->setFrom($from)
-                ->setRecipient($invitee->getAttribute('email'))
-                ->setName($invitee->getAttribute('name'))
-                ->trigger()
-            ;
+                $mails
+                    ->setSubject($subject)
+                    ->setBody($body)
+                    ->setFrom($from)
+                    ->setRecipient($invitee->getAttribute('email'))
+                    ->setName($invitee->getAttribute('name'))
+                    ->trigger()
+                ;
+            } elseif (!empty($phone)) {
+                $messaging
+                    ->setRecipient($phone)
+                    ->setMessage($url)
+                    ->trigger();
+            }
         }
 
         $events