Fix public share links

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

lib/Service/SessionService.php

@@ -70,7 +70,7 @@ class SessionService {
 		$session = new Session();
 		$session->setDocumentId($documentId);
 		$userName = $this->userId ? $this->userId : $guestName;
-		$session->setUserId($userName);
+		$session->setUserId($this->userId);
 		$session->setToken($this->secureRandom->generate(64));
 		$color = $this->avatarManager->getGuestAvatar($userName)->avatarBackgroundColor($userName);
 		$color = sprintf("#%02x%02x%02x", $color->r, $color->g, $color->b);
@@ -124,9 +124,6 @@ class SessionService {
 	}
 
 	public function isValidSession($documentId, $sessionId, $token) {
-		if ($this->userId) {
-			return true;
-		}
 		try {
 			$session = $this->getSession($documentId, $sessionId, $token);
 		} catch (DoesNotExistException $e) {

src/components/EditorWrapper.vue

@@ -363,7 +363,9 @@ export default {
 						this.hasConnectionIssue = true
 						// FIXME: ideally we just try to reconnect in the service, so we don't loose steps
 						OC.Notification.showTemporary('Connection failed, reconnecting')
-						setTimeout(this.reconnect.bind(this), 1000)
+						if (data.retry !== false) {
+							setTimeout(this.reconnect.bind(this), 5000)
+						}
 					}
 					if (error === ERROR_TYPE.SOURCE_NOT_FOUND) {
 						this.initialLoading = false

src/services/PollingBackend.js

@@ -159,6 +159,8 @@ class PollingBackend {
 			} else if (e.response.status === 403) {
 				this._authority.emit('error', ERROR_TYPE.CONNECTION_FAILED, {})
 			} else {
+				this.increaseRefetchTimer()
+				this._authority.emit('error', ERROR_TYPE.CONNECTION_FAILED, {retry: false})
 				console.error('Failed to fetch steps due to other reason', e)
 			}
 		})