2 files changed, 7 insertions, 32 deletions
diff --git a/backend/api/handler.go b/backend/api/handler.go
index 57ae973..dcebfa1 100644
--- a/backend/api/handler.go
+++ b/backend/api/handler.go
@@ -218,7 +218,7 @@ func (h *Handler) GetGame(ctx context.Context, request GetGameRequestObject, use
 		}
 		return nil, echo.NewHTTPError(http.StatusInternalServerError, err.Error())
 	}
-	if !row.IsPublic && !user.IsAdmin {
+	if !row.IsPublic && (user == nil || !user.IsAdmin) {
 		return GetGame404JSONResponse{
 			Message: "Game not found",
 		}, nil
@@ -318,7 +318,7 @@ func (h *Handler) GetGameWatchLatestStates(ctx context.Context, request GetGameW
 			Status:               status,
 		}
 
-		if row.UserID == user.UserID && !user.IsAdmin {
+		if user != nil && row.UserID == user.UserID && !user.IsAdmin {
 			return GetGameWatchLatestStates403JSONResponse{
 				Message: "You are one of the main players of this game",
 			}, nil
diff --git a/backend/api/handler_wrapper.go b/backend/api/handler_wrapper.go
index 48a0eef..1c8bc83 100644
--- a/backend/api/handler_wrapper.go
+++ b/backend/api/handler_wrapper.go
@@ -28,12 +28,7 @@ func NewHandler(queries db.Querier, txm db.TxManager, hub GameHubInterface, auth
 }
 
 func (h *HandlerWrapper) GetGame(ctx context.Context, request GetGameRequestObject) (GetGameResponseObject, error) {
-	user, ok := GetUserFromContext(ctx)
-	if !ok {
-		return GetGame401JSONResponse{
-			Message: "Unauthorized",
-		}, nil
-	}
+	user, _ := GetUserFromContext(ctx)
 	return h.impl.GetGame(ctx, request, user)
 }
 
@@ -58,32 +53,17 @@ func (h *HandlerWrapper) GetGamePlaySubmissions(ctx context.Context, request Get
 }
 
 func (h *HandlerWrapper) GetGameWatchLatestStates(ctx context.Context, request GetGameWatchLatestStatesRequestObject) (GetGameWatchLatestStatesResponseObject, error) {
-	user, ok := GetUserFromContext(ctx)
-	if !ok {
-		return GetGameWatchLatestStates401JSONResponse{
-			Message: "Unauthorized",
-		}, nil
-	}
+	user, _ := GetUserFromContext(ctx)
 	return h.impl.GetGameWatchLatestStates(ctx, request, user)
 }
 
 func (h *HandlerWrapper) GetGameWatchRanking(ctx context.Context, request GetGameWatchRankingRequestObject) (GetGameWatchRankingResponseObject, error) {
-	user, ok := GetUserFromContext(ctx)
-	if !ok {
-		return GetGameWatchRanking401JSONResponse{
-			Message: "Unauthorized",
-		}, nil
-	}
+	user, _ := GetUserFromContext(ctx)
 	return h.impl.GetGameWatchRanking(ctx, request, user)
 }
 
 func (h *HandlerWrapper) GetGames(ctx context.Context, request GetGamesRequestObject) (GetGamesResponseObject, error) {
-	user, ok := GetUserFromContext(ctx)
-	if !ok {
-		return GetGames401JSONResponse{
-			Message: "Unauthorized",
-		}, nil
-	}
+	user, _ := GetUserFromContext(ctx)
 	return h.impl.GetGames(ctx, request, user)
 }
 
@@ -98,12 +78,7 @@ func (h *HandlerWrapper) GetMe(ctx context.Context, request GetMeRequestObject)
 }
 
 func (h *HandlerWrapper) GetTournament(ctx context.Context, request GetTournamentRequestObject) (GetTournamentResponseObject, error) {
-	user, ok := GetUserFromContext(ctx)
-	if !ok {
-		return GetTournament401JSONResponse{
-			Message: "Unauthorized",
-		}, nil
-	}
+	user, _ := GetUserFromContext(ctx)
 	return h.impl.GetTournament(ctx, request, user)
 }