From f07043b6cc06b75fe66b45225a06fa45f453bc7a Mon Sep 17 00:00:00 2001
From: rivexe <stepan.mayorov@onlyoffice.com>
Date: Tue, 26 Mar 2024 13:34:34 +0300
Subject: [PATCH] fix: set user avatar as base64

---
 controller/editorapicontroller.php | 13 -------------
 controller/editorcontroller.php    | 11 +----------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/controller/editorapicontroller.php b/controller/editorapicontroller.php
index faafec5c..ab3476b7 100644
--- a/controller/editorapicontroller.php
+++ b/controller/editorapicontroller.php
@@ -448,19 +448,6 @@ public function config($fileId, $filePath = null, $shareToken = null, $version =
 				"id" => $this->buildUserId($userId),
 				"name" => $user->getDisplayName()
 			];
-			$avatar = $this->avatarManager->getAvatar($userId);
-			if ($avatar->exists()) {
-				$userAvatarUrl = $this->urlGenerator->getAbsoluteURL(
-					$this->urlGenerator->linkToRoute(
-						"core.avatar.getAvatar",
-						[
-							"userId" => $userId,
-							"size" => 64,
-						]
-					)
-				);
-				$params["editorConfig"]["user"]["image"] = $userAvatarUrl;
-			}
 		}
 
 		$folderLink = null;
diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php
index 38d7e7fe..7aedb397 100644
--- a/controller/editorcontroller.php
+++ b/controller/editorcontroller.php
@@ -448,16 +448,7 @@ public function userInfo($userIds) {
 					];
 					$avatar = $this->avatarManager->getAvatar($user->getUID());
 					if ($avatar->exists()) {
-						$userAvatarUrl = $this->urlGenerator->getAbsoluteURL(
-							$this->urlGenerator->linkToRoute(
-								"core.avatar.getAvatar",
-								[
-									"userId" => $user->getUID(),
-									"size" => 64,
-								]
-							)
-						);
-						$userData["image"] = $userAvatarUrl;
+						$userData["image"] = "data:image/png;base64," . $avatar->get()->__toString();
 					}
 					array_push($result, $userData);
 				}