Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

feature: read-only mode for locked tenants

goenning89fcd7069484
diff --git a/app/cmd/routes.go b/app/cmd/routes.go
index 79f00749f..ab474805d 100644
--- a/app/cmd/routes.go
+++ b/app/cmd/routes.go
@@ -2,7 +2,6 @@ package cmd
import (
"net/http"
- "strings"
"time"
"github.com/getfider/fider/app/handlers"
@@ -109,20 +108,6 @@ func routes(r *web.Engine) *web.Engine {
r.Get("/posts/:number", handlers.PostDetails())
r.Get("/posts/:number/:slug", handlers.PostDetails())
- /*
- ** This is a temporary redirect and should be removed in the future
- ** START
- */
- r.Get("/ideas/:number", func(c *web.Context) error {
- return c.PermanentRedirect(strings.Replace(c.Request.URL.Path, "/ideas/", "/posts/", 1))
- })
- r.Get("/ideas/:number/*all", func(c *web.Context) error {
- return c.PermanentRedirect(strings.Replace(c.Request.URL.Path, "/ideas/", "/posts/", 1))
- })
- /*
- ** END
- */
-
ui := r.Group()
{
//From this step, a User is required
@@ -184,50 +169,71 @@ func routes(r *web.Engine) *web.Engine {
}
}
- api := r.Group()
+ // Public operations
+ // Does not require authentication
+ publicApi := r.Group()
{
- api.Get("/api/v1/posts", apiv1.SearchPosts())
- api.Get("/api/v1/tags", apiv1.ListTags())
- api.Get("/api/v1/posts/:number", apiv1.GetPost())
- api.Get("/api/v1/posts/:number/comments", apiv1.ListComments())
- api.Get("/api/v1/posts/:number/comments/:id", apiv1.GetComment())
+ publicApi.Get("/api/v1/posts", apiv1.SearchPosts())
+ publicApi.Get("/api/v1/tags", apiv1.ListTags())
+ publicApi.Get("/api/v1/posts/:number", apiv1.GetPost())
+ publicApi.Get("/api/v1/posts/:number/comments", apiv1.ListComments())
+ publicApi.Get("/api/v1/posts/:number/comments/:id", apiv1.GetComment())
+ }
- //From this step, a User is required
- 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())
- api.Post("/api/v1/posts/:number/votes", apiv1.AddVote())
- api.Delete("/api/v1/posts/:number/votes", apiv1.RemoveVote())
- api.Post("/api/v1/posts/:number/subscription", apiv1.Subscribe())
- api.Delete("/api/v1/posts/:number/subscription", apiv1.Unsubscribe())
-
- //From this step, only Collaborators and Administrators are allowed
- api.Use(middlewares.IsAuthorized(enum.RoleCollaborator, enum.RoleAdministrator))
-
- // locale is forced to English for administrative API.
- // This is meant to be removed when all API are translated.
- ui.Use(middlewares.SetLocale("en"))
+ // Operations used to manage the content of a site
+ // Available to any authenticated user
+ membersApi := r.Group()
+ {
+ membersApi.Use(middlewares.IsAuthenticated())
+ membersApi.Use(middlewares.BlockLockedTenants())
+
+ membersApi.Post("/api/v1/posts", apiv1.CreatePost())
+ membersApi.Put("/api/v1/posts/:number", apiv1.UpdatePost())
+ membersApi.Post("/api/v1/posts/:number/comments", apiv1.PostComment())
+ membersApi.Put("/api/v1/posts/:number/comments/:id", apiv1.UpdateComment())
+ membersApi.Delete("/api/v1/posts/:number/comments/:id", apiv1.DeleteComment())
+ membersApi.Post("/api/v1/posts/:number/votes", apiv1.AddVote())
+ membersApi.Delete("/api/v1/posts/:number/votes", apiv1.RemoveVote())
+ membersApi.Post("/api/v1/posts/:number/subscription", apiv1.Subscribe())
+ membersApi.Delete("/api/v1/posts/:number/subscription", apiv1.Unsubscribe())
+
+ membersApi.Use(middlewares.IsAuthorized(enum.RoleCollaborator, enum.RoleAdministrator))
+ membersApi.Put("/api/v1/posts/:number/status", apiv1.SetResponse())
+ }
+
+ // Operations used to manage a site
+ // Available to both collaborators and administrators
+ staffApi := r.Group()
+ {
+ staffApi.Use(middlewares.SetLocale("en"))
+ staffApi.Use(middlewares.IsAuthenticated())
+ staffApi.Use(middlewares.IsAuthorized(enum.RoleCollaborator, enum.RoleAdministrator))
+
+ staffApi.Get("/api/v1/users", apiv1.ListUsers())
+ staffApi.Get("/api/v1/posts/:number/votes", apiv1.ListVotes())
+ staffApi.Post("/api/v1/invitations/send", apiv1.SendInvites())
+ staffApi.Post("/api/v1/invitations/sample", apiv1.SendSampleInvite())
+
+ staffApi.Use(middlewares.BlockLockedTenants())
+ staffApi.Post("/api/v1/posts/:number/tags/:slug", apiv1.AssignTag())
+ staffApi.Delete("/api/v1/posts/:number/tags/:slug", apiv1.UnassignTag())
+ }
- api.Get("/api/v1/users", apiv1.ListUsers())
- 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())
- api.Put("/api/v1/posts/:number/status", apiv1.SetResponse())
- api.Post("/api/v1/posts/:number/tags/:slug", apiv1.AssignTag())
- api.Delete("/api/v1/posts/:number/tags/:slug", apiv1.UnassignTag())
+ // Operations used to manage a site
+ // Only available to administrators
+ adminApi := r.Group()
+ {
+ adminApi.Use(middlewares.SetLocale("en"))
+ adminApi.Use(middlewares.IsAuthenticated())
+ adminApi.Use(middlewares.IsAuthorized(enum.RoleAdministrator))
- //From this step, only Administrators are allowed
- api.Use(middlewares.IsAuthorized(enum.RoleAdministrator))
+ adminApi.Post("/api/v1/users", apiv1.CreateUser())
+ adminApi.Post("/api/v1/tags", apiv1.CreateEditTag())
+ adminApi.Put("/api/v1/tags/:slug", apiv1.CreateEditTag())
+ adminApi.Delete("/api/v1/tags/:slug", apiv1.DeleteTag())
- api.Post("/api/v1/users", apiv1.CreateUser())
- api.Delete("/api/v1/posts/:number", apiv1.DeletePost())
- api.Post("/api/v1/tags", apiv1.CreateEditTag())
- api.Put("/api/v1/tags/:slug", apiv1.CreateEditTag())
- api.Delete("/api/v1/tags/:slug", apiv1.DeleteTag())
+ adminApi.Use(middlewares.BlockLockedTenants())
+ adminApi.Delete("/api/v1/posts/:number", apiv1.DeletePost())
}
return r
diff --git a/app/middlewares/tenant.go b/app/middlewares/tenant.go
index 38e2d3795..6a7ad404b 100644
--- a/app/middlewares/tenant.go
+++ b/app/middlewares/tenant.go
@@ -125,3 +125,17 @@ func CheckTenantPrivacy() web.MiddlewareFunc {
}
}
}
+
+// BlockLockedTenants blocks requests on locked tenants as they are in read-only mode
+func BlockLockedTenants() web.MiddlewareFunc {
+ return func(next web.HandlerFunc) web.HandlerFunc {
+ return func(c *web.Context) error {
+ if c.Tenant().Status == enum.TenantLocked {
+
+ // Only API operations are blocked, so it's ok to always return a JSON
+ return c.JSON(http.StatusPaymentRequired, web.Map{})
+ }
+ return next(c)
+ }
+ }
+}
diff --git a/app/middlewares/tenant_test.go b/app/middlewares/tenant_test.go
index 2476770c9..6b17e52fc 100644
--- a/app/middlewares/tenant_test.go
+++ b/app/middlewares/tenant_test.go
@@ -422,3 +422,35 @@ func TestRequireTenant_SingleHostMode_ValidTenant(t *testing.T) {
Expect(status).Equals(http.StatusOK)
Expect(response.Body.String()).Equals("Demonstration")
}
+
+func TestBlockLockedTenants_ActiveTenant(t *testing.T) {
+ RegisterT(t)
+ server := mock.NewServer()
+ server.Use(middlewares.BlockLockedTenants())
+
+ status, response := server.
+ WithURL("http://demo.test.fider.io").
+ OnTenant(mock.DemoTenant).
+ Execute(func(c *web.Context) error {
+ return c.String(http.StatusOK, c.Tenant().Name)
+ })
+
+ Expect(status).Equals(http.StatusOK)
+ Expect(response.Body.String()).Equals("Demonstration")
+}
+
+func TestBlockLockedTenants_LockedTenant(t *testing.T) {
+ RegisterT(t)
+ server := mock.NewServer()
+ server.Use(middlewares.BlockLockedTenants())
+ mock.DemoTenant.Status = enum.TenantLocked
+
+ status, _ := server.
+ WithURL("http://demo.test.fider.io/api/v1/posts").
+ OnTenant(mock.DemoTenant).
+ Execute(func(c *web.Context) error {
+ return c.String(http.StatusOK, c.Tenant().Name)
+ })
+
+ Expect(status).Equals(http.StatusPaymentRequired)
+}
diff --git a/public/components/VoteCounter.tsx b/public/components/VoteCounter.tsx
index 375171d7d..22f17cf1e 100644
--- a/public/components/VoteCounter.tsx
+++ b/public/components/VoteCounter.tsx
@@ -35,11 +35,12 @@ export const VoteCounter = (props: VoteCounterProps) => {
const hideModal = () => setIsSignInModalOpen(false)
const status = PostStatus.Get(props.post.status)
+ const isDisabled = status.closed || fider.isReadOnly
const className = classSet({
"c-vote-counter__button": true,
"c-vote-counter__button--voted": !status.closed && hasVoted,
- "c-vote-counter__button--disabled": status.closed,
+ "c-vote-counter__button--disabled": isDisabled,
})
const vote = (
@@ -59,7 +60,7 @@ export const VoteCounter = (props: VoteCounterProps) => {
return (
<>
<SignInModal isOpen={isSignInModalOpen} onClose={hideModal} />
- <div className="c-vote-counter">{status.closed ? disabled : vote}</div>
+ <div className="c-vote-counter">{isDisabled ? disabled : vote}</div>
</>
)
}
diff --git a/public/pages/Home/components/PostInput.tsx b/public/pages/Home/components/PostInput.tsx
index e331e4bb5..f91452e49 100644
--- a/public/pages/Home/components/PostInput.tsx
+++ b/public/pages/Home/components/PostInput.tsx
@@ -91,6 +91,7 @@ export const PostInput = (props: PostInputProps) => {
<Form error={error}>
<Input
field="title"
+ disabled={fider.isReadOnly}
noTabFocus={!fider.session.isAuthenticated}
inputRef={titleRef}
onFocus={handleTitleFocus}
diff --git a/public/pages/ShowPost/ShowPost.page.tsx b/public/pages/ShowPost/ShowPost.page.tsx
index 0508fe77f..99ffea4d9 100644
--- a/public/pages/ShowPost/ShowPost.page.tsx
+++ b/public/pages/ShowPost/ShowPost.page.tsx
@@ -163,13 +163,13 @@ export default class ShowPostPage extends React.Component<ShowPostPageProps, Sho
</span>
{this.state.editMode ? (
<VStack>
- <Button variant="primary" onClick={this.saveChanges}>
+ <Button variant="primary" onClick={this.saveChanges} disabled={Fider.isReadOnly}>
<Icon sprite={IconCheck} />{" "}
<span>
<Trans id="action.save">Save</Trans>
</span>
</Button>
- <Button onClick={this.cancelEdit}>
+ <Button onClick={this.cancelEdit} disabled={Fider.isReadOnly}>
<Icon sprite={IconX} />
<span>
<Trans id="action.cancel">Cancel</Trans>
@@ -178,7 +178,7 @@ export default class ShowPostPage extends React.Component<ShowPostPageProps, Sho
</VStack>
) : (
<VStack>
- <Button onClick={this.startEdit}>
+ <Button onClick={this.startEdit} disabled={Fider.isReadOnly}>
<Icon sprite={IconPencilAlt} />
<span>
<Trans id="action.edit">Edit</Trans>
diff --git a/public/pages/ShowPost/components/CommentInput.tsx b/public/pages/ShowPost/components/CommentInput.tsx
index 67a162a51..e3ffb3e19 100644
--- a/public/pages/ShowPost/components/CommentInput.tsx
+++ b/public/pages/ShowPost/components/CommentInput.tsx
@@ -67,6 +67,7 @@ export const CommentInput = (props: CommentInputProps) => {
<TextArea
placeholder={t({ id: "showpost.commentinput.placeholder", message: "Leave a comment" })}
field="content"
+ disabled={fider.isReadOnly}
value={content}
minRows={1}
onChange={commentChanged}
diff --git a/public/pages/ShowPost/components/ModerationPanel.tsx b/public/pages/ShowPost/components/ModerationPanel.tsx
index 143a84384..e37b356a6 100644
--- a/public/pages/ShowPost/components/ModerationPanel.tsx
+++ b/public/pages/ShowPost/components/ModerationPanel.tsx
@@ -70,7 +70,7 @@ export const ModerationPanel = (props: ModerationPanelProps) => {
<span className="text-category">
<Trans id="label.moderation">Moderation</Trans>
</span>
- <Button variant="danger" size="small" className="w-full" onClick={showModal}>
+ <Button disabled={fider.isReadOnly} variant="danger" size="small" className="w-full" onClick={showModal}>
<Trans id="action.delete">Delete</Trans>
</Button>
</VStack>
diff --git a/public/pages/ShowPost/components/NotificationsPanel.tsx b/public/pages/ShowPost/components/NotificationsPanel.tsx
index d299a898e..c9ee001ac 100644
--- a/public/pages/ShowPost/components/NotificationsPanel.tsx
+++ b/public/pages/ShowPost/components/NotificationsPanel.tsx
@@ -31,14 +31,14 @@ export const NotificationsPanel = (props: NotificationsPanelProps) => {
}
const button = subscribed ? (
- <Button className="w-full" onClick={subscribeOrUnsubscribe}>
+ <Button className="w-full" onClick={subscribeOrUnsubscribe} disabled={fider.isReadOnly}>
<Icon sprite={IconVolumeOff} />{" "}
<span>
<Trans id="label.unsubscribe">Unsubscribe</Trans>
</span>
</Button>
) : (
- <Button className="w-full" onClick={subscribeOrUnsubscribe}>
+ <Button className="w-full" onClick={subscribeOrUnsubscribe} disabled={fider.isReadOnly}>
<Icon sprite={IconVolumeOn} />
<span>
<Trans id="label.subscribe">Subscribe</Trans>
diff --git a/public/pages/ShowPost/components/ResponseForm.tsx b/public/pages/ShowPost/components/ResponseForm.tsx
index c41518f39..92f0f1d66 100644
--- a/public/pages/ShowPost/components/ResponseForm.tsx
+++ b/public/pages/ShowPost/components/ResponseForm.tsx
@@ -3,7 +3,7 @@ import React from "react"
import { Modal, Button, DisplayError, Select, Form, TextArea, Field, SelectOption, Icon } from "@fider/components"
import { Post, PostStatus } from "@fider/models"
-import { actions, Failure } from "@fider/services"
+import { actions, Failure, Fider } from "@fider/services"
import { PostSearch } from "./PostSearch"
import IconSpeakerPhone from "@fider/assets/images/heroicons-speakerphone.svg"
import { t, Trans } from "@lingui/macro"
@@ -67,7 +67,7 @@ export class ResponseForm extends React.Component<ResponseFormProps, ResponseFor
public render() {
const button = (
- <Button className="w-full" onClick={this.showModal}>
+ <Button className="w-full" onClick={this.showModal} disabled={Fider.isReadOnly}>
<Icon sprite={IconSpeakerPhone} />{" "}
<span>
<Trans id="action.respond">Respond</Trans>
diff --git a/public/pages/ShowPost/components/TagsPanel.tsx b/public/pages/ShowPost/components/TagsPanel.tsx
index 314a3f54c..0a23df773 100644
--- a/public/pages/ShowPost/components/TagsPanel.tsx
+++ b/public/pages/ShowPost/components/TagsPanel.tsx
@@ -75,6 +75,17 @@ export const TagsPanel = (props: TagsPanelProps) => {
const icon = canEdit && (isEditing ? <Icon sprite={IconCheckCircle} className="h-4" /> : <Icon sprite={IconPencilAlt} className="h-4" />)
+ if (fider.isReadOnly) {
+ return (
+ <VStack>
+ <HStack spacing={2} className="text-category">
+ <Trans id="label.tags">Tags</Trans>
+ </HStack>
+ {tagsList}
+ </VStack>
+ )
+ }
+
return (
<VStack>
<HStack spacing={2} className="text-category clickable" onClick={onSubtitleClick}>