🧹 chore: fiber locals reorg

GenerateNU · May 25, 2024 · 9eebc6f · 9eebc6f
1 parent 1187dc9
commit 9eebc6f
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 21 deletions.
diff --git a/backend/entities/oauth/base/controller.go b/backend/entities/oauth/base/controller.go
@@ -4,8 +4,9 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/GenerateNU/sac/backend/auth"
 	"github.com/GenerateNU/sac/backend/entities/models"
+	"github.com/GenerateNU/sac/backend/locals"
+
 	"github.com/gofiber/fiber/v2"
 )
 
@@ -25,7 +26,7 @@ func (oc *OAuthController) Authorize(c *fiber.Ctx) error {
 	}
 
 	// Extract the user making the call:
-	userID, err := auth.UserIDFrom(c)
+	userID, err := locals.UserIDFrom(c)
 	if err != nil {
 		return err
 	}
@@ -53,7 +54,7 @@ func (oc *OAuthController) Token(c *fiber.Ctx) error {
 	}
 
 	// Extract the user making the call:
-	userID, err := auth.UserIDFrom(c)
+	userID, err := locals.UserIDFrom(c)
 	if err != nil {
 		return err
 	}
@@ -75,7 +76,7 @@ func (oc *OAuthController) Revoke(c *fiber.Ctx) error {
 	}
 
 	// Extract the user making the call:
-	userID, err := auth.UserIDFrom(c)
+	userID, err := locals.UserIDFrom(c)
 	if err != nil {
 		return err
 	}

