Reworked the template loading (fix #54)

handlers/handlers.go

@@ -48,25 +48,31 @@ func New(store store.Store) (*Handler, error) {
 	return h, nil
 }
 
-func (h *Handler) setTemplateFromFS(name string) error {
+func (h *Handler) addTemplatesFromFS(files []string) error {
-	tokenTemplate, err := tmpls.FSString(false, "/"+name)
+	var t *template.Template
-	if err != nil {
+	for _, file := range files {
-		return errors.Wrap(err, "could not read token template file")
+		fileContent, err := tmpls.FSString(false, "/"+file)
-	}
+		if err != nil {
-	templ, err := template.New(name).Parse(tokenTemplate)
+			return errors.Wrap(err, "could not read template file")
-	if err != nil {
+		}
-		return errors.Wrap(err, "could not create template from file content")
+		if t == nil {
+			t, err = template.New(file).Parse(fileContent)
+			if err != nil {
+				return errors.Wrap(err, "could not create template from file content")
+			}
+			continue
+		}
+		if _, err := t.New(file).Parse(fileContent); err != nil {
+			return errors.Wrap(err, "could not parse template")
+		}
 	}
-	h.engine.SetHTMLTemplate(templ)
+	h.engine.SetHTMLTemplate(t)
 	return nil
 }
 
 func (h *Handler) setHandlers() error {
-	templates := []string{"token.html", "protected.html"}
+	if err := h.addTemplatesFromFS([]string{"token.html", "protected.html"}); err != nil {
-	for _, template := range templates {
+		return errors.Wrap(err, "could not add templates from FS")
-		if err := h.setTemplateFromFS(template); err != nil {
-			return errors.Wrapf(err, "could not set template %s from FS", template)
-		}
 	}
 	h.engine.Use(ginrus.Ginrus(logrus.StandardLogger(), time.RFC3339, false))
 	protected := h.engine.Group("/api/v1/protected")