kontor-echo: setup project to show homepage

kontor-echo/internal/handlers/auth.go

@@ -0,0 +1,114 @@
+package handlers
+
+import (
+	"kontor-api-echo/internal/config"
+	"kontor-api-echo/internal/globals"
+	"kontor-api-echo/internal/helpers"
+	"kontor-api-echo/internal/models"
+	"kontor-api-echo/internal/repository"
+	"kontor-api-echo/internal/service"
+	"net/http"
+
+	"github.com/labstack/echo/v5"
+	"github.com/uptrace/bun"
+)
+
+type AuthHandler struct {
+	Service *service.AuthService
+	Secret  []byte
+}
+
+func NewAuthHandler(db *bun.DB) *AuthHandler {
+	handler := &AuthHandler{Service: service.NewAuthService(repository.NewProfileRepository(db)), Secret: config.ServerConfig.ApiSecret}
+	return handler
+}
+
+func (handler *AuthHandler) Login(c *echo.Context) error {
+	var input models.LoginInput
+
+	if err := c.Bind(&input); err != nil {
+		return c.JSON(http.StatusBadRequest, map[string]any{"error": err.Error()})
+	}
+
+	profile_id, err := handler.Service.LoginCheck(input.Email, input.Password)
+
+	if err != nil {
+		return c.JSON(http.StatusBadRequest, map[string]any{"error": "username or password is incorrect."})
+	}
+
+	token, err := helpers.GenerateToken(profile_id)
+	logger := c.Logger()
+	if err != nil {
+		logger.Info("Login", "GenerateToken error", err.Error())
+	}
+	return c.JSON(http.StatusOK, map[string]any{"token": token})
+}
+
+func (handler *AuthHandler) LoginPage(c *echo.Context) error {
+	cookie, _ := c.Cookie(globals.UserKey)
+	user := cookie.Value
+	logger := c.Logger()
+	logger.Info("LoginPage", globals.UserKey, user)
+	data := globals.GetDefaultValues(user, "Please logout first")
+	if user != "" {
+		return c.Render(http.StatusBadRequest, "login", data)
+	}
+	data["message"] = ""
+	return c.Render(http.StatusOK, "login", data)
+}
+
+func (handler *AuthHandler) LoginPost(c *echo.Context) error {
+	cookie, _ := c.Cookie(globals.UserKey)
+	user := cookie.Value
+	logger := c.Logger()
+	logger.Info("LoginPost", "user", user)
+	data := globals.GetDefaultValues(user, "Please logout first")
+	if user != "" {
+		return c.Render(http.StatusBadRequest, "login", data)
+	}
+
+	username := c.FormValue("username")
+	password := c.FormValue("password")
+
+	if helpers.EmptyUserPass(username, password) {
+		data["message"] = "Parameters can't be empty"
+		c.Render(http.StatusBadRequest, "login", data)
+	}
+
+	profile_id, err := handler.Service.LoginCheck(username, password)
+	if err != nil {
+		data["message"] = "Incorrect username or password"
+		c.Render(http.StatusUnauthorized, "login", data)
+	}
+	c.SetCookie(&http.Cookie{
+		Name:     globals.UserKey,
+		Value:    profile_id,
+		MaxAge:   3600,
+		Path:     "/",
+		Domain:   "",
+		HttpOnly: true,
+	})
+	logger.Info("LoginPost: redirect to index")
+	return c.Redirect(http.StatusMovedPermanently, "/")
+}
+
+func (handler *AuthHandler) LogoutPage(c *echo.Context) error {
+	cookie, _ := c.Cookie(globals.UserKey)
+	user := cookie.Value
+	logger := c.Logger()
+	logger.Info("LogoutPage", globals.UserKey, user)
+	if user == "" {
+		logger.Info("Invalid session token")
+		return c.Redirect(http.StatusMovedPermanently, "/")
+	}
+	c.SetCookie(&http.Cookie{
+		Name:     globals.UserKey,
+		Value:    "",
+		MaxAge:   -1, // Deletes the cookie immediately
+		Path:     "/",
+		Domain:   "",
+		HttpOnly: true,
+	})
+	logger.Info("LogoutPage: redirect to index page")
+	return c.Redirect(http.StatusMovedPermanently, "/")
+}

kontor-echo/internal/handlers/kontor.go

@@ -0,0 +1,33 @@
+package handlers
+
+import (
+	"kontor-api-echo/internal/globals"
+	"net/http"
+	"time"
+
+	"github.com/labstack/echo/v5"
+)
+
+func Health(c *echo.Context) error {
+	return c.JSON(200, map[string]string{
+		"ok":      "true",
+		"status":  "healthy",
+		"version": globals.Version,
+		"time":    time.Now().UTC().Format(time.RFC3339),
+	})
+}
+
+func Index(c *echo.Context) error {
+	logger := c.Logger()
+	cookie, err := c.Cookie(globals.UserKey)
+	user := ""
+	if err != nil {
+		logger.Info("error reading cookie", "error", err.Error())
+	} else {
+		user = cookie.Value
+	}
+
+	logger.Info("IndexGetHandler", globals.UserKey, user)
+	data := globals.GetDefaultValues(user, "This is an index page...")
+	return c.Render(http.StatusOK, "home", data)
+}

kontor-echo/internal/handlers/mail.go

