Fix uncatched errors on push stepsbugfix/1311

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

2 files changed, 14 insertions, 5 deletions

diff --git a/lib/Service/ApiService.php b/lib/Service/ApiService.php
index b7148c6d1..4f0370d0b 100644
--- a/lib/Service/ApiService.php
+++ b/lib/Service/ApiService.php
@@ -138,6 +138,10 @@ class ApiService {
 	 */
 	public function push($documentId, $sessionId, $sessionToken, $version, $steps, $token = null): DataResponse {
 		$session = $this->sessionService->getSession($documentId, $sessionId, $sessionToken);
+		if ($session === false || !$this->sessionService->isValidSession($documentId, $sessionId, $sessionToken)) {
+			return new DataResponse([], 403);
+		}
+
 		$file = $this->documentService->getFileForSession($session, $token);
 		if ($this->sessionService->isValidSession($documentId, $sessionId, $sessionToken) && !$this->documentService->isReadOnly($file, $token)) {
 			try {
diff --git a/src/services/PollingBackend.js b/src/services/PollingBackend.js
index 42349451d..31960223d 100644
--- a/src/services/PollingBackend.js
+++ b/src/services/PollingBackend.js
@@ -214,15 +214,20 @@ class PollingBackend {
 			this.lock = false
 			this.fetchSteps()
 		}).catch((e) => {
-			console.error('failed to apply steps due to collission, retrying')
 			this.lock = false
 			if (!e.response || e.code === 'ECONNABORTED') {
 				this._authority.emit('error', ERROR_TYPE.CONNECTION_FAILED, {})
 				return
-			} else if (e.response.status === 403 && e.response.data.document.currentVersion === this._authority.document.currentVersion) {
-				// Only emit conflict event if we have synced until the latest version
-				this._authority.emit('error', ERROR_TYPE.PUSH_FAILURE, {})
-				OC.Notification.showTemporary('Changes could not be sent yet')
+			} else if (e.response.status === 403) {
+				this._authority.emit('error', ERROR_TYPE.CONNECTION_FAILED, { retry: false })
+				return
+			} else if (e.response.status === 412) {
+				console.error('failed to apply steps due to collission, retrying', e)
+				if (e.response?.data?.document?.currentVersion === this._authority.document.currentVersion) {
+					// Only emit conflict event if we have synced until the latest version
+					this._authority.emit('error', ERROR_TYPE.PUSH_FAILURE, {})
+					OC.Notification.showTemporary('Changes could not be sent yet')
+				}
 			}
 
 			this.fetchSteps()