Reconnect after session has timed out

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

2 files changed, 16 insertions, 1 deletions

diff --git a/src/services/PollingBackend.js b/src/services/PollingBackend.js
index b650516f0..a41d1353f 100644
--- a/src/services/PollingBackend.js
+++ b/src/services/PollingBackend.js
@@ -145,6 +145,8 @@ class PollingBackend {
 				this._authority.emit('error', ERROR_TYPE.SAVE_COLLISSION, {
 					outsideChange: e.response.data.outsideChange
 				})
+			} else if (e.response.status === 403) {
+				this._authority.emit('error', ERROR_TYPE.CONNECTION_FAILED, {})
 			} else {
 				console.error('Failed to fetch steps due to other reason', e)
 			}
@@ -179,6 +181,15 @@ class PollingBackend {
 		}).catch((e) => {
 			console.error('failed to apply steps due to collission, retrying')
 			this.lock = false
+			if (!e.response) {
+				throw e
+			}
+			// Only emit conflict event if we have synced until the latest version
+			if (e.response.status === 403 && e.response.data.document.currentVersion === this._authority.document.currentVersion) {
+				this._authority.emit('error', ERROR_TYPE.PUSH_FAILURE, {})
+				OC.Notification.showTemporary('Changes could not be sent yet')
+			}
+
 			this.fetchSteps()
 			this.carefulRetry()
 		})
diff --git a/src/services/SyncService.js b/src/services/SyncService.js
index 306ffc5f8..2d7a95829 100644
--- a/src/services/SyncService.js
+++ b/src/services/SyncService.js
@@ -42,7 +42,11 @@ const ERROR_TYPE = {
 	 */
 	PUSH_FAILURE: 1,
 
-	LOAD_ERROR: 2
+	LOAD_ERROR: 2,
+
+	CONNECTION_FAILED: 3,
+
+	SOURCE_NOT_FOUND: 4
 }
 
 class SyncService {