From d37bddb720f01b63fcb431d861870306dc563db7 Mon Sep 17 00:00:00 2001
From: Fornax <wim@fornaxian.tech>
Date: Mon, 29 Nov 2021 23:32:25 +0100
Subject: [PATCH] Fix coupon form a bit

---
 res/template/fragments/form.html       | 1 -
 webcontroller/subscription_activate.go | 9 +++++++++
 webcontroller/web_controller.go        | 4 ++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/res/template/fragments/form.html b/res/template/fragments/form.html
index 6d7b674..e308011 100644
--- a/res/template/fragments/form.html
+++ b/res/template/fragments/form.html
@@ -9,7 +9,6 @@
 				</div>
 			{{else}}
 				<div id="submit_result" class="highlight_red">
-					Something went wrong, please correct these errors before continuing:<br/>
 					<ul>
 						{{range $msg := .SubmitMessages}}
 							<li>{{$msg}}</li>
diff --git a/webcontroller/subscription_activate.go b/webcontroller/subscription_activate.go
index 45dcc03..70180aa 100644
--- a/webcontroller/subscription_activate.go
+++ b/webcontroller/subscription_activate.go
@@ -226,6 +226,15 @@ func (wc *WebController) couponForm(td *TemplateData, r *http.Request) (f Form)
 		return f
 	}
 
+	if !td.Authenticated {
+		f.Submitted = true
+		f.SubmitMessages = []template.HTML{
+			`You need to log in to a pixeldrain account to use the coupon. ` +
+				`<a href="/login">Click here to log in</a>`,
+		}
+		return f
+	}
+
 	if f.ReadInput(r) {
 		if err := td.PixelAPI.PostCouponRedeem(r.FormValue("code")); err != nil {
 			formAPIError(err, &f)
diff --git a/webcontroller/web_controller.go b/webcontroller/web_controller.go
index f79470f..edd3ed2 100644
--- a/webcontroller/web_controller.go
+++ b/webcontroller/web_controller.go
@@ -193,8 +193,8 @@ func New(
 		{GET, "knoxfs_activate", wc.serveForm(wc.knoxfsLinkForm, handlerOpts{Auth: true})},
 		{PST, "knoxfs_activate", wc.serveForm(wc.knoxfsLinkForm, handlerOpts{Auth: true})},
 
-		{GET, "coupon_redeem", wc.serveForm(wc.couponForm, handlerOpts{Auth: true})},
-		{PST, "coupon_redeem", wc.serveForm(wc.couponForm, handlerOpts{Auth: true})},
+		{GET, "coupon_redeem", wc.serveForm(wc.couponForm, handlerOpts{})},
+		{PST, "coupon_redeem", wc.serveForm(wc.couponForm, handlerOpts{})},
 
 		// Admin settings
 		{GET, "admin" /*                */, wc.serveTemplate("admin", handlerOpts{Auth: true})},