From a818a48c76e4dcf0bf1e071623e05ff272869b67 Mon Sep 17 00:00:00 2001
From: zeripath <art27@cantab.net>
Date: Mon, 20 Dec 2021 20:53:08 +0000
Subject: [PATCH] Move POST /{username}/action/{action} to simply POST
 /{username} (#18045) (#18046)

Backport #18045

The current code unfortunately requires that `action` be a reserved
repository name as it prevents posts to change the settings for
action repositories. However, we can simply change action handler
to work on POST /{username} instead.

Fix #18037

Signed-off-by: Andrew Thornton <art27@cantab.net>
---
 routers/web/user/profile.go | 4 ++--
 routers/web/web.go          | 4 +---
 templates/user/profile.tmpl | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/routers/web/user/profile.go b/routers/web/user/profile.go
index d723263d8a1a..885fece39f20 100644
--- a/routers/web/user/profile.go
+++ b/routers/web/user/profile.go
@@ -321,7 +321,7 @@ func Action(ctx *context.Context) {
 	}
 
 	var err error
-	switch ctx.Params(":action") {
+	switch ctx.Query("action") {
 	case "follow":
 		err = models.FollowUser(ctx.User.ID, u.ID)
 	case "unfollow":
@@ -329,7 +329,7 @@ func Action(ctx *context.Context) {
 	}
 
 	if err != nil {
-		ctx.ServerError(fmt.Sprintf("Action (%s)", ctx.Params(":action")), err)
+		ctx.ServerError(fmt.Sprintf("Action (%s)", ctx.Query("action")), err)
 		return
 	}
 
diff --git a/routers/web/web.go b/routers/web/web.go
index 8e9b3ccb228a..82d5669e82fb 100644
--- a/routers/web/web.go
+++ b/routers/web/web.go
@@ -461,9 +461,7 @@ func RegisterRoutes(m *web.Route) {
 		m.Get("/attachments/{uuid}", repo.GetAttachment)
 	}, ignSignIn)
 
-	m.Group("/{username}", func() {
-		m.Post("/action/{action}", user.Action)
-	}, reqSignIn)
+	m.Post("/{username}", reqSignIn, user.Action)
 
 	if !setting.IsProd() {
 		m.Get("/template/*", dev.TemplatePreview)
diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl
index e5962db65ce6..c66953e687eb 100644
--- a/templates/user/profile.tmpl
+++ b/templates/user/profile.tmpl
@@ -66,12 +66,12 @@
 							{{if and .IsSigned (ne .SignedUserName .Owner.Name)}}
 							<li class="follow">
 								{{if .SignedUser.IsFollowing .Owner.ID}}
-									<form method="post" action="{{.Link}}/action/unfollow?redirect_to={{$.Link}}">
+									<form method="post" action="{{.Link}}?action=unfollow&redirect_to={{$.Link}}">
 										{{$.CsrfTokenHtml}}
 										<button type="submit" class="ui basic red button">{{svg "octicon-person"}} {{.i18n.Tr "user.unfollow"}}</button>
 									</form>
 								{{else}}
-									<form method="post" action="{{.Link}}/action/follow?redirect_to={{$.Link}}">
+									<form method="post" action="{{.Link}}?action=follow&redirect_to={{$.Link}}">
 										{{$.CsrfTokenHtml}}
 										<button type="submit" class="ui basic green button">{{svg "octicon-person"}} {{.i18n.Tr "user.follow"}}</button>
 									</form>