From 437f69455fc38980c9990d79bd322f1e38070060 Mon Sep 17 00:00:00 2001 From: Xenomorph07 Date: Sat, 14 Sep 2024 18:41:05 +0530 Subject: [PATCH] fix: FIXING DUMB THINGS --- internal/middlewares/auth_middleware.go | 34 ------------------------- internal/middlewares/verify-refresh.go | 34 ------------------------- internal/server/routes.go | 3 ++- 3 files changed, 2 insertions(+), 69 deletions(-) delete mode 100644 internal/middlewares/auth_middleware.go delete mode 100644 internal/middlewares/verify-refresh.go diff --git a/internal/middlewares/auth_middleware.go b/internal/middlewares/auth_middleware.go deleted file mode 100644 index 596d6f5..0000000 --- a/internal/middlewares/auth_middleware.go +++ /dev/null @@ -1,34 +0,0 @@ -package middleware - -import ( - "context" - "net/http" - - "github.com/go-chi/jwtauth/v5" -) - -type contextKey string - -const ClaimsContextKey contextKey = "jwt_claims" - -func JWTAuthMiddleware(tokenAuth *jwtauth.JWTAuth) func(http.Handler) http.Handler { - return func(next http.Handler) http.Handler { - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - _, claims, err := jwtauth.FromContext(r.Context()) - if err != nil { - http.Error(w, "Invalid token", http.StatusUnauthorized) - return - } - - ctx := context.WithValue(r.Context(), ClaimsContextKey, claims) - next.ServeHTTP(w, r.WithContext(ctx)) - }) - } -} - -func GetClaims(r *http.Request) map[string]interface{} { - if claims, ok := r.Context().Value(ClaimsContextKey).(map[string]interface{}); ok { - return claims - } - return nil -} diff --git a/internal/middlewares/verify-refresh.go b/internal/middlewares/verify-refresh.go deleted file mode 100644 index fc0a76a..0000000 --- a/internal/middlewares/verify-refresh.go +++ /dev/null @@ -1,34 +0,0 @@ -package middleware - -import ( - "net/http" - - "github.com/go-chi/render" - "github.com/CodeChefVIT/cookoff-backend/internal/helpers/auth" -) - -func VerifyRefreshTokenMiddleware(tokenManager *auth.AuthTokenManager) func(http.Handler) http.Handler { - return func(next http.Handler) http.Handler { - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - cookie, err := r.Cookie("refresh_token") - if err != nil { - if err == http.ErrNoCookie { - render.JSON(w, r, map[string]string{"error": "Missing refresh token cookie"}) - w.WriteHeader(http.StatusUnauthorized) - return - } - render.JSON(w, r, map[string]string{"error": "Error retrieving refresh token cookie"}) - w.WriteHeader(http.StatusInternalServerError) - return - } - refreshToken := cookie.Value - isValid, err := tokenManager.VerifyRefreshToken(refreshToken) - if err != nil || !isValid { - render.JSON(w, r, map[string]string{"error": "Invalid or expired refresh token"}) - w.WriteHeader(http.StatusUnauthorized) - return - } - next.ServeHTTP(w, r) - }) - } -} diff --git a/internal/server/routes.go b/internal/server/routes.go index 2e378ff..58fe54a 100644 --- a/internal/server/routes.go +++ b/internal/server/routes.go @@ -1,9 +1,10 @@ package server import ( - "github.com/CodeChefVIT/cookoff-backend/internal/controllers" "net/http" + "github.com/CodeChefVIT/cookoff-backend/internal/controllers" + "github.com/CodeChefVIT/cookoff-backend/internal/helpers/auth" "github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5/middleware"