Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

feature: allow users to edit their posts within 1 hour (#957)

Guilherme Oenningd193aa0347f5
diff --git a/app/actions/actions.go b/app/actions/actions.go
index 0fb493071..dff3f8485 100644
--- a/app/actions/actions.go
+++ b/app/actions/actions.go
@@ -12,3 +12,9 @@ type Actionable interface {
IsAuthorized(ctx context.Context, user *entity.User) bool
Validate(ctx context.Context, user *entity.User) *validate.Result
}
+
+// PreExecuteAction can add custom pre processing logic for any action
+// OnPreExecute is executed before IsAuthorized and Validate
+type PreExecuteAction interface {
+ OnPreExecute(ctx context.Context) error
+}
diff --git a/app/actions/post.go b/app/actions/post.go
index e4f26dd30..b6c5009ea 100644
--- a/app/actions/post.go
+++ b/app/actions/post.go
@@ -2,6 +2,7 @@ package actions
import (
"context"
+ "time"
"github.com/getfider/fider/app/models/dto"
"github.com/getfider/fider/app/models/entity"
@@ -69,9 +70,25 @@ type UpdatePost struct {
Post *entity.Post
}
+// OnPreExecute prefetches Post for later use
+func (input *UpdatePost) OnPreExecute(ctx context.Context) error {
+ getPost := &query.GetPostByNumber{Number: input.Number}
+ if err := bus.Dispatch(ctx, getPost); err != nil {
+ return err
+ }
+
+ input.Post = getPost.Result
+ return nil
+}
+
// IsAuthorized returns true if current user is authorized to perform this action
-func (action *UpdatePost) IsAuthorized(ctx context.Context, user *entity.User) bool {
- return user != nil && user.IsCollaborator()
+func (input *UpdatePost) IsAuthorized(ctx context.Context, user *entity.User) bool {
+ if user.IsCollaborator() {
+ return true
+ }
+
+ timeAgo := time.Now().UTC().Sub(input.Post.CreatedAt)
+ return input.Post.User.ID == user.ID && timeAgo <= 1 * time.Hour
}
// Validate if current model is valid
@@ -88,13 +105,6 @@ func (action *UpdatePost) Validate(ctx context.Context, user *entity.User) *vali
result.AddFieldFailure("title", "Title must have less than 100 characters.")
}
- postByNumber := &query.GetPostByNumber{Number: action.Number}
- if err := bus.Dispatch(ctx, postByNumber); err != nil {
- return validate.Error(err)
- }
-
- action.Post = postByNumber.Result
-
postBySlug := &query.GetPostBySlug{Slug: slug.Make(action.Title)}
err := bus.Dispatch(ctx, postBySlug)
if err != nil && errors.Cause(err) != app.ErrNotFound {
diff --git a/app/cmd/routes.go b/app/cmd/routes.go
index 31ea95dd7..9b3585d80 100644
--- a/app/cmd/routes.go
+++ b/app/cmd/routes.go
@@ -172,6 +172,7 @@ func routes(r *web.Engine) *web.Engine {
api.Use(middlewares.IsAuthenticated())
api.Post("/api/v1/posts", apiv1.CreatePost())
+ api.Put("/api/v1/posts/:number", apiv1.UpdatePost())
api.Post("/api/v1/posts/:number/comments", apiv1.PostComment())
api.Put("/api/v1/posts/:number/comments/:id", apiv1.UpdateComment())
api.Delete("/api/v1/posts/:number/comments/:id", apiv1.DeleteComment())
@@ -184,7 +185,6 @@ func routes(r *web.Engine) *web.Engine {
api.Use(middlewares.IsAuthorized(enum.RoleCollaborator, enum.RoleAdministrator))
api.Get("/api/v1/users", apiv1.ListUsers())
- api.Put("/api/v1/posts/:number", apiv1.UpdatePost())
api.Get("/api/v1/posts/:number/votes", apiv1.ListVotes())
api.Post("/api/v1/invitations/send", apiv1.SendInvites())
api.Post("/api/v1/invitations/sample", apiv1.SendSampleInvite())
diff --git a/app/handlers/apiv1/post_test.go b/app/handlers/apiv1/post_test.go
index 8ace4a619..72e9c9572 100644
--- a/app/handlers/apiv1/post_test.go
+++ b/app/handlers/apiv1/post_test.go
@@ -5,6 +5,7 @@ import (
"fmt"
"net/http"
"testing"
+ "time"
"github.com/getfider/fider/app"
"github.com/getfider/fider/app/models/entity"
@@ -122,7 +123,48 @@ func TestUpdatePostHandler_TenantStaff(t *testing.T) {
func TestUpdatePostHandler_NonAuthorized(t *testing.T) {
RegisterT(t)
- bus.AddHandler(func(ctx context.Context, q *query.GetPostBySlug) error { return app.ErrNotFound })
+ post := &entity.Post{
+ ID: 5,
+ Number: 5,
+ Title: "My First Post",
+ Description: "Such an amazing description",
+ User: mock.JonSnow,
+ }
+ bus.AddHandler(func(ctx context.Context, q *query.GetPostByNumber) error {
+ if q.Number == post.Number {
+ q.Result = post
+ return nil
+ }
+ return app.ErrNotFound
+ })
+
+ code, _ := mock.NewServer().
+ OnTenant(mock.DemoTenant).
+ AsUser(mock.AryaStark).
+ AddParam("number", "5").
+ ExecutePost(apiv1.UpdatePost(), `{ "title": "the new title", "description": "new description" }`)
+
+ Expect(code).Equals(http.StatusForbidden)
+}
+
+func TestUpdatePostHandler_IsOwner_AfterGracePeriod(t *testing.T) {
+ RegisterT(t)
+
+ post := &entity.Post{
+ ID: 5,
+ Number: 5,
+ Title: "My First Post",
+ Description: "Such an amazing description",
+ User: mock.AryaStark,
+ CreatedAt: time.Now().UTC().Add(-2 * time.Hour),
+ }
+ bus.AddHandler(func(ctx context.Context, q *query.GetPostByNumber) error {
+ if q.Number == post.Number {
+ q.Result = post
+ return nil
+ }
+ return app.ErrNotFound
+ })
code, _ := mock.NewServer().
OnTenant(mock.DemoTenant).
@@ -133,6 +175,39 @@ func TestUpdatePostHandler_NonAuthorized(t *testing.T) {
Expect(code).Equals(http.StatusForbidden)
}
+
+func TestUpdatePostHandler_IsOwner_WithinGracePeriod(t *testing.T) {
+ RegisterT(t)
+
+ post := &entity.Post{
+ ID: 5,
+ Number: 5,
+ Title: "My First Post",
+ Description: "Such an amazing description",
+ User: mock.AryaStark,
+ CreatedAt: time.Now().UTC(),
+ }
+ bus.AddHandler(func(ctx context.Context, q *query.GetPostByNumber) error {
+ if q.Number == post.Number {
+ q.Result = post
+ return nil
+ }
+ return app.ErrNotFound
+ })
+ bus.AddHandler(func(ctx context.Context, q *query.GetPostBySlug) error { return app.ErrNotFound })
+ bus.AddHandler(func(ctx context.Context, cmd *cmd.UploadImages) error { return nil })
+ bus.AddHandler(func(ctx context.Context, cmd *cmd.SetAttachments) error { return nil })
+ bus.AddHandler(func(ctx context.Context, cmd *cmd.UpdatePost) error { return nil })
+
+ code, _ := mock.NewServer().
+ OnTenant(mock.DemoTenant).
+ AsUser(mock.AryaStark).
+ AddParam("number", "5").
+ ExecutePost(apiv1.UpdatePost(), `{ "title": "the new title", "description": "new description" }`)
+
+ Expect(code).Equals(http.StatusOK)
+}
+
func TestUpdatePostHandler_InvalidTitle(t *testing.T) {
RegisterT(t)
diff --git a/app/middlewares/setup.go b/app/middlewares/setup.go
index a5df5dfb3..9a979738a 100644
--- a/app/middlewares/setup.go
+++ b/app/middlewares/setup.go
@@ -36,7 +36,9 @@ func WorkerSetup() worker.MiddlewareFunc {
return
}
- log.Error(c, err)
+ if err != nil {
+ log.Error(c, err)
+ }
log.Infof(c, "Task '@{TaskName:magenta}' finished in @{ElapsedMs:magenta}ms (@{State})", dto.Props{
"State": state,
"TaskName": c.TaskName(),
@@ -76,7 +78,7 @@ func WorkerSetup() worker.MiddlewareFunc {
}
//Still no errors, everything is fine!
- logFinish("committed", err)
+ logFinish("committed", nil)
return nil
}
}
@@ -149,7 +151,7 @@ func WebSetup() web.MiddlewareFunc {
}
//Still no errors, everything is fine!
- logFinish("committed", err)
+ logFinish("committed", nil)
return nil
}
}
diff --git a/app/pkg/mock/setup.go b/app/pkg/mock/setup.go
index 092fbeb9d..84757d695 100644
--- a/app/pkg/mock/setup.go
+++ b/app/pkg/mock/setup.go
@@ -13,12 +13,16 @@ var DemoTenant *entity.Tenant
// AvengersTenant is a mocked tenant
var AvengersTenant *entity.Tenant
-// JonSnow is a mocked user
+// JonSnow is a mocked user (administrator)
var JonSnow *entity.User
-// AryaStark is a mocked user
+// AryaStark is a mocked user (visitor)
var AryaStark *entity.User
+func init() {
+ seed()
+}
+
// NewSingleTenantServer creates a new multitenant test server
func NewSingleTenantServer() *Server {
server := createServer()
diff --git a/app/pkg/web/context.go b/app/pkg/web/context.go
index fb2c61d7a..7cb25114f 100644
--- a/app/pkg/web/context.go
+++ b/app/pkg/web/context.go
@@ -188,9 +188,17 @@ func (c *Context) BindTo(i actions.Actionable) *validate.Result {
}
return validate.Error(errors.Wrap(err, "failed to bind request to action"))
}
+
+ if v, ok := i.(actions.PreExecuteAction); ok {
+ if err := v.OnPreExecute(c); err != nil {
+ return validate.Error(err)
+ }
+ }
+
if !i.IsAuthorized(c, c.User()) {
return validate.Unauthorized()
}
+
return i.Validate(c, c.User())
}
diff --git a/public/pages/ShowPost/ShowPost.page.tsx b/public/pages/ShowPost/ShowPost.page.tsx
index abcb83210..f90d30744 100644
--- a/public/pages/ShowPost/ShowPost.page.tsx
+++ b/public/pages/ShowPost/ShowPost.page.tsx
@@ -2,8 +2,8 @@ import "./ShowPost.page.scss"
import React from "react"
-import { Comment, Post, Tag, Vote, ImageUpload } from "@fider/models"
-import { actions, Failure, Fider } from "@fider/services"
+import { Comment, Post, Tag, Vote, ImageUpload, CurrentUser } from "@fider/models"
+import { actions, Failure, Fider, timeAgo } from "@fider/services"
import {
VoteCounter,
@@ -48,6 +48,15 @@ interface ShowPostPageState {
error?: Failure
}
+const oneHour = 3600
+const canEditPost = (user: CurrentUser, post: Post) => {
+ if (user.isCollaborator) {
+ return true
+ }
+
+ return user.id === post.user.id && timeAgo(post.createdAt) <= oneHour
+}
+
export default class ShowPostPage extends React.Component<ShowPostPageProps, ShowPostPageState> {
constructor(props: ShowPostPageProps) {
super(props)
@@ -138,7 +147,7 @@ export default class ShowPostPage extends React.Component<ShowPostPageProps, Sho
<VStack spacing={4} className="p-show-post__action-col">
<VotesPanel post={this.props.post} votes={this.props.votes} />
- {Fider.session.isAuthenticated && Fider.session.user.isCollaborator && (
+ {Fider.session.isAuthenticated && canEditPost(Fider.session.user, this.props.post) && (
<VStack>
<span key={0} className="text-category">
Actions
@@ -157,7 +166,7 @@ export default class ShowPostPage extends React.Component<ShowPostPageProps, Sho
<Button onClick={this.startEdit}>
<Icon sprite={IconPencilAlt} /> <span>Edit</span>
</Button>
- <ResponseForm post={this.props.post} />
+ {Fider.session.user.isCollaborator && <ResponseForm post={this.props.post} />}
</VStack>
)}
</VStack>
diff --git a/public/services/utils.ts b/public/services/utils.ts
index c01bd3084..a4f3fc958 100644
--- a/public/services/utils.ts
+++ b/public/services/utils.ts
@@ -116,6 +116,11 @@ export const fileToBase64 = async (file: File): Promise<string> => {
})
}
+export const timeAgo = (date: string | Date): number => {
+ const d = date instanceof Date ? date : new Date(date)
+ return (new Date().getTime() - d.getTime()) / 1000
+}
+
export const isCookieEnabled = (): boolean => {
try {
document.cookie = "cookietest=1"