handlers: clean up

handlers/handlers.go

@@ -3,7 +3,6 @@ package handlers
 import (
 	"context"
 	"errors"
-	"fmt"
 	"html/template"
 	"io/fs"
 	"net/http"
@@ -38,8 +37,9 @@ func listAllTmpls() []string {
 	return files
 }
 
+// TODO: mimic https://github.com/drone/funcmap/blob/master/funcmap.go
 func setFuncMap(t *template.Template) {
-	t = t.Funcs(template.FuncMap{
+	t.Funcs(template.FuncMap{
 		"ifIE":    func() template.HTML { return template.HTML("<!--[if IE]>") },
 		"endifIE": func() template.HTML { return template.HTML("<![endif]>") },
 		"htmlSafe": func(html string) template.HTML {
@@ -51,30 +51,11 @@ func setFuncMap(t *template.Template) {
 	})
 }
 
-func getFuncMap() []template.FuncMap {
-	return []template.FuncMap{
-		map[string]interface{}{
-			"ifIE":    func() template.HTML { return template.HTML("<!--[if IE]>") },
-			"endifIE": func() template.HTML { return template.HTML("<![endif]>") },
-			"htmlSafe": func(html string) template.HTML {
-				return template.HTML(html)
-			},
-			"pageIs": func(want, got string) bool {
-				return want == got
-			},
-		},
-	}
-}
-
 func initTemplates(f fs.FS) {
 	if f != nil || f != tmplFS {
 		tmplFS = f
 	}
 
-	// for _, funcs := range getFuncMap() {
-	// // log.Println(funcs)
-	// tmpls.Funcs(funcs)
-	// }
 	setFuncMap(tmpls)
 
 	allTmpls := listAllTmpls()
@@ -86,7 +67,9 @@ func initTemplates(f fs.FS) {
 
 func makeTplMap(tpl *template.Template) {
 	allTmpls := listAllTmpls()
+
 	var tp tplMap
+
 	if templateMap == nil {
 		tp = make(tplMap, len(allTmpls))
 	} else {
@@ -105,9 +88,13 @@ func getTmpl(name string) *template.Template {
 
 	if liveMode {
 		log.Info("re-reading tmpls")
+
 		tpl := template.New("")
+
 		setFuncMap(tpl)
+
 		allTmpls := listAllTmpls()
+
 		// ensure this fails at compile time, if at all ("Must").
 		tmpls = template.Must(tpl.ParseFS(tmplFS, allTmpls...))
 	}
@@ -123,19 +110,7 @@ func Admin() echo.HandlerFunc {
 
 func Index() echo.HandlerFunc {
 	return func(c echo.Context) error {
-		// tpl, err := template.New("index").ParseFS(templates, "index.tmpl")
-		// tpl := template.New("index")
-		// tpl := theTmpls.New("index.tmpl")
-
-		// tpl := tmpls.Lookup("index.tmpl")
 		tpl := getTmpl("index.tmpl")
-		// if conf.LiveMode {
-		// // reload tmpls.
-		// LoadTemplates(tmplFS)
-		// }
-
-		// tpl := templateMap["index.tmpl"]
-
 		csrf := c.Get("csrf").(string)
 
 		err := tpl.Execute(c.Response().Writer,
@@ -165,6 +140,7 @@ func Signin() echo.HandlerFunc {
 				log.Info("no session cookie found")
 			}
 		}
+
 		if session != nil {
 			log.Info("got session")
 			// if err := session.Valid(); err == nil && session.Expires.After(time.Now()) {
@@ -196,16 +172,15 @@ func Signin() echo.HandlerFunc {
 
 func SigninPost(client *ent.Client) echo.HandlerFunc {
 	return func(c echo.Context) error {
-		ct := c.Request().Header.Get("Content-Type")
-		fmt.Printf("signin(POST): content-type: %s\n", ct)
-
 		err := c.Request().ParseForm()
 		if err != nil {
 			return err
 		}
 
 		var username string
+
 		var password string
+
 		if uname := c.Request().FormValue("username"); uname != "" {
 			username = uname
 			log.Infof("authenticating user '%s' at /signin", username)
@@ -225,6 +200,7 @@ func SigninPost(client *ent.Client) echo.HandlerFunc {
 		ctx := context.WithValue(context.Background(), "logger", log)
 		if usr, err := moduser.QueryUser(ctx, client, username); err == nil {
 			log.Info("queried user:", &usr.ID)
+
 			if usr.Password != password {
 				log.Warn("wrong user credentials, redirecting to /signin")
 
@@ -262,19 +238,18 @@ func SigninPost(client *ent.Client) echo.HandlerFunc {
 func Signup() echo.HandlerFunc {
 	return func(c echo.Context) error {
 		session, err := c.Cookie("session")
-		if err != nil {
+		if err != nil && err == http.ErrNoCookie {
-			if err == http.ErrNoCookie {
+			log.Info("no session cookie found")
-				log.Info("no session cookie found")
-			}
 		}
+
 		if session != nil {
 			log.Info("got session")
 			// if err := session.Valid(); err == nil && session.Expires.After(time.Now()) {
 			if err := session.Valid(); err == nil {
 				return c.Redirect(302, "/home")
-			} else {
-				log.Warn("invalid (or expired) session", "error", err.Error())
 			}
+
+			log.Warn("invalid (or expired) session", "error", err.Error())
 		}
 
 		tpl := getTmpl("signup.tmpl")
@@ -320,8 +295,10 @@ func SignupPost(client *ent.Client) echo.HandlerFunc {
 		}
 
 		var username string
+
 		if uname := c.Request().FormValue("username"); uname != "" {
 			username = uname
+
 			if passwd := c.Request().FormValue("password"); passwd != "" {
 				ctx := context.WithValue(context.Background(), "logger", log)
 
@@ -368,9 +345,9 @@ func Home() echo.HandlerFunc {
 		session, err := c.Cookie("session")
 		if err != nil {
 			if err == http.ErrNoCookie {
-				// return err
 				log.Infof("error no cookie: %q", err)
 				http.Error(c.Response().Writer, http.StatusText(http.StatusUnauthorized), http.StatusUnauthorized)
+
 				return nil
 			}
 
@@ -378,17 +355,18 @@ func Home() echo.HandlerFunc {
 			http.Error(c.Response().Writer, http.StatusText(http.StatusBadRequest), http.StatusBadRequest)
 
 			return nil
-
 		}
+
 		if session != nil {
 			log.Info("got session")
-			// if err := session.Valid(); err == nil && session.Expires.After(time.Now()) {
+
-			if err := session.Valid(); err == nil {
+			if err := session.Valid(); err != nil {
-				username = session.Value
-			} else {
 				log.Warn("invalid or expired session?")
+
 				return echo.NewHTTPError(http.StatusUnauthorized, http.StatusText(http.StatusUnauthorized))
 			}
+
+			username = session.Value
 		}
 
 		// example denial.
@@ -408,8 +386,8 @@ func Home() echo.HandlerFunc {
 			},
 		)
 		if err != nil {
-			// return err
 			log.Warnf("error: %q", err)
+
 			return echo.NewHTTPError(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError))
 		}
 
@@ -429,6 +407,7 @@ func Logout() echo.HandlerFunc {
 				}
 
 				log.Warnf("error: %q", err)
+
 				return nil
 			}
 
@@ -464,6 +443,7 @@ func Logout() echo.HandlerFunc {
 		)
 		if err != nil {
 			log.Warnf("error: %q", err)
+
 			return echo.NewHTTPError(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError))
 		}