From 67d0f525af6fa098aafdee7a8af1740e18e2dae2 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 22 Feb 2021 20:46:01 +1100
Subject: [PATCH 1/2] Postmark webhooks

---
 app/Http/Controllers/CreditController.php   |   9 ++
 app/Http/Controllers/PostMarkController.php | 156 ++++++++++++++++++++
 routes/api.php                              |   2 +
 3 files changed, 167 insertions(+)
 create mode 100644 app/Http/Controllers/PostMarkController.php

diff --git a/app/Http/Controllers/CreditController.php b/app/Http/Controllers/CreditController.php
index 4974cbb875fc..efdec9af28a2 100644
--- a/app/Http/Controllers/CreditController.php
+++ b/app/Http/Controllers/CreditController.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 
 namespace App\Http\Controllers;
 
diff --git a/app/Http/Controllers/PostMarkController.php b/app/Http/Controllers/PostMarkController.php
new file mode 100644
index 000000000000..74067176b919
--- /dev/null
+++ b/app/Http/Controllers/PostMarkController.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+/**
+ * Class PostMarkController.
+ */
+class PostMarkController extends BaseController
+{
+
+    public function __construct()
+    {
+    }
+
+    /**
+     * Process Postmark Webhook.
+     *
+     *
+     * @OA\Post(
+     *      path="/api/v1/postmark_webhook",
+     *      operationId="postmarkWebhook",
+     *      tags={"postmark"},
+     *      summary="Processing webhooks from PostMark",
+     *      description="Adds an credit to the system",
+     *      @OA\Parameter(ref="#/components/parameters/X-Api-Secret"),
+     *      @OA\Parameter(ref="#/components/parameters/X-Api-Token"),
+     *      @OA\Parameter(ref="#/components/parameters/X-Requested-With"),
+     *      @OA\Parameter(ref="#/components/parameters/include"),
+     *      @OA\Response(
+     *          response=200,
+     *          description="Returns the saved credit object",
+     *          @OA\Header(header="X-MINIMUM-CLIENT-VERSION", ref="#/components/headers/X-MINIMUM-CLIENT-VERSION"),
+     *          @OA\Header(header="X-RateLimit-Remaining", ref="#/components/headers/X-RateLimit-Remaining"),
+     *          @OA\Header(header="X-RateLimit-Limit", ref="#/components/headers/X-RateLimit-Limit"),
+     *          @OA\JsonContent(ref="#/components/schemas/Credit"),
+     *       ),
+     *       @OA\Response(
+     *          response=422,
+     *          description="Validation error",
+     *          @OA\JsonContent(ref="#/components/schemas/ValidationError"),
+     *
+     *       ),
+     *       @OA\Response(
+     *           response="default",
+     *           description="Unexpected Error",
+     *           @OA\JsonContent(ref="#/components/schemas/Error"),
+     *       ),
+     *     )
+     */
+    public function webhook(Request $request)
+    {
+
+        if($request->header('X-API-SECURITY') && $request->header('X-API-SECURITY') == config('postmark.secret'))
+        {
+
+        }
+
+    }
+
+
+
+
+
+// {
+//   "RecordType": "Delivery",
+//   "ServerID": 23,
+//   "MessageStream": "outbound",
+//   "MessageID": "00000000-0000-0000-0000-000000000000",
+//   "Recipient": "john@example.com",
+//   "Tag": "welcome-email",
+//   "DeliveredAt": "2021-02-21T16:34:52Z",
+//   "Details": "Test delivery webhook details",
+//   "Metadata": {
+//     "example": "value",
+//     "example_2": "value"
+//   }
+// }
+    private function processDelivery($request)
+    {
+
+    }
+
+// {
+//   "Metadata": {
+//     "example": "value",
+//     "example_2": "value"
+//   },
+//   "RecordType": "Bounce",
+//   "ID": 42,
+//   "Type": "HardBounce",
+//   "TypeCode": 1,
+//   "Name": "Hard bounce",
+//   "Tag": "Test",
+//   "MessageID": "00000000-0000-0000-0000-000000000000",
+//   "ServerID": 1234,
+//   "MessageStream": "outbound",
+//   "Description": "The server was unable to deliver your message (ex: unknown user, mailbox not found).",
+//   "Details": "Test bounce details",
+//   "Email": "john@example.com",
+//   "From": "sender@example.com",
+//   "BouncedAt": "2021-02-21T16:34:52Z",
+//   "DumpAvailable": true,
+//   "Inactive": true,
+//   "CanActivate": true,
+//   "Subject": "Test subject",
+//   "Content": "Test content"
+// }
+
+    private function processBounce($request)
+    {
+
+    }
+
+// {
+//   "Metadata": {
+//     "example": "value",
+//     "example_2": "value"
+//   },
+//   "RecordType": "SpamComplaint",
+//   "ID": 42,
+//   "Type": "SpamComplaint",
+//   "TypeCode": 100001,
+//   "Name": "Spam complaint",
+//   "Tag": "Test",
+//   "MessageID": "00000000-0000-0000-0000-000000000000",
+//   "ServerID": 1234,
+//   "MessageStream": "outbound",
+//   "Description": "The subscriber explicitly marked this message as spam.",
+//   "Details": "Test spam complaint details",
+//   "Email": "john@example.com",
+//   "From": "sender@example.com",
+//   "BouncedAt": "2021-02-21T16:34:52Z",
+//   "DumpAvailable": true,
+//   "Inactive": true,
+//   "CanActivate": false,
+//   "Subject": "Test subject",
+//   "Content": "Test content"
+// }
+    private function processSpamComplaint($request)
+    {
+
+    }
+
+
+}
diff --git a/routes/api.php b/routes/api.php
index bc148ded9fc6..48fdd6c4e244 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -177,4 +177,6 @@ Route::match(['get', 'post'], 'payment_webhook/{company_key}/{company_gateway_id
     ->middleware(['guest', 'api_db'])
     ->name('payment_webhook');
 
+Route::post('postmark_webhook', 'PostMarkController@webhook');
+
 Route::fallback('BaseController@notFound');

From c7048e8cb1568ce35e76fc1882b82f93b53a568a Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 22 Feb 2021 20:54:46 +1100
Subject: [PATCH 2/2] Fixes for user present name

---
 app/Jobs/Mail/NinjaMailerJob.php | 4 ++--
 app/Models/User.php              | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/Jobs/Mail/NinjaMailerJob.php b/app/Jobs/Mail/NinjaMailerJob.php
index a040556d386a..a33eb48ca8eb 100644
--- a/app/Jobs/Mail/NinjaMailerJob.php
+++ b/app/Jobs/Mail/NinjaMailerJob.php
@@ -142,7 +142,7 @@ class NinjaMailerJob implements ShouldQueue
 
         $user = User::find($this->decodePrimaryKey($sending_user));
 
-        nlog("Sending via {$user->present()->name()}");
+        nlog("Sending via {$user->name()}");
 
         $google = (new Google())->init();
         $google->getClient()->setAccessToken(json_encode($user->oauth_user_token));
@@ -164,7 +164,7 @@ class NinjaMailerJob implements ShouldQueue
 
         $this->nmo
              ->mailable
-             ->from($user->email, $user->present()->name())
+             ->from($user->email, $user->name())
              ->withSwiftMessage(function ($message) use($token) {
                 $message->getHeaders()->addTextHeader('GmailToken', $token);     
              });
diff --git a/app/Models/User.php b/app/Models/User.php
index f5e94281a502..36c7aec6ac39 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -103,6 +103,12 @@ class User extends Authenticatable implements MustVerifyEmail
         'deleted_at'       => 'timestamp',
     ];
 
+
+    public function name()
+    {
+        return $this->first_name . ' ' . $this->last_name;
+    }
+
     public function getEntityType()
     {
         return self::class;