@@ -0,0 +1,30 @@
+package handlers
+
+import (
+	"kontor-api-echo/internal/models"
+	"kontor-api-echo/internal/repository"
+	"kontor-api-echo/internal/service"
+	"net/http"
+
+	"github.com/labstack/echo/v5"
+	"github.com/uptrace/bun"
+)
+
+type MailHandler struct {
+	Service *service.MailService
+}
+
+func NewMailHandler(db *bun.DB) *MailHandler {
+	handler := &MailHandler{Service: service.NewMailService(repository.NewMailRepository(db))}
+	return handler
+}
+
+func (handler *MailHandler) List(c *echo.Context) {
+	mails, err := handler.Service.List(c.Request().Context())
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, map[string]any{"error": err.Error()})
+		return
+	}
+	dtos := models.ConvertMailsToDtos(mails)
+	c.JSON(http.StatusOK, dtos)
+}

kontor-echo/internal/handlers/mailaccount.go

@@ -0,0 +1,30 @@
+package handlers
+
+import (
+	"kontor-api-echo/internal/models"
+	"kontor-api-echo/internal/repository"
+	"kontor-api-echo/internal/service"
+	"net/http"
+
+	"github.com/labstack/echo/v5"
+	"github.com/uptrace/bun"
+)
+
+type MailAccountHandler struct {
+	Service *service.MailAccountService
+}
+
+func NewMailAccountHandler(db *bun.DB) *MailAccountHandler {
+	handler := &MailAccountHandler{Service: service.NewMailAccountService(repository.NewMailAccountRepository(db))}
+	return handler
+}
+
+func (handler *MailAccountHandler) List(c *echo.Context) {
+	mailaccounts, err := handler.Service.List(c.Request().Context())
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, map[string]any{"error": err.Error()})
+		return
+	}
+	dtos := models.ConvertMailAccountsToDtos(mailaccounts)
+	c.JSON(http.StatusOK, dtos)
+}

kontor-echo/internal/handlers/media_actor.go

@@ -67,35 +67,35 @@ func (handler *MediaActorHandler) Delete(c *echo.Context) {
 	c.JSON(http.StatusOK, map[string]string{"ok": "true"})
 }
 
-func (handler *MediaActorHandler) ListPage(c *echo.Context) {
+func (handler *MediaActorHandler) ListPage(c *echo.Context) error {
 	cookie, err := c.Cookie(globals.UserKey)
 	user := cookie.Value
 	actors, err := handler.Service.List(c.Request().Context())
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-		return
+		return err
 	}
 	data := globals.GetDefaultValues(user, "MediaActors...")
 	data["actors"] = actors
 	c.Render(http.StatusOK, "media_actors", data)
+	return nil
 }
 
