Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

new setting to disable automatic email signups

Kevin Papst17dd2dbb8609
diff --git a/app/actions/tenant.go b/app/actions/tenant.go
index 36d129bcc..ce2f56630 100644
--- a/app/actions/tenant.go
+++ b/app/actions/tenant.go
@@ -290,6 +290,7 @@ type UpdateTenantPrivacySettings struct {
IsPrivate bool `json:"isPrivate"`
IsFeedEnabled bool `json:"isFeedEnabled"`
IsModerationEnabled bool `json:"isModerationEnabled"`
+ IsSignUpDisabled bool `json:"isSignUpDisabled"`
}
// IsAuthorized returns true if current user is authorized to perform this action
diff --git a/app/handlers/admin.go b/app/handlers/admin.go
index 6ffd5462e..1c5d2de37 100644
--- a/app/handlers/admin.go
+++ b/app/handlers/admin.go
@@ -108,6 +108,7 @@ func UpdatePrivacySettings() web.HandlerFunc {
IsPrivate: action.IsPrivate,
IsFeedEnabled: action.IsFeedEnabled,
IsModerationEnabled: action.IsModerationEnabled,
+ IsSignUpDisabled: action.IsSignUpDisabled,
}
if err := bus.Dispatch(c, updateSettings); err != nil {
return c.Failure(err)
diff --git a/app/handlers/admin_test.go b/app/handlers/admin_test.go
index 2f8d864e7..5aa678050 100644
--- a/app/handlers/admin_test.go
+++ b/app/handlers/admin_test.go
@@ -198,6 +198,29 @@ func TestUpdatePrivacySettingsHandler(t *testing.T) {
Expect(updateCmd.IsFeedEnabled).IsTrue()
}
+func TestUpdatePrivacySettingsHandler_SignUpDisabled(t *testing.T) {
+ RegisterT(t)
+
+ var updateCmd *cmd.UpdateTenantPrivacySettings
+ bus.AddHandler(func(ctx context.Context, c *cmd.UpdateTenantPrivacySettings) error {
+ updateCmd = c
+ return nil
+ })
+
+ server := mock.NewServer()
+ code, _ := server.
+ OnTenant(mock.DemoTenant).
+ AsUser(mock.JonSnow).
+ ExecutePost(
+ handlers.UpdatePrivacySettings(),
+ `{ "isPrivate": false, "isFeedEnabled": true, "isSignUpDisabled": true }`,
+ )
+
+ Expect(code).Equals(http.StatusOK)
+ Expect(updateCmd.IsPrivate).IsFalse()
+ Expect(updateCmd.IsSignUpDisabled).IsTrue()
+}
+
func TestManageMembersHandler(t *testing.T) {
RegisterT(t)
diff --git a/app/handlers/oauth.go b/app/handlers/oauth.go
index 5aeceacae..c6730e3d0 100644
--- a/app/handlers/oauth.go
+++ b/app/handlers/oauth.go
@@ -273,7 +273,7 @@ func OAuthToken() web.HandlerFunc {
if err != nil {
if errors.Cause(err) == app.ErrNotFound {
isTrusted := customConfig != nil && customConfig.IsTrusted
- if c.Tenant().IsPrivate && !isTrusted {
+ if !c.Tenant().IsSignUpAllowed() && !isTrusted {
return c.Redirect("/not-invited")
}
diff --git a/app/handlers/oauth_test.go b/app/handlers/oauth_test.go
index 72c09eec3..292545443 100644
--- a/app/handlers/oauth_test.go
+++ b/app/handlers/oauth_test.go
@@ -750,6 +750,49 @@ func TestOAuthTokenHandler_NewUser_PrivateSite(t *testing.T) {
ExpectFiderAuthCookie(response, nil)
}
+func TestOAuthTokenHandler_NewUser_SignUpDisabled(t *testing.T) {
+ RegisterT(t)
+
+ server := mock.NewServer()
+ mock.AvengersTenant.IsSignUpDisabled = true
+
+ bus.AddHandler(func(ctx context.Context, q *query.GetUserByEmail) error {
+ return app.ErrNotFound
+ })
+
+ bus.AddHandler(func(ctx context.Context, q *query.GetUserByProvider) error {
+ return app.ErrNotFound
+ })
+
+ bus.AddHandler(func(ctx context.Context, q *query.GetCustomOAuthConfigByProvider) error {
+ Expect(q.Provider).Equals(app.FacebookProvider)
+ return app.ErrNotFound
+ })
+
+ bus.AddHandler(func(ctx context.Context, q *query.GetOAuthProfile) error {
+ Expect(q.Provider).Equals(app.FacebookProvider)
+ Expect(q.Code).Equals("456")
+ q.Result = &dto.OAuthUserProfile{
+ ID: "FB456",
+ Name: "Some Facebook Guy",
+ Email: "[email protected]",
+ }
+ return nil
+ })
+
+ code, response := server.
+ WithURL("http://feedback.theavengers.com/oauth/facebook/token?code=456&redirect=/&handoff="+newHandoff(app.FacebookProvider, "http://feedback.theavengers.com", "MY_SESSION_ID")).
+ OnTenant(mock.AvengersTenant).
+ AddParam("provider", app.FacebookProvider).
+ AddCookie(web.CookieSessionName, "MY_SESSION_ID").
+ Use(middlewares.Session()).
+ Execute(handlers.OAuthToken())
+
+ Expect(code).Equals(http.StatusTemporaryRedirect)
+ Expect(response.Header().Get("Location")).Equals("/not-invited")
+ ExpectFiderAuthCookie(response, nil)
+}
+
func TestOAuthTokenHandler_NewUser_PrivateSite_UsingTrustedProvider(t *testing.T) {
RegisterT(t)
diff --git a/app/handlers/signin.go b/app/handlers/signin.go
index 435243d29..a77060705 100644
--- a/app/handlers/signin.go
+++ b/app/handlers/signin.go
@@ -128,8 +128,8 @@ func SignInByEmailWithName() web.HandlerFunc {
})
}
- // Check if tenant is private (new users not allowed)
- if c.Tenant().IsPrivate {
+ // Check if new users are allowed to sign up (not on private sites or when sign up is disabled)
+ if !c.Tenant().IsSignUpAllowed() {
return c.Forbidden()
}
@@ -215,7 +215,7 @@ func VerifySignInCode() web.HandlerFunc {
if err != nil {
if errors.Cause(err) == app.ErrNotFound {
// User doesn't exist
- if c.Tenant().IsPrivate {
+ if !c.Tenant().IsSignUpAllowed() {
return c.Forbidden()
}
@@ -315,7 +315,7 @@ func VerifySignInKey(kind enum.EmailVerificationKind) web.HandlerFunc {
err = bus.Dispatch(c, userByEmail)
if err != nil {
if errors.Cause(err) == app.ErrNotFound {
- if kind == enum.EmailVerificationKindSignIn && c.Tenant().IsPrivate {
+ if kind == enum.EmailVerificationKindSignIn && !c.Tenant().IsSignUpAllowed() {
return NotInvitedPage()(c)
}
@@ -387,6 +387,11 @@ func CompleteSignInProfile() web.HandlerFunc {
return c.BadRequest(web.Map{})
}
+ // Only invited users can create an account when sign up is not allowed
+ if action.Kind == enum.EmailVerificationKindSignIn && !c.Tenant().IsSignUpAllowed() {
+ return c.Forbidden()
+ }
+
user := &entity.User{
Name: action.Name,
Email: result.Email,
diff --git a/app/handlers/signin_test.go b/app/handlers/signin_test.go
index ca027bf9d..20f960a17 100644
--- a/app/handlers/signin_test.go
+++ b/app/handlers/signin_test.go
@@ -1117,3 +1117,175 @@ func ExpectFiderToken(token string, expected *entity.User) {
Expect(user.UserName).Equals(expected.Name)
Expect(user.UserEmail).Equals(expected.Email)
}
+
+func TestSignInByEmailWithNameHandler_SignUpDisabled(t *testing.T) {
+ RegisterT(t)
+
+ bus.AddHandler(func(ctx context.Context, q *query.GetUserByEmail) error {
+ return app.ErrNotFound
+ })
+
+ server := mock.NewServer()
+ mock.DemoTenant.IsSignUpDisabled = true
+
+ code, _ := server.
+ OnTenant(mock.DemoTenant).
+ ExecutePost(handlers.SignInByEmailWithName(), `{ "email": "[email protected]", "name": "New User" }`)
+
+ Expect(code).Equals(http.StatusForbidden)
+ ExpectHandler(&cmd.SaveVerificationKey{}).CalledTimes(0)
+}
+
+func TestVerifySignInCodeHandler_CorrectCode_NewUser_SignUpDisabled(t *testing.T) {
+ RegisterT(t)
+
+ server := mock.NewServer()
+ mock.DemoTenant.IsSignUpDisabled = true
+
+ bus.AddHandler(func(ctx context.Context, q *query.GetActiveVerificationByEmail) error {
+ q.Result = &entity.EmailVerification{
+ Email: "[email protected]",
+ Name: "New User",
+ Key: "some-long-link-key",
+ Code: "123456",
+ CreatedAt: time.Now(),
+ ExpiresAt: time.Now().Add(15 * time.Minute),
+ }
+ return nil
+ })
+
+ bus.AddHandler(func(ctx context.Context, c *cmd.IncrementVerificationAttempts) error {
+ return nil
+ })
+
+ bus.AddHandler(func(ctx context.Context, q *query.GetUserByEmail) error {
+ return app.ErrNotFound
+ })
+
+ code, _ := server.
+ OnTenant(mock.DemoTenant).
+ ExecutePost(handlers.VerifySignInCode(), `{ "email": "[email protected]", "code": "123456" }`)
+
+ Expect(code).Equals(http.StatusForbidden)
+ ExpectHandler(&cmd.RegisterUser{}).CalledTimes(0)
+}
+
+func TestVerifySignInKeyHandler_SignUpDisabled_SignInRequest_NewUser(t *testing.T) {
+ RegisterT(t)
+
+ key := "1234567890"
+ bus.AddHandler(func(ctx context.Context, q *query.GetVerificationByKey) error {
+ if q.Key == key && q.Kind == enum.EmailVerificationKindSignIn {
+ q.Result = &entity.EmailVerification{
+ Key: q.Key,
+ Kind: q.Kind,
+ ExpiresAt: time.Now().Add(5 * time.Minute),
+ Email: "[email protected]",
+ Name: "Hot Pie",
+ }
+ return nil
+ }
+ return app.ErrNotFound
+ })
+
+ bus.AddHandler(func(ctx context.Context, q *query.GetUserByEmail) error {
+ return app.ErrNotFound
+ })
+
+ server := mock.NewServer()
+ mock.DemoTenant.IsSignUpDisabled = true
+
+ code, _ := server.
+ OnTenant(mock.DemoTenant).
+ WithURL("http://demo.test.fider.io/signin/verify?k=" + key).
+ Execute(handlers.VerifySignInKey(enum.EmailVerificationKindSignIn))
+
+ Expect(code).Equals(http.StatusForbidden)
+ ExpectHandler(&cmd.RegisterUser{}).CalledTimes(0)
+}
+
+func TestCompleteSignInProfileHandler_SignUpDisabled(t *testing.T) {
+ for _, tenantSetup := range []func(tenant *entity.Tenant){
+ func(tenant *entity.Tenant) { tenant.IsSignUpDisabled = true },
+ func(tenant *entity.Tenant) { tenant.IsPrivate = true },
+ } {
+ RegisterT(t)
+
+ key := "1234567890"
+ bus.AddHandler(func(ctx context.Context, q *query.GetVerificationByKey) error {
+ q.Result = &entity.EmailVerification{
+ Key: q.Key,
+ Kind: q.Kind,
+ ExpiresAt: time.Now().Add(5 * time.Minute),
+ Email: "[email protected]",
+ }
+ return nil
+ })
+
+ bus.AddHandler(func(ctx context.Context, q *query.GetUserByEmail) error {
+ return app.ErrNotFound
+ })
+
+ server := mock.NewServer()
+ tenantSetup(mock.DemoTenant)
+
+ code, _ := server.
+ OnTenant(mock.DemoTenant).
+ WithURL("http://demo.test.fider.io/signin/complete").
+ ExecutePost(handlers.CompleteSignInProfile(), fmt.Sprintf(`
+ {
+ "name": "Hot Pie",
+ "kind": %d,
+ "key": "%s"
+ }`, enum.EmailVerificationKindSignIn, key))
+
+ Expect(code).Equals(http.StatusForbidden)
+ ExpectHandler(&cmd.RegisterUser{}).CalledTimes(0)
+ }
+}
+
+func TestCompleteSignInProfileHandler_SignUpDisabled_Invitation(t *testing.T) {
+ RegisterT(t)
+
+ key := "1234567890"
+ var newUser *entity.User
+ bus.AddHandler(func(ctx context.Context, c *cmd.RegisterUser) error {
+ newUser = c.User
+ return nil
+ })
+
+ bus.AddHandler(func(ctx context.Context, q *query.GetVerificationByKey) error {
+ Expect(q.Kind).Equals(enum.EmailVerificationKindUserInvitation)
+ q.Result = &entity.EmailVerification{
+ Key: q.Key,
+ Kind: q.Kind,
+ ExpiresAt: time.Now().Add(5 * time.Minute),
+ Email: "[email protected]",
+ }
+ return nil
+ })
+
+ bus.AddHandler(func(ctx context.Context, q *query.GetUserByEmail) error {
+ return app.ErrNotFound
+ })
+
+ bus.AddHandler(func(ctx context.Context, c *cmd.SetKeyAsVerified) error {
+ return nil
+ })
+
+ server := mock.NewServer()
+ mock.DemoTenant.IsSignUpDisabled = true
+
+ code, response := server.
+ OnTenant(mock.DemoTenant).
+ WithURL("http://demo.test.fider.io/signin/complete").
+ ExecutePost(handlers.CompleteSignInProfile(), fmt.Sprintf(`
+ {
+ "name": "Hot Pie",
+ "kind": %d,
+ "key": "%s"
+ }`, enum.EmailVerificationKindUserInvitation, key))
+
+ Expect(code).Equals(http.StatusOK)
+ ExpectFiderAuthCookie(response, newUser)
+}
diff --git a/app/models/cmd/tenant.go b/app/models/cmd/tenant.go
index e9bc946bd..d39cc7a10 100644
--- a/app/models/cmd/tenant.go
+++ b/app/models/cmd/tenant.go
@@ -20,6 +20,7 @@ type UpdateTenantPrivacySettings struct {
IsPrivate bool
IsFeedEnabled bool
IsModerationEnabled bool
+ IsSignUpDisabled bool
}
type UpdateTenantEmailAuthAllowedSettings struct {
diff --git a/app/models/entity/tenant.go b/app/models/entity/tenant.go
index 0fe782273..5b61e217f 100644
--- a/app/models/entity/tenant.go
+++ b/app/models/entity/tenant.go
@@ -26,6 +26,7 @@ type Tenant struct {
IsFeedEnabled bool `json:"isFeedEnabled"`
PreventIndexing bool `json:"preventIndexing"`
IsModerationEnabled bool `json:"isModerationEnabled"`
+ IsSignUpDisabled bool `json:"isSignUpDisabled"`
IsPro bool `json:"isPro"`
// ScheduledDeletionAt is set when the account owner has requested deletion of the whole
// site. The tenant stays active during the grace window; a background job performs the
@@ -41,6 +42,13 @@ func (t *Tenant) IsDisabled() bool {
return t.Status == enum.TenantDisabled
}
+// IsSignUpAllowed returns true if visitors can create a new account on their own,
+// e.g. by signing in with an unknown email address or an untrusted OAuth provider.
+// Invitations by administrators are always allowed.
+func (t *Tenant) IsSignUpAllowed() bool {
+ return !t.IsPrivate && !t.IsSignUpDisabled
+}
+
// TenantContact is a reference to an administrator account
type TenantContact struct {
Name string `json:"name"`
diff --git a/app/pkg/web/testdata/home_ssr.html b/app/pkg/web/testdata/home_ssr.html
index 5a1688d35..cf341e789 100755
--- a/app/pkg/web/testdata/home_ssr.html
+++ b/app/pkg/web/testdata/home_ssr.html
@@ -45,7 +45,7 @@
<script id="server-data" type="application/json">
- {"contextID":"CONTEXT_ID","description":"My Page Description","page":"Test.page","props":{"countPerStatus":{},"posts":[],"tags":[]},"settings":{"allowAllowedSchemes":true,"assetsURL":"https://demo.test.fider.io:3000","baseURL":"https://demo.test.fider.io:3000","domain":".test.fider.io","environment":"test","googleAnalytics":"","hasLegal":true,"isBillingEnabled":false,"locale":"en","localeDirection":"ltr","mode":"multi","oauth":[],"postWithTags":true,"version":"dev"},"tenant":{"id":0,"name":"","subdomain":"","invitation":"","welcomeMessage":"","welcomeHeader":"","descriptionTemplate":"","cname":"","status":0,"locale":"en","isPrivate":false,"logoBlobKey":"","allowedSchemes":"","isEmailAuthAllowed":false,"isFeedEnabled":false,"preventIndexing":false,"isModerationEnabled":false,"isPro":false},"title":"My Page Title · "}
+ {"contextID":"CONTEXT_ID","description":"My Page Description","page":"Test.page","props":{"countPerStatus":{},"posts":[],"tags":[]},"settings":{"allowAllowedSchemes":true,"assetsURL":"https://demo.test.fider.io:3000","baseURL":"https://demo.test.fider.io:3000","domain":".test.fider.io","environment":"test","googleAnalytics":"","hasLegal":true,"isBillingEnabled":false,"locale":"en","localeDirection":"ltr","mode":"multi","oauth":[],"postWithTags":true,"version":"dev"},"tenant":{"id":0,"name":"","subdomain":"","invitation":"","welcomeMessage":"","welcomeHeader":"","descriptionTemplate":"","cname":"","status":0,"locale":"en","isPrivate":false,"logoBlobKey":"","allowedSchemes":"","isEmailAuthAllowed":false,"isFeedEnabled":false,"preventIndexing":false,"isModerationEnabled":false,"isSignUpDisabled":false,"isPro":false},"title":"My Page Title · "}
</script>
diff --git a/app/pkg/web/testdata/tenant.html b/app/pkg/web/testdata/tenant.html
index 9f0b82c41..af3b8ee8d 100755
--- a/app/pkg/web/testdata/tenant.html
+++ b/app/pkg/web/testdata/tenant.html
@@ -45,7 +45,7 @@
<script id="server-data" type="application/json">
- {"contextID":"CONTEXT_ID","page":"","props":{},"settings":{"allowAllowedSchemes":true,"assetsURL":"https://demo.test.fider.io:3000","baseURL":"https://demo.test.fider.io:3000","domain":".test.fider.io","environment":"test","googleAnalytics":"","hasLegal":true,"isBillingEnabled":false,"locale":"en","localeDirection":"ltr","mode":"multi","oauth":[],"postWithTags":true,"version":"dev"},"tenant":{"id":0,"name":"Game of Thrones","subdomain":"","invitation":"","welcomeMessage":"","welcomeHeader":"","descriptionTemplate":"","cname":"","status":0,"locale":"","isPrivate":false,"logoBlobKey":"","allowedSchemes":"","isEmailAuthAllowed":false,"isFeedEnabled":false,"preventIndexing":false,"isModerationEnabled":false,"isPro":false},"title":"Game of Thrones"}
+ {"contextID":"CONTEXT_ID","page":"","props":{},"settings":{"allowAllowedSchemes":true,"assetsURL":"https://demo.test.fider.io:3000","baseURL":"https://demo.test.fider.io:3000","domain":".test.fider.io","environment":"test","googleAnalytics":"","hasLegal":true,"isBillingEnabled":false,"locale":"en","localeDirection":"ltr","mode":"multi","oauth":[],"postWithTags":true,"version":"dev"},"tenant":{"id":0,"name":"Game of Thrones","subdomain":"","invitation":"","welcomeMessage":"","welcomeHeader":"","descriptionTemplate":"","cname":"","status":0,"locale":"","isPrivate":false,"logoBlobKey":"","allowedSchemes":"","isEmailAuthAllowed":false,"isFeedEnabled":false,"preventIndexing":false,"isModerationEnabled":false,"isSignUpDisabled":false,"isPro":false},"title":"Game of Thrones"}
</script>
diff --git a/app/services/sqlstore/dbEntities/tenant.go b/app/services/sqlstore/dbEntities/tenant.go
index 2fdb49b37..5b2cf3672 100644
--- a/app/services/sqlstore/dbEntities/tenant.go
+++ b/app/services/sqlstore/dbEntities/tenant.go
@@ -28,6 +28,7 @@ type Tenant struct {
IsFeedEnabled bool `db:"is_feed_enabled"`
PreventIndexing bool `db:"prevent_indexing"`
IsModerationEnabled bool `db:"is_moderation_enabled"`
+ IsSignUpDisabled bool `db:"is_signup_disabled"`
IsPro bool `db:"is_pro"`
HasPaddleSubscription bool `db:"has_paddle_subscription"`
ScheduledDeletionAt dbx.NullTime `db:"scheduled_deletion_at"`
@@ -65,6 +66,7 @@ func (t *Tenant) ToModel() *entity.Tenant {
IsFeedEnabled: t.IsFeedEnabled,
PreventIndexing: t.PreventIndexing,
IsModerationEnabled: isPro && t.IsModerationEnabled,
+ IsSignUpDisabled: t.IsSignUpDisabled,
IsPro: isPro,
}
diff --git a/app/services/sqlstore/postgres/tenant.go b/app/services/sqlstore/postgres/tenant.go
index 39a6313f9..fb7e720f6 100644
--- a/app/services/sqlstore/postgres/tenant.go
+++ b/app/services/sqlstore/postgres/tenant.go
@@ -60,6 +60,10 @@ func updateTenantPrivacySettings(ctx context.Context, c *cmd.UpdateTenantPrivacy
if err != nil {
return errors.Wrap(err, "failed update tenant moderation setting")
}
+ _, err = trx.Execute("UPDATE tenants SET is_signup_disabled = $1 WHERE id = $2", c.IsSignUpDisabled, tenant.ID)
+ if err != nil {
+ return errors.Wrap(err, "failed update tenant sign up setting")
+ }
return nil
})
}
@@ -260,7 +264,7 @@ func getFirstTenant(ctx context.Context, q *query.GetFirstTenant) error {
tenant := dbEntities.Tenant{}
err := trx.Get(&tenant, `
- SELECT t.id, t.name, t.subdomain, t.cname, t.invitation, t.locale, t.welcome_message, t.welcome_header, t.description_template, t.status, t.is_private, t.logo_bkey, t.custom_css, t.allowed_schemes, t.is_email_auth_allowed, t.is_feed_enabled, t.is_moderation_enabled, t.prevent_indexing, t.is_pro, t.scheduled_deletion_at,
+ SELECT t.id, t.name, t.subdomain, t.cname, t.invitation, t.locale, t.welcome_message, t.welcome_header, t.description_template, t.status, t.is_private, t.logo_bkey, t.custom_css, t.allowed_schemes, t.is_email_auth_allowed, t.is_feed_enabled, t.is_moderation_enabled, t.is_signup_disabled, t.prevent_indexing, t.is_pro, t.scheduled_deletion_at,
(b.paddle_subscription_id IS NOT NULL AND b.stripe_subscription_id IS NULL) AS has_paddle_subscription
FROM tenants t
LEFT JOIN tenants_billing b ON b.tenant_id = t.id
@@ -280,7 +284,7 @@ func getTenantByDomain(ctx context.Context, q *query.GetTenantByDomain) error {
tenant := dbEntities.Tenant{}
err := trx.Get(&tenant, `
- SELECT t.id, t.name, t.subdomain, t.cname, t.invitation, t.locale, t.welcome_message, t.welcome_header, t.description_template, t.status, t.is_private, t.logo_bkey, t.custom_css, t.allowed_schemes, t.is_email_auth_allowed, t.is_feed_enabled, t.is_moderation_enabled, t.prevent_indexing, t.is_pro, t.scheduled_deletion_at,
+ SELECT t.id, t.name, t.subdomain, t.cname, t.invitation, t.locale, t.welcome_message, t.welcome_header, t.description_template, t.status, t.is_private, t.logo_bkey, t.custom_css, t.allowed_schemes, t.is_email_auth_allowed, t.is_feed_enabled, t.is_moderation_enabled, t.is_signup_disabled, t.prevent_indexing, t.is_pro, t.scheduled_deletion_at,
(b.paddle_subscription_id IS NOT NULL AND b.stripe_subscription_id IS NULL) AS has_paddle_subscription
FROM tenants t
LEFT JOIN tenants_billing b ON b.tenant_id = t.id
diff --git a/locale/de/client.json b/locale/de/client.json
index 02dcfcb8b..344346801 100644
--- a/locale/de/client.json
+++ b/locale/de/client.json
@@ -242,6 +242,7 @@
"signin.message.onlyadmins": "Derzeit ist die Anmeldung nur mit einem Administratorkonto erlaubt.",
"signin.message.private.text": "Wenn du ein Konto oder eine Einladung hast, kannst du folgende Optionen nutzen, um dich anzumelden.",
"signin.message.private.title": "<0>{0}</0> ist ein privater Raum, du musst dich anmelden, um teilzunehmen und abstimmen zu können.",
+ "signin.message.signupdisabled": "Wir konnten kein Konto für diese E-Mail-Adresse finden. Neue Registrierungen sind derzeit deaktiviert.",
"signin.message.socialbutton.intro": "Einloggen mit",
"signin.name.placeholder": "Dein Name",
"validation.custom.maxattachments": "Es sind maximal {number} Anhänge zulässig.",
diff --git a/locale/en/client.json b/locale/en/client.json
index 70516faa9..8ae3532f4 100644
--- a/locale/en/client.json
+++ b/locale/en/client.json
@@ -242,6 +242,7 @@
"signin.message.onlyadmins": "Currently only allowed to sign in to an administrator account",
"signin.message.private.text": "If you have an account or an invitation, you may use following options to sign in.",
"signin.message.private.title": "<0>{0}</0> is a private space, you must sign in to participate and vote.",
+ "signin.message.signupdisabled": "We couldn't find an account for this email address. New sign-ups are currently disabled.",
"signin.message.socialbutton.intro": "Continue with",
"signin.name.placeholder": "Your name",
"validation.custom.maxattachments": "A maximum of {number} attachments are allowed.",
diff --git a/migrations/202610131200_add_tenant_signup_disabled.sql b/migrations/202610131200_add_tenant_signup_disabled.sql
new file mode 100644
index 000000000..a037ead3e
--- /dev/null
+++ b/migrations/202610131200_add_tenant_signup_disabled.sql
@@ -0,0 +1 @@
+ALTER TABLE tenants ADD is_signup_disabled BOOLEAN NOT NULL DEFAULT false;
diff --git a/public/components/common/SignInControl.tsx b/public/components/common/SignInControl.tsx
index 1caaae68a..f4de52d90 100644
--- a/public/components/common/SignInControl.tsx
+++ b/public/components/common/SignInControl.tsx
@@ -63,6 +63,21 @@ export const SignInControl: React.FunctionComponent<SignInControlProps> = (props
setError(undefined)
const data = result.data as { userExists?: boolean } | undefined
if (data && data.userExists === false) {
+ if (fider.session.tenant.isPrivate || fider.session.tenant.isSignUpDisabled) {
+ // New users are not allowed to create an account on their own
+ setError({
+ errors: [
+ {
+ field: "email",
+ message: i18n._({
+ id: "signin.message.signupdisabled",
+ message: "We couldn't find an account for this email address. New sign-ups are currently disabled.",
+ }),
+ },
+ ],
+ })
+ return
+ }
// New user - show name field
setEmailSignInStep(EmailSigninStep.EnterName)
} else {
diff --git a/public/models/identity.ts b/public/models/identity.ts
index 8ba53f00e..06afcffa6 100644
--- a/public/models/identity.ts
+++ b/public/models/identity.ts
@@ -15,6 +15,7 @@ export interface Tenant {
isEmailAuthAllowed: boolean
isFeedEnabled: boolean
isModerationEnabled: boolean
+ isSignUpDisabled: boolean
isPro: boolean
}
diff --git a/public/pages/Administration/components/OAuthForm.tsx b/public/pages/Administration/components/OAuthForm.tsx
index 2c05ab930..fcddb117d 100644
--- a/public/pages/Administration/components/OAuthForm.tsx
+++ b/public/pages/Administration/components/OAuthForm.tsx
@@ -225,7 +225,8 @@ export const OAuthForm: React.FC<OAuthFormProps> = (props) => {
<Field label="Trusted Source">
<Toggle field="isTrusted" active={isTrusted} onToggle={setTrusted} label={isTrusted ? "Yes" : "No"} />
<p className="text-muted mt-1">
- This setting only applies to private sites. This site is currently <strong>{fider.session.tenant.isPrivate ? "Private" : "Public"}</strong>.
+ This setting only applies to private sites or when sign-ups are disabled. This site is currently{" "}
+ <strong>{fider.session.tenant.isPrivate ? "Private" : fider.session.tenant.isSignUpDisabled ? "Public, sign-ups disabled" : "Public"}</strong>.
</p>
<p className="text-muted">
If enabled, users authenticated by this provider can get access to this site without being invited. This is recommended for corporate access, such
diff --git a/public/pages/Administration/pages/PrivacySettings.page.tsx b/public/pages/Administration/pages/PrivacySettings.page.tsx
index f2cce0c0d..a535e5118 100644
--- a/public/pages/Administration/pages/PrivacySettings.page.tsx
+++ b/public/pages/Administration/pages/PrivacySettings.page.tsx
@@ -7,6 +7,7 @@ export interface PrivacySettingsPageState {
isPrivate: boolean
isFeedEnabled: boolean
isModerationEnabled: boolean
+ isSignUpDisabled: boolean
}
export default class PrivacySettingsPage extends AdminBasePage<any, PrivacySettingsPageState> {
@@ -22,15 +23,17 @@ export default class PrivacySettingsPage extends AdminBasePage<any, PrivacySetti
isPrivate: Fider.session.tenant.isPrivate,
isFeedEnabled: Fider.session.tenant.isFeedEnabled,
isModerationEnabled: Fider.session.tenant.isModerationEnabled,
+ isSignUpDisabled: Fider.session.tenant.isSignUpDisabled,
}
}
- private updatePrivacySettings = async (isPrivate: boolean, isFeedEnabled: boolean, isModerationEnabled?: boolean) => {
+ private updatePrivacySettings = async (isPrivate: boolean, isFeedEnabled: boolean, isModerationEnabled?: boolean, isSignUpDisabled?: boolean) => {
this.setState(
{
isPrivate,
isFeedEnabled: isPrivate ? false : isFeedEnabled, // Disable feed if site is private
isModerationEnabled: isModerationEnabled !== undefined ? isModerationEnabled : this.state.isModerationEnabled,
+ isSignUpDisabled: isSignUpDisabled !== undefined ? isSignUpDisabled : this.state.isSignUpDisabled,
},
async () => {
const response = await actions.updateTenantPrivacy(this.state)
@@ -53,6 +56,10 @@ export default class PrivacySettingsPage extends AdminBasePage<any, PrivacySetti
this.updatePrivacySettings(this.state.isPrivate, this.state.isFeedEnabled, enabled)
}
+ private signUpDisabledToggle = async (disabled: boolean) => {
+ this.updatePrivacySettings(this.state.isPrivate, this.state.isFeedEnabled, undefined, disabled)
+ }
+
public content() {
return (
<Form>
@@ -63,6 +70,17 @@ export default class PrivacySettingsPage extends AdminBasePage<any, PrivacySetti
invited users and users from trusted OAuth providers will have access to this board. Disables the feed feature.
</p>
</Field>
+ <Field label="Disable Sign-ups">
+ <Toggle
+ disabled={!Fider.session.user.isAdministrator || this.state.isPrivate}
+ active={this.state.isPrivate || this.state.isSignUpDisabled}
+ onToggle={this.signUpDisabledToggle}
+ />
+ <p className="text-muted mt-1">
+ Prevents visitors from creating a new account on their own. The board stays publicly visible. <br /> When enabled, only already registered users,
+ invited users and users from trusted OAuth providers can sign in. Private boards always have sign-ups disabled.
+ </p>
+ </Field>
<Field label="ATOM Feed">
<Toggle disabled={!Fider.session.user.isAdministrator || this.state.isPrivate} active={this.state.isFeedEnabled} onToggle={this.atomFeedToggle} />
<p className="text-muted mt-1">