Gate sign-up on AllowSignup field instead of user count
This commit is contained in:
+10
-11
@@ -48,14 +48,14 @@ func (ss *SessionStore) Delete(token string) {
|
||||
// --- Handlers ---
|
||||
|
||||
type AuthHandler struct {
|
||||
Store *store.Store
|
||||
Sessions *SessionStore
|
||||
Tpl *Templates
|
||||
Store *store.Store
|
||||
Sessions *SessionStore
|
||||
Tpl *Templates
|
||||
AllowSignup bool
|
||||
}
|
||||
|
||||
func (h *AuthHandler) ServeSignup(w http.ResponseWriter, r *http.Request) {
|
||||
count, err := h.Store.UserCount()
|
||||
if err == nil && count > 0 {
|
||||
if !h.AllowSignup {
|
||||
http.Redirect(w, r, "/signin", http.StatusSeeOther)
|
||||
return
|
||||
}
|
||||
@@ -97,14 +97,13 @@ func (h *AuthHandler) ServeSignup(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
}
|
||||
|
||||
func (h *AuthHandler) hasUsers() bool {
|
||||
count, err := h.Store.UserCount()
|
||||
return err == nil && count > 0
|
||||
func (h *AuthHandler) allowSignup() bool {
|
||||
return h.AllowSignup
|
||||
}
|
||||
|
||||
func (h *AuthHandler) ServeSignin(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method == http.MethodGet {
|
||||
h.Tpl.Render(w, "signin", map[string]any{"HasUser": h.hasUsers()})
|
||||
h.Tpl.Render(w, "signin", map[string]any{"HasUser": h.allowSignup()})
|
||||
return
|
||||
}
|
||||
|
||||
@@ -114,12 +113,12 @@ func (h *AuthHandler) ServeSignin(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
user, err := h.Store.UserByEmail(email)
|
||||
if err != nil {
|
||||
h.Tpl.Render(w, "signin", map[string]any{"Error": "Invalid email or password.", "HasUser": h.hasUsers()})
|
||||
h.Tpl.Render(w, "signin", map[string]any{"Error": "Invalid email or password.", "HasUser": h.allowSignup()})
|
||||
return
|
||||
}
|
||||
|
||||
if err := bcrypt.CompareHashAndPassword([]byte(user.PasswordHash), []byte(password)); err != nil {
|
||||
h.Tpl.Render(w, "signin", map[string]any{"Error": "Invalid email or password.", "HasUser": h.hasUsers()})
|
||||
h.Tpl.Render(w, "signin", map[string]any{"Error": "Invalid email or password.", "HasUser": h.allowSignup()})
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user