Fix public share links (#455)

Fix public share links

.drone.yml

@@ -178,7 +178,7 @@ steps:
     image: nextcloudci/node:node-4
     commands:
       - git status
-      - bash -c "[[ ! \"`git status --porcelain `\" ]] || ( echo 'Uncommited changes in webpack build' && exit 0 )"
+      - bash -c "[[ ! \"`git status --porcelain `\" ]] || ( echo 'Uncommited changes in webpack build' && exit 1 )"
 trigger:
   branch:
     - master

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/components/SessionList.vue

@@ -22,11 +22,12 @@
 
 <template>
 	<div class="session-list">
-		<div v-tooltip.left="editorsTooltip" class="avatar-list" @click="popoverVisible=!popoverVisible">
+		<div v-tooltip.bottom="editorsTooltip" class="avatar-list" @click="popoverVisible=!popoverVisible">
 			<div v-if="sessionsPopover.length > 0" class="avatardiv icon-more" />
 			<Avatar v-for="session in sessionsVisible"
 				:key="session.id"
-				:url="avatarUrl(session)"
+				:user="session.userId ? session.userId : session.guestName"
+				:is-guest="session.userId === null"
 				:disable-tooltip="true"
 				:style="sessionStyle(session)"
 				:size="32" />
@@ -92,7 +93,12 @@ export default {
 		},
 		activeSessions() {
 			return Object.values(this.sessions).filter((session) =>
-				session.lastContact > Date.now() / 1000 - COLLABORATOR_DISCONNECT_TIME && !session.isCurrent && session.userId !== null)
+				session.lastContact > Date.now() / 1000 - COLLABORATOR_DISCONNECT_TIME && !session.isCurrent
+					&& (session.userId !== null || session.guestName !== null)
+			)
+		},
+		currentSession() {
+			return Object.values(this.sessions).find((session) => session.isCurrent)
 		},
 		sessionStyle() {
 			return (session) => {

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)
 			}
 		})