From a585c94c66b5bcaebcc2dbcaa451954817dbd4e1 Mon Sep 17 00:00:00 2001
From: Grishka <git@grishka.me>
Date: Wed, 3 Aug 2022 11:15:59 +0300
Subject: [PATCH] Fix error handling in invite request form

---
 src/main/java/smithereen/routes/SessionRoutes.java        | 8 +++++++-
 .../templates/common/register_request_invite.twig         | 6 ++++++
 src/main/resources/templates/desktop/forms.twig           | 2 +-
 src/main/resources/templates/mobile/forms.twig            | 2 +-
 4 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 src/main/resources/templates/common/register_request_invite.twig

diff --git a/src/main/java/smithereen/routes/SessionRoutes.java b/src/main/java/smithereen/routes/SessionRoutes.java
index 65f24135..853c5429 100644
--- a/src/main/java/smithereen/routes/SessionRoutes.java
+++ b/src/main/java/smithereen/routes/SessionRoutes.java
@@ -411,7 +411,13 @@ public static Object requestSignupInvite(Request req, Response resp){
 			context(req).getUsersController().requestSignupInvite(req, firstName, lastName, email, reason);
 			return new RenderedTemplateResponse("generic_message", req).with("message", lang(req).get("signup_request_submitted"));
 		}catch(UserErrorException x){
-			return wrapForm(req, resp, "register_form_request_invite", "/account/requestInvite", lang(req).get("signup_title"), "request_invitation", "requestInvite", List.of("first_name", "last_name", "email", "reason"), req::queryParams, lang(req).get(x.getMessage()));
+			return new RenderedTemplateResponse("register_request_invite", req)
+					.with("first_name", req.queryParams("first_name"))
+					.with("last_name", req.queryParams("last_name"))
+					.with("email", req.queryParams("email"))
+					.with("reason", req.queryParams("reason"))
+					.with("message", lang(req).get(x.getMessage()))
+					.pageTitle(lang(req).get("signup_title"));
 		}
 	}
 }
diff --git a/src/main/resources/templates/common/register_request_invite.twig b/src/main/resources/templates/common/register_request_invite.twig
new file mode 100644
index 00000000..ad538905
--- /dev/null
+++ b/src/main/resources/templates/common/register_request_invite.twig
@@ -0,0 +1,6 @@
+{%extends "page"%}
+{%block content%}
+<div class="singleColumn">
+{%include "register_form_request_invite"%}
+</div>
+{%endblock%}
\ No newline at end of file
diff --git a/src/main/resources/templates/desktop/forms.twig b/src/main/resources/templates/desktop/forms.twig
index d7f62410..c2ef0dfd 100644
--- a/src/main/resources/templates/desktop/forms.twig
+++ b/src/main/resources/templates/desktop/forms.twig
@@ -71,7 +71,7 @@
 			<label for="{{name}}">{{label}}</label>:
 		</td>
 		<td>
-			<textarea id="{{name}}" name="{{name}}" rows="3" class="control">{{value}}</textarea>
+			<textarea id="{{name}}" name="{{name}}" rows="3" class="control"{% if options.required %} required{% endif %}>{{value}}</textarea>
 			{%if options.explanation is not null%}
 			<br/><span class="formExplanation">{{options.explanation}}</span>
 			{%endif%}
diff --git a/src/main/resources/templates/mobile/forms.twig b/src/main/resources/templates/mobile/forms.twig
index 893e7249..ed66b16e 100644
--- a/src/main/resources/templates/mobile/forms.twig
+++ b/src/main/resources/templates/mobile/forms.twig
@@ -44,7 +44,7 @@
 		<div class="label">
 			<label for="{{name}}">{{label}}</label>:
 		</div>
-		<textarea id="{{name}}" name="{{name}}" rows="3">{{value}}</textarea>
+		<textarea id="{{name}}" name="{{name}}" rows="3"{% if options.required %} required{% endif %}>{{value}}</textarea>
 		{%if options.explanation is not null%}
 		<br/><span class="formExplanation">{{options.explanation}}</span>
 		{%endif%}