From e7478ae6577afefd5ce8e8a7ced3cfa25ecfbd9a Mon Sep 17 00:00:00 2001 From: Piotr Biernat Date: Sat, 13 Dec 2025 15:55:27 +0100 Subject: [PATCH] Update --- deploy/scripts/image-build.sh | 3 ++- deploy/scripts/image-push.sh | 5 +++-- src/app/server.go | 5 ++--- src/go.mod | 4 ++-- src/go.sum | 8 ++++---- src/internal/http/access_handler.go | 8 ++++++-- 6 files changed, 19 insertions(+), 14 deletions(-) diff --git a/deploy/scripts/image-build.sh b/deploy/scripts/image-build.sh index fb11f8c..29c6a9b 100755 --- a/deploy/scripts/image-build.sh +++ b/deploy/scripts/image-build.sh @@ -1,7 +1,8 @@ #!/bin/sh # RUN IN REPO ROOT DIR !! -export IMAGE_PREFIX="git.ego.freeddns.org/egommerce/identity" +# export IMAGE_PREFIX="git.ego.freeddns.org/egommerce/identity" +export IMAGE_PREFIX="localhost:32000/egommerce/identity" export BUILDER_IMAGE="egommerce-builder:identity" export BUILD_TIME=$(date +"%Y%m%d%H%M%S") export SERVER_IMAGE="$IMAGE_PREFIX-svc" diff --git a/deploy/scripts/image-push.sh b/deploy/scripts/image-push.sh index e9e76e7..d9c9295 100755 --- a/deploy/scripts/image-push.sh +++ b/deploy/scripts/image-push.sh @@ -1,12 +1,13 @@ #!/bin/sh # RUN IN REPO ROOT DIR !! -export IMAGE_PREFIX="git.ego.freeddns.org/egommerce/identity" +# export IMAGE_PREFIX="git.ego.freeddns.org/egommerce/identity" +export IMAGE_PREFIX="localhost:32000/egommerce/identity" export SERVER_IMAGE="$IMAGE_PREFIX-svc" TARGET=${1:-latest} -echo $DOCKER_PASSWORD | docker login git.ego.freeddns.org -u $DOCKER_USERNAME --password-stdin +# echo $DOCKER_PASSWORD | docker login git.ego.freeddns.org -u $DOCKER_USERNAME --password-stdin docker push "$SERVER_IMAGE:$TARGET" diff --git a/src/app/server.go b/src/app/server.go index a28244f..1c018c9 100644 --- a/src/app/server.go +++ b/src/app/server.go @@ -90,7 +90,7 @@ func (s *Server) setupRouter() { Post("/login", http.LoginHandlerFn(s.GetDatabase(), s.GetCache())). Post("/refresh", http.RefreshHandlerFn(s.GetDatabase(), s.GetCache())). // add JWTProtected() and get token from Auth Bearer header not from the body? Post("/register", http.RegisterHandlerFn(s.GetDatabase(), s.GetCache())). - Get("/access", JWTProtected(), http.AccessHandlerFn(s.GetDatabase(), s.GetCache())) + Get("/access" /*JWTProtected(), */, http.AccessHandlerFn(s.GetDatabase(), s.GetCache())) } func (s *Server) setupMiddleware() { @@ -100,10 +100,9 @@ func (s *Server) setupMiddleware() { func LoggingMiddleware() func(c *fiber.Ctx) error { return func(c *fiber.Ctx) error { - log.Printf("Request: %s, remote: %s, via: %s", + log.Printf("Request: %s, remote: %s", c.Request().URI().String(), c.Context().RemoteIP().String(), - string(c.Context().UserAgent()), ) return c.Next() diff --git a/src/go.mod b/src/go.mod index 108b69d..f76437b 100644 --- a/src/go.mod +++ b/src/go.mod @@ -5,8 +5,8 @@ go 1.24.0 toolchain go1.24.1 require ( - git.ego.freeddns.org/egommerce/api-entities v0.3.36 - git.ego.freeddns.org/egommerce/go-api-pkg v0.5.3 + git.ego.freeddns.org/egommerce/api-entities v0.3.53 + git.ego.freeddns.org/egommerce/go-api-pkg v0.5.15 github.com/georgysavva/scany/v2 v2.1.4 github.com/go-redis/redis/v8 v8.11.5 github.com/gofiber/contrib/jwt v1.1.2 diff --git a/src/go.sum b/src/go.sum index a7c3fcf..34e7e6f 100644 --- a/src/go.sum +++ b/src/go.sum @@ -1,7 +1,7 @@ -git.ego.freeddns.org/egommerce/api-entities v0.3.36 h1:vqIR7CCcRmO7xBpRUnmQuF0DlXozpbBf5w7ud62otvw= -git.ego.freeddns.org/egommerce/api-entities v0.3.36/go.mod h1:IqynARw+06GOm4eZGZuepmbi7bUxWBnOB4jd5cI7jf8= -git.ego.freeddns.org/egommerce/go-api-pkg v0.5.3 h1:so+OWWVJEg6JZ5XOSmCpfW7Pd7IL6ETH0QsC6zCwndo= -git.ego.freeddns.org/egommerce/go-api-pkg v0.5.3/go.mod h1:T3ia8iprzlTRznPVXYCgEzQb/1UvIcdn9FHabE58vy0= +git.ego.freeddns.org/egommerce/api-entities v0.3.53 h1:ORI3xxoqdYZXQ2V0AoRzIv15MW22SSQVBZZB/JN9HZo= +git.ego.freeddns.org/egommerce/api-entities v0.3.53/go.mod h1:D58YWJz0jvARi/7pNpDMzp00nfk9YLOj9zjcKRDHBhY= +git.ego.freeddns.org/egommerce/go-api-pkg v0.5.15 h1:ximGX7AQisDGasMnmefHa50truDLK60JaCffBTxcSYs= +git.ego.freeddns.org/egommerce/go-api-pkg v0.5.15/go.mod h1:l+Yq33RTFxqG06+VKL5wutOulQyp3PU4EWHl3OOemUY= github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0= github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/MicahParks/keyfunc/v2 v2.1.0 h1:6ZXKb9Rp6qp1bDbJefnG7cTH8yMN1IC/4nf+GVjO99k= diff --git a/src/internal/http/access_handler.go b/src/internal/http/access_handler.go index dea39b2..b19b3a3 100644 --- a/src/internal/http/access_handler.go +++ b/src/internal/http/access_handler.go @@ -21,7 +21,11 @@ func AccessHandlerFn(db *pgxpool.Pool, cache *redis.Client) fiber.Handler { authSrv := service.NewAuthService(userRepo, cache) guardSrv := service.NewGuardService(authSrv, cache, userRepo, roleRepo, urlRepo) - url, srvName := c.Query("q"), c.Query("srv") + req := new(identityDTO.CheckAccessRequestDTO) + if err := c.BodyParser(req); err != nil { + return c.Status(fiber.StatusBadRequest).JSON(&commonDTO.ErrorResponseDTO{Error: "error parsing input"}) + } + url, srvName := req.URL, req.Service header := new(identityDTO.AuthorizationHeaderDTO) c.ReqHeaderParser(header) @@ -29,6 +33,6 @@ func AccessHandlerFn(db *pgxpool.Pool, cache *redis.Client) fiber.Handler { return c.Status(fiber.StatusNotFound).JSON(&commonDTO.ErrorResponseDTO{Error: err.Error()}) } - return c.SendStatus(fiber.StatusNoContent) + return c.JSON(&identityDTO.CheckAccessResponseDTO{Status: "OK"}) } }