Merge pull request #2655 from nextcloud/fix/2651

Fix: Handle invalid form hashes correctly

Author: Chartman123

lib/Controller/PageController.php

@@ -70,9 +70,17 @@ public function index(?string $hash = null): TemplateResponse {
 		$this->insertHeaderOnIos();
 		$this->initialState->provideInitialState('maxStringLengths', Constants::MAX_STRING_LENGTHS);
 		$this->initialState->provideInitialState('appConfig', $this->configService->getAppConfig());
+
 		if (isset($hash)) {
-			$this->initialState->provideInitialState('formId', $this->formMapper->findByHash($hash)->id);
+			try {
+				$form = $this->formMapper->findByHash($hash);
+				$this->initialState->provideInitialState('formId', $form->id);
+			} catch (DoesNotExistException $e) {
+				// Provide null to indicate no form was found
+				$this->initialState->provideInitialState('formId', 'invalid');
+			}
 		}
+
 		return new TemplateResponse($this->appName, self::TEMPLATE_MAIN, [
 			'id-app-content' => '#app-content-vue',
 			'id-app-navigation' => '#app-navigation-vue',

src/Forms.vue

@@ -251,6 +251,11 @@ export default {
 
 		// If the user is allowed to access this route
 		routeAllowed() {
+			// Check formId from initial state on app initialization
+			if (this.loading && loadState(appName, 'formId') === 'invalid') {
+				return false
+			}
+
 			// Not allowed, if no hash
 			if (!this.routeHash) {
 				return false
@@ -420,17 +425,16 @@ export default {
 					showError(t('forms', 'Form not found'))
 
 					if ([403, 404].includes(error.response?.status)) {
-						this.$router.push({ name: 'root' })
+						if (this.$route.name !== 'root') {
+							this.$router.push({ name: 'root' })
+						}
 					}
 				}
 			}
 
 			this.loading = false
 		},
 
-		/**
-		 *
-		 */
 		async onNewForm() {
 			try {
 				// Request a new empty form
@@ -487,7 +491,7 @@ export default {
 			this.forms.splice(formIndex, 1)
 
 			// Redirect if current form has been deleted
-			if (deletedHash === this.routeHash) {
+			if (deletedHash === this.routeHash && this.$route.name !== 'root') {
 				this.$router.push({ name: 'root' })
 			}
 		},