BC-5142 - BrB registrationlinks lead to 504 Gateway Time-out (#3355)

* Redirect correctly for invalid import hash
hpi-schul-cloud · Dec 1, 2023 · 00269ab · 00269ab
1 parent a703cf1
commit 00269ab
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/controllers/registration.js b/controllers/registration.js
@@ -60,7 +60,11 @@ const getSchoolConsentVersionByType = async (req, res, consentType) => {
 		}
 	} catch (error) {
 		// invalid token
-		throw new Error('Invalid import hash!');
+		logger.warn(
+			'Invalid import hash!',
+			formatError(error),
+		);
+		return Promise.resolve();
 	}
 	return undefined;
 };

diff --git a/static/scripts/dataprivacy/registration-link-validation.js b/static/scripts/dataprivacy/registration-link-validation.js
diff --git a/static/scripts/dataprivacy/registration.js b/static/scripts/dataprivacy/registration.js
@@ -7,11 +7,19 @@ const USER_LANG_SET_KEY = 'USER_LANG_SET';
 window.addEventListener('DOMContentLoaded', () => {
 	// show language settings if not set
 	if (getCookie(USER_LANG_SET_KEY) === 'true') {
-		document.querySelector('#language-screen').style.display = 'none';
-		document.querySelector('#welcome-screen').style.display = 'block';
+		if (document.querySelector('#language-screen')) {
+			document.querySelector('#language-screen').style.display = 'none';
+		}
+		if (document.querySelector('#welcome-screen')) {
+			document.querySelector('#welcome-screen').style.display = 'block';
+		}
 	} else {
-		document.querySelector('#language-screen').style.display = 'block';
-		document.querySelector('#welcome-screen').style.display = 'none';
+		if (document.querySelector('#language-screen')) {
+			document.querySelector('#language-screen').style.display = 'block';
+		}
+		if (document.querySelector('#welcome-screen')) {
+			document.querySelector('#welcome-screen').style.display = 'none';
+		}
 		$('select').trigger('chosen:updated');
 	}