refactor(template, auth): simplify Dist function and update HTTP request handling with fiber client

Author: ReneWerner87

entgo-sveltekit/template/template.go

@@ -3,18 +3,12 @@ package template
 import (
 	"embed"
 	"io/fs"
-	"log"
-	"net/http"
 )
 
 //go:embed all:dist
 var content embed.FS
 
 // All returns the content of the all directory.
-func Dist() http.FileSystem {
-	dist, err := fs.Sub(content, "dist")
-	if err != nil {
-		log.Fatal(err)
-	}
-	return http.FS(dist)
+func Dist() fs.FS {
+	return content
 }

oauth2/go.mod

@@ -12,6 +12,7 @@ require (
 
 require (
 	github.com/andybalholm/brotli v1.2.0 // indirect
+	github.com/fxamacker/cbor/v2 v2.9.0 // indirect
 	github.com/gofiber/schema v1.6.0 // indirect
 	github.com/gofiber/template v1.8.3 // indirect
 	github.com/gofiber/utils v1.1.0 // indirect
@@ -25,6 +26,7 @@ require (
 	github.com/tinylib/msgp v1.5.0 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasthttp v1.68.0 // indirect
+	github.com/x448/float16 v0.8.4 // indirect
 	golang.org/x/crypto v0.44.0 // indirect
 	golang.org/x/net v0.47.0 // indirect
 	golang.org/x/sys v0.38.0 // indirect

oauth2/middleware/auth.go

@@ -6,6 +6,7 @@ import (
 	"oauth2/models"
 
 	"github.com/gofiber/fiber/v3"
+	"github.com/gofiber/fiber/v3/client"
 	"github.com/gofiber/fiber/v3/middleware/session"
 )
 
@@ -22,26 +23,33 @@ func OAUTHRedirect(ctx fiber.Ctx) error {
 
 	// Next, lets for the HTTP request to call the github oauth enpoint	to get our access token
 
-	a := fiber.AcquireAgent()
-	req := a.Request()
-	req.Header.SetMethod(fiber.MethodPost)
-	req.Header.Set("accept", "application/json")
-	req.SetRequestURI(fmt.Sprintf("https://github.com/login/oauth/access_token?client_id=%s&client_secret=%s&code=%s", models.ClientID, models.ClientSecret, code))
-	if err := a.Parse(); err != nil {
-		models.SYSLOG.Errorf("could not create HTTP request: %v", err)
-	}
-
+	a := client.New()
+	req := a.R()
+	req.SetMethod("POST")
+	req.SetURL(fmt.Sprintf("https://github.com/login/oauth/access_token?client_id=%s&client_secret=%s&code=%s", models.ClientID, models.ClientSecret, code))
+	req.SetHeader("accept", "application/json")
 	var retCode int
 	var retBody []byte
-	var errs []error
 	// Send out the HTTP request
 	var t *models.OAuthAccessResponse
-
-	if retCode, retBody, errs = a.Struct(&t); len(errs) > 0 {
+	resp, clientErr := req.Send()
+	if clientErr != nil {
+		models.SYSLOG.Errorf("could not create HTTP request: %v", clientErr)
+	}
+	if clientErr == nil {
+		retCode = resp.StatusCode()
+		retBody = resp.Body()
+		clientErr = resp.JSON(&t)
+	}
+	if clientErr != nil {
 		models.SYSLOG.Tracef("received: %v", string(retBody))
-		models.SYSLOG.Errorf("could not send HTTP request: %v", errs)
+		models.SYSLOG.Errorf("could not send HTTP request: %v", clientErr)
 		return ctx.SendStatus(fiber.StatusInternalServerError)
 	}
+	var errs []error
+	if clientErr != nil {
+		errs = append(errs, clientErr)
+	}
 	models.SYSLOG.Tracef("received : %v %v %v", retCode, string(retBody), errs)
 
 	var sess *session.Session

sveltekit-embed/main.go

@@ -1,13 +1,12 @@
 package main
 
 import (
-	"app/template"
-	"os"
-
 	"github.com/gofiber/fiber/v3"
 	"github.com/gofiber/fiber/v3/middleware/cors"
 	"github.com/gofiber/fiber/v3/middleware/logger"
 	"github.com/gofiber/fiber/v3/middleware/static"
+
+	"app/template"
 )
 
 const (
@@ -31,7 +30,7 @@ func main() {
 	}))
 	// Serve static files
 	app.All("/*", static.New("", static.Config{
-		FS: os.DirFS(template.Dist()),
+		FS: template.Dist(),
 		// TODO: Migrate to NotFoundHandler (fiber.Handler) - NotFoundFile is deprecated
 		// NotFoundFile: "index.html",
 		IndexNames: []string{"index.html"},

sveltekit-embed/template/template.go

@@ -3,18 +3,12 @@ package template
 import (
 	"embed"
 	"io/fs"
-	"log"
-	"net/http"
 )
 
 //go:embed all:dist
 var content embed.FS
 
 // All returns the content of the all directory.
-func Dist() http.FileSystem {
-	dist, err := fs.Sub(content, "dist")
-	if err != nil {
-		log.Fatal(err)
-	}
-	return http.FS(dist)
+func Dist() fs.FS {
+	return content
 }