Merge pull request #20 from utopia-php/feat-push

Feat push

.github/workflows/tests.yml

@@ -12,7 +12,34 @@ jobs:
       with:
         fetch-depth: 2
     - run: git checkout HEAD^2
-    - name: Run Tests
+    - name: Run Tests 
+      env:
+        MAILGUN_API_KEY: ${{ secrets.MAILGUN_API_KEY }}
+        MAILGUN_DOMAIN: ${{ secrets.MAILGUN_DOMAIN }}
+        SENDGRID_API_KEY: ${{ secrets.SENDGRID_API_KEY }}
+        FCM_SERVER_KEY: ${{ secrets.FCM_SERVER_KEY }}
+        FCM_SERVER_TO: ${{ secrets.FCM_SERVER_TO }}
+        TWILIO_ACCOUNT_SID: ${{ secrets.TWILIO_ACCOUNT_SID }}
+        TWILIO_AUTH_TOKEN: ${{ secrets.TWILIO_AUTH_TOKEN }}
+        TWILIO_TO: ${{ secrets.TWILIO_TO }}
+        TWILIO_FROM: ${{ secrets.TWILIO_FROM }}
+        TELNYX_API_KEY: ${{ secrets.TELNYX_API_KEY }}
+        TELNYX_PUBLIC_KEY: ${{ secrets.TELNYX_PUBLIC_KEY }}
+        APNS_AUTHKEY_8KVVCLA3HL: ${{ secrets.APNS_AUTHKEY_8KVVCLA3HL }}
+        APNS_AUTH_ID: ${{ secrets.APNS_AUTH_ID }}
+        APNS_TEAM_ID: ${{ secrets.APNS_TEAM_ID }}
+        APNS_BUNDLE_ID: ${{ secrets.APNS_BUNDLE_ID }}
+        APNS_TO: ${{ secrets.APNS_TO }}
+        MSG_91_SENDER_ID: ${{ secrets.MSG_91_SENDER_ID }}
+        MSG_91_AUTH_KEY: ${{ secrets.MSG_91_AUTH_KEY }}
+        MSG_91_TO: ${{ secrets.MSG_91_TO }}
+        MSG_91_FROM: ${{ secrets.MSG_91_FROM }}
+        TEST_EMAIL: ${{ secrets.TEST_EMAIL }}
+        TEST_FROM_EMAIL: ${{ secrets.TEST_FROM_EMAIL }}
+        VONAGE_API_KEY: ${{ secrets.VONAGE_API_KEY }}
+        VONAGE_API_SECRET: ${{ secrets.VONAGE_API_SECRET }}
+        VONAGE_TO: ${{ secrets.VONAGE_TO }}
+        VONAGE_FROM: ${{ secrets.VONAGE_FROM }}
       run: |
         docker compose up -d --build
         sleep 5

.gitignore

@@ -1,3 +1,97 @@
 .idea
 vendor
+Makefile
+.envrc
+.env
+*.p8
+
+### Linux ###
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+### macOS ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### macOS Patch ###
+# iCloud generated files
+*.icloud
+
+### PHPUnit ###
+# Covers PHPUnit
+# Reference: https://phpunit.de/
+
+# Generated files
 .phpunit.result.cache
+.phpunit.cache
+
+# PHPUnit
+/app/phpunit.xml
+/phpunit.xml
+
+# Build data
+/build/
+
+### Windows ###
+# Windows thumbnail cache files
+Thumbs.db
+Thumbs.db:encryptable
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+# End of https://www.toptal.com/developers/gitignore/api/macos,linux,windows,phpunit

README.md

@@ -15,7 +15,7 @@ Install using composer:
 composer require utopia-php/messaging
 ```
 
-## Email
+## Email 
 
 ```php
 <?php

composer.json

@@ -26,8 +26,8 @@
     "ext-curl": "*"
   },
   "require-dev": {
-    "phpunit/phpunit": "9.5.*",
-    "phpmailer/phpmailer": "6.6.*",
+    "phpunit/phpunit": "9.6.*",
+    "phpmailer/phpmailer": "6.8.*",
     "laravel/pint": "^1.2"
   },
   "config": {

docker-compose.yml

@@ -2,13 +2,40 @@ version: '3.9'
 
 services:
   tests:
+    environment:
+    - MAILGUN_API_KEY
+    - MAILGUN_DOMAIN
+    - SENDGRID_API_KEY
+    - FCM_SERVER_KEY
+    - FCM_SERVER_TO
+    - TWILIO_ACCOUNT_SID
+    - TWILIO_AUTH_TOKEN
+    - TWILIO_TO
+    - TWILIO_FROM
+    - TELNYX_API_KEY
+    - TELNYX_PUBLIC_KEY
+    - APNS_AUTHKEY_8KVVCLA3HL
+    - APNS_AUTH_ID
+    - APNS_TEAM_ID
+    - APNS_BUNDLE_ID
+    - APNS_TO
+    - MSG_91_SENDER_ID
+    - MSG_91_AUTH_KEY
+    - MSG_91_TO
+    - MSG_91_FROM
+    - TEST_EMAIL
+    - TEST_FROM_EMAIL
+    - VONAGE_API_KEY
+    - VONAGE_API_SECRET
+    - VONAGE_TO
+    - VONAGE_FROM
     build:
       context: .
     volumes:
       - ./src:/usr/local/src/src
       - ./tests:/usr/local/src/tests
       - ./phpunit.xml:/usr/local/src/phpunit.xml
-
+      
   maildev:
     image: appwrite/mailcatcher:1.0.0
     ports:

src/Utopia/Messaging/Adapters/Email/Mailgun.php

@@ -14,14 +14,25 @@ class Mailgun extends EmailAdapter
     public function __construct(
         private string $apiKey,
         private string $domain,
+        private bool $isEU = false
     ) {
     }
 
+    /**
+     * Get adapter name.
+     *
+     * @return string
+     */
     public function getName(): string
     {
         return 'Mailgun';
     }
 
+    /**
+     * Get adapter description.
+     *
+     * @return int
+     */
     public function getMaxMessagesPerRequest(): int
     {
         return 1000;
@@ -34,19 +45,26 @@ public function getMaxMessagesPerRequest(): int
      */
     protected function process(Email $message): string
     {
-        return $this->request(
+        $usDomain = 'api.mailgun.net';
+        $euDomain = 'api.eu.mailgun.net';
+
+        $domain = $this->isEU ? $euDomain : $usDomain;
+
+        $response = $this->request(
             method: 'POST',
-            url: "https://api.mailgun.net/v3/{$this->domain}/messages",
+            url: "https://$domain/v3/{$this->domain}/messages",
             headers: [
                 'Authorization: Basic '.base64_encode('api:'.$this->apiKey),
             ],
             body: \http_build_query([
-                'from' => $message->getFrom(),
                 'to' => \implode(',', $message->getTo()),
+                'from' => $message->getFrom(),
                 'subject' => $message->getSubject(),
                 'text' => $message->isHtml() ? null : $message->getContent(),
                 'html' => $message->isHtml() ? $message->getContent() : null,
             ]),
         );
+
+        return $response;
     }
 }