Merged in feature/local-pdp (pull request #208)
permit.io local pdp * docs and testing * build fix * docs * permit rights * accept self signed certs * fix eula error
This commit is contained in:
@@ -5,6 +5,7 @@ package queryapi
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"strings"
|
||||
"time"
|
||||
@@ -50,8 +51,12 @@ func (s *Controllers) ListEulaVersions(ctx echo.Context, params ListEulaVersions
|
||||
PageSize: pageSize,
|
||||
})
|
||||
if err != nil {
|
||||
s.cfg.GetAuthLogger().Error("ListEulaVersions: failed to list EULA versions",
|
||||
"error", err,
|
||||
"page", page,
|
||||
"page_size", pageSize)
|
||||
return ctx.JSON(http.StatusInternalServerError, ErrorMessage{
|
||||
Message: "Failed to list EULA versions",
|
||||
Message: fmt.Sprintf("Failed to list EULA versions: %v", err),
|
||||
})
|
||||
}
|
||||
|
||||
@@ -123,8 +128,12 @@ func (s *Controllers) CreateEulaVersion(ctx echo.Context) error {
|
||||
Message: "EULA version already exists",
|
||||
})
|
||||
}
|
||||
s.cfg.GetAuthLogger().Error("CreateEulaVersion: failed to create EULA version",
|
||||
"error", err,
|
||||
"version", req.Version,
|
||||
"created_by", adminUser.Email)
|
||||
return ctx.JSON(http.StatusInternalServerError, ErrorMessage{
|
||||
Message: "Failed to create EULA version",
|
||||
Message: fmt.Sprintf("Failed to create EULA version: %v", err),
|
||||
})
|
||||
}
|
||||
|
||||
@@ -157,8 +166,11 @@ func (s *Controllers) GetEulaVersion(ctx echo.Context, versionID EulaVersionID)
|
||||
Message: "EULA version not found",
|
||||
})
|
||||
}
|
||||
s.cfg.GetAuthLogger().Error("GetEulaVersion: failed to get EULA version",
|
||||
"error", err,
|
||||
"version_id", id)
|
||||
return ctx.JSON(http.StatusInternalServerError, ErrorMessage{
|
||||
Message: "Failed to get EULA version",
|
||||
Message: fmt.Sprintf("Failed to get EULA version: %v", err),
|
||||
})
|
||||
}
|
||||
|
||||
@@ -210,8 +222,11 @@ func (s *Controllers) UpdateEulaVersion(ctx echo.Context, versionID EulaVersionI
|
||||
Message: "EULA version not found",
|
||||
})
|
||||
}
|
||||
s.cfg.GetAuthLogger().Error("UpdateEulaVersion: failed to update EULA version",
|
||||
"error", err,
|
||||
"version_id", id)
|
||||
return ctx.JSON(http.StatusInternalServerError, ErrorMessage{
|
||||
Message: "Failed to update EULA version",
|
||||
Message: fmt.Sprintf("Failed to update EULA version: %v", err),
|
||||
})
|
||||
}
|
||||
|
||||
@@ -259,8 +274,12 @@ func (s *Controllers) ActivateEulaVersion(ctx echo.Context, versionID EulaVersio
|
||||
Message: "Concurrent activation conflict - another version was activated. Please refresh and try again.",
|
||||
})
|
||||
}
|
||||
s.cfg.GetAuthLogger().Error("ActivateEulaVersion: failed to activate EULA version",
|
||||
"error", err,
|
||||
"version_id", id,
|
||||
"activated_by", adminUser.Email)
|
||||
return ctx.JSON(http.StatusInternalServerError, ErrorMessage{
|
||||
Message: "Failed to activate EULA version",
|
||||
Message: fmt.Sprintf("Failed to activate EULA version: %v", err),
|
||||
})
|
||||
}
|
||||
|
||||
@@ -310,8 +329,12 @@ func (s *Controllers) ListEulaAgreements(ctx echo.Context, params ListEulaAgreem
|
||||
|
||||
result, err := s.svc.Eula.ListAgreements(ctx.Request().Context(), input)
|
||||
if err != nil {
|
||||
s.cfg.GetAuthLogger().Error("ListEulaAgreements: failed to list EULA agreements",
|
||||
"error", err,
|
||||
"page", page,
|
||||
"page_size", pageSize)
|
||||
return ctx.JSON(http.StatusInternalServerError, ErrorMessage{
|
||||
Message: "Failed to list EULA agreements",
|
||||
Message: fmt.Sprintf("Failed to list EULA agreements: %v", err),
|
||||
})
|
||||
}
|
||||
|
||||
@@ -355,8 +378,10 @@ func (s *Controllers) GetEulaCompliance(ctx echo.Context, params GetEulaComplian
|
||||
// Initialize AWS config for Cognito
|
||||
awsCfg, err := aws.GetAWSConfig(context.Background())
|
||||
if err != nil {
|
||||
s.cfg.GetAuthLogger().Error("GetEulaCompliance: failed to initialize AWS configuration",
|
||||
"error", err)
|
||||
return ctx.JSON(http.StatusInternalServerError, ErrorMessage{
|
||||
Message: "Failed to initialize AWS configuration",
|
||||
Message: fmt.Sprintf("Failed to initialize AWS configuration: %v", err),
|
||||
})
|
||||
}
|
||||
|
||||
@@ -399,12 +424,16 @@ func (s *Controllers) GetEulaCompliance(ctx echo.Context, params GetEulaComplian
|
||||
}
|
||||
// Check if it's a Cognito error
|
||||
if strings.Contains(err.Error(), "Cognito") || strings.Contains(err.Error(), "cognito") {
|
||||
s.cfg.GetAuthLogger().Error("GetEulaCompliance: Cognito error during compliance report",
|
||||
"error", err)
|
||||
return ctx.JSON(http.StatusBadGateway, ErrorMessage{
|
||||
Message: "Failed to fetch users from Cognito: " + err.Error(),
|
||||
})
|
||||
}
|
||||
s.cfg.GetAuthLogger().Error("GetEulaCompliance: failed to generate compliance report",
|
||||
"error", err)
|
||||
return ctx.JSON(http.StatusInternalServerError, ErrorMessage{
|
||||
Message: "Failed to generate compliance report",
|
||||
Message: fmt.Sprintf("Failed to generate compliance report: %v", err),
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user