Merge branch 'master' into rmCreateCollBrowse

SynBioHub · Dec 15, 2024 · 05402fc · 05402fc
2 parents 5416fdc + 406456a
commit 05402fc
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/lib/app.js b/lib/app.js
@@ -186,9 +186,7 @@ function App () {
   }
 
   // User Endpoints
-  if (config.get('allowPublicSignup')) {
-    app.all('/register', views.register)
-  }
+  app.all('/register', allowPublicSignup, views.register)
   app.all('/login', views.login)
   app.post('/remoteLogin', forceNoHTML, views.login)
   app.all('/logout', views.logout)
@@ -519,6 +517,18 @@ function App () {
     }
   }
 
+  function allowPublicSignup (req, res, next) {
+    if (!config.get('allowPublicSignup')) {
+      if (!req.accepts('text/html')) {
+        res.status(401).send('Public signup is not allowed')
+      } else {
+        res.redirect('/')
+      }
+    } else {
+      next()
+    }
+  }
+
   function requirePublicLogin (req, res, next) {
     if (config.get('requireLogin') && !req.user) {
       if (!req.accepts('text/html')) {

diff --git a/templates/layouts/default.jade b/templates/layouts/default.jade
@@ -51,11 +51,16 @@ block body
                                 a(href='/logout', title='Sign Out')
                                     span.fa.fa-sign-out
                                     span.blue-text.hidden-xs.hidden-sm  Sign Out
-                        else
+                        else if config.allowPublicSignup
                             li
                                 a(href='/login')
                                     span.fa.fa-sign-in
                                     span.blue-text.hidden-xs.hidden-sm  Login or Register
+                        else 
+                            li
+                                a(href='/login')
+                                    span.fa.fa-sign-in
+                                    span.blue-text.hidden-xs.hidden-sm  Login
 
 
         div.clearfix