-func (handler *MediaActorHandler) EditPage(c *echo.Context) {
+func (handler *MediaActorHandler) EditPage(c *echo.Context) error {
 	cookie, err := c.Cookie(globals.UserKey)
 	user := cookie.Value
 	id := c.Param("id")
 	//logger := slog.Get(c)
 	actor, err := handler.Service.Get(c.Request().Context(), id)
 	if err != nil {
-		c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-		return
+		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
 	}
 	data := globals.GetDefaultValues(user, "MediaActors...")
 	data["actor"] = actor
-	c.Render(http.StatusOK, "actor_detail", data)
+	return c.Render(http.StatusOK, "actor_detail", data)
 }
 
-func (handler *MediaActorHandler) UpdatePage(c *echo.Context) {
+func (handler *MediaActorHandler) UpdatePage(c *echo.Context) error {
 	cookie, err := c.Cookie(globals.UserKey)
 	user := cookie.Value
 	id := c.Param("id")
@@ -103,8 +103,7 @@ func (handler *MediaActorHandler) UpdatePage(c *echo.Context) {
 	actor, err := handler.Service.Get(c.Request().Context(), id)
 	if err != nil {
 		logger.Info("MediaActorHandler#UpdatePage", "error", err.Error())
-		c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-		return
+		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
 	}
 	var form models.MediaActorForm
 	if err := c.Bind(&form); err != nil {
@@ -113,15 +112,14 @@ func (handler *MediaActorHandler) UpdatePage(c *echo.Context) {
 		data["actor"] = actor
 		data["Form"] = form
 		data["Errors"] = err.Error()
-		c.Render(http.StatusBadRequest, "actor_detail", data)
-		return
+		return c.Render(http.StatusBadRequest, "actor_detail", data)
 	}
 	logger.Info("MediaActorHandler#UpdatePage", "actor", actor)
 	//handler.Service.Update(c.Request.Context(), form.ConvertFormToMediaLofiDTO())
-	c.Redirect(http.StatusFound, globals.MediaActorLink)
+	return c.Redirect(http.StatusFound, globals.MediaActorLink)
 }
 
-func (handler *MediaActorHandler) DeletePage(c *echo.Context) {
+func (handler *MediaActorHandler) DeletePage(c *echo.Context) error {
 	//session := sessions.Default(c)
 	//user := session.Get(globals.UserKey)
 	id := c.Param("id")
@@ -129,9 +127,9 @@ func (handler *MediaActorHandler) DeletePage(c *echo.Context) {
 	//actor, err := handler.Service.Get(c.Request.Context(), id)
 	// if err != nil {
 	// 	logger.Info("MediaActorHandler#DeletePage", "error", err.Error())
-	// 	c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+	// 	c.JSON(http.StatusInternalServerError, map[string]any{"error": err.Error()})
 	// 	return
 	// }
 	logger.Info("MediaActorHandler#DeletePage", "actor", id)
-	c.Redirect(http.StatusFound, globals.MediaActorLink)
+	return c.Redirect(http.StatusFound, globals.MediaActorLink)
 }

kontor-echo/internal/handlers/media_article.go

@@ -22,44 +22,41 @@ func NewMediaArticleHandler(db *bun.DB) *MediaArticleHandler {
 	return mediaFileHandler
 }
 
-func (handler *MediaArticleHandler) List(c *echo.Context) {
+func (handler *MediaArticleHandler) List(c *echo.Context) error {
 	logger := c.Logger()
 	logger.Info("MediaArticleHandler#List")
 	articles, err := handler.Service.List(c.Request().Context())
 	if err != nil {
-		c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-		return
+		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
 	}
 	dtos := models.ConvertMediaArticlesToDtos(articles)
-	c.JSON(http.StatusOK, dtos)
+	return c.JSON(http.StatusOK, dtos)
 }
 
-func (handler *MediaArticleHandler) Delete(c *echo.Context) {
+func (handler *MediaArticleHandler) Delete(c *echo.Context) error {
 	id := c.Param("id")
 	err := handler.Service.Delete(c.Request().Context(), id)
 	if err != nil {
-		c.JSON(http.StatusNotFound, map[string]string{"error": "lofi not found"})
-		return
+		return c.JSON(http.StatusNotFound, map[string]string{"error": "lofi not found"})
 	}
-	c.JSON(http.StatusOK, map[string]string{"ok": "true"})
+	return c.JSON(http.StatusOK, map[string]string{"ok": "true"})
 }
 
-func (handler *MediaArticleHandler) ListPage(c *echo.Context) {
+func (handler *MediaArticleHandler) ListPage(c *echo.Context) error {
 	cookie, err := c.Cookie(globals.UserKey)
 	user := cookie.Value
 	files, err := handler.Service.List(c.Request().Context())
 	if err != nil {
-		c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-		return
+		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
 	}
 	data := globals.GetDefaultValues(user, "MediaArticles...")
 	data["title"] = "Kontor MediaArticles"
 	data["media_links"] = files
 	data["MediaLinksUrl"] = globals.MediaArticleLink
-	c.Render(http.StatusOK, "media_links", data)
+	return c.Render(http.StatusOK, "media_links", data)
 }
 
-func (handler *MediaArticleHandler) EditPage(c *echo.Context) {
+func (handler *MediaArticleHandler) EditPage(c *echo.Context) error {
 	cookie, err := c.Cookie(globals.UserKey)
 	user := cookie.Value
 	id := c.Param("id")
@@ -67,16 +64,15 @@ func (handler *MediaArticleHandler) EditPage(c *echo.Context) {
 	media_file, err := handler.Service.Get(c.Request().Context(), id)
 	if err != nil {
 		logger.Info("MediaArticleHandler#EditPage", "error", err.Error())
-		c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-		return
+		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
 	}
 	logger.Info("MediaArticleHandler#EditPage", "media_file", media_file)
 	data := globals.GetDefaultValues(user, "MediaArticle Details...")
 	data["lofi"] = media_file
-	c.Render(http.StatusOK, "lofi_detail", data)
+	return c.Render(http.StatusOK, "lofi_detail", data)
 }
 
-func (handler *MediaArticleHandler) UpdatePage(c *echo.Context) {
+func (handler *MediaArticleHandler) UpdatePage(c *echo.Context) error {
 	cookie, err := c.Cookie(globals.UserKey)
 	user := cookie.Value
 	id := c.Param("id")
@@ -84,8 +80,7 @@ func (handler *MediaArticleHandler) UpdatePage(c *echo.Context) {
 	media_article, err := handler.Service.Get(c.Request().Context(), id)
 	if err != nil {
 		logger.Info("MediaArticleHandler#UpdatePage", "error", err.Error())
-		c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-		return
+		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
 	}
 	var form models.MediaArticleForm
 	if err := c.Bind(&form); err != nil {
@@ -93,23 +88,21 @@ func (handler *MediaArticleHandler) UpdatePage(c *echo.Context) {
 		data := globals.GetDefaultValues(user, "MediaArticle Details...")
 		data["Form"] = form
 		data["Errors"] = err.Error()
-		c.Render(http.StatusBadRequest, "lofi_detail", data)
-		return
+		return c.Render(http.StatusBadRequest, "lofi_detail", data)
 	}
 	logger.Info("MediaArticleHandler#UpdatePage", "media_article", media_article)
 	//handler.Service.Update(c.Request.Context(), form.ConvertFormToMediaFileDTO())
-	c.Redirect(http.StatusFound, globals.MediaArticleLink)
+	return c.Redirect(http.StatusFound, globals.MediaArticleLink)
 }
 
-func (handler *MediaArticleHandler) DeletePage(c *echo.Context) {
+func (handler *MediaArticleHandler) DeletePage(c *echo.Context) error {
 	id := c.Param("id")
 	logger := c.Logger()
 	err := handler.Service.Delete(c.Request().Context(), id)
 	if err != nil {
 		logger.Info("MediaArticleHandler#DeletePage", "error", err.Error())
-		c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-		return
+		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
 	}
 	logger.Info("MediaArticleHandler#DeletePage", "lofi", id)
-	c.Redirect(http.StatusFound, globals.MediaArticleLink)
+	return c.Redirect(http.StatusFound, globals.MediaArticleLink)
 }

kontor-echo/internal/handlers/media_file.go

@@ -22,59 +22,57 @@ func NewMediaFileHandler(db *bun.DB) *MediaFileHandler {
 	return mediaFileHandler
 }
 
-func (handler *MediaFileHandler) List(c *echo.Context) {
+func (handler *MediaFileHandler) List(c *echo.Context) error {
 	logger := c.Logger()
 	logger.Info("MediaFileHandler#List")
 	files, err := handler.Service.List(c.Request().Context())
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-		return
+		return err
 	}
 	dtos := models.ConvertMediaFilesToDtos(files)
-	c.JSON(http.StatusOK, dtos)
+	return c.JSON(http.StatusOK, dtos)
 }
 
-func (handler *MediaFileHandler) Add(c *echo.Context) {
+func (handler *MediaFileHandler) Add(c *echo.Context) error {
 	var input models.MediaFileAdd
 
 	if err := c.Bind(&input); err != nil {
 		c.JSON(http.StatusBadRequest, map[string]string{"error": err.Error()})
-		return
+		return err
 	}
 	lofi, err := handler.Service.Add(c.Request().Context(), input.Url)
 	if err != nil {
 		c.JSON(http.StatusNotFound, map[string]string{"error": "lofi not added"})
-		return
+		return err
 	}
-	c.JSON(http.StatusOK, lofi)
+	return c.JSON(http.StatusOK, lofi)
 }
 
-func (handler *MediaFileHandler) Delete(c *echo.Context) {
+func (handler *MediaFileHandler) Delete(c *echo.Context) error {
 	id := c.Param("id")
 	err := handler.Service.Delete(c.Request().Context(), id)
 	if err != nil {
-		c.JSON(http.StatusNotFound, map[string]string{"error": "lofi not found"})
-		return
+		return c.JSON(http.StatusNotFound, map[string]string{"error": "lofi not found"})
 	}
-	c.JSON(http.StatusOK, map[string]string{"ok": "true"})
+	return c.JSON(http.StatusOK, map[string]string{"ok": "true"})
 }
 
-func (handler *MediaFileHandler) ListPage(c *echo.Context) {
+func (handler *MediaFileHandler) ListPage(c *echo.Context) error {
 	cookie, err := c.Cookie(globals.UserKey)
 	user := cookie.Value
 	files, err := handler.Service.List(c.Request().Context())
 	if err != nil {
-		c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-		return
+		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
 	}
 	data := globals.GetDefaultValues(user, "MediaFiles...")
 	data["title"] = "Kontor MediaFiles"
 	data["media_links"] = files
 	data["MediaLinksUrl"] = globals.MediaVideoLink
-	c.Render(http.StatusOK, "media_links", data)
+	return c.Render(http.StatusOK, "media_links", data)
 }
 
-func (handler *MediaFileHandler) EditPage(c *echo.Context) {
+func (handler *MediaFileHandler) EditPage(c *echo.Context) error {
 	cookie, err := c.Cookie(globals.UserKey)
 	user := cookie.Value
 	id := c.Param("id")
@@ -82,16 +80,15 @@ func (handler *MediaFileHandler) EditPage(c *echo.Context) {
 	media_file, err := handler.Service.Get(c.Request().Context(), id)
 	if err != nil {
 		logger.Info("MediaLoFiHandler#EditPage", "error", err.Error())
-		c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-		return
+		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
 	}
 	logger.Info("MediaLoFiHandler#EditPage", "media_file", media_file)
 	data := globals.GetDefaultValues(user, "MediaFile Details...")
 	data["lofi"] = media_file
-	c.Render(http.StatusOK, "lofi_detail", data)
+	return c.Render(http.StatusOK, "lofi_detail", data)
 }
 
-func (handler *MediaFileHandler) UpdatePage(c *echo.Context) {
+func (handler *MediaFileHandler) UpdatePage(c *echo.Context) error {
 	cookie, err := c.Cookie(globals.UserKey)
 	user := cookie.Value
 	id := c.Param("id")
@@ -99,8 +96,7 @@ func (handler *MediaFileHandler) UpdatePage(c *echo.Context) {
 	media_file, err := handler.Service.Get(c.Request().Context(), id)
 	if err != nil {
 		logger.Info("MediaFileHandler#UpdatePage", "error", err.Error())
-		c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-		return
+		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
 	}
 	var form models.MediaFileForm
 	if err := c.Bind(&form); err != nil {
@@ -108,15 +104,14 @@ func (handler *MediaFileHandler) UpdatePage(c *echo.Context) {
 		data := globals.GetDefaultValues(user, "MediaFile Details...")
 		data["Form"] = form
 		data["Errors"] = err.Error()
-		c.Render(http.StatusBadRequest, "lofi_detail", data)
-		return
+		return c.Render(http.StatusBadRequest, "lofi_detail", data)
 	}
 	logger.Info("MediaFileHandler#UpdatePage", "media_file", media_file)
 	//handler.Service.Update(c.Request.Context(), form.ConvertFormToMediaFileDTO())
-	c.Redirect(http.StatusFound, globals.MediaFileLink)
+	return c.Redirect(http.StatusFound, globals.MediaFileLink)
 }
 
-func (handler *MediaFileHandler) DeletePage(c *echo.Context) {
+func (handler *MediaFileHandler) DeletePage(c *echo.Context) error {
 	//session := sessions.Default(c)
 	//user := session.Get(globals.UserKey)
 	id := c.Param("id")
@@ -124,9 +119,8 @@ func (handler *MediaFileHandler) DeletePage(c *echo.Context) {
 	err := handler.Service.Delete(c.Request().Context(), id)
 	if err != nil {
 		logger.Info("MediaFileHandler#DeletePage", "error", err.Error())
-		c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-		return
+		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
 	}
 	logger.Info("MediaFileHandler#DeletePage", "lofi", id)
-	c.Redirect(http.StatusFound, globals.MediaFileLink)
+	return c.Redirect(http.StatusFound, globals.MediaFileLink)
 }

kontor-echo/internal/handlers/media_lofi.go

@@ -59,33 +59,31 @@ func (handler *MediaLoFiHandler) Add(c *echo.Context) {
 	c.JSON(http.StatusOK, lofi)
 }
 
-func (handler *MediaLoFiHandler) Update(c *echo.Context) {
+func (handler *MediaLoFiHandler) Update(c *echo.Context) error {
 	var input models.MediaLoFiDTO
 
 	if err := c.Bind(&input); err != nil {
-		c.JSON(http.StatusBadRequest, map[string]string{"error": err.Error()})
-		return
+		return c.JSON(http.StatusBadRequest, map[string]string{"error": err.Error()})
 	}
 	lofi, err := handler.Service.Update(c.Request().Context(), input)
 	if err != nil {
 		logger := c.Logger()
 		logger.Info("MediaLoFiHandler#Update", "error", err.Error())
-		c.JSON(http.StatusNotFound, map[string]string{"error": "lofi not updated"})
-		return
+		return c.JSON(http.StatusNotFound, map[string]string{"error": "lofi not updated"})
 	}
-	c.JSON(http.StatusOK, lofi)
+	return c.JSON(http.StatusOK, lofi)
 }
-func (handler *MediaLoFiHandler) Delete(c *echo.Context) {
+
+func (handler *MediaLoFiHandler) Delete(c *echo.Context) error {
 	id := c.Param("id")
 	err := handler.Service.Delete(c.Request().Context(), id)
 	if err != nil {
-		c.JSON(http.StatusNotFound, map[string]string{"error": "lofi not found"})
-		return
+		return c.JSON(http.StatusNotFound, map[string]string{"error": "lofi not found"})
 	}
-	c.JSON(http.StatusOK, map[string]string{"ok": "true"})
+	return c.JSON(http.StatusOK, map[string]string{"ok": "true"})
 }
 
-func (handler *MediaLoFiHandler) ListPage(c *echo.Context) {
+func (handler *MediaLoFiHandler) ListPage(c *echo.Context) error {
 	cookie, err := c.Cookie(globals.UserKey)
 	user := cookie.Value
 	logger := c.Logger()
@@ -113,8 +111,7 @@ func (handler *MediaLoFiHandler) ListPage(c *echo.Context) {
 	lofis, err := handler.Service.List(c.Request().Context())
 	if err != nil {
 		logger.Info("MediaLoFiHandler#ListPage", "error", err.Error())
-		c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-		return
+		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
 	}
 	logger.Info("MediaLoFiHandler#ListPage", "lofis count", len(lofis))
 	data := globals.GetDefaultValues(user, "MediaFiles...")
@@ -122,10 +119,10 @@ func (handler *MediaLoFiHandler) ListPage(c *echo.Context) {
 	data["isReview"] = review
 	data["isDownload"] = download
 	data["MediaLinksUrl"] = globals.MediaLofiLink
-	c.Render(http.StatusOK, "media_links", data)
+	return c.Render(http.StatusOK, "media_links", data)
 }
 
-func (handler *MediaLoFiHandler) EditPage(c *echo.Context) {
+func (handler *MediaLoFiHandler) EditPage(c *echo.Context) error {
 	cookie, err := c.Cookie(globals.UserKey)
 	user := cookie.Value
 	id := c.Param("id")
@@ -146,25 +143,23 @@ func (handler *MediaLoFiHandler) EditPage(c *echo.Context) {
 		lofi, err = handler.Service.Get(c.Request().Context(), id)
 		if err != nil {
 			logger.Info("MediaLoFiHandler#EditPage", "error", err.Error())
-			c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-			return
+			return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
 		}
 	}
 	logger.Info("MediaLoFiHandler#EditPage", "lofi", lofi)
 	data := globals.GetDefaultValues(user, "MediaLofis...")
 	data["media"] = lofi
 	data["MediaLinksUrl"] = globals.MediaLofiLink
-	c.Render(http.StatusOK, "media_detail", data)
+	return c.Render(http.StatusOK, "media_detail", data)
 }
 
-func (handler *MediaLoFiHandler) ChangeReviewPage(c *echo.Context) {
+func (handler *MediaLoFiHandler) ChangeReviewPage(c *echo.Context) error {
 	id := c.Param("id")
 	logger := c.Logger()
 	lofi, err := handler.Service.Get(c.Request().Context(), id)
 	if err != nil {
 		logger.Info("MediaLoFiHandler#ChangeReviewPage", "error", err.Error())
-		c.Redirect(http.StatusNotFound, globals.MediaLofiLink)
-		return
+		return c.Redirect(http.StatusNotFound, globals.MediaLofiLink)
 	}
 	lofi.Review = !lofi.Review
 	handler.Service.Update(c.Request().Context(), lofi.ConvertMediaLoFiToDTO())
@@ -174,17 +169,16 @@ func (handler *MediaLoFiHandler) ChangeReviewPage(c *echo.Context) {
 	lofis, err := handler.Service.List(c.Request().Context())
 	if err != nil {
 		logger.Info("MediaLoFiHandler#ChangeReviewPage", "error", err.Error())
-		c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-		return
+		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
 	}
 	logger.Info("MediaLoFiHandler#ListPage", "lofis count", len(lofis))
 	data := globals.GetDefaultValues(user, "MediaLofis...")
 	data["lofis"] = lofis
-	//c.HTML(http.StatusOK, "lofi", data)
-	c.Redirect(http.StatusCreated, globals.MediaLofiLink)
+	//c.Render(http.StatusOK, "lofi", data)
+	return c.Redirect(http.StatusCreated, globals.MediaLofiLink)
 }
 
-func (handler *MediaLoFiHandler) UpdatePage(c *echo.Context) {
+func (handler *MediaLoFiHandler) UpdatePage(c *echo.Context) error {
 	cookie, err := c.Cookie(globals.UserKey)
 	user := cookie.Value
 	id := c.Param("id")
@@ -192,25 +186,23 @@ func (handler *MediaLoFiHandler) UpdatePage(c *echo.Context) {
 	lofi, err := handler.Service.Get(c.Request().Context(), id)
 	if err != nil {
 		logger.Info("MediaLoFiHandler#UpdatePage", "error", err.Error())
-		c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-		return
+		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
 	}
 	var form models.MediaLoFiForm
 	if err := c.Bind(&form); err != nil {
 		logger.Info("MediaLoFiHandler#UpdatePage", "error", err.Error())
-		c.Render(http.StatusBadRequest, "lofi_detail", map[string]any{
+		return c.Render(http.StatusBadRequest, "lofi_detail", map[string]any{
 			"Form":   form,
 			"Errors": err.Error(),
 			"user":   user,
 		})
-		return
 	}
 	logger.Info("MediaLoFiHandler#UpdatePage", "lofi", lofi)
 	//handler.Service.Update(c.Request.Context(), form.ConvertFormToMediaLofiDTO())
-	c.Redirect(http.StatusFound, globals.MediaLofiLink)
+	return c.Redirect(http.StatusFound, globals.MediaLofiLink)
 }
 
-func (handler *MediaLoFiHandler) DeletePage(c *echo.Context) {
+func (handler *MediaLoFiHandler) DeletePage(c *echo.Context) error {
 	cookie, err := c.Cookie(globals.UserKey)
 	user := cookie.Value
 	id := c.Param("id")
@@ -218,11 +210,10 @@ func (handler *MediaLoFiHandler) DeletePage(c *echo.Context) {
 	lofi, err := handler.Service.Get(c.Request().Context(), id)
 	if err != nil {
 		logger.Info("MediaLoFiHandler#DeletePage", "error", err.Error())
-		c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-		return
+		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
 	}
 	logger.Info("MediaLoFiHandler#DeletePage", "lofi", id)
-	c.Render(http.StatusOK, "lofi_delete", map[string]any{
+	return c.Render(http.StatusOK, "lofi_delete", map[string]any{
 		"title":   "Kontor MediaFiles",
 		"version": "0.4.0",
 		"message": "MediaFiles...",

kontor-echo/internal/handlers/media_music.go

@@ -22,68 +22,62 @@ func NewMediaMusicHandler(db *bun.DB) *MediaMusicHandler {
 	return mediaMusicHandler
 }
 
-func (handler *MediaMusicHandler) List(c *echo.Context) {
+func (handler *MediaMusicHandler) List(c *echo.Context) error {
 	musics, err := handler.Service.List(c.Request().Context())
 	if err != nil {
-		c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-		return
+		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
 	}
 	dtos := models.ConvertMediaMusicsToDtos(musics)
-	c.JSON(http.StatusOK, dtos)
+	return c.JSON(http.StatusOK, dtos)
 }
 
-func (handler *MediaMusicHandler) Get(c *echo.Context) {
+func (handler *MediaMusicHandler) Get(c *echo.Context) error {
 	id := c.Param("id")
 	music, err := handler.Service.Get(c.Request().Context(), id)
 	if err != nil {
-		c.JSON(http.StatusNotFound, map[string]string{"error": "MediaMusic not found"})
-		return
+		return c.JSON(http.StatusNotFound, map[string]string{"error": "MediaMusic not found"})
 	}
-	c.JSON(http.StatusOK, music)
+	return c.JSON(http.StatusOK, music)
 }
 
-func (handler *MediaMusicHandler) Add(c *echo.Context) {
+func (handler *MediaMusicHandler) Add(c *echo.Context) error {
 	var input models.MediaLofiAdd
 
 	if err := c.Bind(&input); err != nil {
-		c.JSON(http.StatusBadRequest, map[string]string{"error": err.Error()})
-		return
+		return c.JSON(http.StatusBadRequest, map[string]string{"error": err.Error()})
 	}
 	music, err := handler.Service.Add(c.Request().Context(), input.Url)
 	if err != nil {
-		c.JSON(http.StatusNotFound, map[string]string{"error": "MediaMusic not added"})
-		return
+		return c.JSON(http.StatusNotFound, map[string]string{"error": "MediaMusic not added"})
 	}
-	c.JSON(http.StatusOK, music)
+	return c.JSON(http.StatusOK, music)
 }
 
-func (handler *MediaMusicHandler) Update(c *echo.Context) {
+func (handler *MediaMusicHandler) Update(c *echo.Context) error {
 	var input models.MediaMusicDTO
 
 	if err := c.Bind(&input); err != nil {
-		c.JSON(http.StatusBadRequest, map[string]string{"error": err.Error()})
-		return
+		return c.JSON(http.StatusBadRequest, map[string]string{"error": err.Error()})
 	}
 	music, err := handler.Service.Update(c.Request().Context(), input)
 	if err != nil {
 		logger := c.Logger()
 		logger.Info("MediaMusicHandler#Update", "error", err.Error())
-		c.JSON(http.StatusNotFound, map[string]string{"error": "MediaMusic not updated"})
-		return
+		return c.JSON(http.StatusNotFound, map[string]string{"error": "MediaMusic not updated"})
 	}
-	c.JSON(http.StatusOK, music)
+	return c.JSON(http.StatusOK, music)
 }
-func (handler *MediaMusicHandler) Delete(c *echo.Context) {
+
+func (handler *MediaMusicHandler) Delete(c *echo.Context) error {
 	id := c.Param("id")
 	err := handler.Service.Delete(c.Request().Context(), id)
 	if err != nil {
-		c.JSON(http.StatusNotFound, map[string]string{"error": "MediaMusic not found"})
-		return
+		return c.JSON(http.StatusNotFound, map[string]string{"error": "MediaMusic not found"})
 	}
-	c.JSON(http.StatusOK, map[string]string{"ok": "true"})
+	return c.JSON(http.StatusOK, map[string]string{"ok": "true"})
 }
 
-func (handler *MediaMusicHandler) ListPage(c *echo.Context) {
+func (handler *MediaMusicHandler) ListPage(c *echo.Context) error {
 	cookie, err := c.Cookie(globals.UserKey)
 	user := cookie.Value
 	logger := c.Logger()
@@ -111,8 +105,7 @@ func (handler *MediaMusicHandler) ListPage(c *echo.Context) {
 	musics, err := handler.Service.List(c.Request().Context())
 	if err != nil {
 		logger.Info("MediaMusicHandler#ListPage", "error", err.Error())
-		c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-		return
+		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
 	}
 	logger.Info("MediaMusicHandler#ListPage", "MediaMusic count", len(musics))
 	data := globals.GetDefaultValues(user, "MediaMusic...")
@@ -120,10 +113,10 @@ func (handler *MediaMusicHandler) ListPage(c *echo.Context) {
 	data["MediaLinksUrl"] = globals.MediaMusicLink
 	data["isReview"] = review
 	data["isDownload"] = download
-	c.Render(http.StatusOK, "media_links", data)
+	return c.Render(http.StatusOK, "media_links", data)
 }
 
-func (handler *MediaMusicHandler) EditPage(c *echo.Context) {
+func (handler *MediaMusicHandler) EditPage(c *echo.Context) error {
 	cookie, err := c.Cookie(globals.UserKey)
 	user := cookie.Value
 	id := c.Param("id")
@@ -131,16 +124,15 @@ func (handler *MediaMusicHandler) EditPage(c *echo.Context) {
 	music, err := handler.Service.Get(c.Request().Context(), id)
 	if err != nil {
 		logger.Info("MediaMusicHandler#EditPage", "error", err.Error())
-		c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-		return
+		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
 	}
 	logger.Info("MediaMusicHandler#EditPage", "music", music)
 	data := globals.GetDefaultValues(user, "MediaMusic...")
 	data["lofi"] = music
-	c.Render(http.StatusOK, "lofi_detail", data)
+	return c.Render(http.StatusOK, "lofi_detail", data)
 }
 
-func (handler *MediaMusicHandler) UpdatePage(c *echo.Context) {
+func (handler *MediaMusicHandler) UpdatePage(c *echo.Context) error {
 	cookie, err := c.Cookie(globals.UserKey)
 	user := cookie.Value
 	id := c.Param("id")
@@ -148,8 +140,7 @@ func (handler *MediaMusicHandler) UpdatePage(c *echo.Context) {
 	music, err := handler.Service.Get(c.Request().Context(), id)
 	if err != nil {
 		logger.Info("MediaMusicHandler#UpdatePage", "error", err.Error())
-		c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-		return
+		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
 	}
 	var form models.MediaMusicForm
 	if err := c.Bind(&form); err != nil {
@@ -157,15 +148,14 @@ func (handler *MediaMusicHandler) UpdatePage(c *echo.Context) {
 		data := globals.GetDefaultValues(user, "MediaMusic...")
 		data["Form"] = form
 		data["Errors"] = err.Error()
-		c.Render(http.StatusBadRequest, "lofi_detail", data)
-		return
+		return c.Render(http.StatusBadRequest, "lofi_detail", data)
 	}
 	logger.Info("MediaMusicHandler#UpdatePage", "music", music)
 	//handler.Service.Update(c.Request.Context(), form.ConvertFormToMediaLofiDTO())
-	c.Redirect(http.StatusFound, globals.MediaMusicLink)
+	return c.Redirect(http.StatusFound, globals.MediaMusicLink)
 }
 
-func (handler *MediaMusicHandler) DeletePage(c *echo.Context) {
+func (handler *MediaMusicHandler) DeletePage(c *echo.Context) error {
 	// session := sessions.Default(c)
 	// user := session.Get(globals.UserKey)
 	id := c.Param("id")
@@ -173,9 +163,8 @@ func (handler *MediaMusicHandler) DeletePage(c *echo.Context) {
 	err := handler.Service.Delete(c.Request().Context(), id)
 	if err != nil {
 		logger.Info("MediaMusicHandler#DeletePage", "error", err.Error())
-		c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-		return
+		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
 	}
 	logger.Info("MediaMusicHandler#DeletePage", "music", id)
-	c.Redirect(http.StatusFound, globals.MediaMusicLink)
+	return c.Redirect(http.StatusFound, globals.MediaMusicLink)
 }

kontor-echo/internal/handlers/media_video.go

@@ -20,36 +20,34 @@ func NewMediaVideoHandler(db *bun.DB) *MediaVideoHandler {
 	return handler
 }
 
-func (handler *MediaVideoHandler) List(c *echo.Context) {
+func (handler *MediaVideoHandler) List(c *echo.Context) error {
 	logger := c.Logger()
 	logger.Info("MediaVideoHandler#List")
 	videos, err := handler.Service.List(c.Request().Context())
 	if err != nil {
-		c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-		return
+		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
 	}
 	dtos := models.ConvertMediaVideosToDtos(videos)
-	c.JSON(http.StatusOK, dtos)
+	return c.JSON(http.StatusOK, dtos)
 }
 
-func (handler *MediaVideoHandler) ListPage(c *echo.Context) {
+func (handler *MediaVideoHandler) ListPage(c *echo.Context) error {
 	cookie, err := c.Cookie(globals.UserKey)
 	user := cookie.Value
 	logger := c.Logger()
 	videos, err := handler.Service.List(c.Request().Context())
 	if err != nil {
-		c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-		return
+		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
 	}
 	logger.Info("MediaVideoHandler#ListPage", "videos count", len(videos))
 	data := globals.GetDefaultValues(user, "MediaVideos...")
 	data["title"] = "Kontor MediaVideos"
 	data["media_links"] = videos
 	data["MediaLinksUrl"] = globals.MediaVideoLink
-	c.Render(http.StatusOK, "media_links", data)
+	return c.Render(http.StatusOK, "media_links", data)
 }
 
-func (handler *MediaVideoHandler) EditPage(c *echo.Context) {
+func (handler *MediaVideoHandler) EditPage(c *echo.Context) error {
 	cookie, err := c.Cookie(globals.UserKey)
 	user := cookie.Value
 	id := c.Param("id")
@@ -57,16 +55,15 @@ func (handler *MediaVideoHandler) EditPage(c *echo.Context) {
 	video, err := handler.Service.Get(c.Request().Context(), id)
 	if err != nil {
 		logger.Info("MediaVideoHandler#EditPage", "error", err.Error())
-		c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-		return
+		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
 	}
 	logger.Info("MediaVideoHandler#EditPage", "lofi", video)
 	data := globals.GetDefaultValues(user, "MediaLofis...")
 	data["lofi"] = video
-	c.Render(http.StatusOK, "lofi_detail", data)
+	return c.Render(http.StatusOK, "lofi_detail", data)
 }
 
-func (handler *MediaVideoHandler) UpdatePage(c *echo.Context) {
+func (handler *MediaVideoHandler) UpdatePage(c *echo.Context) error {
 	cookie, err := c.Cookie(globals.UserKey)
 	user := cookie.Value
 	id := c.Param("id")
@@ -74,25 +71,23 @@ func (handler *MediaVideoHandler) UpdatePage(c *echo.Context) {
 	video, err := handler.Service.Get(c.Request().Context(), id)
 	if err != nil {
 		logger.Info("MediaVideoHandler#UpdatePage", "error", err.Error())
-		c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-		return
+		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
 	}
 	var form models.MediaVideoForm
 	if err := c.Bind(&form); err != nil {
 		logger.Info("MediaVideoHandler#UpdatePage", "error", err.Error())
-		c.Render(http.StatusBadRequest, "lofi_detail", map[string]any{
+		return c.Render(http.StatusBadRequest, "lofi_detail", map[string]any{
 			"Form":   form,
 			"Errors": err.Error(),
 			"user":   user,
 		})
-		return
 	}
 	logger.Info("MediaVideoHandler#UpdatePage", "lofi", video)
 	//handler.Service.Update(c.Request.Context(), form.ConvertFormToMediaLofiDTO())
-	c.Redirect(http.StatusFound, globals.MediaVideoLink)
+	return c.Redirect(http.StatusFound, globals.MediaVideoLink)
 }
 
-func (handler *MediaVideoHandler) DeletePage(c *echo.Context) {
+func (handler *MediaVideoHandler) DeletePage(c *echo.Context) error {
 	cookie, err := c.Cookie(globals.UserKey)
 	user := cookie.Value
 	id := c.Param("id")
@@ -100,11 +95,10 @@ func (handler *MediaVideoHandler) DeletePage(c *echo.Context) {
 	err = handler.Service.Delete(c.Request().Context(), id)
 	if err != nil {
 		logger.Info("MediaVideoHandler#DeletePage", "error", err.Error())
-		c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
-		return
+		return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
 	}
 	logger.Info("MediaVideoHandler#DeletePage", "video", id)
-	c.Render(http.StatusOK, "lofi_delete", map[string]string{
+	return c.Render(http.StatusOK, "lofi_delete", map[string]string{
 		"title":   "Kontor MediaFiles",
 		"version": "0.4.0",
 		"message": "MediaFiles...",

kontor-echo/internal/handlers/token.go

@@ -0,0 +1,30 @@
+package handlers
+
+import (
+	"kontor-api-echo/internal/models"
+	"kontor-api-echo/internal/repository"
+	"kontor-api-echo/internal/service"
+	"net/http"
+
+	"github.com/labstack/echo/v5"
+	"github.com/uptrace/bun"
+)
+
+type TokenHandler struct {
+	Service *service.TokenService
+}
+
+func NewTokenHandler(db *bun.DB) *TokenHandler {
+	handler := &TokenHandler{Service: service.NewTokenService(repository.NewTokenRepository(db))}
+	return handler
+}
+
+func (handler *TokenHandler) List(c *echo.Context) {
+	tokens, err := handler.Service.List(c.Request().Context())
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, map[string]any{"error": err.Error()})
+		return
+	}
+	dtos := models.ConvertTokensToDtos(tokens)
+	c.JSON(http.StatusOK, dtos)
+}