From ca8cb6f2601d3e520ef9023387d442364bf21f46 Mon Sep 17 00:00:00 2001
From: fogelito <fogelshmuel@gmail.com>
Date: Sun, 2 Nov 2025 09:13:55 +0200
Subject: [PATCH] Add utopia-php/emails

---
 app/controllers/api/account.php |   6 +-
 composer.json                   |   1 +
 composer.lock                   | 162 ++++++++++++++++++++++----------
 3 files changed, 116 insertions(+), 53 deletions(-)

diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
index cdd7280fb7..6c31f28754 100644
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@@ -1675,10 +1675,12 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
         }
 
         if (empty($user->getAttribute('email'))) {
-            $emailCanonical = new EmailCanonical($oauth2->getUserEmail($accessToken));
+            $oauth2Email = $oauth2->getUserEmail($accessToken);
+
+            $emailCanonical = new EmailCanonical($oauth2Email);
 
             $user
-                ->setAttribute('email', $oauth2->getUserEmail($accessToken))
+                ->setAttribute('email', $oauth2Email)
                 ->setAttribute('emailCanonical', $emailCanonical->getCanonical())
                 ->setAttribute('emailIsCanonical', $emailCanonical->isCanonicalSupported())
                 ->setAttribute('emailIsCorporate', $emailCanonical->isCorporate())
diff --git a/composer.json b/composer.json
index 3e00015220..f008c8e089 100644
--- a/composer.json
+++ b/composer.json
@@ -60,6 +60,7 @@
         "utopia-php/framework": "0.33.*",
         "utopia-php/fetch": "0.4.*",
         "utopia-php/image": "0.8.*",
+        "utopia-php/emails": "0.6.*",
         "utopia-php/locale": "0.8.*",
         "utopia-php/logger": "0.6.*",
         "utopia-php/messaging": "0.20.*",
diff --git a/composer.lock b/composer.lock
index 36c2c94265..394e2a9e3e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f826d3b283b10af98dfd565c4187a83a",
+    "content-hash": "c53027e4009de3901769fe29b0d1a68f",
     "packages": [
         {
             "name": "adhocore/jwt",
@@ -3840,16 +3840,16 @@
         },
         {
             "name": "utopia-php/database",
-            "version": "3.0.2",
+            "version": "3.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/database.git",
-                "reference": "b92554e2e7b3b00f0f0acb2b53c6a11e1349b81e"
+                "reference": "b6541a9cd9b21786a5020327f582838afdb159aa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/database/zipball/b92554e2e7b3b00f0f0acb2b53c6a11e1349b81e",
-                "reference": "b92554e2e7b3b00f0f0acb2b53c6a11e1349b81e",
+                "url": "https://api.github.com/repos/utopia-php/database/zipball/b6541a9cd9b21786a5020327f582838afdb159aa",
+                "reference": "b6541a9cd9b21786a5020327f582838afdb159aa",
                 "shasum": ""
             },
             "require": {
@@ -3892,22 +3892,22 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/database/issues",
-                "source": "https://github.com/utopia-php/database/tree/3.0.2"
+                "source": "https://github.com/utopia-php/database/tree/3.1.2"
             },
-            "time": "2025-10-20T23:58:56+00:00"
+            "time": "2025-10-30T13:10:13+00:00"
         },
         {
             "name": "utopia-php/detector",
-            "version": "0.2.0",
+            "version": "0.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/detector.git",
-                "reference": "795ed56169af833fd6a4ea58a6c747e05ccc7ba6"
+                "reference": "9a41be5f21efe2d865de79b08dff94fff85ce5e9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/detector/zipball/795ed56169af833fd6a4ea58a6c747e05ccc7ba6",
-                "reference": "795ed56169af833fd6a4ea58a6c747e05ccc7ba6",
+                "url": "https://api.github.com/repos/utopia-php/detector/zipball/9a41be5f21efe2d865de79b08dff94fff85ce5e9",
+                "reference": "9a41be5f21efe2d865de79b08dff94fff85ce5e9",
                 "shasum": ""
             },
             "require": {
@@ -3937,9 +3937,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/detector/issues",
-                "source": "https://github.com/utopia-php/detector/tree/0.2.0"
+                "source": "https://github.com/utopia-php/detector/tree/0.2.2"
             },
-            "time": "2025-10-21T13:57:30+00:00"
+            "time": "2025-10-31T12:43:31+00:00"
         },
         {
             "name": "utopia-php/dns",
@@ -4106,6 +4106,66 @@
             },
             "time": "2024-05-07T02:01:25+00:00"
         },
