🗑️ Clean up code

pkg/internal/services/accounts.go

@@ -342,11 +342,12 @@ func DeleteAccount(id uint) error {
 		return err
 	} else {
 		InvalidAuthCacheWithUser(id)
-		_, _ = proto.NewDirectoryServiceClient(gap.Nx.GetNexusGrpcConn()).BroadcastEvent(context.Background(), &proto.EventInfo{
+		conn := gap.Nx.GetNexusGrpcConn()
+		_, _ = proto.NewDirectoryServiceClient(conn).BroadcastEvent(context.Background(), &proto.EventInfo{
 			Event: "deletion",
 			Data: nex.EncodeMap(map[string]any{
 				"type": "account",
-				"id":   fmt.Sprintf("%d", id),
+				"id":   id,
 			}),
 		})
 	}

pkg/internal/web/admin/badges_api.go

@@ -3,7 +3,7 @@ package admin
 import (
 	"fmt"
 	"git.solsynth.dev/hypernet/passport/pkg/authkit/models"
-	"git.solsynth.dev/hypernet/passport/pkg/internal/http/exts"
+	"git.solsynth.dev/hypernet/passport/pkg/internal/web/exts"
 
 	"git.solsynth.dev/hypernet/passport/pkg/internal/database"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/services"

pkg/internal/web/admin/factors_api.go

@@ -3,7 +3,7 @@ package admin
 import (
 	"git.solsynth.dev/hypernet/passport/pkg/authkit/models"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/database"
-	"git.solsynth.dev/hypernet/passport/pkg/internal/http/exts"
+	"git.solsynth.dev/hypernet/passport/pkg/internal/web/exts"
 	"github.com/gofiber/fiber/v2"
 	jsoniter "github.com/json-iterator/go"
 	"github.com/samber/lo"

pkg/internal/web/admin/index.go

@@ -4,7 +4,7 @@ import (
 	"github.com/gofiber/fiber/v2"
 )
 
-func MapAdminAPIs(app *fiber.App, baseURL string) {
+func MapControllers(app *fiber.App, baseURL string) {
 	admin := app.Group(baseURL)
 	{
 		admin.Post("/badges", grantBadge)

pkg/internal/web/admin/notify_api.go

@@ -3,8 +3,8 @@ package admin
 import (
 	"git.solsynth.dev/hypernet/passport/pkg/authkit/models"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/database"
-	"git.solsynth.dev/hypernet/passport/pkg/internal/http/exts"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/services"
+	"git.solsynth.dev/hypernet/passport/pkg/internal/web/exts"
 	"github.com/gofiber/fiber/v2"
 	"github.com/rs/zerolog/log"
 )

pkg/internal/web/admin/permissions_api.go

@@ -5,8 +5,8 @@ import (
 
 	"git.solsynth.dev/hypernet/passport/pkg/authkit/models"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/database"
-	"git.solsynth.dev/hypernet/passport/pkg/internal/http/exts"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/services"
+	"git.solsynth.dev/hypernet/passport/pkg/internal/web/exts"
 	"github.com/gofiber/fiber/v2"
 )
 

pkg/internal/web/admin/users_api.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"git.solsynth.dev/hypernet/passport/pkg/authkit/models"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/database"
-	"git.solsynth.dev/hypernet/passport/pkg/internal/http/exts"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/services"
+	"git.solsynth.dev/hypernet/passport/pkg/internal/web/exts"
 	"github.com/gofiber/fiber/v2"
 )
 

pkg/internal/web/api/accounts_api.go

@@ -9,7 +9,7 @@ import (
 	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
 	"gorm.io/gorm"
 
-	"git.solsynth.dev/hypernet/passport/pkg/internal/http/exts"
+	"git.solsynth.dev/hypernet/passport/pkg/internal/web/exts"
 
 	"git.solsynth.dev/hypernet/passport/pkg/authkit/models"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/database"

pkg/internal/web/api/auth_api.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"git.solsynth.dev/hypernet/passport/pkg/internal/http/exts"
+	"git.solsynth.dev/hypernet/passport/pkg/internal/web/exts"
 
 	"github.com/gofiber/fiber/v2"
 

pkg/internal/web/api/avatar_api.go

@@ -3,8 +3,8 @@ package api
 import (
 	"git.solsynth.dev/hypernet/passport/pkg/authkit/models"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/database"
-	"git.solsynth.dev/hypernet/passport/pkg/internal/http/exts"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/services"
+	"git.solsynth.dev/hypernet/passport/pkg/internal/web/exts"
 	"github.com/gofiber/fiber/v2"
 	"strconv"
 )

pkg/internal/web/api/bot_token_api.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"git.solsynth.dev/hypernet/passport/pkg/authkit/models"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/database"
-	"git.solsynth.dev/hypernet/passport/pkg/internal/http/exts"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/services"
+	"git.solsynth.dev/hypernet/passport/pkg/internal/web/exts"
 	"github.com/gofiber/fiber/v2"
 	"gorm.io/gorm"
 )

pkg/internal/web/api/bots_api.go

@@ -3,8 +3,8 @@ package api
 import (
 	"git.solsynth.dev/hypernet/passport/pkg/authkit/models"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/database"
-	"git.solsynth.dev/hypernet/passport/pkg/internal/http/exts"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/services"
+	"git.solsynth.dev/hypernet/passport/pkg/internal/web/exts"
 	"github.com/gofiber/fiber/v2"
 	"github.com/samber/lo"
 	"gorm.io/datatypes"

pkg/internal/web/api/check_in_api.go

@@ -3,8 +3,8 @@ package api
 import (
 	"git.solsynth.dev/hypernet/passport/pkg/authkit/models"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/database"
-	"git.solsynth.dev/hypernet/passport/pkg/internal/http/exts"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/services"
+	"git.solsynth.dev/hypernet/passport/pkg/internal/web/exts"
 	"github.com/gofiber/fiber/v2"
 	"strconv"
 )

pkg/internal/web/api/contacts_api.go

@@ -4,7 +4,7 @@ import (
 	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
 	"git.solsynth.dev/hypernet/passport/pkg/authkit/models"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/database"
-	"git.solsynth.dev/hypernet/passport/pkg/internal/http/exts"
+	"git.solsynth.dev/hypernet/passport/pkg/internal/web/exts"
 	"github.com/gofiber/fiber/v2"
 )
 
@@ -45,9 +45,9 @@ func createContact(c *fiber.Ctx) error {
 	user := c.Locals("user").(models.Account)
 
 	var data struct {
-		Type int8 `json:"type"`
-		Content string `json:"content" validate:"required"`
-		IsPublic bool `json:"is_public"`
+		Type     int8   `json:"type"`
+		Content  string `json:"content" validate:"required"`
+		IsPublic bool   `json:"is_public"`
 	}
 
 	if err := exts.BindAndValidate(c, &data); err != nil {
@@ -55,13 +55,13 @@ func createContact(c *fiber.Ctx) error {
 	}
 
 	contact := models.AccountContact{
-        Type:       data.Type,
-        Content:    data.Content,
-        IsPublic:   data.IsPublic,
-        IsPrimary:  false,
-        VerifiedAt: nil,
-        AccountID:  user.ID,
-    }
+		Type:       data.Type,
+		Content:    data.Content,
+		IsPublic:   data.IsPublic,
+		IsPrimary:  false,
+		VerifiedAt: nil,
+		AccountID:  user.ID,
+	}
 	if err := database.C.Create(&contact).Error; err != nil {
 		return fiber.NewError(fiber.StatusInternalServerError, err.Error())
 	}
@@ -78,9 +78,9 @@ func updateContact(c *fiber.Ctx) error {
 	contactId, _ := c.ParamsInt("contactId")
 
 	var data struct {
-		Type int8 `json:"type"`
-		Content string `json:"content" validate:"required"`
-		IsPublic bool `json:"is_public"`
+		Type     int8   `json:"type"`
+		Content  string `json:"content" validate:"required"`
+		IsPublic bool   `json:"is_public"`
 	}
 
 	if err := exts.BindAndValidate(c, &data); err != nil {
@@ -124,4 +124,4 @@ func deleteContact(c *fiber.Ctx) error {
 	}
 
 	return c.SendStatus(fiber.StatusOK)
-}
+}

pkg/internal/web/api/events_api.go

@@ -3,7 +3,7 @@ package api
 import (
 	"git.solsynth.dev/hypernet/passport/pkg/authkit/models"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/database"
-	"git.solsynth.dev/hypernet/passport/pkg/internal/http/exts"
+	"git.solsynth.dev/hypernet/passport/pkg/internal/web/exts"
 	"github.com/gofiber/fiber/v2"
 )
 

pkg/internal/web/api/factors_api.go

@@ -5,8 +5,8 @@ import (
 
 	"git.solsynth.dev/hypernet/passport/pkg/authkit/models"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/database"
-	"git.solsynth.dev/hypernet/passport/pkg/internal/http/exts"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/services"
+	"git.solsynth.dev/hypernet/passport/pkg/internal/web/exts"
 	"github.com/gofiber/fiber/v2"
 	"github.com/pquerna/otp/totp"
 	"github.com/samber/lo"

pkg/internal/web/api/index.go

@@ -4,7 +4,7 @@ import (
 	"github.com/gofiber/fiber/v2"
 )
 
-func MapAPIs(app *fiber.App, baseURL string) {
+func MapControllers(app *fiber.App, baseURL string) {
 	api := app.Group(baseURL).Name("API")
 	{
 		api.Get("/well-known/openid-configuration", getOidcConfiguration)

pkg/internal/web/api/notifications_api.go

@@ -6,8 +6,8 @@ import (
 
 	"git.solsynth.dev/hypernet/passport/pkg/authkit/models"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/database"
-	"git.solsynth.dev/hypernet/passport/pkg/internal/http/exts"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/services"
+	"git.solsynth.dev/hypernet/passport/pkg/internal/web/exts"
 	"github.com/gofiber/fiber/v2"
 	"github.com/samber/lo"
 )

pkg/internal/web/api/notify_api.go

@@ -5,8 +5,8 @@ import (
 
 	"git.solsynth.dev/hypernet/passport/pkg/authkit/models"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/database"
-	"git.solsynth.dev/hypernet/passport/pkg/internal/http/exts"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/services"
+	"git.solsynth.dev/hypernet/passport/pkg/internal/web/exts"
 	"github.com/gofiber/fiber/v2"
 )
 

pkg/internal/web/api/oauth_api.go

@@ -4,7 +4,7 @@ import (
 	"strings"
 	"time"
 
-	"git.solsynth.dev/hypernet/passport/pkg/internal/http/exts"
+	"git.solsynth.dev/hypernet/passport/pkg/internal/web/exts"
 
 	"git.solsynth.dev/hypernet/passport/pkg/authkit/models"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/database"

pkg/internal/web/api/password_api.go

@@ -1,8 +1,8 @@
 package api
 
 import (
-	"git.solsynth.dev/hypernet/passport/pkg/internal/http/exts"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/services"
+	"git.solsynth.dev/hypernet/passport/pkg/internal/web/exts"
 	"github.com/gofiber/fiber/v2"
 )
 

pkg/internal/web/api/preferences_api.go

@@ -2,8 +2,8 @@ package api
 
 import (
 	"git.solsynth.dev/hypernet/passport/pkg/authkit/models"
-	"git.solsynth.dev/hypernet/passport/pkg/internal/http/exts"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/services"
+	"git.solsynth.dev/hypernet/passport/pkg/internal/web/exts"
 	"github.com/gofiber/fiber/v2"
 )
 

pkg/internal/web/api/realm_members_api.go

@@ -3,8 +3,8 @@ package api
 import (
 	"git.solsynth.dev/hypernet/passport/pkg/authkit/models"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/database"
-	"git.solsynth.dev/hypernet/passport/pkg/internal/http/exts"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/services"
+	"git.solsynth.dev/hypernet/passport/pkg/internal/web/exts"
 	"github.com/gofiber/fiber/v2"
 	"strconv"
 )

pkg/internal/web/api/realms_api.go

@@ -1,12 +1,13 @@
 package api
 
 import (
+	"strconv"
+
 	"git.solsynth.dev/hypernet/passport/pkg/authkit/models"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/database"
-	"git.solsynth.dev/hypernet/passport/pkg/internal/http/exts"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/services"
+	"git.solsynth.dev/hypernet/passport/pkg/internal/web/exts"
 	"github.com/gofiber/fiber/v2"
-	"strconv"
 )
 
 func getRealm(c *fiber.Ctx) error {

pkg/internal/web/api/relationships_api.go

@@ -5,8 +5,8 @@ import (
 	"strings"
 
 	"git.solsynth.dev/hypernet/passport/pkg/authkit/models"
-	"git.solsynth.dev/hypernet/passport/pkg/internal/http/exts"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/services"
+	"git.solsynth.dev/hypernet/passport/pkg/internal/web/exts"
 	"github.com/gofiber/fiber/v2"
 	"github.com/samber/lo"
 )

pkg/internal/web/api/reports_api.go

@@ -2,8 +2,8 @@ package api
 
 import (
 	"git.solsynth.dev/hypernet/passport/pkg/authkit/models"
-	"git.solsynth.dev/hypernet/passport/pkg/internal/http/exts"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/services"
+	"git.solsynth.dev/hypernet/passport/pkg/internal/web/exts"
 	"github.com/gofiber/fiber/v2"
 )
 

pkg/internal/web/api/security_api.go

@@ -3,7 +3,7 @@ package api
 import (
 	"git.solsynth.dev/hypernet/passport/pkg/authkit/models"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/database"
-	"git.solsynth.dev/hypernet/passport/pkg/internal/http/exts"
+	"git.solsynth.dev/hypernet/passport/pkg/internal/web/exts"
 	"github.com/gofiber/fiber/v2"
 )
 

pkg/internal/web/api/statuses_api.go

@@ -7,8 +7,8 @@ import (
 
 	"git.solsynth.dev/hypernet/passport/pkg/authkit/models"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/database"
-	"git.solsynth.dev/hypernet/passport/pkg/internal/http/exts"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/services"
+	"git.solsynth.dev/hypernet/passport/pkg/internal/web/exts"
 	"github.com/gofiber/fiber/v2"
 	"github.com/samber/lo"
 )

pkg/internal/web/api/userinfo_api.go

@@ -9,7 +9,7 @@ import (
 	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
 	"git.solsynth.dev/hypernet/passport/pkg/authkit/models"
 	localCache "git.solsynth.dev/hypernet/passport/pkg/internal/cache"
-	"git.solsynth.dev/hypernet/passport/pkg/internal/http/exts"
+	"git.solsynth.dev/hypernet/passport/pkg/internal/web/exts"
 	"github.com/eko/gocache/lib/v4/cache"
 	"github.com/eko/gocache/lib/v4/marshaler"
 	"gorm.io/gorm"

pkg/internal/web/server.go

@@ -1,16 +1,17 @@
-package http
+package web
 
 import (
-	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
-	"git.solsynth.dev/hypernet/passport/pkg/authkit"
 	"strings"
 
-	"git.solsynth.dev/hypernet/passport/pkg/internal/http/admin"
-	"git.solsynth.dev/hypernet/passport/pkg/internal/http/api"
+	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
+	"git.solsynth.dev/hypernet/passport/pkg/authkit"
+
+	"git.solsynth.dev/hypernet/passport/pkg/internal/web/admin"
+	"git.solsynth.dev/hypernet/passport/pkg/internal/web/api"
+	"github.com/gofiber/contrib/fiberzerolog"
 	"github.com/gofiber/fiber/v2"
 	"github.com/gofiber/fiber/v2/middleware/cors"
 	"github.com/gofiber/fiber/v2/middleware/idempotency"
-	"github.com/gofiber/fiber/v2/middleware/logger"
 	jsoniter "github.com/json-iterator/go"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/viper"
@@ -26,8 +27,8 @@ func NewServer() *App {
 	app := fiber.New(fiber.Config{
 		DisableStartupMessage: true,
 		EnableIPValidation:    true,
-		ServerHeader:          "Hypernet.Passport",
-		AppName:               "Hypernet.Passport",
+		ServerHeader:          "HyperNet.Passport",
+		AppName:               "HyperNet.Passport",
 		ProxyHeader:           fiber.HeaderXForwardedFor,
 		JSONEncoder:           jsoniter.ConfigCompatibleWithStandardLibrary.Marshal,
 		JSONDecoder:           jsoniter.ConfigCompatibleWithStandardLibrary.Unmarshal,
@@ -51,16 +52,15 @@ func NewServer() *App {
 		},
 	}))
 
-	app.Use(logger.New(logger.Config{
-		Format: "${status} | ${latency} | ${method} ${path}\n",
-		Output: log.Logger,
+	app.Use(fiberzerolog.New(fiberzerolog.Config{
+		Logger: &log.Logger,
 	}))
 
 	app.Use(sec.ContextMiddleware(IReader))
 	app.Use(authkit.ParseAccountMiddleware)
 
-	admin.MapAdminAPIs(app, "/api/admin")
-	api.MapAPIs(app, "/api")
+	admin.MapControllers(app, "/api/admin")
+	api.MapControllers(app, "/api")
 
 	return &App{app}
 }

pkg/main.go

@@ -2,18 +2,19 @@ package main
 
 import (
 	"fmt"
-	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
-	"github.com/fatih/color"
 	"os"
 	"os/signal"
 	"syscall"
 
+	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
+	"github.com/fatih/color"
+
 	pkg "git.solsynth.dev/hypernet/passport/pkg/internal"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/gap"
 
 	"git.solsynth.dev/hypernet/passport/pkg/internal/grpc"
-	"git.solsynth.dev/hypernet/passport/pkg/internal/http"
 	"git.solsynth.dev/hypernet/passport/pkg/internal/services"
+	"git.solsynth.dev/hypernet/passport/pkg/internal/web"
 	"github.com/robfig/cron/v3"
 
 	"git.solsynth.dev/hypernet/passport/pkg/internal/cache"
@@ -55,7 +56,7 @@ func main() {
 	if reader, err := sec.NewInternalTokenReader(viper.GetString("security.internal_public_key")); err != nil {
 		log.Error().Err(err).Msg("An error occurred when reading internal public key for jwt. Authentication related features will be disabled.")
 	} else {
-		http.IReader = reader
+		web.IReader = reader
 		log.Info().Msg("Internal jwt public key loaded.")
 	}
 	if reader, err := sec.NewJwtReader(viper.GetString("security.public_key")); err != nil {
@@ -89,7 +90,7 @@ func main() {
 	}
 
 	// App
-	go http.NewServer().Listen()
+	go web.NewServer().Listen()
 
 	// Grpc App
 	go grpc.NewServer().Listen()