From d1059c1cc79fe61f9538f3da55e8f42abbede570 Mon Sep 17 00:00:00 2001
From: Sami Mazouz <sychocouldy@gmail.com>
Date: Sat, 20 May 2023 10:51:26 +0100
Subject: [PATCH] fix: improve avatar upload functionality

Signed-off-by: Sami Mazouz <sychocouldy@gmail.com>
---
 framework/core/js/src/forum/components/AvatarEditor.js        | 2 +-
 framework/core/src/Api/Controller/UploadFaviconController.php | 2 +-
 framework/core/src/Api/Controller/UploadLogoController.php    | 2 +-
 framework/core/src/User/AvatarValidator.php                   | 2 +-
 framework/core/src/User/Command/UploadAvatarHandler.php       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/framework/core/js/src/forum/components/AvatarEditor.js b/framework/core/js/src/forum/components/AvatarEditor.js
index e28b617d0..7f92bdfff 100644
--- a/framework/core/js/src/forum/components/AvatarEditor.js
+++ b/framework/core/js/src/forum/components/AvatarEditor.js
@@ -204,7 +204,7 @@ export default class AvatarEditor extends Component {
 
   /**
    * After a successful upload/removal, push the updated user data into the
-   * store, and force a recomputation of the user's avatar color.
+   * store, and force a re-computation of the user's avatar color.
    *
    * @param {object} response
    * @protected
diff --git a/framework/core/src/Api/Controller/UploadFaviconController.php b/framework/core/src/Api/Controller/UploadFaviconController.php
index 525b39680..442a4c35a 100644
--- a/framework/core/src/Api/Controller/UploadFaviconController.php
+++ b/framework/core/src/Api/Controller/UploadFaviconController.php
@@ -62,7 +62,7 @@ class UploadFaviconController extends UploadImageController
             ]);
         }
 
-        $encodedImage = $this->imageManager->make($file->getStream())->resize(64, 64, function ($constraint) {
+        $encodedImage = $this->imageManager->make($file->getStream()->getMetadata('uri'))->resize(64, 64, function ($constraint) {
             $constraint->aspectRatio();
             $constraint->upsize();
         })->encode('png');
diff --git a/framework/core/src/Api/Controller/UploadLogoController.php b/framework/core/src/Api/Controller/UploadLogoController.php
index 8da214d12..683737755 100644
--- a/framework/core/src/Api/Controller/UploadLogoController.php
+++ b/framework/core/src/Api/Controller/UploadLogoController.php
@@ -38,7 +38,7 @@ class UploadLogoController extends UploadImageController
      */
     protected function makeImage(UploadedFileInterface $file): Image
     {
-        $encodedImage = $this->imageManager->make($file->getStream())->heighten(60, function ($constraint) {
+        $encodedImage = $this->imageManager->make($file->getStream()->getMetadata('uri'))->heighten(60, function ($constraint) {
             $constraint->upsize();
         })->encode('png');
 
diff --git a/framework/core/src/User/AvatarValidator.php b/framework/core/src/User/AvatarValidator.php
index 4bb55284d..cf42ef45c 100644
--- a/framework/core/src/User/AvatarValidator.php
+++ b/framework/core/src/User/AvatarValidator.php
@@ -87,7 +87,7 @@ class AvatarValidator extends AbstractValidator
         }
 
         try {
-            $this->imageManager->make($file->getStream());
+            $this->imageManager->make($file->getStream()->getMetadata('uri'));
         } catch (NotReadableException $_e) {
             $this->raise('image');
         }
diff --git a/framework/core/src/User/Command/UploadAvatarHandler.php b/framework/core/src/User/Command/UploadAvatarHandler.php
index 45d334177..ae8844230 100644
--- a/framework/core/src/User/Command/UploadAvatarHandler.php
+++ b/framework/core/src/User/Command/UploadAvatarHandler.php
@@ -74,7 +74,7 @@ class UploadAvatarHandler
 
         $this->validator->assertValid(['avatar' => $command->file]);
 
-        $image = $this->imageManager->make($command->file->getStream());
+        $image = $this->imageManager->make($command->file->getStream()->getMetadata('uri'));
 
         $this->events->dispatch(
             new AvatarSaving($user, $actor, $image)