Make require-login work

cmd/serve.go

@@ -159,6 +159,7 @@ func execServe(c *cli.Context) error {
 	webRoot := c.String("web-root")
 	enableSignup := c.Bool("enable-signup")
 	enableLogin := c.Bool("enable-login")
+	requireLogin := c.Bool("require-login")
 	enableReservations := c.Bool("enable-reservations")
 	upstreamBaseURL := c.String("upstream-base-url")
 	upstreamAccessToken := c.String("upstream-access-token")
@@ -408,6 +409,7 @@ func execServe(c *cli.Context) error {
 	conf.BillingContact = billingContact
 	conf.EnableSignup = enableSignup
 	conf.EnableLogin = enableLogin
+	conf.RequireLogin = requireLogin
 	conf.EnableReservations = enableReservations
 	conf.EnableMetrics = enableMetrics
 	conf.MetricsListenHTTP = metricsListenHTTP

server/config.go

@@ -150,6 +150,7 @@ type Config struct {
 	BillingContact                       string
 	EnableSignup                         bool // Enable creation of accounts via API and UI
 	EnableLogin                          bool
+	RequireLogin                         bool
 	EnableReservations                   bool // Allow users with role "user" to own/reserve topics
 	EnableMetrics                        bool
 	AccessControlAllowOrigin             string // CORS header field to restrict access from web clients

server/server.go

@@ -586,7 +586,7 @@ func (s *Server) handleWebConfig(w http.ResponseWriter, _ *http.Request, _ *visi
 		EnableCalls:        s.config.TwilioAccount != "",
 		EnableEmails:       s.config.SMTPSenderFrom != "",
 		EnableReservations: s.config.EnableReservations,
-		ReuqireLogin:       s.config.RequireLogin,
+		RequireLogin:       s.config.RequireLogin,
 		EnableWebPush:      s.config.WebPushPublicKey != "",
 		BillingContact:     s.config.BillingContact,
 		WebPushPublicKey:   s.config.WebPushPublicKey,

server/types.go

@@ -401,13 +401,13 @@ type apiConfigResponse struct {
 	BaseURL            string   `json:"base_url"`
 	AppRoot            string   `json:"app_root"`
 	EnableLogin        bool     `json:"enable_login"`
+	RequireLogin       bool     `json:"require_login"`
 	EnableSignup       bool     `json:"enable_signup"`
 	EnablePayments     bool     `json:"enable_payments"`
 	EnableCalls        bool     `json:"enable_calls"`
 	EnableEmails       bool     `json:"enable_emails"`
 	EnableReservations bool     `json:"enable_reservations"`
 	EnableWebPush      bool     `json:"enable_web_push"`
-	RequireLogin       bool     `json:"require_login"`
 	BillingContact     string   `json:"billing_contact"`
 	WebPushPublicKey   string   `json:"web_push_public_key"`
 	DisallowedTopics   []string `json:"disallowed_topics"`

web/public/config.js

@@ -9,6 +9,7 @@ var config = {
   base_url: window.location.origin, // Change to test against a different server
   app_root: "/",
   enable_login: true,
+  require_login: true,
   enable_signup: true,
   enable_payments: false,
   enable_reservations: true,

web/src/components/Navigation.jsx

@@ -164,36 +164,39 @@ const NavList = (props) => {
             <ListItemText primary={t("nav_button_account")} />
           </ListItemButton>
         )}
-        {session.exists() || !config.require_login && (
-        <ListItemButton onClick={() => navigate(routes.settings)} selected={location.pathname === routes.settings}>
-          <ListItemIcon>
-            <SettingsIcon />
-          </ListItemIcon>
-          <ListItemText primary={t("nav_button_settings")} />
-        </ListItemButton>
-        )}
+        {session.exists() ||
+          (!config.require_login && (
+            <ListItemButton onClick={() => navigate(routes.settings)} selected={location.pathname === routes.settings}>
+              <ListItemIcon>
+                <SettingsIcon />
+              </ListItemIcon>
+              <ListItemText primary={t("nav_button_settings")} />
+            </ListItemButton>
+          ))}
         <ListItemButton onClick={() => openUrl("/docs")}>
           <ListItemIcon>
             <ArticleIcon />
           </ListItemIcon>
           <ListItemText primary={t("nav_button_documentation")} />
         </ListItemButton>
-        {session.exists() || !config.require_login && (
-        <ListItemButton onClick={() => props.onPublishMessageClick()}>
-          <ListItemIcon>
-            <Send />
-          </ListItemIcon>
-          <ListItemText primary={t("nav_button_publish_message")} />
-        </ListItemButton>
-        )}
-        {session.exists() || !config.require_login && (
-        <ListItemButton onClick={() => setSubscribeDialogOpen(true)}>
-          <ListItemIcon>
-            <AddIcon />
-          </ListItemIcon>
-          <ListItemText primary={t("nav_button_subscribe")} />
-        </ListItemButton>
-        )}
+        {session.exists() ||
+          (!config.require_login && (
+            <ListItemButton onClick={() => props.onPublishMessageClick()}>
+              <ListItemIcon>
+                <Send />
+              </ListItemIcon>
+              <ListItemText primary={t("nav_button_publish_message")} />
+            </ListItemButton>
+          ))}
+        {session.exists() ||
+          (!config.require_login && (
+            <ListItemButton onClick={() => setSubscribeDialogOpen(true)}>
+              <ListItemIcon>
+                <AddIcon />
+              </ListItemIcon>
+              <ListItemText primary={t("nav_button_subscribe")} />
+            </ListItemButton>
+          ))}
         {showUpgradeBanner && (
           // The text background gradient didn't seem to do well with switching between light/dark mode,
           // So adding a `key` forces React to replace the entire component when the theme changes

web/src/components/Notifications.jsx

@@ -640,12 +640,16 @@ const NoSubscriptions = () => {
         {!session.exists() && config.require_login && t("notifications_no_subscriptions_login_title")}
       </Typography>
       <Paragraph>
-        {!session.exists() && !config.require_login && t("notifications_no_subscriptions_description", {
-          linktext: t("nav_button_subscribe"),
-        })}
-        {!session.exists() && config.require_login && t("notifications_no_subscriptions_login_description", {
-          linktext: t("action_bar_sign_in"),
-        })}
+        {!session.exists() &&
+          !config.require_login &&
+          t("notifications_no_subscriptions_description", {
+            linktext: t("nav_button_subscribe"),
+          })}
+        {!session.exists() &&
+          config.require_login &&
+          t("notifications_no_subscriptions_login_description", {
+            linktext: t("action_bar_sign_in"),
+          })}
       </Paragraph>
       <Paragraph>
         <ForMoreDetails />

web/src/components/Preferences.jsx

@@ -66,20 +66,20 @@ const maybeUpdateAccountSettings = async (payload) => {
 };
 
 const Preferences = () => {
-  if (!session.exists() or !config.requireLogin) {
+  if (!session.exists() || !config.require_login) {
     window.location.href = routes.app;
     return <></>;
   }
-    return (
-        <Container maxWidth="md" sx={{ marginTop: 3, marginBottom: 3 }}>
-            <Stack spacing={3}>
-              <Notifications />
-              <Reservations />
-              <Users />
-              <Appearance />
-            </Stack>
-        </Container>
-    );
+  return (
+    <Container maxWidth="md" sx={{ marginTop: 3, marginBottom: 3 }}>
+      <Stack spacing={3}>
+        <Notifications />
+        <Reservations />
+        <Users />
+        <Appearance />
+      </Stack>
+    </Container>
+  );
 };
 
 const Notifications = () => {