diff --git a/backend/entities/users/base/controller.go b/backend/entities/users/base/controller.go
@@ -3,8 +3,8 @@ package base
 import (
 	"net/http"
 
-	"github.com/GenerateNU/sac/backend/auth"
 	authEntities "github.com/GenerateNU/sac/backend/entities/auth"
+	"github.com/GenerateNU/sac/backend/locals"
 	"github.com/GenerateNU/sac/backend/utilities"
 	"github.com/garrettladley/fiberpaginate"
 
@@ -63,7 +63,7 @@ func (u *UserController) GetUsers(c *fiber.Ctx) error {
 // @Failure     500   {object}      error
 // @Router		/auth/me  [get]
 func (u *UserController) GetMe(c *fiber.Ctx) error {
-	userID, err := auth.UserIDFrom(c)
+	userID, err := locals.UserIDFrom(c)
 	if err != nil {
 		return err
 	}

diff --git a/backend/auth/locals.go → backend/locals/locals.go b/backend/auth/locals.go → backend/locals/locals.go
@@ -1,8 +1,9 @@
-package auth
+package locals
 
 import (
 	"fmt"
 
+	"github.com/GenerateNU/sac/backend/auth"
 	"github.com/GenerateNU/sac/backend/utilities"
 	"github.com/gofiber/fiber/v2"
 	"github.com/google/uuid"
@@ -15,21 +16,21 @@ const (
 	userIDKey localsKey = 1
 )
 
-func CustomClaimsFrom(c *fiber.Ctx) (*CustomClaims, error) {
+func CustomClaimsFrom(c *fiber.Ctx) (*auth.CustomClaims, error) {
 	rawClaims := c.Locals(claimsKey)
 	if rawClaims == nil {
 		return nil, utilities.Forbidden()
 	}
 
-	claims, ok := rawClaims.(*CustomClaims)
+	claims, ok := rawClaims.(*auth.CustomClaims)
 	if !ok {
-		return nil, fmt.Errorf("claims are not of type CustomClaims. got: %T", rawClaims)
+		return nil, fmt.Errorf("claims are not of type auth.CustomClaims. got: %T", rawClaims)
 	}
 
 	return claims, nil
 }
 
-func SetClaims(c *fiber.Ctx, claims *CustomClaims) {
+func SetCustomClaims(c *fiber.Ctx, claims *auth.CustomClaims) {
 	c.Locals(claimsKey, claims)
 }
 

diff --git a/backend/middleware/auth/auth.go b/backend/middleware/auth/auth.go
@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	"github.com/GenerateNU/sac/backend/auth"
+	"github.com/GenerateNU/sac/backend/locals"
 	"github.com/GenerateNU/sac/backend/utilities"
 	"github.com/google/uuid"
 
@@ -17,7 +18,7 @@ import (
 )
 
 func (m *AuthMiddlewareService) IsSuper(c *fiber.Ctx) bool {
-	claims, err := auth.CustomClaimsFrom(c)
+	claims, err := locals.CustomClaimsFrom(c)
 	if err != nil {
 		_ = err
 		return false
@@ -67,15 +68,15 @@ func (m *AuthMiddlewareService) Authenticate(c *fiber.Ctx) error {
 		// 	return errors.Unauthorized.FiberError(c)
 		// }
 
-		auth.SetClaims(c, claims)
+		locals.SetCustomClaims(c, claims)
 
 		rawUserID := claims.Issuer
 		userID, err := uuid.Parse(rawUserID)
 		if err != nil {
 			return fmt.Errorf("invalid user id: %s", rawUserID)
 		}
 
-		auth.SetUserID(c, &userID)
+		locals.SetUserID(c, &userID)
 
 		return nil
 	}(c)
@@ -88,7 +89,7 @@ func (m *AuthMiddlewareService) Authorize(requiredPermissions ...auth.Permission
 			return utilities.Unauthorized()
 		}
 
-		claims, err := auth.CustomClaimsFrom(c)
+		claims, err := locals.CustomClaimsFrom(c)
 		if err != nil {
 			return err
 		}

diff --git a/backend/middleware/auth/club.go b/backend/middleware/auth/club.go
@@ -3,8 +3,8 @@ package auth
 import (
 	"slices"
 
-	"github.com/GenerateNU/sac/backend/auth"
 	"github.com/GenerateNU/sac/backend/entities/clubs"
+	"github.com/GenerateNU/sac/backend/locals"
 	"github.com/GenerateNU/sac/backend/utilities"
 	"github.com/gofiber/fiber/v2"
 )
@@ -25,7 +25,7 @@ func (m *AuthMiddlewareService) ClubAuthorizeById(c *fiber.Ctx, extractor Extrac
 			return err
 		}
 
-		userID, err := auth.UserIDFrom(c)
+		userID, err := locals.UserIDFrom(c)
 		if err != nil {
 			return err
 		}

diff --git a/backend/middleware/auth/event.go b/backend/middleware/auth/event.go
@@ -3,8 +3,8 @@ package auth
 import (
 	"slices"
 
-	"github.com/GenerateNU/sac/backend/auth"
 	"github.com/GenerateNU/sac/backend/entities/events"
+	"github.com/GenerateNU/sac/backend/locals"
 	"github.com/GenerateNU/sac/backend/utilities"
 	"github.com/gofiber/fiber/v2"
 )
@@ -25,7 +25,7 @@ func (m *AuthMiddlewareService) EventAuthorizeById(c *fiber.Ctx, extractor Extra
 			return err
 		}
 
-		userID, err := auth.UserIDFrom(c)
+		userID, err := locals.UserIDFrom(c)
 		if err != nil {
 			return err
 		}

diff --git a/backend/middleware/auth/user.go b/backend/middleware/auth/user.go
@@ -1,7 +1,7 @@
 package auth
 
 import (
-	"github.com/GenerateNU/sac/backend/auth"
+	"github.com/GenerateNU/sac/backend/locals"
 	"github.com/GenerateNU/sac/backend/utilities"
 	"github.com/gofiber/fiber/v2"
 )
@@ -21,7 +21,7 @@ func (m *AuthMiddlewareService) UserAuthorizeById(c *fiber.Ctx) error {
 			return err
 		}
 
-		userID, err := auth.UserIDFrom(c)
+		userID, err := locals.UserIDFrom(c)
 		if err != nil {
 			return err
 		}