From 7506a815140b4db0ec50e6197929c0bc99252b05 Mon Sep 17 00:00:00 2001 From: Roman Date: Sat, 10 Apr 2021 00:44:34 +0200 Subject: [PATCH] some more contact api stuff --- core/Api/ContactAPI.class.php | 245 ++++++++++++++++---- core/Api/MailAPI.class.php | 42 +++- core/Configuration/CreateDatabase.class.php | 10 +- 3 files changed, 247 insertions(+), 50 deletions(-) diff --git a/core/Api/ContactAPI.class.php b/core/Api/ContactAPI.class.php index e4f1401..084a7a3 100644 --- a/core/Api/ContactAPI.class.php +++ b/core/Api/ContactAPI.class.php @@ -1,8 +1,34 @@ messageId = null; + } + + protected function sendMail(string $name, ?string $fromEmail, string $subject, string $message, ?string $to = null): bool { + $request = new \Api\Mail\Send($this->user); + $this->success = $request->execute(array( + "subject" => $subject, + "body" => $message, + "replyTo" => $fromEmail, + "replyName" => $name, + "to" => $to + )); + + if ($this->success) { + $this->messageId = $request->getResult()["messageId"]; + } + + return $this->success; + } } } @@ -12,14 +38,11 @@ namespace Api\Contact { use Api\Parameter\Parameter; use Api\Parameter\StringType; use Api\VerifyCaptcha; + use Driver\SQL\Condition\Compare; use Objects\User; class Request extends ContactAPI { - private int $notificationId; - private int $contactRequestId; - private ?string $messageId; - public function __construct(User $user, bool $externalCall = false) { $parameters = array( 'fromName' => new StringType('fromName', 32), @@ -32,7 +55,6 @@ namespace Api\Contact { $parameters["captcha"] = new StringType("captcha"); } - $this->messageId = null; parent::__construct($user, $externalCall, $parameters); } @@ -50,11 +72,16 @@ namespace Api\Contact { } } - $sendMail = $this->sendMail(); + // parameter + $message = $this->getParam("message"); + $name = $this->getParam("fromName"); + $email = $this->getParam("fromEmail"); + + $sendMail = $this->sendMail($name, $email, "Contact Request", $message); $mailError = $this->getLastError(); $insertDB = $this->insertContactRequest(); - $dbError = $this->getLastError(); + $dbError = $this->getLastError(); // Create a log entry if (!$sendMail || $mailError) { @@ -77,7 +104,7 @@ namespace Api\Contact { return $this->success; } - private function insertContactRequest() { + private function insertContactRequest(): bool { $sql = $this->user->getSQL(); $name = $this->getParam("fromName"); $email = $this->getParam("fromEmail"); @@ -91,62 +118,194 @@ namespace Api\Contact { $this->success = ($res !== FALSE); $this->lastError = $sql->getLastError(); - - if ($this->success) { - $this->contactRequestId = $sql->getLastInsertId(); - } - return $this->success; } + } - private function createNotification() { + class Respond extends ContactAPI { + + public function __construct(User $user, bool $externalCall = false) { + parent::__construct($user, $externalCall, array( + "requestId" => new Parameter("requestId", Parameter::TYPE_INT), + 'message' => new StringType('message', 512), + )); + $this->loginRequired = true; + $this->csrfTokenRequired = false; + } + + private function getSenderMail(): ?string { + $requestId = $this->getParam("requestId"); $sql = $this->user->getSQL(); - $name = $this->getParam("fromName"); - $email = $this->getParam("fromEmail"); - $message = $this->getParam("message"); - - $res = $sql->insert("Notification", array("title", "message", "type")) - ->addRow("New Contact Request from: $name", "$name ($email) wrote:\n$message", "message") - ->returning("uid") + $res = $sql->select("from_email") + ->from("ContactRequest") + ->where(new Compare("uid", $requestId)) ->execute(); - $this->success = ($res !== FALSE); + $this->success = ($res !== false); $this->lastError = $sql->getLastError(); if ($this->success) { - $this->notificationId = $sql->getLastInsertId(); - - $res = $sql->insert("GroupNotification", array("group_id", "notification_id")) - ->addRow(USER_GROUP_ADMIN, $this->notificationId) - ->addRow(USER_GROUP_SUPPORT, $this->notificationId) - ->execute(); - - $this->success = ($res !== FALSE); - $this->lastError = $sql->getLastError(); + if (empty($res)) { + return $this->createError("Request does not exist"); + } else { + return $res[0]["from_email"]; + } } + return null; + } + + private function insertResponseMessage(): bool { + $sql = $this->user->getSQL(); + $message = $this->getParam("message"); + $requestId = $this->getParam("requestId"); + + $this->success = $sql->insert("ContactMessage", ["request_id", "user_id", "message", "messageId", "read"]) + ->addRow($requestId, $this->user->getId(), $message, $this->messageId, true) + ->execute(); + + $this->lastError = $sql->getLastError(); return $this->success; } - private function sendMail(): bool { - $name = $this->getParam("fromName"); - $email = $this->getParam("fromEmail"); - $message = $this->getParam("message"); + private function updateEntity() { + $sql = $this->user->getSQL(); + $requestId = $this->getParam("requestId"); - $request = new \Api\Mail\Send($this->user); - $this->success = $request->execute(array( - "subject" => "Contact Request", - "body" => $message, - "replyTo" => $email, - "replyName" => $name - )); + $sql->update("EntityLog") + ->set("modified", $sql->now()) + ->where(new Compare("entityId", $requestId)) + ->execute(); + } + + public function execute($values = array()): bool { + if (!parent::execute($values)) { + return false; + } + + $message = $this->getParam("message"); + $senderMail = $this->getSenderMail(); + if (!$this->success) { + return false; + } + + $fromName = $this->user->getUsername(); + $fromEmail = $this->user->getEmail(); + + if (!$this->sendMail($fromName, $fromEmail, "Re: Contact Request", $message, $senderMail)) { + return false; + } + + if (!$this->insertResponseMessage()) { + return false; + } + + $this->updateEntity(); + return $this->success; + } + } + + class Fetch extends ContactAPI { + + public function __construct(User $user, bool $externalCall = false) { + parent::__construct($user, $externalCall, array()); + $this->loginRequired = true; + $this->csrfTokenRequired = false; + } + + public function execute($values = array()): bool { + if (!parent::execute($values)) { + return false; + } + + $sql = $this->user->getSQL(); + $res = $sql->select("ContactRequest.uid", "from_name", "from_email", "from_name", $sql->sum("read")) + ->from("ContactRequest") + ->groupBy("uid") + ->leftJoin("ContactMessage", "ContactRequest.uid", "ContactMessage.request_id") + ->execute(); + + $this->success = ($res !== false); + $this->lastError = $sql->getLastError(); if ($this->success) { - $this->messageId = $request->getResult()["messageId"]; + $this->result["contactRequests"] = $res; } return $this->success; } } + class Get extends ContactAPI { + + public function __construct(User $user, bool $externalCall = false) { + parent::__construct($user, $externalCall, array( + "requestId" => new Parameter("requestId", Parameter::TYPE_INT), + )); + $this->loginRequired = true; + $this->csrfTokenRequired = false; + } + + private function updateRead() { + $requestId = $this->getParam("requestId"); + $sql = $this->user->getSQL(); + $sql->update("ContactMessage") + ->set("read", 1) + ->where(new Compare("request_id", $requestId)) + ->execute(); + } + + public function execute($values = array()): bool { + if (!parent::execute($values)) { + return false; + } + + $requestId = $this->getParam("requestId"); + $sql = $this->user->getSQL(); + + $res = $sql->select("from_name", "from_email", "message", "created_at") + ->from("ContactRequest") + ->where(new Compare("uid", $requestId)) + ->execute(); + + $this->success = ($res !== false); + $this->lastError = $sql->getLastError(); + + if ($this->success) { + if (empty($res)) { + return $this->createError("Request does not exist"); + } else { + $row = $res[0]; + $this->result["request"] = array( + "from_name" => $row["from_name"], + "from_email" => $row["from_email"], + "messages" => array( + ["sender_id" => null, "message" => $row["message"], "timestamp" => $row["created_at"]] + ) + ); + + $res = $sql->select("user_id", "message", "created_at") + ->from("ContactMessage") + ->where(new Compare("request_id", $requestId)) + ->orderBy("created_at") + ->execute(); + + $this->success = ($res !== false); + $this->lastError = $sql->getLastError(); + + if ($this->success) { + foreach ($res as $row) { + $this->result["request"]["messages"][] = array( + "sender_id" => $row["user_id"], "message" => $row["message"], "timestamp" => $row["created_at"] + ); + } + + $this->updateRead(); + } + } + } + + return $this->success; + } + } } \ No newline at end of file diff --git a/core/Api/MailAPI.class.php b/core/Api/MailAPI.class.php index a266ee6..1578d60 100644 --- a/core/Api/MailAPI.class.php +++ b/core/Api/MailAPI.class.php @@ -40,6 +40,7 @@ namespace Api\Mail { use Api\Parameter\StringType; use Driver\SQL\Column\Column; use Driver\SQL\Condition\Compare; + use Driver\SQL\Condition\CondIn; use Driver\SQL\Strategy\UpdateStrategy; use External\PHPMailer\Exception; use External\PHPMailer\PHPMailer; @@ -139,11 +140,12 @@ namespace Api\Mail { } // TODO: IMAP mail settings :( + // TODO: attachments class Sync extends MailAPI { public function __construct(User $user, bool $externalCall = false) { parent::__construct($user, $externalCall, array()); - $this->csrfTokenRequired = true; + $this->loginRequired = true; } private function fetchMessageIds() { @@ -184,20 +186,36 @@ namespace Api\Mail { private function insertMessages($messages): bool { $sql = $this->user->getSQL(); - $query = $sql->insert("ContactMessage", ["request_id", "user_id", "message", "messageId"]) + $query = $sql->insert("ContactMessage", ["request_id", "user_id", "message", "messageId", "created_at"]) ->onDuplicateKeyStrategy(new UpdateStrategy(["message_id"], ["message" => new Column("message")])); + $entityIds = []; foreach ($messages as $message) { + $requestId = $message["requestId"]; $query->addRow( - $message["requestId"], + $requestId, $sql->select("uid")->from("User")->where(new Compare("email", $message["from"]))->limit(1), $message["body"], - $message["messageId"] + $message["messageId"], + (new \DateTime())->setTimeStamp($message["timestamp"]), ); + + if (!in_array($requestId, $entityIds)) { + $entityIds[] = $requestId; + } } $this->success = $query->execute(); $this->lastError = $sql->getLastError(); + + // Update entity log + if ($this->success && count($entityIds) > 0) { + $sql->update("EntityLog") + ->set("modified", $sql->now()) + ->where(new CondIn("entityId", $entityIds)) + ->execute(); + } + return $this->success; } @@ -246,6 +264,20 @@ namespace Api\Mail { return $boxes; } + private function getSenderAddress($header): string { + if (property_exists($header, "reply_to") && count($header->reply_to) > 0) { + $mailBox = $header->reply_to[0]->mailbox; + $host = $header->reply_to[0]->host; + } else if (property_exists($header, "from") && count($header->from) > 0) { + $mailBox = $header->from[0]->mailbox; + $host = $header->from[0]->host; + } else { + return "unknown_addr"; + } + + return "$mailBox@$host"; + } + private function runSearch($mbox, string $searchCriteria, ?\DateTime $lastSyncDateTime, array $messageIds, array &$messages) { $result = @imap_search($mbox, $searchCriteria); if ($result === false) { @@ -268,7 +300,7 @@ namespace Api\Mail { $requestId = $this->findContactRequest($messageIds, $references); if ($requestId) { $messageId = $header->message_id; - $senderAddress = $header->senderaddress; + $senderAddress = $this->getSenderAddress($header); $structure = imap_fetchstructure($mbox, $msgNo); $attachments = []; diff --git a/core/Configuration/CreateDatabase.class.php b/core/Configuration/CreateDatabase.class.php index 11f3805..4a9ea26 100644 --- a/core/Configuration/CreateDatabase.class.php +++ b/core/Configuration/CreateDatabase.class.php @@ -176,9 +176,12 @@ class CreateDatabase extends DatabaseScript { ->addString("message", 512) ->addString("messageId", 78) ->addDateTime("created_at", false, $sql->currentTimestamp()) + ->addBool("read", false) ->unique("messageId") ->primaryKey("uid") - ->foreignKey("request_id", "ContactRequest", "uid", new CascadeStrategy()); + ->foreignKey("request_id", "ContactRequest", "uid", new CascadeStrategy()) + ->foreignKey("user_id", "User", "uid", new SetNullStrategy()); + $queries[] = $sql->createTable("ApiPermission") ->addString("method", 32) @@ -208,7 +211,10 @@ class CreateDatabase extends DatabaseScript { ->addRow("User/edit", array(USER_GROUP_ADMIN), "Allows users to edit details and group memberships of any user") ->addRow("User/delete", array(USER_GROUP_ADMIN), "Allows users to delete any other user") ->addRow("Permission/fetch", array(USER_GROUP_ADMIN), "Allows users to list all API permissions") - ->addRow("Visitors/stats", array(USER_GROUP_ADMIN, USER_GROUP_SUPPORT), "Allows users to see visitor statistics"); + ->addRow("Visitors/stats", array(USER_GROUP_ADMIN, USER_GROUP_SUPPORT), "Allows users to see visitor statistics") + ->addRow("Contact/respond", array(USER_GROUP_ADMIN, USER_GROUP_SUPPORT), "Allows users to respond to contact requests") + ->addRow("Contact/fetch", array(USER_GROUP_ADMIN, USER_GROUP_SUPPORT), "Allows users to fetch all contact requests") + ->addRow("Contact/get", array(USER_GROUP_ADMIN, USER_GROUP_SUPPORT), "Allows users to see messages within a contact request"); self::loadPatches($queries, $sql);