Merge pull request #1026 from nextcloud/fix/1005/refresh_only_once_ev…

…ery_30_s
nextcloud · Sep 8, 2020 · 9b068d1 · 9b068d1
2 parents 77a6488 + 928590d
commit 9b068d1
Show file tree

Hide file tree

Showing 13 changed files with 32 additions and 17 deletions.
diff --git a/js/editor-collab.js b/js/editor-collab.js
diff --git a/js/editor-collab.js.map b/js/editor-collab.js.map
diff --git a/js/files.js b/js/files.js
diff --git a/js/files.js.map b/js/files.js.map
diff --git a/js/public.js b/js/public.js
diff --git a/js/public.js.map b/js/public.js.map
diff --git a/js/text.js b/js/text.js
diff --git a/js/text.js.map b/js/text.js.map
diff --git a/js/viewer.js b/js/viewer.js
diff --git a/js/viewer.js.map b/js/viewer.js.map
diff --git a/lib/Db/Session.php b/lib/Db/Session.php
@@ -27,6 +27,7 @@
 use OCP\AppFramework\Db\Entity;
 
 /**
+ * @method int getLastContact()
  * @method setLastContact(int $getTime)
  * @method getDocumentId()
  * @method getUserId()

diff --git a/lib/Service/SessionService.php b/lib/Service/SessionService.php
@@ -164,7 +164,7 @@ public function getSession($documentId, $sessionId, $token) {
 
 		try {
 			$data = $this->sessionMapper->find($documentId, $sessionId, $token);
-			$this->cache->set($token, json_encode($data), self::SESSION_VALID_TIME);
+			$this->cache->set($token, json_encode($data), self::SESSION_VALID_TIME - 30);
 			return $data;
 		} catch (DoesNotExistException $e) {
 			$this->session = false;
@@ -178,9 +178,23 @@ public function isValidSession($documentId, $sessionId, $token): bool {
 			return false;
 		}
 
-		$session->setLastContact($this->timeFactory->getTime());
-		$this->sessionMapper->update($session);
-		$this->cache->set($token, json_encode($session), self::SESSION_VALID_TIME);
+		$currentTime = $this->timeFactory->getTime();
+		if (($currentTime - $session->getLastContact()) >= 30) {
+			/*
+			 * We need to update the timestamp.
+			 * Make sure that the session we got is still in the database
+			 */
+			try {
+				$session = $this->sessionMapper->find($documentId, $sessionId, $token);
+			} catch (DoesNotExistException $e) {
+				$this->session = false;
+				$this->cache->remove($token);
+				return false;
+			}
+			$session->setLastContact($this->timeFactory->getTime());
+			$this->sessionMapper->update($session);
+			$this->cache->set($token, json_encode($session), self::SESSION_VALID_TIME - 30);
+		}
 		return true;
 	}
 

diff --git a/src/components/SessionList.vue b/src/components/SessionList.vue
@@ -45,8 +45,8 @@ import PopoverMenu from '@nextcloud/vue/dist/Components/PopoverMenu'
 import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip'
 import { generateUrl } from '@nextcloud/router'
 
-const COLLABORATOR_IDLE_TIME = 10
-const COLLABORATOR_DISCONNECT_TIME = 30
+const COLLABORATOR_IDLE_TIME = 60
+const COLLABORATOR_DISCONNECT_TIME = 90
 
 export default {
 	name: 'SessionList',