Improve git login/signup messages and logging

Author: arran4

authHandlers.go

@@ -156,7 +156,13 @@ func GitLoginAction(w http.ResponseWriter, r *http.Request) error {
 		return fmt.Errorf("password handler not available")
 	}
 	okPass, err := ph.CheckPassword(r.Context(), user, pass)
+	if err != nil {
+		log.Printf("git login check error for %s: %v", user, err)
+	}
 	if err != nil || !okPass {
+		if !okPass {
+			log.Printf("git login failed for %s: invalid password", user)
+		}
 		http.Redirect(w, r, "/login/git?error=invalid", http.StatusSeeOther)
 		return nil
 	}
@@ -180,15 +186,19 @@ func GitSignupAction(w http.ResponseWriter, r *http.Request) error {
 	}
 	if err := ph.CreateUser(r.Context(), user, pass); err != nil {
 		if errors.Is(err, ErrUserExists) {
+			log.Printf("git signup for %s failed: user exists", user)
 			http.Redirect(w, r, "/login/git?error=exists", http.StatusSeeOther)
 			return nil
 		}
+		log.Printf("git signup create user error for %s: %v", user, err)
 		return err
 	}
 	if err := prov.CreateRepo(r.Context(), user, nil, RepoName); err != nil {
+		log.Printf("git signup create repo error for %s: %v", user, err)
 		return err
 	}
 	if err := prov.CreateBookmarks(r.Context(), user, nil, "main", defaultBookmarks); err != nil {
+		log.Printf("git signup create sample bookmarks error for %s: %v", user, err)
 		return fmt.Errorf("create sample bookmarks: %w", err)
 	}
 	return nil

data_test.go

@@ -46,6 +46,7 @@ func testFuncMap() template.FuncMap {
 		"Providers":          func() []string { return []string{"github", "gitlab"} },
 		"AllProviders":       func() []string { return []string{"github", "gitlab"} },
 		"ProviderConfigured": func(string) bool { return true },
+		"errorMsg":           func(s string) string { return s },
 		"ref":                func() string { return "refs/heads/main" },
 		"add1":               func(i int) int { return i + 1 },
 		"tab":                func() string { return "" },

funcs.go

@@ -70,6 +70,7 @@ func NewFuncs(r *http.Request) template.FuncMap {
 			creds := providerCreds(p)
 			return creds != nil && GetProvider(p) != nil
 		},
+		"errorMsg": errorMessage,
 		"ref": func() string {
 			return r.URL.Query().Get("ref")
 		},
@@ -329,3 +330,14 @@ func BookmarksExist(r *http.Request) (bool, error) {
 	}
 	return bookmarks != "", nil
 }
+
+func errorMessage(code string) string {
+	switch code {
+	case "invalid":
+		return "Invalid username or password"
+	case "exists":
+		return "Account already exists"
+	default:
+		return code
+	}
+}

templates/gitLoginPage.gohtml

@@ -1,6 +1,6 @@
 {{ template "head" $ }}
 <form method="POST" action="/login/git">
-    {{- if .Error }}<p style="color:red">{{ .Error }}</p>{{ end }}
+    {{- if .Error }}<p style="color:red">{{ errorMsg .Error }}</p>{{ end }}
     Username: <input type="text" name="username"><br>
     Password: <input type="password" name="password"><br>
     <input type="submit" value="Login">