Open platform to collect and prioritize feedback
refactor: move some API to /api/v1 (#481)
Guilherme Oenning5a0177bd8322
diff --git a/app/actions/user.go b/app/actions/user.goindex 8f3b8bb1f..846883416 100644--- a/app/actions/user.go+++ b/app/actions/user.go@@ -35,12 +35,12 @@ func (input *ChangeUserRole) Validate(user *models.User, services *app.Services)target, err := services.Users.GetByID(input.Model.UserID)if err != nil {if errors.Cause(err) == app.ErrNotFound {- result.AddFieldFailure("user_id", "User not found")+ result.AddFieldFailure("userId", "User not found")} else {return validate.Error(err)}} else if target.Tenant.ID != user.Tenant.ID {- result.AddFieldFailure("user_id", "User not found")+ result.AddFieldFailure("userId", "User not found")}return result}diff --git a/app/actions/user_test.go b/app/actions/user_test.goindex f24988b83..aa8e6f35b 100644--- a/app/actions/user_test.go+++ b/app/actions/user_test.go@@ -63,7 +63,7 @@ func TestChangeUserRole_InvalidUser(t *testing.T) {action := actions.ChangeUserRole{Model: &models.ChangeUserRole{UserID: 999, Role: models.RoleAdministrator}}action.IsAuthorized(currentUser, nil)result := action.Validate(currentUser, services)- ExpectFailed(result, "user_id")+ ExpectFailed(result, "userId")}func TestChangeUserRole_InvalidUser_Tenant(t *testing.T) {@@ -83,5 +83,5 @@ func TestChangeUserRole_InvalidUser_Tenant(t *testing.T) {action := actions.ChangeUserRole{Model: &models.ChangeUserRole{UserID: targetUser.ID, Role: models.RoleAdministrator}}action.IsAuthorized(currentUser, nil)result := action.Validate(currentUser, services)- ExpectFailed(result, "user_id")+ ExpectFailed(result, "userId")}diff --git a/app/cmd/routes.go b/app/cmd/routes.goindex a2ce33226..00dc80c92 100644--- a/app/cmd/routes.go+++ b/app/cmd/routes.go@@ -6,6 +6,7 @@ import ("time""github.com/getfider/fider/app/handlers"+ "github.com/getfider/fider/app/handlers/apiv1""github.com/getfider/fider/app/middlewares""github.com/getfider/fider/app/models""github.com/getfider/fider/app/pkg/web"@@ -39,8 +40,8 @@ func routes(r *web.Engine) *web.Engine {{noTenant.Get("/-/health", handlers.Health())- noTenant.Post("/api/tenants", handlers.CreateTenant())- noTenant.Get("/api/tenants/:subdomain/availability", handlers.CheckAvailability())+ noTenant.Post("/_api/tenants", handlers.CreateTenant())+ noTenant.Get("/_api/tenants/:subdomain/availability", handlers.CheckAvailability())noTenant.Get("/signup", handlers.SignUp())noTenant.Get("/oauth/:provider", handlers.SignInByOAuth())@@ -70,8 +71,8 @@ func routes(r *web.Engine) *web.Engine {open.Get("/not-invited", handlers.NotInvitedPage())open.Get("/signin/verify", handlers.VerifySignInKey(models.EmailVerificationKindSignIn))open.Get("/invite/verify", handlers.VerifySignInKey(models.EmailVerificationKindUserInvitation))- open.Post("/api/signin/complete", handlers.CompleteSignInProfile())- open.Post("/api/signin", handlers.SignInByEmail())+ open.Post("/_api/signin/complete", handlers.CompleteSignInProfile())+ open.Post("/_api/signin", handlers.SignInByEmail())}r.Use(middlewares.User())@@ -84,7 +85,7 @@ func routes(r *web.Engine) *web.Engine {public := page.Group(){public.Get("/", handlers.Index())- public.Get("/api/posts/search", handlers.SearchPosts())+ public.Get("/api/v1/posts", apiv1.SearchPosts())public.Get("/posts/:number", handlers.PostDetails())public.Get("/posts/:number/*all", handlers.PostDetails())public.Get("/signout", handlers.SignOut())@@ -107,22 +108,22 @@ func routes(r *web.Engine) *web.Engine {private.Get("/notifications/:id", handlers.ReadNotification())private.Get("/change-email/verify", handlers.VerifyChangeEmailKey())- private.Post("/api/posts", handlers.CreatePost())- private.Post("/api/posts/:number", handlers.UpdatePost())- private.Post("/api/posts/:number/comments", handlers.PostComment())- private.Post("/api/posts/:number/comments/:id", handlers.UpdateComment())- private.Post("/api/posts/:number/status", handlers.SetResponse())- private.Post("/api/posts/:number/support", handlers.AddSupporter())- private.Post("/api/posts/:number/unsupport", handlers.RemoveSupporter())- private.Post("/api/posts/:number/subscribe", handlers.Subscribe())- private.Post("/api/posts/:number/unsubscribe", handlers.Unsubscribe())- private.Post("/api/posts/:number/tags/:slug", handlers.AssignTag())- private.Delete("/api/posts/:number/tags/:slug", handlers.UnassignTag())- private.Delete("/api/user", handlers.DeleteUser())- private.Post("/api/user/settings", handlers.UpdateUserSettings())- private.Post("/api/user/change-email", handlers.ChangeUserEmail())- private.Post("/api/notifications/read-all", handlers.ReadAllNotifications())- private.Get("/api/notifications/unread/total", handlers.TotalUnreadNotifications())+ private.Post("/api/v1/posts", apiv1.CreatePost())+ private.Put("/api/v1/posts/:number", apiv1.UpdatePost())+ private.Post("/api/v1/posts/:number/comments", apiv1.PostComment())+ private.Put("/api/v1/posts/:number/comments/:id", apiv1.UpdateComment())+ private.Put("/api/v1/posts/:number/status", apiv1.SetResponse())+ private.Post("/api/v1/posts/:number/support", apiv1.AddSupporter())+ private.Delete("/api/v1/posts/:number/support", apiv1.RemoveSupporter())+ private.Post("/api/v1/posts/:number/subscription", apiv1.Subscribe())+ private.Delete("/api/v1/posts/:number/subscription", apiv1.Unsubscribe())+ private.Post("/api/v1/posts/:number/tags/:slug", apiv1.AssignTag())+ private.Delete("/api/v1/posts/:number/tags/:slug", apiv1.UnassignTag())+ private.Delete("/_api/user", handlers.DeleteUser())+ private.Post("/_api/user/settings", handlers.UpdateUserSettings())+ private.Post("/_api/user/change-email", handlers.ChangeUserEmail())+ private.Post("/_api/notifications/read-all", handlers.ReadAllNotifications())+ private.Get("/_api/notifications/unread/total", handlers.TotalUnreadNotifications())private.Use(middlewares.IsAuthorized(models.RoleCollaborator, models.RoleAdministrator))@@ -133,23 +134,23 @@ func routes(r *web.Engine) *web.Engine {private.Get("/admin/members", handlers.ManageMembers())private.Get("/admin/tags", handlers.ManageTags())private.Get("/admin/authentication", handlers.ManageAuthentication())- private.Get("/api/admin/oauth/:provider", handlers.GetOAuthConfig())- private.Post("/api/admin/invitations/send", handlers.SendInvites())- private.Post("/api/admin/invitations/sample", handlers.SendSampleInvite())+ private.Get("/_api/admin/oauth/:provider", handlers.GetOAuthConfig())+ private.Post("/api/v1/invitations/send", apiv1.SendInvites())+ private.Post("/api/v1/invitations/sample", apiv1.SendSampleInvite())private.Use(middlewares.IsAuthorized(models.RoleAdministrator))private.Get("/admin/export", handlers.Page("Export · Site Settings", ""))private.Get("/admin/export/posts.csv", handlers.ExportPostsToCSV())- private.Delete("/api/posts/:number", handlers.DeletePost())- private.Post("/api/admin/settings/general", handlers.UpdateSettings())- private.Post("/api/admin/settings/advanced", handlers.UpdateAdvancedSettings())- private.Post("/api/admin/settings/privacy", handlers.UpdatePrivacy())- private.Delete("/api/admin/tags/:slug", handlers.DeleteTag())- private.Post("/api/admin/tags/:slug", handlers.CreateEditTag())- private.Post("/api/admin/tags", handlers.CreateEditTag())- private.Post("/api/admin/oauth", handlers.SaveOAuthConfig())- private.Post("/api/admin/users/:user_id/role", handlers.ChangeUserRole())+ private.Delete("/api/v1/posts/:number", apiv1.DeletePost())+ private.Post("/_api/admin/settings/general", handlers.UpdateSettings())+ private.Post("/_api/admin/settings/advanced", handlers.UpdateAdvancedSettings())+ private.Post("/_api/admin/settings/privacy", handlers.UpdatePrivacy())+ private.Post("/api/v1/tags", apiv1.CreateEditTag())+ private.Put("/api/v1/tags/:slug", apiv1.CreateEditTag())+ private.Delete("/api/v1/tags/:slug", apiv1.DeleteTag())+ private.Post("/_api/admin/oauth", handlers.SaveOAuthConfig())+ private.Post("/api/v1/roles/:role/users", handlers.ChangeUserRole())}}diff --git a/app/handlers/invite.go b/app/handlers/apiv1/invite.gosimilarity index 98%rename from app/handlers/invite.gorename to app/handlers/apiv1/invite.goindex 231860219..b6b17f6eb 100644--- a/app/handlers/invite.go+++ b/app/handlers/apiv1/invite.go@@ -1,4 +1,4 @@-package handlers+package apiv1import ("strings"diff --git a/app/handlers/apiv1/post.go b/app/handlers/apiv1/post.gonew file mode 100644index 000000000..f9e3efa97--- /dev/null+++ b/app/handlers/apiv1/post.go@@ -0,0 +1,199 @@+package apiv1++import (+ "github.com/getfider/fider/app/actions"+ "github.com/getfider/fider/app/models"+ "github.com/getfider/fider/app/pkg/web"+ "github.com/getfider/fider/app/tasks"+)++// SearchPosts return existing posts based on search criteria+func SearchPosts() web.HandlerFunc {+ return func(c web.Context) error {+ posts, err := c.Services().Posts.Search(+ c.QueryParam("q"),+ c.QueryParam("f"),+ c.QueryParam("l"),+ c.QueryParamAsArray("t"),+ )+ if err != nil {+ return c.Failure(err)+ }+ return c.Ok(posts)+ }+}++// CreatePost creates a new post on current tenant+func CreatePost() web.HandlerFunc {+ return func(c web.Context) error {+ input := new(actions.CreateNewPost)+ if result := c.BindTo(input); !result.Ok {+ return c.HandleValidation(result)+ }++ posts := c.Services().Posts+ post, err := posts.Add(input.Model.Title, input.Model.Description)+ if err != nil {+ return c.Failure(err)+ }++ if err := posts.AddSupporter(post, c.User()); err != nil {+ return c.Failure(err)+ }++ c.Enqueue(tasks.NotifyAboutNewPost(post))++ return c.Ok(post)+ }+}++// UpdatePost updates an existing post of current tenant+func UpdatePost() web.HandlerFunc {+ return func(c web.Context) error {+ input := new(actions.UpdatePost)+ if result := c.BindTo(input); !result.Ok {+ return c.HandleValidation(result)+ }++ _, err := c.Services().Posts.Update(input.Post, input.Model.Title, input.Model.Description)+ if err != nil {+ return c.Failure(err)+ }++ return c.Ok(web.Map{})+ }+}++// SetResponse changes current post staff response+func SetResponse() web.HandlerFunc {+ return func(c web.Context) error {+ input := new(actions.SetResponse)+ if result := c.BindTo(input); !result.Ok {+ return c.HandleValidation(result)+ }++ post, err := c.Services().Posts.GetByNumber(input.Model.Number)+ if err != nil {+ return c.Failure(err)+ }++ prevStatus := post.Status+ if input.Model.Status == models.PostDuplicate {+ err = c.Services().Posts.MarkAsDuplicate(post, input.Original)+ } else {+ err = c.Services().Posts.SetResponse(post, input.Model.Text, input.Model.Status)+ }+ if err != nil {+ return c.Failure(err)+ }++ c.Enqueue(tasks.NotifyAboutStatusChange(post, prevStatus))++ return c.Ok(web.Map{})+ }+}++// DeletePost deletes an existing post of current tenant+func DeletePost() web.HandlerFunc {+ return func(c web.Context) error {+ input := new(actions.DeletePost)+ if result := c.BindTo(input); !result.Ok {+ return c.HandleValidation(result)+ }++ err := c.Services().Posts.SetResponse(input.Post, input.Model.Text, models.PostDeleted)+ if err != nil {+ return c.Failure(err)+ }++ return c.Ok(web.Map{})+ }+}++// PostComment creates a new comment on given post+func PostComment() web.HandlerFunc {+ return func(c web.Context) error {+ input := new(actions.AddNewComment)+ if result := c.BindTo(input); !result.Ok {+ return c.HandleValidation(result)+ }++ post, err := c.Services().Posts.GetByNumber(input.Model.Number)+ if err != nil {+ return c.Failure(err)+ }++ _, err = c.Services().Posts.AddComment(post, input.Model.Content)+ if err != nil {+ return c.Failure(err)+ }++ c.Enqueue(tasks.NotifyAboutNewComment(post, input.Model))++ return c.Ok(web.Map{})+ }+}++// UpdateComment changes an existing comment with new content+func UpdateComment() web.HandlerFunc {+ return func(c web.Context) error {+ input := new(actions.EditComment)+ if result := c.BindTo(input); !result.Ok {+ return c.HandleValidation(result)+ }++ err := c.Services().Posts.UpdateComment(input.Model.ID, input.Model.Content)+ if err != nil {+ return c.Failure(err)+ }++ return c.Ok(web.Map{})+ }+}++// AddSupporter adds current user to given post list of supporters+func AddSupporter() web.HandlerFunc {+ return func(c web.Context) error {+ return addOrRemove(c, c.Services().Posts.AddSupporter)+ }+}++// RemoveSupporter removes current user from given post list of supporters+func RemoveSupporter() web.HandlerFunc {+ return func(c web.Context) error {+ return addOrRemove(c, c.Services().Posts.RemoveSupporter)+ }+}++// Subscribe adds current user to list of subscribers of given post+func Subscribe() web.HandlerFunc {+ return func(c web.Context) error {+ return addOrRemove(c, c.Services().Posts.AddSubscriber)+ }+}++// Unsubscribe removes current user from list of subscribers of given post+func Unsubscribe() web.HandlerFunc {+ return func(c web.Context) error {+ return addOrRemove(c, c.Services().Posts.RemoveSubscriber)+ }+}++func addOrRemove(c web.Context, addOrRemove func(post *models.Post, user *models.User) error) error {+ number, err := c.ParamAsInt("number")+ if err != nil {+ return c.Failure(err)+ }++ post, err := c.Services().Posts.GetByNumber(number)+ if err != nil {+ return c.Failure(err)+ }++ err = addOrRemove(post, c.User())+ if err != nil {+ return c.Failure(err)+ }++ return c.Ok(web.Map{})+}diff --git a/app/handlers/apiv1/post_test.go b/app/handlers/apiv1/post_test.gonew file mode 100644index 000000000..7b0653690--- /dev/null+++ b/app/handlers/apiv1/post_test.go@@ -0,0 +1,407 @@+package apiv1_test++import (+ "fmt"+ "net/http"+ "testing"++ "github.com/getfider/fider/app"+ "github.com/getfider/fider/app/handlers/apiv1"+ "github.com/getfider/fider/app/models"+ . "github.com/getfider/fider/app/pkg/assert"+ "github.com/getfider/fider/app/pkg/errors"+ "github.com/getfider/fider/app/pkg/mock"+)++func TestCreatePostHandler(t *testing.T) {+ RegisterT(t)++ server, services := mock.NewServer()+ code, _ := server.+ OnTenant(mock.DemoTenant).+ AsUser(mock.JonSnow).+ ExecutePost(apiv1.CreatePost(), `{ "title": "My newest post :)" }`)++ post, err := services.Posts.GetByID(1)+ Expect(code).Equals(http.StatusOK)+ Expect(err).IsNil()+ Expect(post.Title).Equals("My newest post :)")+ Expect(post.TotalSupporters).Equals(1)+}++func TestCreatePostHandler_WithoutTitle(t *testing.T) {+ RegisterT(t)++ server, services := mock.NewServer()+ code, _ := server.+ OnTenant(mock.DemoTenant).+ AsUser(mock.JonSnow).+ ExecutePost(apiv1.CreatePost(), `{ "title": "" }`)++ _, err := services.Posts.GetByID(1)+ Expect(code).Equals(http.StatusBadRequest)+ Expect(err).IsNotNil()+}++func TestUpdatePostHandler_TenantStaff(t *testing.T) {+ RegisterT(t)++ server, services := mock.NewServer()+ services.SetCurrentTenant(mock.DemoTenant)+ services.SetCurrentUser(mock.AryaStark)+ post, _ := services.Posts.Add("My First Post", "With a description")++ code, _ := server.+ OnTenant(mock.DemoTenant).+ AsUser(mock.JonSnow).+ AddParam("number", post.Number).+ ExecutePost(apiv1.UpdatePost(), `{ "title": "the new title", "description": "new description" }`)++ post, _ = services.Posts.GetByNumber(post.Number)+ Expect(code).Equals(http.StatusOK)+ Expect(post.Title).Equals("the new title")+ Expect(post.Description).Equals("new description")+}++func TestUpdatePostHandler_NonAuthorized(t *testing.T) {+ RegisterT(t)++ server, services := mock.NewServer()+ services.SetCurrentTenant(mock.DemoTenant)+ services.SetCurrentUser(mock.JonSnow)+ post, _ := services.Posts.Add("My First Post", "With a description")++ code, _ := server.+ OnTenant(mock.DemoTenant).+ AsUser(mock.AryaStark).+ AddParam("number", post.Number).+ ExecutePost(apiv1.UpdatePost(), `{ "title": "the new title", "description": "new description" }`)++ Expect(code).Equals(http.StatusForbidden)+}++func TestUpdatePostHandler_InvalidTitle(t *testing.T) {+ RegisterT(t)++ server, services := mock.NewServer()+ services.SetCurrentTenant(mock.DemoTenant)+ services.SetCurrentUser(mock.JonSnow)+ post, _ := services.Posts.Add("My First Post", "With a description")++ code, _ := server.+ OnTenant(mock.DemoTenant).+ AsUser(mock.JonSnow).+ AddParam("number", post.Number).+ ExecutePost(apiv1.UpdatePost(), `{ "title": "", "description": "" }`)++ Expect(code).Equals(http.StatusBadRequest)+}++func TestUpdatePostHandler_InvalidPost(t *testing.T) {+ RegisterT(t)++ server, _ := mock.NewServer()++ code, _ := server.+ OnTenant(mock.DemoTenant).+ AsUser(mock.JonSnow).+ AddParam("number", 999).+ ExecutePost(apiv1.UpdatePost(), `{ "title": "This is a good title!", "description": "And description too..." }`)++ Expect(code).Equals(http.StatusNotFound)+}++func TestUpdatePostHandler_DuplicateTitle(t *testing.T) {+ RegisterT(t)++ server, services := mock.NewServer()+ services.SetCurrentTenant(mock.DemoTenant)+ services.SetCurrentUser(mock.JonSnow)+ post1, _ := services.Posts.Add("My First Post", "With a description")+ services.Posts.Add("My Second Post", "With a description")++ code, _ := server.+ OnTenant(mock.DemoTenant).+ AsUser(mock.JonSnow).+ AddParam("number", post1.Number).+ ExecutePost(apiv1.UpdatePost(), `{ "title": "My Second Post", "description": "And description too..." }`)++ Expect(code).Equals(http.StatusBadRequest)+}++func TestSetResponseHandler(t *testing.T) {+ RegisterT(t)++ server, services := mock.NewServer()+ services.SetCurrentTenant(mock.DemoTenant)+ services.SetCurrentUser(mock.AryaStark)+ post, _ := services.Posts.Add("The Post #1", "The Description #1")+ services.Posts.AddSupporter(post, mock.AryaStark)++ code, _ := server.+ OnTenant(mock.DemoTenant).+ AsUser(mock.JonSnow).+ AddParam("number", post.ID).+ ExecutePost(apiv1.SetResponse(), fmt.Sprintf(`{ "status": %d, "text": "Done!" }`, models.PostCompleted))++ post, _ = services.Posts.GetByNumber(post.Number)++ Expect(code).Equals(http.StatusOK)+ Expect(post.Status).Equals(models.PostCompleted)+ Expect(post.Response.Text).Equals("Done!")+ Expect(post.Response.User.ID).Equals(mock.JonSnow.ID)+}++func TestSetResponseHandler_Unauthorized(t *testing.T) {+ RegisterT(t)++ server, services := mock.NewServer()+ services.SetCurrentTenant(mock.DemoTenant)+ services.SetCurrentUser(mock.AryaStark)+ post, _ := services.Posts.Add("The Post #1", "The Description #1")+ services.Posts.AddSupporter(post, mock.AryaStark)++ code, _ := server.+ OnTenant(mock.DemoTenant).+ AsUser(mock.AryaStark).+ AddParam("number", post.ID).+ ExecutePost(apiv1.SetResponse(), fmt.Sprintf(`{ "status": %d, "text": "Done!" }`, models.PostCompleted))++ post, _ = services.Posts.GetByNumber(post.Number)++ Expect(code).Equals(http.StatusForbidden)+ Expect(post.Status).Equals(models.PostOpen)+}++func TestSetResponseHandler_Duplicate(t *testing.T) {+ RegisterT(t)++ server, services := mock.NewServer()+ services.SetCurrentTenant(mock.DemoTenant)+ services.SetCurrentUser(mock.AryaStark)+ post1, _ := services.Posts.Add("The Post #1", "The Description #1")+ post2, _ := services.Posts.Add("The Post #2", "The Description #2")++ body := fmt.Sprintf(`{ "status": %d, "originalNumber": %d }`, models.PostDuplicate, post2.Number)+ code, _ := server.+ OnTenant(mock.DemoTenant).+ AsUser(mock.JonSnow).+ AddParam("number", post1.ID).+ ExecutePost(apiv1.SetResponse(), body)+ Expect(code).Equals(http.StatusOK)++ post1, _ = services.Posts.GetByNumber(post1.Number)+ Expect(post1.Status).Equals(models.PostDuplicate)++ post2, _ = services.Posts.GetByNumber(post2.Number)+ Expect(post2.Status).Equals(models.PostOpen)+}++func TestSetResponseHandler_Duplicate_NotFound(t *testing.T) {+ RegisterT(t)++ server, services := mock.NewServer()+ services.SetCurrentTenant(mock.DemoTenant)+ services.SetCurrentUser(mock.AryaStark)+ post1, _ := services.Posts.Add("The Post #1", "The Description #1")++ body := fmt.Sprintf(`{ "status": %d, "originalNumber": 9999 }`, models.PostDuplicate)+ code, _ := server.+ OnTenant(mock.DemoTenant).+ AsUser(mock.JonSnow).+ AddParam("number", post1.ID).+ ExecutePost(apiv1.SetResponse(), body)++ Expect(code).Equals(http.StatusBadRequest)+}++func TestSetResponseHandler_Duplicate_Itself(t *testing.T) {+ RegisterT(t)++ server, services := mock.NewServer()+ services.SetCurrentTenant(mock.DemoTenant)+ services.SetCurrentUser(mock.AryaStark)+ post, _ := services.Posts.Add("The Post #1", "The Description #1")++ body := fmt.Sprintf(`{ "status": %d, "originalNumber": %d }`, models.PostDuplicate, post.Number)+ code, _ := server.+ OnTenant(mock.DemoTenant).+ AsUser(mock.JonSnow).+ AddParam("number", post.ID).+ ExecutePost(apiv1.SetResponse(), body)++ Expect(code).Equals(http.StatusBadRequest)+}++func TestAddSupporterHandler(t *testing.T) {+ RegisterT(t)++ server, services := mock.NewServer()+ services.SetCurrentTenant(mock.DemoTenant)+ services.SetCurrentUser(mock.JonSnow)+ first, _ := services.Posts.Add("The Post #1", "The Description #1")+ second, _ := services.Posts.Add("The Post #2", "The Description #2")++ code, _ := server.+ OnTenant(mock.DemoTenant).+ AsUser(mock.AryaStark).+ AddParam("number", second.Number).+ Execute(apiv1.AddSupporter())++ first, _ = services.Posts.GetByNumber(1)+ second, _ = services.Posts.GetByNumber(2)++ Expect(code).Equals(http.StatusOK)+ Expect(first.TotalSupporters).Equals(0)+ Expect(second.TotalSupporters).Equals(1)+}++func TestAddSupporterHandler_InvalidPost(t *testing.T) {+ RegisterT(t)++ server, _ := mock.NewServer()+ code, _ := server.+ OnTenant(mock.DemoTenant).+ AsUser(mock.AryaStark).+ AddParam("number", 999).+ Execute(apiv1.AddSupporter())++ Expect(code).Equals(http.StatusNotFound)+}++func TestRemoveSupporterHandler(t *testing.T) {+ RegisterT(t)++ server, services := mock.NewServer()+ services.SetCurrentTenant(mock.DemoTenant)+ services.SetCurrentUser(mock.JonSnow)+ post, _ := services.Posts.Add("The Post #1", "The Description #1")+ services.Posts.AddSupporter(post, mock.JonSnow)+ services.Posts.AddSupporter(post, mock.AryaStark)++ code, _ := server.+ OnTenant(mock.DemoTenant).+ AsUser(mock.AryaStark).+ AddParam("number", post.ID).+ Execute(apiv1.RemoveSupporter())++ post, _ = services.Posts.GetByNumber(post.Number)++ Expect(code).Equals(http.StatusOK)+ Expect(post.TotalSupporters).Equals(1)+}++func TestDeletePostHandler_Authorized(t *testing.T) {+ RegisterT(t)++ server, services := mock.NewServer()+ services.SetCurrentTenant(mock.DemoTenant)+ services.SetCurrentUser(mock.JonSnow)+ post, _ := services.Posts.Add("The Post #1", "The Description #1")++ code, _ := server.+ OnTenant(mock.DemoTenant).+ AsUser(mock.JonSnow).+ AddParam("number", post.Number).+ ExecutePost(apiv1.DeletePost(), `{ }`)++ Expect(code).Equals(http.StatusOK)+ post, err := services.Posts.GetByNumber(post.Number)+ Expect(post).IsNil()+ Expect(errors.Cause(err)).Equals(app.ErrNotFound)+}++func TestPostCommentHandler(t *testing.T) {+ RegisterT(t)++ server, services := mock.NewServer()+ services.SetCurrentTenant(mock.DemoTenant)+ services.SetCurrentUser(mock.JonSnow)+ post, _ := services.Posts.Add("My First Post", "With a description")++ code, _ := server.+ OnTenant(mock.DemoTenant).+ AsUser(mock.JonSnow).+ AddParam("number", post.Number).+ ExecutePost(apiv1.PostComment(), `{ "content": "This is a comment!" }`)++ Expect(code).Equals(http.StatusOK)+}++func TestPostCommentHandler_WithoutContent(t *testing.T) {+ RegisterT(t)++ server, services := mock.NewServer()+ services.SetCurrentTenant(mock.DemoTenant)+ services.SetCurrentUser(mock.JonSnow)+ post, _ := services.Posts.Add("My First Post", "With a description")++ code, _ := server.+ OnTenant(mock.DemoTenant).+ AsUser(mock.JonSnow).+ AddParam("number", post.Number).+ ExecutePost(apiv1.PostComment(), `{ "content": "" }`)++ Expect(code).Equals(http.StatusBadRequest)+}++func TestAddCommentHandler(t *testing.T) {+ RegisterT(t)++ server, services := mock.NewServer()+ services.SetCurrentTenant(mock.DemoTenant)+ services.SetCurrentUser(mock.AryaStark)+ post, _ := services.Posts.Add("The Post #1", "The Description #1")++ code, _ := server.+ OnTenant(mock.DemoTenant).+ AsUser(mock.JonSnow).+ AddParam("number", post.Number).+ ExecutePost(apiv1.PostComment(), `{ "content": "My first comment" }`)++ Expect(code).Equals(http.StatusOK)+ comments, _ := services.Posts.GetCommentsByPost(post)+ Expect(comments).HasLen(1)+}++func TestUpdateCommentHandler_Authorized(t *testing.T) {+ RegisterT(t)++ server, services := mock.NewServer()+ services.SetCurrentTenant(mock.DemoTenant)+ services.SetCurrentUser(mock.AryaStark)+ post, _ := services.Posts.Add("The Post #1", "The Description #1")+ commentId, _ := services.Posts.AddComment(post, "My first comment")++ code, _ := server.+ OnTenant(mock.DemoTenant).+ AsUser(mock.AryaStark).+ AddParam("number", post.Number).+ AddParam("id", commentId).+ ExecutePost(apiv1.UpdateComment(), `{ "content": "My first comment has been edited" }`)++ Expect(code).Equals(http.StatusOK)+ comment, _ := services.Posts.GetCommentByID(commentId)+ Expect(comment.Content).Equals("My first comment has been edited")+}++func TestUpdateCommentHandler_Unauthorized(t *testing.T) {+ RegisterT(t)++ server, services := mock.NewServer()+ services.SetCurrentTenant(mock.DemoTenant)+ services.SetCurrentUser(mock.JonSnow)+ post, _ := services.Posts.Add("The Post #1", "The Description #1")+ commentId, _ := services.Posts.AddComment(post, "My first comment")++ code, _ := server.+ OnTenant(mock.DemoTenant).+ AsUser(mock.AryaStark).+ AddParam("number", post.Number).+ AddParam("id", commentId).+ ExecutePost(apiv1.UpdateComment(), `{ "content": "My first comment has been edited" }`)++ Expect(code).Equals(http.StatusForbidden)+ comment, _ := services.Posts.GetCommentByID(commentId)+ Expect(comment.Content).Equals("My first comment")+}diff --git a/app/handlers/apiv1/tag.go b/app/handlers/apiv1/tag.gonew file mode 100644index 000000000..73aaf0726--- /dev/null+++ b/app/handlers/apiv1/tag.go@@ -0,0 +1,85 @@+package apiv1++import (+ "github.com/getfider/fider/app/actions"+ "github.com/getfider/fider/app/models"+ "github.com/getfider/fider/app/pkg/web"+)++// AssignTag to existing dea+func AssignTag() web.HandlerFunc {+ return func(c web.Context) error {+ input := new(actions.AssignUnassignTag)+ if result := c.BindTo(input); !result.Ok {+ return c.HandleValidation(result)+ }++ err := c.Services().Tags.AssignTag(input.Tag, input.Post)+ if err != nil {+ return c.Failure(err)+ }++ return c.Ok(web.Map{})+ }+}++// UnassignTag from existing dea+func UnassignTag() web.HandlerFunc {+ return func(c web.Context) error {+ input := new(actions.AssignUnassignTag)+ if result := c.BindTo(input); !result.Ok {+ return c.HandleValidation(result)+ }++ err := c.Services().Tags.UnassignTag(input.Tag, input.Post)+ if err != nil {+ return c.Failure(err)+ }++ return c.Ok(web.Map{})+ }+}++// CreateEditTag creates a new tag on current tenant+func CreateEditTag() web.HandlerFunc {+ return func(c web.Context) error {+ input := new(actions.CreateEditTag)+ if result := c.BindTo(input); !result.Ok {+ return c.HandleValidation(result)+ }++ var (+ tag *models.Tag+ err error+ )++ if input.Model.Slug != "" {+ tag, err = c.Services().Tags.Update(input.Tag, input.Model.Name, input.Model.Color, input.Model.IsPublic)+ } else {+ tag, err = c.Services().Tags.Add(input.Model.Name, input.Model.Color, input.Model.IsPublic)+ }++ if err != nil {+ return c.Failure(err)+ }++ return c.Ok(tag)+ }+}++// DeleteTag deletes anexisting tag+func DeleteTag() web.HandlerFunc {+ return func(c web.Context) error {+ input := new(actions.DeleteTag)+ if result := c.BindTo(input); !result.Ok {+ return c.HandleValidation(result)+ }++ err := c.Services().Tags.Delete(input.Tag)+ if err != nil {+ return c.Failure(err)+ }++ return c.Ok(web.Map{})+ }+}diff --git a/app/handlers/tag_test.go b/app/handlers/apiv1/tag_test.gosimilarity index 91%rename from app/handlers/tag_test.gorename to app/handlers/apiv1/tag_test.goindex 09406c1dd..4486511c9 100644--- a/app/handlers/tag_test.go+++ b/app/handlers/apiv1/tag_test.go@@ -1,11 +1,11 @@-package handlers_test+package apiv1_testimport ("net/http""testing""github.com/getfider/fider/app"- "github.com/getfider/fider/app/handlers"+ "github.com/getfider/fider/app/handlers/apiv1". "github.com/getfider/fider/app/pkg/assert""github.com/getfider/fider/app/pkg/errors""github.com/getfider/fider/app/pkg/mock"@@ -19,7 +19,7 @@ func TestCreateTagHandler_ValidRequests(t *testing.T) {status, _ := server.AsUser(mock.JonSnow).ExecutePost(- handlers.CreateEditTag(),+ apiv1.CreateEditTag(),`{ "name": "Feature Request", "color": "00FF00", "isPublic": true }`,)@@ -49,7 +49,7 @@ func TestCreateTagHandler_InvalidRequests(t *testing.T) {server, _ := mock.NewServer()status, _ := server.AsUser(mock.JonSnow).- ExecutePostAsJSON(handlers.CreateEditTag(), testCase)+ ExecutePostAsJSON(apiv1.CreateEditTag(), testCase)Expect(status).Equals(http.StatusBadRequest)}@@ -64,7 +64,7 @@ func TestCreateTagHandler_AlreadyInUse(t *testing.T) {status, _ := server.AsUser(mock.JonSnow).ExecutePostAsJSON(- handlers.CreateEditTag(),+ apiv1.CreateEditTag(),`{ "name": "Bug", "color": "0000FF", "isPublic": true }`,)@@ -78,7 +78,7 @@ func TestCreateTagHandler_Collaborator(t *testing.T) {status, _ := server.AsUser(mock.AryaStark).ExecutePost(- handlers.CreateEditTag(),+ apiv1.CreateEditTag(),`{ "name": "Feature Request", "color": "000000", "isPublic": true }`,)@@ -93,7 +93,7 @@ func TestEditInvalidTagHandler(t *testing.T) {AsUser(mock.JonSnow).AddParam("slug", "bug").ExecutePost(- handlers.CreateEditTag(),+ apiv1.CreateEditTag(),`{ "name": "Feature Request", "color": "000000", "isPublic": true }`,)@@ -110,7 +110,7 @@ func TestEditExistingTagHandler(t *testing.T) {AsUser(mock.JonSnow).AddParam("slug", "bug").ExecutePost(- handlers.CreateEditTag(),+ apiv1.CreateEditTag(),`{ "name": "Feature Request", "color": "000000", "isPublic": true }`,)@@ -131,7 +131,7 @@ func TestDeleteInvalidTagHandler(t *testing.T) {status, _ := server.AsUser(mock.JonSnow).AddParam("slug", "bug").- Execute(handlers.DeleteTag())+ Execute(apiv1.DeleteTag())Expect(status).Equals(http.StatusNotFound)}@@ -145,7 +145,7 @@ func TestDeleteExistingTagHandler(t *testing.T) {status, _ := server.AsUser(mock.JonSnow).AddParam("slug", "bug").- Execute(handlers.DeleteTag())+ Execute(apiv1.DeleteTag())tag, err := services.Tags.GetBySlug("bug")Expect(status).Equals(http.StatusOK)@@ -162,13 +162,12 @@ func TestDeleteExistingTagHandler_Collaborator(t *testing.T) {status, _ := server.AsUser(mock.AryaStark).AddParam("slug", "bug").- Execute(handlers.DeleteTag())+ Execute(apiv1.DeleteTag())tag, err := services.Tags.GetBySlug("bug")Expect(status).Equals(http.StatusForbidden)Expect(tag).IsNotNil()Expect(err).IsNil()-}func TestAssignTagHandler_Success(t *testing.T) {@@ -184,7 +183,7 @@ func TestAssignTagHandler_Success(t *testing.T) {AsUser(mock.JonSnow).AddParam("slug", tag.Slug).AddParam("number", post.Number).- Execute(handlers.AssignTag())+ Execute(apiv1.AssignTag())tags, err := services.Tags.GetAssigned(post)Expect(status).Equals(http.StatusOK)@@ -201,7 +200,7 @@ func TestAssignTagHandler_UnknownTag(t *testing.T) {AsUser(mock.JonSnow).AddParam("slug", "bug").AddParam("number", 1).- Execute(handlers.AssignTag())+ Execute(apiv1.AssignTag())Expect(status).Equals(http.StatusNotFound)}@@ -210,8 +209,8 @@ func TestAssignOrUnassignTagHandler_Unauthorized(t *testing.T) {RegisterT(t)var testCases = []web.HandlerFunc{- handlers.AssignTag(),- handlers.UnassignTag(),+ apiv1.AssignTag(),+ apiv1.UnassignTag(),}for _, handler := range testCases {@@ -245,7 +244,7 @@ func TestUnassignTagHandler_Success(t *testing.T) {AsUser(mock.JonSnow).AddParam("slug", tag.Slug).AddParam("number", post.Number).- Execute(handlers.UnassignTag())+ Execute(apiv1.UnassignTag())tags, err := services.Tags.GetAssigned(post)Expect(status).Equals(http.StatusOK)diff --git a/app/handlers/post.go b/app/handlers/post.goindex 0178e8e4f..38982290c 100644--- a/app/handlers/post.go+++ b/app/handlers/post.go@@ -1,12 +1,9 @@package handlersimport (- "github.com/getfider/fider/app/actions"- "github.com/getfider/fider/app/models""github.com/getfider/fider/app/pkg/csv""github.com/getfider/fider/app/pkg/markdown""github.com/getfider/fider/app/pkg/web"- "github.com/getfider/fider/app/tasks")// Index is the default home page@@ -50,80 +47,6 @@ func Index() web.HandlerFunc {}}-// SearchPosts return existing posts based on search criteria-func SearchPosts() web.HandlerFunc {- return func(c web.Context) error {- posts, err := c.Services().Posts.Search(- c.QueryParam("q"),- c.QueryParam("f"),- c.QueryParam("l"),- c.QueryParamAsArray("t"),- )- if err != nil {- return c.Failure(err)- }- return c.Ok(posts)- }-}--// CreatePost creates a new post on current tenant-func CreatePost() web.HandlerFunc {- return func(c web.Context) error {- input := new(actions.CreateNewPost)- if result := c.BindTo(input); !result.Ok {- return c.HandleValidation(result)- }-- posts := c.Services().Posts- post, err := posts.Add(input.Model.Title, input.Model.Description)- if err != nil {- return c.Failure(err)- }-- if err := posts.AddSupporter(post, c.User()); err != nil {- return c.Failure(err)- }-- c.Enqueue(tasks.NotifyAboutNewPost(post))-- return c.Ok(post)- }-}--// UpdatePost updates an existing post of current tenant-func UpdatePost() web.HandlerFunc {- return func(c web.Context) error {- input := new(actions.UpdatePost)- if result := c.BindTo(input); !result.Ok {- return c.HandleValidation(result)- }-- _, err := c.Services().Posts.Update(input.Post, input.Model.Title, input.Model.Description)- if err != nil {- return c.Failure(err)- }-- return c.Ok(web.Map{})- }-}--// DeletePost deletes an existing post of current tenant-func DeletePost() web.HandlerFunc {- return func(c web.Context) error {- input := new(actions.DeletePost)- if result := c.BindTo(input); !result.Ok {- return c.HandleValidation(result)- }-- err := c.Services().Posts.SetResponse(input.Post, input.Model.Text, models.PostDeleted)- if err != nil {- return c.Failure(err)- }-- return c.Ok(web.Map{})- }-}-// PostDetails shows details of given Post by idfunc PostDetails() web.HandlerFunc {return func(c web.Context) error {@@ -166,123 +89,6 @@ func PostDetails() web.HandlerFunc {}}-// PostComment creates a new comment on given post-func PostComment() web.HandlerFunc {- return func(c web.Context) error {- input := new(actions.AddNewComment)- if result := c.BindTo(input); !result.Ok {- return c.HandleValidation(result)- }-- post, err := c.Services().Posts.GetByNumber(input.Model.Number)- if err != nil {- return c.Failure(err)- }-- _, err = c.Services().Posts.AddComment(post, input.Model.Content)- if err != nil {- return c.Failure(err)- }-- c.Enqueue(tasks.NotifyAboutNewComment(post, input.Model))-- return c.Ok(web.Map{})- }-}--// UpdateComment changes an existing comment with new content-func UpdateComment() web.HandlerFunc {- return func(c web.Context) error {- input := new(actions.EditComment)- if result := c.BindTo(input); !result.Ok {- return c.HandleValidation(result)- }-- err := c.Services().Posts.UpdateComment(input.Model.ID, input.Model.Content)- if err != nil {- return c.Failure(err)- }-- return c.Ok(web.Map{})- }-}--// SetResponse changes current post staff response-func SetResponse() web.HandlerFunc {- return func(c web.Context) error {- input := new(actions.SetResponse)- if result := c.BindTo(input); !result.Ok {- return c.HandleValidation(result)- }-- post, err := c.Services().Posts.GetByNumber(input.Model.Number)- if err != nil {- return c.Failure(err)- }-- prevStatus := post.Status- if input.Model.Status == models.PostDuplicate {- err = c.Services().Posts.MarkAsDuplicate(post, input.Original)- } else {- err = c.Services().Posts.SetResponse(post, input.Model.Text, input.Model.Status)- }- if err != nil {- return c.Failure(err)- }-- c.Enqueue(tasks.NotifyAboutStatusChange(post, prevStatus))-- return c.Ok(web.Map{})- }-}--// AddSupporter adds current user to given post list of supporters-func AddSupporter() web.HandlerFunc {- return func(c web.Context) error {- return addOrRemove(c, c.Services().Posts.AddSupporter)- }-}--// RemoveSupporter removes current user from given post list of supporters-func RemoveSupporter() web.HandlerFunc {- return func(c web.Context) error {- return addOrRemove(c, c.Services().Posts.RemoveSupporter)- }-}--// Subscribe adds current user to list of subscribers of given post-func Subscribe() web.HandlerFunc {- return func(c web.Context) error {- return addOrRemove(c, c.Services().Posts.AddSubscriber)- }-}--// Unsubscribe removes current user from list of subscribers of given post-func Unsubscribe() web.HandlerFunc {- return func(c web.Context) error {- return addOrRemove(c, c.Services().Posts.RemoveSubscriber)- }-}--func addOrRemove(c web.Context, addOrRemove func(post *models.Post, user *models.User) error) error {- number, err := c.ParamAsInt("number")- if err != nil {- return c.Failure(err)- }-- post, err := c.Services().Posts.GetByNumber(number)- if err != nil {- return c.Failure(err)- }-- err = addOrRemove(post, c.User())- if err != nil {- return c.Failure(err)- }-- return c.Ok(web.Map{})-}-// ExportPostsToCSV returns a CSV with all postsfunc ExportPostsToCSV() web.HandlerFunc {return func(c web.Context) error {diff --git a/app/handlers/post_test.go b/app/handlers/post_test.goindex 6d90f74fd..333a3f112 100644--- a/app/handlers/post_test.go+++ b/app/handlers/post_test.go@@ -1,16 +1,11 @@package handlers_testimport (- "fmt""net/http""testing"- "github.com/getfider/fider/app"- "github.com/getfider/fider/app/models"-"github.com/getfider/fider/app/handlers". "github.com/getfider/fider/app/pkg/assert"- "github.com/getfider/fider/app/pkg/errors""github.com/getfider/fider/app/pkg/mock")@@ -52,396 +47,3 @@ func TestDetailsHandler_NotFound(t *testing.T) {Expect(code).Equals(http.StatusNotFound)}--func TestCreatePostHandler(t *testing.T) {- RegisterT(t)-- server, services := mock.NewServer()- code, _ := server.- OnTenant(mock.DemoTenant).- AsUser(mock.JonSnow).- ExecutePost(handlers.CreatePost(), `{ "title": "My newest post :)" }`)-- post, err := services.Posts.GetByID(1)- Expect(code).Equals(http.StatusOK)- Expect(err).IsNil()- Expect(post.Title).Equals("My newest post :)")- Expect(post.TotalSupporters).Equals(1)-}--func TestCreatePostHandler_WithoutTitle(t *testing.T) {- RegisterT(t)-- server, services := mock.NewServer()- code, _ := server.- OnTenant(mock.DemoTenant).- AsUser(mock.JonSnow).- ExecutePost(handlers.CreatePost(), `{ "title": "" }`)-- _, err := services.Posts.GetByID(1)- Expect(code).Equals(http.StatusBadRequest)- Expect(err).IsNotNil()-}--func TestUpdatePostHandler_TenantStaff(t *testing.T) {- RegisterT(t)-- server, services := mock.NewServer()- services.SetCurrentTenant(mock.DemoTenant)- services.SetCurrentUser(mock.AryaStark)- post, _ := services.Posts.Add("My First Post", "With a description")-- code, _ := server.- OnTenant(mock.DemoTenant).- AsUser(mock.JonSnow).- AddParam("number", post.Number).- ExecutePost(handlers.UpdatePost(), `{ "title": "the new title", "description": "new description" }`)-- post, _ = services.Posts.GetByNumber(post.Number)- Expect(code).Equals(http.StatusOK)- Expect(post.Title).Equals("the new title")- Expect(post.Description).Equals("new description")-}--func TestUpdatePostHandler_NonAuthorized(t *testing.T) {- RegisterT(t)-- server, services := mock.NewServer()- services.SetCurrentTenant(mock.DemoTenant)- services.SetCurrentUser(mock.JonSnow)- post, _ := services.Posts.Add("My First Post", "With a description")-- code, _ := server.- OnTenant(mock.DemoTenant).- AsUser(mock.AryaStark).- AddParam("number", post.Number).- ExecutePost(handlers.UpdatePost(), `{ "title": "the new title", "description": "new description" }`)-- Expect(code).Equals(http.StatusForbidden)-}--func TestUpdatePostHandler_InvalidTitle(t *testing.T) {- RegisterT(t)-- server, services := mock.NewServer()- services.SetCurrentTenant(mock.DemoTenant)- services.SetCurrentUser(mock.JonSnow)- post, _ := services.Posts.Add("My First Post", "With a description")-- code, _ := server.- OnTenant(mock.DemoTenant).- AsUser(mock.JonSnow).- AddParam("number", post.Number).- ExecutePost(handlers.UpdatePost(), `{ "title": "", "description": "" }`)-- Expect(code).Equals(http.StatusBadRequest)-}--func TestUpdatePostHandler_InvalidPost(t *testing.T) {- RegisterT(t)-- server, _ := mock.NewServer()-- code, _ := server.- OnTenant(mock.DemoTenant).- AsUser(mock.JonSnow).- AddParam("number", 999).- ExecutePost(handlers.UpdatePost(), `{ "title": "This is a good title!", "description": "And description too..." }`)-- Expect(code).Equals(http.StatusNotFound)-}--func TestUpdatePostHandler_DuplicateTitle(t *testing.T) {- RegisterT(t)-- server, services := mock.NewServer()- services.SetCurrentTenant(mock.DemoTenant)- services.SetCurrentUser(mock.JonSnow)- post1, _ := services.Posts.Add("My First Post", "With a description")- services.Posts.Add("My Second Post", "With a description")-- code, _ := server.- OnTenant(mock.DemoTenant).- AsUser(mock.JonSnow).- AddParam("number", post1.Number).- ExecutePost(handlers.UpdatePost(), `{ "title": "My Second Post", "description": "And description too..." }`)-- Expect(code).Equals(http.StatusBadRequest)-}--func TestPostCommentHandler(t *testing.T) {- RegisterT(t)-- server, services := mock.NewServer()- services.SetCurrentTenant(mock.DemoTenant)- services.SetCurrentUser(mock.JonSnow)- post, _ := services.Posts.Add("My First Post", "With a description")-- code, _ := server.- OnTenant(mock.DemoTenant).- AsUser(mock.JonSnow).- AddParam("number", post.Number).- ExecutePost(handlers.PostComment(), `{ "content": "This is a comment!" }`)-- Expect(code).Equals(http.StatusOK)-}--func TestPostCommentHandler_WithoutContent(t *testing.T) {- RegisterT(t)-- server, services := mock.NewServer()- services.SetCurrentTenant(mock.DemoTenant)- services.SetCurrentUser(mock.JonSnow)- post, _ := services.Posts.Add("My First Post", "With a description")-- code, _ := server.- OnTenant(mock.DemoTenant).- AsUser(mock.JonSnow).- AddParam("number", post.Number).- ExecutePost(handlers.PostComment(), `{ "content": "" }`)-- Expect(code).Equals(http.StatusBadRequest)-}--func TestAddSupporterHandler(t *testing.T) {- RegisterT(t)-- server, services := mock.NewServer()- services.SetCurrentTenant(mock.DemoTenant)- services.SetCurrentUser(mock.JonSnow)- first, _ := services.Posts.Add("The Post #1", "The Description #1")- second, _ := services.Posts.Add("The Post #2", "The Description #2")-- code, _ := server.- OnTenant(mock.DemoTenant).- AsUser(mock.AryaStark).- AddParam("number", second.Number).- Execute(handlers.AddSupporter())-- first, _ = services.Posts.GetByNumber(1)- second, _ = services.Posts.GetByNumber(2)-- Expect(code).Equals(http.StatusOK)- Expect(first.TotalSupporters).Equals(0)- Expect(second.TotalSupporters).Equals(1)-}--func TestAddSupporterHandler_InvalidPost(t *testing.T) {- RegisterT(t)-- server, _ := mock.NewServer()- code, _ := server.- OnTenant(mock.DemoTenant).- AsUser(mock.AryaStark).- AddParam("number", 999).- Execute(handlers.AddSupporter())-- Expect(code).Equals(http.StatusNotFound)-}--func TestRemoveSupporterHandler(t *testing.T) {- RegisterT(t)-- server, services := mock.NewServer()- services.SetCurrentTenant(mock.DemoTenant)- services.SetCurrentUser(mock.JonSnow)- post, _ := services.Posts.Add("The Post #1", "The Description #1")- services.Posts.AddSupporter(post, mock.JonSnow)- services.Posts.AddSupporter(post, mock.AryaStark)-- code, _ := server.- OnTenant(mock.DemoTenant).- AsUser(mock.AryaStark).- AddParam("number", post.ID).- Execute(handlers.RemoveSupporter())-- post, _ = services.Posts.GetByNumber(post.Number)-- Expect(code).Equals(http.StatusOK)- Expect(post.TotalSupporters).Equals(1)-}--func TestSetResponseHandler(t *testing.T) {- RegisterT(t)-- server, services := mock.NewServer()- services.SetCurrentTenant(mock.DemoTenant)- services.SetCurrentUser(mock.AryaStark)- post, _ := services.Posts.Add("The Post #1", "The Description #1")- services.Posts.AddSupporter(post, mock.AryaStark)-- code, _ := server.- OnTenant(mock.DemoTenant).- AsUser(mock.JonSnow).- AddParam("number", post.ID).- ExecutePost(handlers.SetResponse(), fmt.Sprintf(`{ "status": %d, "text": "Done!" }`, models.PostCompleted))-- post, _ = services.Posts.GetByNumber(post.Number)-- Expect(code).Equals(http.StatusOK)- Expect(post.Status).Equals(models.PostCompleted)- Expect(post.Response.Text).Equals("Done!")- Expect(post.Response.User.ID).Equals(mock.JonSnow.ID)-}--func TestSetResponseHandler_Unauthorized(t *testing.T) {- RegisterT(t)-- server, services := mock.NewServer()- services.SetCurrentTenant(mock.DemoTenant)- services.SetCurrentUser(mock.AryaStark)- post, _ := services.Posts.Add("The Post #1", "The Description #1")- services.Posts.AddSupporter(post, mock.AryaStark)-- code, _ := server.- OnTenant(mock.DemoTenant).- AsUser(mock.AryaStark).- AddParam("number", post.ID).- ExecutePost(handlers.SetResponse(), fmt.Sprintf(`{ "status": %d, "text": "Done!" }`, models.PostCompleted))-- post, _ = services.Posts.GetByNumber(post.Number)-- Expect(code).Equals(http.StatusForbidden)- Expect(post.Status).Equals(models.PostOpen)-}--func TestSetResponseHandler_Duplicate(t *testing.T) {- RegisterT(t)-- server, services := mock.NewServer()- services.SetCurrentTenant(mock.DemoTenant)- services.SetCurrentUser(mock.AryaStark)- post1, _ := services.Posts.Add("The Post #1", "The Description #1")- post2, _ := services.Posts.Add("The Post #2", "The Description #2")-- body := fmt.Sprintf(`{ "status": %d, "originalNumber": %d }`, models.PostDuplicate, post2.Number)- code, _ := server.- OnTenant(mock.DemoTenant).- AsUser(mock.JonSnow).- AddParam("number", post1.ID).- ExecutePost(handlers.SetResponse(), body)- Expect(code).Equals(http.StatusOK)-- post1, _ = services.Posts.GetByNumber(post1.Number)- Expect(post1.Status).Equals(models.PostDuplicate)-- post2, _ = services.Posts.GetByNumber(post2.Number)- Expect(post2.Status).Equals(models.PostOpen)-}--func TestSetResponseHandler_Duplicate_NotFound(t *testing.T) {- RegisterT(t)-- server, services := mock.NewServer()- services.SetCurrentTenant(mock.DemoTenant)- services.SetCurrentUser(mock.AryaStark)- post1, _ := services.Posts.Add("The Post #1", "The Description #1")-- body := fmt.Sprintf(`{ "status": %d, "originalNumber": 9999 }`, models.PostDuplicate)- code, _ := server.- OnTenant(mock.DemoTenant).- AsUser(mock.JonSnow).- AddParam("number", post1.ID).- ExecutePost(handlers.SetResponse(), body)-- Expect(code).Equals(http.StatusBadRequest)-}--func TestSetResponseHandler_Duplicate_Itself(t *testing.T) {- RegisterT(t)-- server, services := mock.NewServer()- services.SetCurrentTenant(mock.DemoTenant)- services.SetCurrentUser(mock.AryaStark)- post, _ := services.Posts.Add("The Post #1", "The Description #1")-- body := fmt.Sprintf(`{ "status": %d, "originalNumber": %d }`, models.PostDuplicate, post.Number)- code, _ := server.- OnTenant(mock.DemoTenant).- AsUser(mock.JonSnow).- AddParam("number", post.ID).- ExecutePost(handlers.SetResponse(), body)-- Expect(code).Equals(http.StatusBadRequest)-}--func TestAddCommentHandler(t *testing.T) {- RegisterT(t)-- server, services := mock.NewServer()- services.SetCurrentTenant(mock.DemoTenant)- services.SetCurrentUser(mock.AryaStark)- post, _ := services.Posts.Add("The Post #1", "The Description #1")-- code, _ := server.- OnTenant(mock.DemoTenant).- AsUser(mock.JonSnow).- AddParam("number", post.Number).- ExecutePost(handlers.PostComment(), `{ "content": "My first comment" }`)-- Expect(code).Equals(http.StatusOK)- comments, _ := services.Posts.GetCommentsByPost(post)- Expect(comments).HasLen(1)-}--func TestUpdateCommentHandler_Authorized(t *testing.T) {- RegisterT(t)-- server, services := mock.NewServer()- services.SetCurrentTenant(mock.DemoTenant)- services.SetCurrentUser(mock.AryaStark)- post, _ := services.Posts.Add("The Post #1", "The Description #1")- commentId, _ := services.Posts.AddComment(post, "My first comment")-- code, _ := server.- OnTenant(mock.DemoTenant).- AsUser(mock.AryaStark).- AddParam("number", post.Number).- AddParam("id", commentId).- ExecutePost(handlers.UpdateComment(), `{ "content": "My first comment has been edited" }`)-- Expect(code).Equals(http.StatusOK)- comment, _ := services.Posts.GetCommentByID(commentId)- Expect(comment.Content).Equals("My first comment has been edited")-}--func TestUpdateCommentHandler_Unauthorized(t *testing.T) {- RegisterT(t)-- server, services := mock.NewServer()- services.SetCurrentTenant(mock.DemoTenant)- services.SetCurrentUser(mock.JonSnow)- post, _ := services.Posts.Add("The Post #1", "The Description #1")- commentId, _ := services.Posts.AddComment(post, "My first comment")-- code, _ := server.- OnTenant(mock.DemoTenant).- AsUser(mock.AryaStark).- AddParam("number", post.Number).- AddParam("id", commentId).- ExecutePost(handlers.UpdateComment(), `{ "content": "My first comment has been edited" }`)-- Expect(code).Equals(http.StatusForbidden)- comment, _ := services.Posts.GetCommentByID(commentId)- Expect(comment.Content).Equals("My first comment")-}--func TestDeletePostHandler_Authorized(t *testing.T) {- RegisterT(t)-- server, services := mock.NewServer()- services.SetCurrentTenant(mock.DemoTenant)- services.SetCurrentUser(mock.JonSnow)- post, _ := services.Posts.Add("The Post #1", "The Description #1")-- code, _ := server.- OnTenant(mock.DemoTenant).- AsUser(mock.JonSnow).- AddParam("number", post.Number).- ExecutePost(handlers.DeletePost(), `{ }`)-- Expect(code).Equals(http.StatusOK)- post, err := services.Posts.GetByNumber(post.Number)- Expect(post).IsNil()- Expect(errors.Cause(err)).Equals(app.ErrNotFound)-}diff --git a/app/handlers/settings_test.go b/app/handlers/settings_test.goindex 1dff11288..9527cdbc7 100644--- a/app/handlers/settings_test.go+++ b/app/handlers/settings_test.go@@ -88,8 +88,8 @@ func TestChangeRoleHandler_Valid(t *testing.T) {code, _ := server.OnTenant(mock.DemoTenant).AsUser(mock.JonSnow).- AddParam("user_id", mock.AryaStark.ID).- ExecutePost(handlers.ChangeUserRole(), fmt.Sprintf(`{ "role": %d }`, models.RoleAdministrator))+ AddParam("role", models.RoleAdministrator).+ ExecutePost(handlers.ChangeUserRole(), fmt.Sprintf(`{ "userId": %d }`, mock.AryaStark.ID))user, _ := services.Users.GetByID(mock.AryaStark.ID)diff --git a/app/handlers/tag.go b/app/handlers/tag.goindex ee4c475da..551bbad94 100644--- a/app/handlers/tag.go+++ b/app/handlers/tag.go@@ -1,8 +1,6 @@package handlersimport (- "github.com/getfider/fider/app/actions"- "github.com/getfider/fider/app/models""github.com/getfider/fider/app/pkg/web")@@ -22,81 +20,3 @@ func ManageTags() web.HandlerFunc {})}}--// CreateEditTag creates a new tag on current tenant-func CreateEditTag() web.HandlerFunc {- return func(c web.Context) error {- input := new(actions.CreateEditTag)- if result := c.BindTo(input); !result.Ok {- return c.HandleValidation(result)- }-- var (- tag *models.Tag- err error- )-- if input.Model.Slug != "" {- tag, err = c.Services().Tags.Update(input.Tag, input.Model.Name, input.Model.Color, input.Model.IsPublic)- } else {- tag, err = c.Services().Tags.Add(input.Model.Name, input.Model.Color, input.Model.IsPublic)- }-- if err != nil {- return c.Failure(err)- }-- return c.Ok(tag)- }-}--// DeleteTag deletes anexisting tag-func DeleteTag() web.HandlerFunc {- return func(c web.Context) error {- input := new(actions.DeleteTag)- if result := c.BindTo(input); !result.Ok {- return c.HandleValidation(result)- }-- err := c.Services().Tags.Delete(input.Tag)- if err != nil {- return c.Failure(err)- }-- return c.Ok(web.Map{})- }-}--// AssignTag to existing dea-func AssignTag() web.HandlerFunc {- return func(c web.Context) error {- input := new(actions.AssignUnassignTag)- if result := c.BindTo(input); !result.Ok {- return c.HandleValidation(result)- }-- err := c.Services().Tags.AssignTag(input.Tag, input.Post)- if err != nil {- return c.Failure(err)- }-- return c.Ok(web.Map{})- }-}--// UnassignTag from existing dea-func UnassignTag() web.HandlerFunc {- return func(c web.Context) error {- input := new(actions.AssignUnassignTag)- if result := c.BindTo(input); !result.Ok {- return c.HandleValidation(result)- }-- err := c.Services().Tags.UnassignTag(input.Tag, input.Post)- if err != nil {- return c.Failure(err)- }-- return c.Ok(web.Map{})- }-}diff --git a/app/models/identity.go b/app/models/identity.goindex 4304e21c7..53d3b6067 100644--- a/app/models/identity.go+++ b/app/models/identity.go@@ -283,8 +283,8 @@ type UpdateUserSettings struct {// ChangeUserRole is the input model change role of an usertype ChangeUserRole struct {- UserID int `route:"user_id"`- Role Role `json:"role"`+ Role Role `route:"role"`+ UserID int `json:"userId"`}// InviteUsers is used to invite new users into Fiderdiff --git a/app/pkg/web/binder.go b/app/pkg/web/binder.goindex 87d81869e..e2ce8c4ed 100644--- a/app/pkg/web/binder.go+++ b/app/pkg/web/binder.go@@ -12,8 +12,6 @@ import (var (//ErrContentTypeNotAllowed is used when POSTing a body that is not jsonErrContentTypeNotAllowed = stdErrors.New("Only Content-Type application/json is allowed")- intType = reflect.TypeOf(0)- stringType = reflect.TypeOf(""))//DefaultBinder is the default HTTP binder@@ -27,7 +25,8 @@ func NewDefaultBinder() *DefaultBinder {func methodHasBody(method string) bool {return method == http.MethodPost ||- method == http.MethodDelete+ method == http.MethodDelete ||+ method == http.MethodPut}//Bind request data to object i@@ -56,11 +55,12 @@ func (b *DefaultBinder) bindRoute(idx int, target reflect.Value, targetType reflname := targetType.Field(idx).Tag.Get("route")if name != "" {field := target.Field(idx)- fieldType := field.Type()- if fieldType == intType {+ fieldTypeKind := field.Type().Kind()++ if isInt(fieldTypeKind) {value, _ := strconv.ParseInt(params[name], 10, 64)field.SetInt(value)- } else if fieldType == stringType {+ } else if isString(fieldTypeKind) {field.SetString(params[name])}}@@ -74,16 +74,23 @@ func (b *DefaultBinder) format(idx int, target reflect.Value, targetType reflectfieldTypeKind := fieldType.Kind()format := targetType.Field(idx).Tag.Get("format")- if fieldType == stringType {+ if isString(fieldTypeKind) {value := field.Interface().(string)field.SetString(applyFormat(format, value))- } else if fieldTypeKind == reflect.Slice && fieldType.Elem() == stringType {+ } else if fieldTypeKind == reflect.Slice && isString(fieldType.Elem().Kind()) {values := field.Interface().([]string)for i, value := range values {field.Index(i).SetString(applyFormat(format, value))}}+}++func isInt(k reflect.Kind) bool {+ return k == reflect.Int || k == reflect.Int8 || k == reflect.Int16 || k == reflect.Int32 || k == reflect.Int64+}+func isString(k reflect.Kind) bool {+ return k == reflect.String}func applyFormat(format string, value string) string {diff --git a/app/pkg/web/binder_test.go b/app/pkg/web/binder_test.goindex 1dc73bed7..3825a5bf6 100644--- a/app/pkg/web/binder_test.go+++ b/app/pkg/web/binder_test.go@@ -24,13 +24,16 @@ func TestDefaultBinder_FromParams(t *testing.T) {params := make(web.StringMap, 0)params["number"] = "2"params["slug"] = "jon-snow"- ctx := newBodyContext("POST", params, `{ "name": "Jon Snow" }`, "application/json")- u := new(updateUser)- err := binder.Bind(u, ctx)- Expect(err).IsNil()- Expect(u.Number).Equals(2)- Expect(u.Slug).Equals("jon-snow")- Expect(u.Name).Equals("Jon Snow")++ for _, method := range []string{"POST", "PUT", "DELETE"} {+ ctx := newBodyContext(method, params, `{ "name": "Jon Snow" }`, "application/json")+ u := new(updateUser)+ err := binder.Bind(u, ctx)+ Expect(err).IsNil()+ Expect(u.Number).Equals(2)+ Expect(u.Slug).Equals("jon-snow")+ Expect(u.Name).Equals("Jon Snow")+ }}func TestDefaultBinder_TrimSpaces(t *testing.T) {@@ -172,3 +175,38 @@ func TestDefaultBinder_POST_NonJSON(t *testing.T) {err := binder.Bind(u, ctx)Expect(err).Equals(web.ErrContentTypeNotAllowed)}++func TestDefaultBinder_POST_CustomType(t *testing.T) {+ RegisterT(t)++ type Size int+ type Size32 int32+ type Size64 int64+ const (+ Small Size = 1+ Large Size = 2+ Small32 Size32 = 3+ Large32 Size32 = 4+ Small64 Size64 = 5+ Large64 Size64 = 6+ )++ type pizza struct {+ TheSize Size `route:"size"`+ TheSize32 Size32 `route:"size32"`+ TheSize64 Size64 `route:"size64"`+ }++ params := make(web.StringMap, 0)+ params["size"] = "1"+ params["size32"] = "4"+ params["size64"] = "5"+ ctx := newBodyContext("POST", params, `{ }`, "application/json")++ u := new(pizza)+ err := binder.Bind(u, ctx)+ Expect(err).IsNil()+ Expect(u.TheSize).Equals(Small)+ Expect(u.TheSize32).Equals(Large32)+ Expect(u.TheSize64).Equals(Small64)+}diff --git a/app/pkg/web/engine.go b/app/pkg/web/engine.goindex acbf7aed3..efb77ae25 100644--- a/app/pkg/web/engine.go+++ b/app/pkg/web/engine.go@@ -238,6 +238,11 @@ func (g *Group) Post(path string, handler HandlerFunc) {g.engine.mux.Handle("POST", path, g.handler(handler))}+//Put handles HTTP PUT requests+func (g *Group) Put(path string, handler HandlerFunc) {+ g.engine.mux.Handle("PUT", path, g.handler(handler))+}+//Delete handles HTTP DELETE requestsfunc (g *Group) Delete(path string, handler HandlerFunc) {g.engine.mux.Handle("DELETE", path, g.handler(handler))diff --git a/public/components/ShowTag.scss b/public/components/ShowTag.scssindex 5a97bc341..79cbca975 100644--- a/public/components/ShowTag.scss+++ b/public/components/ShowTag.scss@@ -10,6 +10,10 @@border: 0;box-shadow: inset 0 -1px 0 rgba(27,31,35,0.12);+ i.icon {+ font-size: $font-size-micro;+ }+&:last-child {margin-top: 0;margin-bottom: 0;diff --git a/public/components/SupportCounter.spec.tsx b/public/components/SupportCounter.spec.tsxindex 654f3d6e5..5b54af62d 100644--- a/public/components/SupportCounter.spec.tsx+++ b/public/components/SupportCounter.spec.tsx@@ -68,7 +68,8 @@ describe("<SupportCounter />", () => {wrapper.find("button").simulate("click");await rerender(wrapper);expect(wrapper.find("SignInModal").length).toBe(1);- expect(mock).toHaveBeenCalledTimes(0);+ expect(mock.post).toHaveBeenCalledTimes(0);+ expect(mock.delete).toHaveBeenCalledTimes(0);});test("click when authenticated and viewerSupported === false", async () => {@@ -78,8 +79,8 @@ describe("<SupportCounter />", () => {const wrapper = shallow(<SupportCounter post={post} />);wrapper.find("button").simulate("click");- expect(mock).toHaveBeenCalledWith("/api/posts/10/support");- expect(mock).toHaveBeenCalledTimes(1);+ expect(mock.post).toHaveBeenCalledWith("/api/v1/posts/10/support");+ expect(mock.post).toHaveBeenCalledTimes(1);await rerender(wrapper);expect(wrapper.find("button").text()).toBe("6");@@ -93,8 +94,8 @@ describe("<SupportCounter />", () => {const wrapper = shallow(<SupportCounter post={post} />);wrapper.find("button").simulate("click");- expect(mock).toHaveBeenCalledWith("/api/posts/10/unsupport");- expect(mock).toHaveBeenCalledTimes(1);+ expect(mock.delete).toHaveBeenCalledWith("/api/v1/posts/10/support");+ expect(mock.delete).toHaveBeenCalledTimes(1);await rerender(wrapper);expect(wrapper.find("button").text()).toBe("4");diff --git a/public/pages/Administration/pages/Invitations.page.tsx b/public/pages/Administration/pages/Invitations.page.tsxindex 02920673e..ac96f864b 100644--- a/public/pages/Administration/pages/Invitations.page.tsx+++ b/public/pages/Administration/pages/Invitations.page.tsx@@ -66,7 +66,7 @@ ${Fider.session.user.name} (${Fider.session.tenant.name})`,private sendInvites = async (e: ButtonClickEvent) => {const result = await actions.sendInvites(this.state.subject, this.state.message, this.state.recipients);if (result.ok) {- notify.success("The invites have been sent.");+ notify.success("Your invites have been sent.");this.setState({ rawRecipients: "", numOfRecipients: 0, recipients: [], error: undefined });} else {this.setState({ error: result.error });@@ -87,7 +87,7 @@ ${Fider.session.user.name} (${Fider.session.tenant.name})`,<TextAreafield="recipients"label="Send invitations to"- placeholder="[email protected]; [email protected]"+ placeholder="[email protected]; [email protected]"minRows={1}value={this.state.rawRecipients}onChange={this.setRecipients}@@ -108,14 +108,7 @@ ${Fider.session.user.name} (${Fider.session.tenant.name})`,</p></Input>- <TextArea- field="message"- label="Message"- placeholder="[email protected]; [email protected]"- minRows={8}- value={this.state.message}- onChange={this.setMessage}- >+ <TextArea field="message" label="Message" minRows={8} value={this.state.message} onChange={this.setMessage}><div className="info"><p>This is the content of the invite. Be polite and explain what this invite is for, otherwise there's a highdiff --git a/public/services/actions/invite.ts b/public/services/actions/invite.tsindex dcec9b046..470f2f026 100644--- a/public/services/actions/invite.ts+++ b/public/services/actions/invite.ts@@ -1,9 +1,9 @@import { http, Result } from "@fider/services";export const sendInvites = async (subject: string, message: string, recipients: string[]): Promise<Result> => {- return http.post("/api/admin/invitations/send", { subject, message, recipients }).then(http.event("invite", "send"));+ return http.post("/api/v1/invitations/send", { subject, message, recipients }).then(http.event("invite", "send"));};export const sendSampleInvite = async (subject: string, message: string): Promise<Result> => {- return http.post("/api/admin/invitations/sample", { subject, message }).then(http.event("invite", "sample"));+ return http.post("/api/v1/invitations/sample", { subject, message }).then(http.event("invite", "sample"));};diff --git a/public/services/actions/notification.ts b/public/services/actions/notification.tsindex c0fd68809..b374be0f9 100644--- a/public/services/actions/notification.ts+++ b/public/services/actions/notification.ts@@ -1,7 +1,7 @@import { http, Result } from "@fider/services";export const getTotalUnreadNotifications = async (): Promise<Result<number>> => {- return http.get<{ total: number }>("/api/notifications/unread/total").then(result => {+ return http.get<{ total: number }>("/_api/notifications/unread/total").then(result => {return {ok: result.ok,error: result.error,@@ -11,5 +11,5 @@ export const getTotalUnreadNotifications = async (): Promise<Result<number>> =>};export const markAllAsRead = async (): Promise<Result> => {- return await http.post("/api/notifications/read-all");+ return await http.post("/_api/notifications/read-all");};diff --git a/public/services/actions/post.ts b/public/services/actions/post.tsindex 2fcfe4fb5..67dba066e 100644--- a/public/services/actions/post.ts+++ b/public/services/actions/post.ts@@ -2,7 +2,7 @@ import { http, Result, querystring } from "@fider/services";import { Post } from "@fider/models";export const getAllPosts = async (): Promise<Result<Post[]>> => {- return await http.get<Post[]>("/api/posts/search");+ return await http.get<Post[]>("/api/v1/posts");};export interface SearchPostsParams {@@ -14,7 +14,7 @@ export interface SearchPostsParams {export const searchPosts = async (params: SearchPostsParams): Promise<Result<Post[]>> => {return await http.get<Post[]>(- `/api/posts/search${querystring.stringify({+ `/api/v1/posts${querystring.stringify({t: params.tags,q: params.query,f: params.filter,@@ -25,34 +25,36 @@ export const searchPosts = async (params: SearchPostsParams): Promise<Result<Posexport const deletePost = async (postNumber: number, text: string): Promise<Result> => {return http- .delete(`/api/posts/${postNumber}`, {+ .delete(`/api/v1/posts/${postNumber}`, {text}).then(http.event("post", "delete"));};export const addSupport = async (postNumber: number): Promise<Result> => {- return http.post(`/api/posts/${postNumber}/support`).then(http.event("post", "support"));+ return http.post(`/api/v1/posts/${postNumber}/support`).then(http.event("post", "support"));};export const removeSupport = async (postNumber: number): Promise<Result> => {- return http.post(`/api/posts/${postNumber}/unsupport`).then(http.event("post", "unsupport"));+ return http.delete(`/api/v1/posts/${postNumber}/support`).then(http.event("post", "unsupport"));};export const subscribe = async (postNumber: number): Promise<Result> => {- return http.post(`/api/posts/${postNumber}/subscribe`).then(http.event("post", "subscribe"));+ return http.post(`/api/v1/posts/${postNumber}/subscription`).then(http.event("post", "subscribe"));};export const unsubscribe = async (postNumber: number): Promise<Result> => {- return http.post(`/api/posts/${postNumber}/unsubscribe`).then(http.event("post", "unsubscribe"));+ return http.delete(`/api/v1/posts/${postNumber}/subscription`).then(http.event("post", "unsubscribe"));};export const createComment = async (postNumber: number, content: string): Promise<Result> => {- return http.post(`/api/posts/${postNumber}/comments`, { content }).then(http.event("comment", "create"));+ return http.post(`/api/v1/posts/${postNumber}/comments`, { content }).then(http.event("comment", "create"));};export const updateComment = async (postNumber: number, commentId: number, content: string): Promise<Result> => {- return http.post(`/api/posts/${postNumber}/comments/${commentId}`, { content }).then(http.event("comment", "update"));+ return http+ .put(`/api/v1/posts/${postNumber}/comments/${commentId}`, { content })+ .then(http.event("comment", "update"));};interface SetResponseInput {@@ -63,7 +65,7 @@ interface SetResponseInput {export const respond = async (postNumber: number, input: SetResponseInput): Promise<Result> => {return http- .post(`/api/posts/${postNumber}/status`, {+ .put(`/api/v1/posts/${postNumber}/status`, {status: input.status,text: input.text,originalNumber: input.originalNumber@@ -72,9 +74,9 @@ export const respond = async (postNumber: number, input: SetResponseInput): Prom};export const createPost = async (title: string, description: string): Promise<Result<Post>> => {- return http.post<Post>(`/api/posts`, { title, description }).then(http.event("post", "create"));+ return http.post<Post>(`/api/v1/posts`, { title, description }).then(http.event("post", "create"));};export const updatePost = async (postNumber: number, title: string, description: string): Promise<Result> => {- return http.post(`/api/posts/${postNumber}`, { title, description }).then(http.event("post", "update"));+ return http.put(`/api/v1/posts/${postNumber}`, { title, description }).then(http.event("post", "update"));};diff --git a/public/services/actions/tag.ts b/public/services/actions/tag.tsindex 1f29fca33..de16874c5 100644--- a/public/services/actions/tag.ts+++ b/public/services/actions/tag.ts@@ -2,21 +2,21 @@ import { http, Result } from "@fider/services/http";import { Tag } from "@fider/models";export const createTag = async (name: string, color: string, isPublic: boolean): Promise<Result<Tag>> => {- return http.post<Tag>(`/api/admin/tags`, { name, color, isPublic }).then(http.event("tag", "create"));+ return http.post<Tag>(`/api/v1/tags`, { name, color, isPublic }).then(http.event("tag", "create"));};export const updateTag = async (slug: string, name: string, color: string, isPublic: boolean): Promise<Result<Tag>> => {- return http.post<Tag>(`/api/admin/tags/${slug}`, { name, color, isPublic }).then(http.event("tag", "update"));+ return http.put<Tag>(`/api/v1/tags/${slug}`, { name, color, isPublic }).then(http.event("tag", "update"));};export const deleteTag = async (slug: string): Promise<Result> => {- return http.delete(`/api/admin/tags/${slug}`).then(http.event("tag", "delete"));+ return http.delete(`/api/v1/tags/${slug}`).then(http.event("tag", "delete"));};export const assignTag = async (slug: string, postNumber: number): Promise<Result> => {- return http.post(`/api/posts/${postNumber}/tags/${slug}`).then(http.event("tag", "assign"));+ return http.post(`/api/v1/posts/${postNumber}/tags/${slug}`).then(http.event("tag", "assign"));};export const unassignTag = async (slug: string, postNumber: number): Promise<Result> => {- return http.delete(`/api/posts/${postNumber}/tags/${slug}`).then(http.event("tag", "unassign"));+ return http.delete(`/api/v1/posts/${postNumber}/tags/${slug}`).then(http.event("tag", "unassign"));};diff --git a/public/services/actions/tenant.ts b/public/services/actions/tenant.tsindex f8ea4cfff..dcf42bbeb 100644--- a/public/services/actions/tenant.ts+++ b/public/services/actions/tenant.ts@@ -20,7 +20,7 @@ export interface CreateTenantResponse {}export const createTenant = async (request: CreateTenantRequest): Promise<Result<CreateTenantResponse>> => {- return await http.post<CreateTenantResponse>("/api/tenants", request);+ return await http.post<CreateTenantResponse>("/_api/tenants", request);};export interface UpdateTenantSettingsRequest {@@ -38,44 +38,44 @@ export interface UpdateTenantSettingsRequest {}export const updateTenantSettings = async (request: UpdateTenantSettingsRequest): Promise<Result> => {- return await http.post("/api/admin/settings/general", request);+ return await http.post("/_api/admin/settings/general", request);};export const updateTenantAdvancedSettings = async (customCSS: string): Promise<Result> => {- return await http.post("/api/admin/settings/advanced", { customCSS });+ return await http.post("/_api/admin/settings/advanced", { customCSS });};export const updateTenantPrivacy = async (isPrivate: boolean): Promise<Result> => {- return await http.post("/api/admin/settings/privacy", {+ return await http.post("/_api/admin/settings/privacy", {isPrivate});};export const checkAvailability = async (subdomain: string): Promise<Result<CheckAvailabilityResponse>> => {- return await http.get<CheckAvailabilityResponse>(`/api/tenants/${subdomain}/availability`);+ return await http.get<CheckAvailabilityResponse>(`/_api/tenants/${subdomain}/availability`);};export const signIn = async (email: string): Promise<Result> => {- return await http.post("/api/signin", {+ return await http.post("/_api/signin", {});};export const completeProfile = async (key: string, name: string): Promise<Result> => {- return await http.post("/api/signin/complete", {+ return await http.post("/_api/signin/complete", {key,name});};export const changeUserRole = async (userId: number, role: UserRole): Promise<Result> => {- return await http.post(`/api/admin/users/${userId}/role`, {- role+ return await http.post(`/api/v1/roles/${role}/users`, {+ userId});};export const getOAuthConfig = async (provider: string): Promise<Result<OAuthConfig>> => {- return await http.get<OAuthConfig>(`/api/admin/oauth/${provider}`);+ return await http.get<OAuthConfig>(`/_api/admin/oauth/${provider}`);};export interface CreateEditOAuthConfigRequest {@@ -95,5 +95,5 @@ export interface CreateEditOAuthConfigRequest {}export const saveOAuthConfig = async (request: CreateEditOAuthConfigRequest): Promise<Result> => {- return await http.post("/api/admin/oauth", request);+ return await http.post("/_api/admin/oauth", request);};diff --git a/public/services/actions/user.ts b/public/services/actions/user.tsindex 2799aacbf..15eecf320 100644--- a/public/services/actions/user.ts+++ b/public/services/actions/user.ts@@ -2,18 +2,18 @@ import { http, Result } from "@fider/services/http";import { UserSettings } from "@fider/models";export const updateUserSettings = async (name: string, settings: UserSettings): Promise<Result> => {- return await http.post("/api/user/settings", {+ return await http.post("/_api/user/settings", {name,settings});};export const changeUserEmail = async (email: string): Promise<Result> => {- return await http.post("/api/user/change-email", {+ return await http.post("/_api/user/change-email", {});};export const deleteCurrentAccount = async (): Promise<Result> => {- return await http.delete("/api/user");+ return await http.delete("/_api/user");};diff --git a/public/services/http.ts b/public/services/http.tsindex 177a68a7d..82c4e60fc 100644--- a/public/services/http.ts+++ b/public/services/http.ts@@ -32,7 +32,7 @@ async function toResult<T>(response: Response): Promise<Result<T>> {};}}-async function request<T>(url: string, method: "GET" | "POST" | "DELETE", body?: any): Promise<Result<T>> {+async function request<T>(url: string, method: "GET" | "POST" | "PUT" | "DELETE", body?: any): Promise<Result<T>> {const headers = [["Accept", "application/json"], ["Content-Type", "application/json"]];const response = await fetch(url, {method,@@ -50,6 +50,9 @@ export const http = {post: async <T = void>(url: string, body?: {}): Promise<Result<T>> => {return await request<T>(url, "POST", body);},+ put: async <T = void>(url: string, body?: {}): Promise<Result<T>> => {+ return await request<T>(url, "PUT", body);+ },delete: async <T = void>(url: string, body?: {}): Promise<Result<T>> => {return await request<T>(url, "DELETE", body);},diff --git a/public/services/testing/http.ts b/public/services/testing/http.tsindex 108f4019b..7796de6be 100644--- a/public/services/testing/http.ts+++ b/public/services/testing/http.ts@@ -9,7 +9,8 @@ export const httpMock = {});http.get = fn;http.post = fn;+ http.put = fn;http.delete = fn;- return fn;+ return http;}};diff --git a/robots.txt b/robots.txtindex 49a10ad06..4893392e8 100644--- a/robots.txt+++ b/robots.txt@@ -1,4 +1,5 @@User-agent: *-Disallow: /api/+Disallow: /_api/+Disallow: /api/v1/Disallow: /admin/Disallow: /oauth/\ No newline at end of file