egommerce/identity-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Update
Some checks failed
ci/woodpecker/push/workflow Pipeline failed
Details

Browse Source
This commit is contained in:
PB
2025-12-13 15:55:27 +01:00
parent cc0bd22cac
commit e7478ae657
6 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
deploy/scripts/image-build.sh
View File

@@ -1,7 +1,8 @@
#!/bin/sh #!/bin/sh
# RUN IN REPO ROOT DIR !! # 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 BUILDER_IMAGE="egommerce-builder:identity"
export BUILD_TIME=$(date +"%Y%m%d%H%M%S") export BUILD_TIME=$(date +"%Y%m%d%H%M%S")
export SERVER_IMAGE="$IMAGE_PREFIX-svc" export SERVER_IMAGE="$IMAGE_PREFIX-svc"

5
deploy/scripts/image-push.sh
View File

@@ -1,12 +1,13 @@
#!/bin/sh #!/bin/sh
# RUN IN REPO ROOT DIR !! # 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" export SERVER_IMAGE="$IMAGE_PREFIX-svc"
TARGET=${1:-latest} 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" docker push "$SERVER_IMAGE:$TARGET"

5
src/app/server.go
View File

@@ -90,7 +90,7 @@ func (s *Server) setupRouter() {
Post("/login", http.LoginHandlerFn(s.GetDatabase(), s.GetCache())). 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("/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())). 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() { func (s *Server) setupMiddleware() {
@@ -100,10 +100,9 @@ func (s *Server) setupMiddleware() {
func LoggingMiddleware() func(c *fiber.Ctx) error { func LoggingMiddleware() func(c *fiber.Ctx) error {
return 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.Request().URI().String(),
c.Context().RemoteIP().String(), c.Context().RemoteIP().String(),
string(c.Context().UserAgent()),
) )
return c.Next() return c.Next()

4
src/go.mod
View File

@@ -5,8 +5,8 @@ go 1.24.0
toolchain go1.24.1 toolchain go1.24.1
require ( require (
git.ego.freeddns.org/egommerce/api-entities v0.3.36 git.ego.freeddns.org/egommerce/api-entities v0.3.53
git.ego.freeddns.org/egommerce/go-api-pkg v0.5.3 git.ego.freeddns.org/egommerce/go-api-pkg v0.5.15
github.com/georgysavva/scany/v2 v2.1.4 github.com/georgysavva/scany/v2 v2.1.4
github.com/go-redis/redis/v8 v8.11.5 github.com/go-redis/redis/v8 v8.11.5
github.com/gofiber/contrib/jwt v1.1.2 github.com/gofiber/contrib/jwt v1.1.2

8
src/go.sum
View File

@@ -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.53 h1:ORI3xxoqdYZXQ2V0AoRzIv15MW22SSQVBZZB/JN9HZo=
git.ego.freeddns.org/egommerce/api-entities v0.3.36/go.mod h1:IqynARw+06GOm4eZGZuepmbi7bUxWBnOB4jd5cI7jf8= 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.3 h1:so+OWWVJEg6JZ5XOSmCpfW7Pd7IL6ETH0QsC6zCwndo= git.ego.freeddns.org/egommerce/go-api-pkg v0.5.15 h1:ximGX7AQisDGasMnmefHa50truDLK60JaCffBTxcSYs=
git.ego.freeddns.org/egommerce/go-api-pkg v0.5.3/go.mod h1:T3ia8iprzlTRznPVXYCgEzQb/1UvIcdn9FHabE58vy0= 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 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0=
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= 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= github.com/MicahParks/keyfunc/v2 v2.1.0 h1:6ZXKb9Rp6qp1bDbJefnG7cTH8yMN1IC/4nf+GVjO99k=

8
src/internal/http/access_handler.go
View File

@@ -21,7 +21,11 @@ func AccessHandlerFn(db *pgxpool.Pool, cache *redis.Client) fiber.Handler {
authSrv := service.NewAuthService(userRepo, cache) authSrv := service.NewAuthService(userRepo, cache)
guardSrv := service.NewGuardService(authSrv, cache, userRepo, roleRepo, urlRepo) 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) header := new(identityDTO.AuthorizationHeaderDTO)
c.ReqHeaderParser(header) 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.Status(fiber.StatusNotFound).JSON(&commonDTO.ErrorResponseDTO{Error: err.Error()})
} }
return c.SendStatus(fiber.StatusNoContent) return c.JSON(&identityDTO.CheckAccessResponseDTO{Status: "OK"})
} }
} }