Update iam.go

backend/pkg/iam/iam.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"github.com/deepmap/oapi-codegen/pkg/middleware"
 	"github.com/getkin/kin-openapi/openapi3filter"
+	"github.com/labstack/echo/v4"
 	"github.com/openclarity/vmclarity/api/models"
 	"net/http"
 )
@@ -64,13 +65,8 @@ func OapiAuthenticatorForProvider(m Provider) openapi3filter.AuthenticationFunc
 
 // GetRequiredRolesFromContext returns a list of roles from context required to
 // perform a request.
-func GetRequiredRolesFromContext(ctx context.Context) []string {
-	eCtx := middleware.GetEchoContext(ctx)
-	if eCtx == nil {
-		return nil
-	}
-
-	ctxData := eCtx.Get(models.IamPolicyScopes)
+func GetRequiredRolesFromContext(ctx echo.Context) []string {
+	ctxData := ctx.Get(models.IamPolicyScopes)
 	if ctxData == nil {
 		return nil
 	}
@@ -80,13 +76,8 @@ func GetRequiredRolesFromContext(ctx context.Context) []string {
 }
 
 // GetUserFromContext returns User from context or throws an error.
-func GetUserFromContext(ctx context.Context) (*User, error) {
-	eCtx := middleware.GetEchoContext(ctx)
-	if eCtx == nil {
-		return nil, fmt.Errorf("could not get context")
-	}
-
-	ctxData := eCtx.Get(userCtxKey)
+func GetUserFromContext(ctx echo.Context) (*User, error) {
+	ctxData := ctx.Get(userCtxKey)
 	if ctxData == nil {
 		return nil, fmt.Errorf("no user data found in context")
 	}