+        {
+            "name": "utopia-php/emails",
+            "version": "0.6.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/utopia-php/emails.git",
+                "reference": "9c4c40cf7c03c2e9e21364566f9b192d03ea93c9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/utopia-php/emails/zipball/9c4c40cf7c03c2e9e21364566f9b192d03ea93c9",
+                "reference": "9c4c40cf7c03c2e9e21364566f9b192d03ea93c9",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.0",
+                "utopia-php/cli": "^0.15",
+                "utopia-php/domains": "^0.9",
+                "utopia-php/fetch": "^0.4",
+                "utopia-php/validators": "^0.0.2"
+            },
+            "require-dev": {
+                "laravel/pint": "1.25.*",
+                "phpstan/phpstan": "^1.10",
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Utopia\\Emails\\": "src/Emails"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Eldad Fux",
+                    "email": "eldad@appwrite.io"
+                }
+            ],
+            "description": "Utopia Emails library is simple and lite library for parsing and validating email addresses. This library is aiming to be as simple and easy to learn and use.",
+            "keywords": [
+                "RFC5322",
+                "email",
+                "emails",
+                "framework",
+                "parsing",
+                "php",
+                "upf",
+                "utopia",
+                "validation"
+            ],
+            "support": {
+                "issues": "https://github.com/utopia-php/emails/issues",
+                "source": "https://github.com/utopia-php/emails/tree/0.6.2"
+            },
+            "time": "2025-10-28T16:08:17+00:00"
+        },
         {
             "name": "utopia-php/fetch",
             "version": "0.4.2",
@@ -4395,16 +4455,16 @@
         },
         {
             "name": "utopia-php/migration",
-            "version": "1.3.2",
+            "version": "1.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/migration.git",
-                "reference": "f5c1d2cae764290766a4c2d1546c1d51de95b67f"
+                "reference": "731b3a963c58c30e0b2368695d57a7e8fcb7455c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/migration/zipball/f5c1d2cae764290766a4c2d1546c1d51de95b67f",
-                "reference": "f5c1d2cae764290766a4c2d1546c1d51de95b67f",
+                "url": "https://api.github.com/repos/utopia-php/migration/zipball/731b3a963c58c30e0b2368695d57a7e8fcb7455c",
+                "reference": "731b3a963c58c30e0b2368695d57a7e8fcb7455c",
                 "shasum": ""
             },
             "require": {
@@ -4444,9 +4504,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/migration/issues",
-                "source": "https://github.com/utopia-php/migration/tree/1.3.2"
+                "source": "https://github.com/utopia-php/migration/tree/1.3.3"
             },
-            "time": "2025-10-22T12:30:47+00:00"
+            "time": "2025-10-28T04:02:08+00:00"
         },
         {
             "name": "utopia-php/mongo",
@@ -5193,16 +5253,16 @@
         },
         {
             "name": "webmozart/assert",
-            "version": "1.12.0",
+            "version": "1.12.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webmozarts/assert.git",
-                "reference": "541057574806f942c94662b817a50f63f7345360"
+                "reference": "9be6926d8b485f55b9229203f962b51ed377ba68"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozarts/assert/zipball/541057574806f942c94662b817a50f63f7345360",
-                "reference": "541057574806f942c94662b817a50f63f7345360",
+                "url": "https://api.github.com/repos/webmozarts/assert/zipball/9be6926d8b485f55b9229203f962b51ed377ba68",
+                "reference": "9be6926d8b485f55b9229203f962b51ed377ba68",
                 "shasum": ""
             },
             "require": {
@@ -5245,9 +5305,9 @@
             ],
             "support": {
                 "issues": "https://github.com/webmozarts/assert/issues",
-                "source": "https://github.com/webmozarts/assert/tree/1.12.0"
+                "source": "https://github.com/webmozarts/assert/tree/1.12.1"
             },
