Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

fix: redirect user to new url if slug has changed (#818)

Guilherme Oenning120651813bfc
diff --git a/app/cmd/routes.go b/app/cmd/routes.go
index 216b75801..ca13df8a8 100644
--- a/app/cmd/routes.go
+++ b/app/cmd/routes.go
@@ -101,7 +101,7 @@ func routes(r *web.Engine) *web.Engine {
r.Get("/", handlers.Index())
r.Get("/posts/:number", handlers.PostDetails())
- r.Get("/posts/:number/*all", handlers.PostDetails())
+ r.Get("/posts/:number/:slug", handlers.PostDetails())
/*
** This is a temporary redirect and should be removed in the future
diff --git a/app/handlers/post.go b/app/handlers/post.go
index 40cc26475..946432a1f 100644
--- a/app/handlers/post.go
+++ b/app/handlers/post.go
@@ -1,6 +1,8 @@
package handlers
import (
+ "fmt"
+
"github.com/getfider/fider/app/models/query"
"github.com/getfider/fider/app/pkg/bus"
"github.com/getfider/fider/app/pkg/csv"
@@ -58,6 +60,10 @@ func PostDetails() web.HandlerFunc {
return c.Failure(err)
}
+ if c.Param("slug") != getPost.Result.Slug {
+ return c.Redirect(fmt.Sprintf("/posts/%d/%s", getPost.Result.Number, getPost.Result.Slug))
+ }
+
isSubscribed := &query.UserSubscribedTo{PostID: getPost.Result.ID}
getComments := &query.GetCommentsByPost{Post: getPost.Result}
getAllTags := &query.GetAllTags{}
diff --git a/app/handlers/post_test.go b/app/handlers/post_test.go
index 76098f6cc..d28b2dc93 100644
--- a/app/handlers/post_test.go
+++ b/app/handlers/post_test.go
@@ -42,7 +42,7 @@ func TestIndexHandler(t *testing.T) {
func TestDetailsHandler(t *testing.T) {
RegisterT(t)
- post := &models.Post{Number: 1, Title: "My Post Title"}
+ post := &models.Post{Number: 1, Title: "My Post Title", Slug: "my-post-title"}
bus.AddHandler(func(ctx context.Context, q *query.GetPostByNumber) error {
q.Result = post
@@ -75,11 +75,35 @@ func TestDetailsHandler(t *testing.T) {
OnTenant(mock.DemoTenant).
AsUser(mock.JonSnow).
AddParam("number", post.Number).
+ AddParam("slug", post.Slug).
Execute(handlers.PostDetails())
Expect(code).Equals(http.StatusOK)
}
+func TestDetailsHandler_RedirectOnDifferentSlu(t *testing.T) {
+ RegisterT(t)
+
+ post := &models.Post{Number: 1, Title: "My Post Title", Slug: "my-post-title"}
+
+ bus.AddHandler(func(ctx context.Context, q *query.GetPostByNumber) error {
+ q.Result = post
+ return nil
+ })
+
+ server := mock.NewServer()
+
+ code, response := server.
+ OnTenant(mock.DemoTenant).
+ AsUser(mock.JonSnow).
+ AddParam("number", post.Number).
+ AddParam("slug", "some-other-slug").
+ Execute(handlers.PostDetails())
+
+ Expect(code).Equals(http.StatusTemporaryRedirect)
+ Expect(response.Header().Get("Location")).Equals("/posts/1/my-post-title")
+}
+
func TestDetailsHandler_NotFound(t *testing.T) {
RegisterT(t)