go.mod

@@ -9,7 +9,6 @@ require (
 
 require (
 	github.com/a-h/templ v0.2.648
-	github.com/golang-jwt/jwt/v5 v5.2.1
 	github.com/gorilla/sessions v1.2.2
 	github.com/labstack/echo-contrib v0.16.0
 	github.com/labstack/echo/v4 v4.11.4

go.sum

@@ -6,8 +6,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
 github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
-github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
-github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=

handlers/auth.go

@@ -1,10 +1,9 @@
 package handlers
 
 import (
-	"log"
 	"net/http"
+	"templ-test/views"
 	"templ-test/views/auth"
-	"templ-test/views/home"
 
 	"github.com/labstack/echo/v4"
 )
@@ -40,17 +39,10 @@ func (h *Handlers) AuthLoginPost(c echo.Context) error {
 	c.SetCookie(cookie)
 
 	// render
-	return Render(c, http.StatusOK, home.Home())
+	return Render(c, http.StatusOK, views.Home())
 }
 
 func (h *Handlers) AuthShowCookies(c echo.Context) error {
-	claims, err := ValidateJwt(c, h.cfg.SharedApiSecret, h.cfg.ApiServerUri)
-	if err != nil {
-		return Render(c, http.StatusInternalServerError, home.Error(err))
-	}
-	log.Println(claims)
-
 	cookies := GetCookieValues(c)
-
 	return Render(c, http.StatusOK, auth.ShowCookie(cookies))
 }

handlers/handler.go

@@ -1,15 +1,12 @@
 package handlers
 
 import (
-	"errors"
 	"templ-test/client"
 	"templ-test/models"
 	"templ-test/services"
-	"time"
 
 	"github.com/a-h/templ"
 
-	"github.com/golang-jwt/jwt/v5"
 	"github.com/labstack/echo/v4"
 )
 
@@ -35,9 +32,7 @@ func NewHandlerClient(api client.ApiClient, cfg services.EnvConfig) *Handlers {
 
 func (h *Handlers) Register(group echo.Group) {
 	group.GET("/", h.HomeHandler)
-	group.GET("/settings", h.Settings)
+	group.GET("/list", h.ListHandler)
-	group.POST("/settings", h.SettingsPost)
-	//group.GET("/list", h.ListHandler)
 
 	auth := group.Group("/auth")
 	auth.GET("/login", h.AuthLogin)
@@ -51,43 +46,6 @@ func Render(ctx echo.Context, statusCode int, t templ.Component) error {
 	return t.Render(ctx.Request().Context(), ctx.Response().Writer)
 }
 
-type jwtToken struct {
-	Exp        time.Time `json:"exp"`
-	Iss        string    `json:"iss"`
-	Authorized bool      `json:"authorized"`
-	UserName   string    `json:"username"`
-	Scopes     []string  `json:"scopes"`
-	jwt.RegisteredClaims
-}
-
-func ValidateJwt(ctx echo.Context, sharedSecret, issuer string) (jwtToken, error) {
-	cookies := GetCookieValues(ctx)
-	if cookies.Token == "" {
-		return jwtToken{}, errors.New("JWT Bearer Token is missing")
-	}
-
-	token, err := jwt.ParseWithClaims(cookies.Token, &jwtToken{}, func(token *jwt.Token) (interface{}, error) {
-		return []byte(sharedSecret), nil
-	})
-	if err != nil {
-		return jwtToken{}, err
-	}
-
-	if !token.Valid {
-		return jwtToken{}, errors.New("invalid jwt token")
-	}
-	
-	claims := token.Claims.(*jwtToken)
-	if !claims.Exp.After(time.Now()) {
-		return jwtToken{}, errors.New("the jwt token has expired")
-	}
-	if claims.Iss != issuer {
-		return jwtToken{}, errors.New("the issuer was invalid")
-	}
-
-	return *claims, nil
-}
-
 func GetCookieValues(ctx echo.Context) models.AllCookies {
 	m := models.AllCookies{}
 

handlers/home.go

@@ -2,25 +2,15 @@ package handlers
 
 import (
 	"net/http"
-	"templ-test/views/home"
+	"templ-test/views"
 
 	"github.com/labstack/echo/v4"
 )
 
 func (h *Handlers) HomeHandler(c echo.Context) error {
-	return Render(c, http.StatusOK, home.Home())
+	return Render(c, http.StatusOK, views.Home())
 }
 
-func (h *Handlers) Settings(c echo.Context) error {
+func (h *Handlers) ListHandler(c echo.Context) error {
-	return Render(c, http.StatusOK, home.UserSettings())
+	return Render(c, http.StatusOK, views.List())
-}
+}
-
-func (h *Handlers) SettingsPost(c echo.Context) error {
-	// take in the updated values from he user and write the cookies... tbd
-
-	return Render(c, http.StatusOK, home.UserSettings())
-}
-
-//func (h *Handlers) ListHandler(c echo.Context) error {
-//	return Render(c, http.StatusOK, views.List())
-//}

services/config.go

@@ -8,9 +8,8 @@ import (
 )
 
 type EnvConfig struct {
-	ApiServerUri    string
+	ApiServerUri string
-	SharedApiSecret string
+	CookieSecret string
-	CookieSecret    string
 }
 
 func NewEnvConfig() EnvConfig {
@@ -23,8 +22,7 @@ func NewEnvConfig() EnvConfig {
 	}
 
 	return EnvConfig{
-		ApiServerUri:    os.Getenv("ApiServerUri"),
+		ApiServerUri: os.Getenv("ApiServerUri"),
-		SharedApiSecret: os.Getenv("SharedApiSecret"),
+		CookieSecret: os.Getenv("CookieSecret"),
-		CookieSecret:    os.Getenv("CookieSecret"),
 	}
 }

views/auth/cookie.templ

@@ -1,10 +1,10 @@
 package auth
 
+import "templ-test/views"
 import "templ-test/models"
-import "templ-test/views/layout"
 
 templ ShowCookie(m models.AllCookies) {
-	@layout.Testing("Cookie Explorer") {
+	@views.WithLayout("Cookie Explorer", true) {
 		<h2>These are stored as cookies</h2>
 		<p>Username: { m.Username }</p>
 		<p>JWT Token: { m.Token }</p>

views/auth/login.templ

@@ -1,9 +1,9 @@
 package auth
 
-import "templ-test/views/layout"
+import "templ-test/views"
 
 templ AuthLogin() {
-	@layout.WithLayout("Login", true) {
+	@views.WithLayout("Login", true) {
 		<form hx-post="/auth/login">
 			<div class="mb-3">
 				<label for="username" class="form-label">Username</label>
@@ -20,4 +20,4 @@ templ AuthLogin() {
 			<button type="submit" class="btn btn-primary">Submit</button>
 		</form>
 	}
-}
+}

views/home.templ

@@ -1,10 +1,9 @@
-package home
+package views
 
 import "templ-test/views/components/bootstrap"
-import "templ-test/views/layout"
 
 templ Home() {
-	@layout.WithLayout("Home", true) {
+	@Testing("Home", true) {
 		<p>
 			this should be above the alert
 		</p>
@@ -15,3 +14,9 @@ templ Home() {
 
 	}
 }
+
+templ List() {
+	@Testing("Lists", true) {
+		
+	}
+}

views/home/error.templ

@@ -1,10 +0,0 @@
-package home
-
-import "templ-test/views/layout"
-
-templ Error(message error) {
-	@layout.Testing("Error") {
-		<h1>Oops... :(</h1>
-		<h3>{ message.Error() } </h3>
-	}
-}

views/home/settings.templ

@@ -1,9 +0,0 @@
-package home
-
-import "templ-test/views/layout"
-
-templ UserSettings() {
-	@layout.Testing("Settings") {
-		<h2>This is not ready yet</h2>
-	}
-}

views/layout.templ

@@ -1,7 +1,51 @@
-package layout
+package views
+
+templ WithLayout(pageName string, useDarkMode bool) {
+	<html>
+		@getHtmlHead()
+		<body>
+			@bootstrapNavBar()
+			@getBodyHeader(pageName)
+			<div class="container-fluid">
+				{ children... }
+			</div>
+		</body>
+	</html>
+}
+
+templ Testing(pageName string, useDarkMode bool) {
+	<html>
+		@getHtmlHead()
+		<body>
+			@bootstrapNavBar()
+			@getBodyHeader(pageName)
+			<div class="container-fluid">
+				{ children... }
+			</div>
+		</body>
+	</html>
+}
+
+templ getHtmlHead() {
+	<head>
+		<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous"/>
+		<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
+		<script src="https://unpkg.com/htmx.org@1.9.11" integrity="sha384-0gxUXCCR8yv9FM2b+U3FDbsKthCI66oH5IA9fHppQq9DDMHuMauqq1ZHBpJxQ0J0" crossorigin="anonymous"></script>
+		<meta charset="utf-8"/>
+		<meta name="twitter:card" content="fill in later"/>
+		<meta name="twitter:image" content=""/>
+		<meta name="og:image" content=""/>
+	</head>
+}
+
+templ getBodyHeader(pageName string) {
+	<header>
+		<h1>{ pageName }</h1>
+	</header>
+}
 
 templ bootstrapNavBar() {
-	<nav class="navbar navbar-expand-lg bg-body-tertiary" data-bs-theme={ useLightOrDarkTheme(ctx)}>
+	<nav class="navbar navbar-expand-lg bg-body-tertiary" data-bs-theme="dark">
 		<div class="container-fluid">
 			<a class="navbar-brand" href="#">Navbar</a>
 			<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">

views/layout/body.templ

@@ -1,27 +0,0 @@
-package layout
-
-templ WithLayout(pageName string, useDarkMode bool) {
-	<html>
-		@getHtmlHead()
-		<body>
-			@bootstrapNavBar()
-			@getBodyHeader(pageName)
-			<div class="container-fluid">
-				{ children... }
-			</div>
-		</body>
-	</html>
-}
-
-templ Testing(pageName string) {
-	<html>
-		@getHtmlHead()
-		<body>
-			@bootstrapNavBar()
-			@getBodyHeader(pageName)
-			<div class="container-fluid">
-				{ children... }
-			</div>
-		</body>
-	</html>
-}

views/layout/header.templ

@@ -1,19 +0,0 @@
-package layout
-
-templ getHtmlHead() {
-	<head>
-		<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous"/>
-		<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
-		<script src="https://unpkg.com/htmx.org@1.9.11" integrity="sha384-0gxUXCCR8yv9FM2b+U3FDbsKthCI66oH5IA9fHppQq9DDMHuMauqq1ZHBpJxQ0J0" crossorigin="anonymous"></script>
-		<meta charset="utf-8"/>
-		<meta name="twitter:card" content="fill in later"/>
-		<meta name="twitter:image" content=""/>
-		<meta name="og:image" content=""/>
-	</head>
-}
-
-templ getBodyHeader(pageName string) {
-	<header>
-		<h1>{ pageName }</h1>
-	</header>
-}

views/layout/util.go

@@ -1,9 +0,0 @@
-package layout
-
-import (
-	"context"
-)
-
-func useLightOrDarkTheme(ctx context.Context) string {
-	return "dark"
-}