-            "time": "2025-10-20T12:43:39+00:00"
+            "time": "2025-10-29T15:56:20+00:00"
         },
         {
             "name": "webonyx/graphql-php",
@@ -5318,16 +5378,16 @@
     "packages-dev": [
         {
             "name": "appwrite/sdk-generator",
-            "version": "1.4.11",
+            "version": "1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/appwrite/sdk-generator.git",
-                "reference": "5970defc3c6e64817fe9847c0b33c87af71709c5"
+                "reference": "42df22195d6457e52e4c819678168470b114a816"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/5970defc3c6e64817fe9847c0b33c87af71709c5",
-                "reference": "5970defc3c6e64817fe9847c0b33c87af71709c5",
+                "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/42df22195d6457e52e4c819678168470b114a816",
+                "reference": "42df22195d6457e52e4c819678168470b114a816",
                 "shasum": ""
             },
             "require": {
@@ -5363,9 +5423,9 @@
             "description": "Appwrite PHP library for generating API SDKs for multiple programming languages and platforms",
             "support": {
                 "issues": "https://github.com/appwrite/sdk-generator/issues",
-                "source": "https://github.com/appwrite/sdk-generator/tree/1.4.11"
+                "source": "https://github.com/appwrite/sdk-generator/tree/1.5.0"
             },
-            "time": "2025-10-24T10:03:09+00:00"
+            "time": "2025-10-31T10:10:25+00:00"
         },
         {
             "name": "doctrine/annotations",
@@ -6069,16 +6129,16 @@
         },
         {
             "name": "phpbench/phpbench",
-            "version": "1.4.1",
+            "version": "1.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpbench/phpbench.git",
-                "reference": "78cd98a9aa34e0f8f80ca01972a8b88d2c30194b"
+                "reference": "bb61ae6c54b3d58642be154eb09f4e73c3511018"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpbench/phpbench/zipball/78cd98a9aa34e0f8f80ca01972a8b88d2c30194b",
-                "reference": "78cd98a9aa34e0f8f80ca01972a8b88d2c30194b",
+                "url": "https://api.github.com/repos/phpbench/phpbench/zipball/bb61ae6c54b3d58642be154eb09f4e73c3511018",
+                "reference": "bb61ae6c54b3d58642be154eb09f4e73c3511018",
                 "shasum": ""
             },
             "require": {
@@ -6105,7 +6165,7 @@
                 "ergebnis/composer-normalize": "^2.39",
                 "friendsofphp/php-cs-fixer": "^3.0",
                 "jangregor/phpstan-prophecy": "^1.0",
-                "phpspec/prophecy": "dev-master",
+                "phpspec/prophecy": "^1.22",
                 "phpstan/extension-installer": "^1.1",
                 "phpstan/phpstan": "^1.0",
                 "phpstan/phpstan-phpunit": "^1.0",
@@ -6155,7 +6215,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpbench/phpbench/issues",
-                "source": "https://github.com/phpbench/phpbench/tree/1.4.1"
+                "source": "https://github.com/phpbench/phpbench/tree/1.4.2"
             },
             "funding": [
                 {
@@ -6163,7 +6223,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-03-12T08:01:40+00:00"
+            "time": "2025-10-26T14:21:59+00:00"
         },
         {
             "name": "phpstan/phpstan",
@@ -7812,16 +7872,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v7.3.4",
+            "version": "v7.3.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "2b9c5fafbac0399a20a2e82429e2bd735dcfb7db"
+                "reference": "cdb80fa5869653c83cfe1a9084a673b6daf57ea7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/2b9c5fafbac0399a20a2e82429e2bd735dcfb7db",
-                "reference": "2b9c5fafbac0399a20a2e82429e2bd735dcfb7db",
+                "url": "https://api.github.com/repos/symfony/console/zipball/cdb80fa5869653c83cfe1a9084a673b6daf57ea7",
+                "reference": "cdb80fa5869653c83cfe1a9084a673b6daf57ea7",
                 "shasum": ""
             },
             "require": {
@@ -7886,7 +7946,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.3.4"
+                "source": "https://github.com/symfony/console/tree/v7.3.5"
             },
             "funding": [
                 {
@@ -7906,7 +7966,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-09-22T15:31:00+00:00"
+            "time": "2025-10-14T15:46:26+00:00"
         },
         {
             "name": "symfony/filesystem",
@@ -7980,16 +8040,16 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v7.3.2",
+            "version": "v7.3.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "2a6614966ba1074fa93dae0bc804227422df4dfe"
+                "reference": "9f696d2f1e340484b4683f7853b273abff94421f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/2a6614966ba1074fa93dae0bc804227422df4dfe",
-                "reference": "2a6614966ba1074fa93dae0bc804227422df4dfe",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/9f696d2f1e340484b4683f7853b273abff94421f",
+                "reference": "9f696d2f1e340484b4683f7853b273abff94421f",
                 "shasum": ""
             },
             "require": {
@@ -8024,7 +8084,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v7.3.2"
+                "source": "https://github.com/symfony/finder/tree/v7.3.5"
             },
             "funding": [
                 {
@@ -8044,7 +8104,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-07-15T13:41:35+00:00"
+            "time": "2025-10-15T18:45:57+00:00"
         },
         {
             "name": "symfony/options-resolver",
@@ -8856,5 +8916,5 @@
     "platform-overrides": {
         "php": "8.3"
     },
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }