From 717dd8c07eaea075ee1bd4e5d0818b2c0405994c Mon Sep 17 00:00:00 2001 From: James Tombleson Date: Sun, 7 Jul 2024 08:01:26 -0700 Subject: [PATCH] cleaned up token checks --- internal/handlers/articles.go | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/internal/handlers/articles.go b/internal/handlers/articles.go index 91d7479..bf602ed 100644 --- a/internal/handlers/articles.go +++ b/internal/handlers/articles.go @@ -3,43 +3,37 @@ package handlers import ( "net/http" - "git.jamestombleson.com/jtom38/newsbot-portal/internal/domain" + apidomain "git.jamestombleson.com/jtom38/newsbot-api/domain" "git.jamestombleson.com/jtom38/newsbot-portal/internal/models" "git.jamestombleson.com/jtom38/newsbot-portal/internal/views/articles" - "git.jamestombleson.com/jtom38/newsbot-portal/internal/views/layout" "github.com/labstack/echo/v4" ) func (h *Handler) ArticlesList(c echo.Context) error { - _, err := ValidateJwt(c, h.config.JwtSecret, h.config.ServerAddress) + err := HasValidScope(c, apidomain.ScopeArticleRead) if err != nil { - return Render(c, http.StatusOK, layout.Error(err)) + return RenderError(c, err) } - userToken, err := c.Cookie(domain.CookieToken) + resp, err := h.api.Articles.List(GetJwtToken(c), 0) if err != nil { - return Render(c, http.StatusBadRequest, layout.Error(err)) + return RenderError(c, err) } - resp, err := h.api.Articles.List(userToken.Value, 0) - if err != nil { - return Render(c, http.StatusBadRequest, layout.Error(err)) - } - vm := models.ListArticlesViewModel{} for _, article := range resp.Payload { - source, err := h.api.Sources.GetById(userToken.Value, article.SourceID) + source, err := h.api.Sources.GetById(GetJwtToken(c), article.SourceID) if err != nil { - return Render(c, http.StatusBadRequest, layout.Error(err)) + return RenderError(c, err) } - item := models.ListArticleSourceModel { + item := models.ListArticleSourceModel{ Article: article, - Source: source.Payload[0], + Source: source.Payload[0], } vm.Items = append(vm.Items, item) - + } return Render(c, http.StatusOK, articles.List(vm))