Open platform to collect and prioritize feedback
feature: introduce locked tenant status (#700)
Guilherme Oenning2f8ffc2728b1
diff --git a/app/cmd/routes.go b/app/cmd/routes.goindex 6cfd4837a..e46a39f12 100644--- a/app/cmd/routes.go+++ b/app/cmd/routes.go@@ -91,6 +91,9 @@ func routes(r *web.Engine) *web.Engine {r.Post("/_api/signin/complete", handlers.CompleteSignInProfile())r.Post("/_api/signin", handlers.SignInByEmail())+ //Block if it's a locked tenant with a non-administrator user+ r.Use(middlewares.BlockLockedTenants())+//Block if it's private tenant with unauthenticated userr.Use(middlewares.CheckTenantPrivacy())diff --git a/app/handlers/signin.go b/app/handlers/signin.goindex 9848345e9..4f8ac40df 100644--- a/app/handlers/signin.go+++ b/app/handlers/signin.go@@ -9,21 +9,22 @@ import ("github.com/getfider/fider/app/models""github.com/getfider/fider/app/pkg/errors""github.com/getfider/fider/app/pkg/web"- "github.com/getfider/fider/app/pkg/web/util"+ webutil "github.com/getfider/fider/app/pkg/web/util""github.com/getfider/fider/app/tasks")// SignInPage renders the sign in pagefunc SignInPage() web.HandlerFunc {return func(c web.Context) error {- if c.IsAuthenticated() || !c.Tenant().IsPrivate {- return c.Redirect(c.BaseURL())++ if c.Tenant().IsPrivate || c.Tenant().Status == models.TenantLocked {+ return c.Page(web.Props{+ Title: "Sign in",+ ChunkName: "SignIn.page",+ })}- return c.Page(web.Props{- Title: "Sign in",- ChunkName: "SignIn.page",- })+ return c.Redirect(c.BaseURL())}}diff --git a/app/handlers/signin_test.go b/app/handlers/signin_test.goindex 1055a3a27..8c75ec57d 100644--- a/app/handlers/signin_test.go+++ b/app/handlers/signin_test.go@@ -200,7 +200,7 @@ func TestVerifySignInKeyHandler_PrivateTenant_InviteRequest_NewUser(t *testing.TExpect(code).Equals(http.StatusOK)}-func TestVerifySignUpKeyHandler_InactiveTenant(t *testing.T) {+func TestVerifySignUpKeyHandler_PendingTenant(t *testing.T) {RegisterT(t)server, services := mock.NewServer()diff --git a/app/middlewares/tenant.go b/app/middlewares/tenant.goindex c7954e25a..36f1ce40a 100644--- a/app/middlewares/tenant.go+++ b/app/middlewares/tenant.go@@ -115,3 +115,22 @@ func CheckTenantPrivacy() web.MiddlewareFunc {}}}++// BlockLockedTenants blocks requests of non-administrator users on locked tenants+func BlockLockedTenants() web.MiddlewareFunc {+ return func(next web.HandlerFunc) web.HandlerFunc {+ return func(c web.Context) error {+ if c.Tenant().Status == models.TenantLocked {+ if c.Request.IsAPI() {+ return c.JSON(http.StatusLocked, web.Map{})+ }++ isAdmin := c.IsAuthenticated() && c.User().Role == models.RoleAdministrator+ if !isAdmin {+ return c.Redirect("/signin")+ }+ }+ return next(c)+ }+ }+}diff --git a/app/middlewares/tenant_test.go b/app/middlewares/tenant_test.goindex f59089f07..26ec3da4f 100644--- a/app/middlewares/tenant_test.go+++ b/app/middlewares/tenant_test.go@@ -306,3 +306,52 @@ 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 = models.TenantLocked++ 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.StatusTemporaryRedirect)+ Expect(response.HeaderMap.Get("Location")).Equals("/signin")+}++func TestBlockLockedTenants_LockedTenant_APICall(t *testing.T) {+ RegisterT(t)+ server, _ := mock.NewServer()+ server.Use(middlewares.BlockLockedTenants())+ mock.DemoTenant.Status = models.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.StatusLocked)+}diff --git a/app/models/identity.go b/app/models/identity.goindex 4d93c536d..ab42af43c 100644--- a/app/models/identity.go+++ b/app/models/identity.go@@ -26,8 +26,8 @@ var (TenantActive = 1//TenantPending is used for signup via email that requires user confirmationTenantPending = 2- //TenantInactive is used when tenants are inative for various reasons- TenantInactive = 3+ //TenantLocked is used when tenants are locked for various reasons+ TenantLocked = 3)//Upload represents a file that has been uploaded to Fiderdiff --git a/public/pages/SignIn/SignIn.page.tsx b/public/pages/SignIn/SignIn.page.tsxindex 59b8f7d3b..64afb103b 100644--- a/public/pages/SignIn/SignIn.page.tsx+++ b/public/pages/SignIn/SignIn.page.tsx@@ -4,6 +4,25 @@ import React from "react";import { SignInControl, TenantLogo, LegalNotice } from "@fider/components";import { notify, Fider } from "@fider/services";+const messages = {+ locked: () => (+ <>+ <p className="welcome">+ <strong>{Fider.session.tenant.name}</strong> is currently locked.+ </p>+ <p>To reactivate this site, sign in with an administrator account and update the required settings.</p>+ </>+ ),+ private: () => (+ <>+ <p className="welcome">+ <strong>{Fider.session.tenant.name}</strong> is a private space and requires an invitation to join it.+ </p>+ <p>If you have an account or an invitation, you may use following options to sign in.</p>+ </>+ )+};+export default class SignInPage extends React.Component<{}, {}> {private onEmailSent = (email: string) => {notify.success(@@ -18,10 +37,7 @@ export default class SignInPage extends React.Component<{}, {}> {<div id="p-signin" className="page container"><div className="message"><TenantLogo size={100} />- <p className="welcome">- <strong>{Fider.session.tenant.name}</strong> is a private space and requires an invitation to join it.- </p>- <p>If you have an account or an invitation, you may use following options to sign in.</p>+ {Fider.session.tenant.isPrivate ? messages.private() : messages.locked()}</div><SignInControl onEmailSent={this.onEmailSent} useEmail={true} redirectTo={Fider.settings.baseURL} /><LegalNotice />diff --git a/public/services/http.ts b/public/services/http.tsindex a4b6bcb97..93853f190 100644--- a/public/services/http.ts+++ b/public/services/http.ts@@ -1,4 +1,4 @@-import { analytics } from "@fider/services";+import { analytics, notify } from "@fider/services";export interface ErrorItem {field?: string;@@ -17,20 +17,29 @@ export interface Result<T = void> {async function toResult<T>(response: Response): Promise<Result<T>> {const body = await response.json();+if (response.status < 400) {return {ok: true,data: body as T};- } else {- return {- ok: false,- data: body as T,- error: {- errors: body.errors- }- };}++ if (response.status === 500) {+ notify.error("An unexpected error occurred while processing your request.");+ } else if (response.status === 403) {+ notify.error("You are not authorized to perform this operation.");+ } else if (response.status === 423) {+ notify.error("This operation is not allowed. Update your billing settings to unlock it.");+ }++ return {+ ok: false,+ data: body as T,+ error: {+ errors: body.errors+ }+ };}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"]];diff --git a/scripts/kill-dev.sh b/scripts/kill-dev.shnew file mode 100755index 000000000..4ca6fb91f--- /dev/null+++ b/scripts/kill-dev.sh@@ -0,0 +1 @@+kill $(lsof -t -i :3000)\ No newline at end of file