Implement guestName for public shares

Signed-off-by: Julius Härtl <jus@bitgrid.net>

1 files changed, 6 insertions, 5 deletions

diff --git a/lib/Service/SessionService.php b/lib/Service/SessionService.php
index a23447914..9de0ea0a9 100644
--- a/lib/Service/SessionService.php
+++ b/lib/Service/SessionService.php
@@ -46,20 +46,21 @@ class SessionService {
 		$this->sessionMapper = $sessionMapper;
 		$this->secureRandom = $secureRandom;
 		$this->timeFactory = $timeFactory;
-		$this->userId = $userId ?? 'Guest';
+		$this->userId = $userId;
 	}
 
-	public function initSession($documentId): Session {
+	public function initSession($documentId, $guestName = null): Session {
 		$session = new Session();
 		$session->setDocumentId($documentId);
-		$session->setUserId($this->userId);
+		$userName = $this->userId ? $this->userId : $guestName;
+		$session->setUserId($userName);
 		$session->setToken($this->secureRandom->generate(64));
 		/** @var IAvatarManager $avatarGenerator */
 		$avatarGenerator = \OC::$server->query(IAvatarManager::class);
-		$color = $avatarGenerator->getGuestAvatar($this->userId)->avatarBackgroundColor($this->userId);
+		$color = $avatarGenerator->getGuestAvatar($userName)->avatarBackgroundColor($userName);
 		$color = sprintf("#%02x%02x%02x", $color->r, $color->g, $color->b);
 		$session->setColor($color);
-		$session->setGuestName(null);
+		$session->setGuestName($guestName);
 		$session->setLastContact($this->timeFactory->getTime());
 		return $this->sessionMapper->insert($session);
 	}