From 7b438b8923d047baff2b5e7422890ec626e3eb60 Mon Sep 17 00:00:00 2001 From: skeris Date: Sun, 2 Jun 2024 16:43:08 +0300 Subject: [PATCH] style: remove unnecessary /quiz prefix 4 miniPart\nci:add envs for encription --- deployments/staging/docker-compose.yaml | 5 ++++- go.mod | 1 + go.sum | 3 +++ service/service.go | 5 +---- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/deployments/staging/docker-compose.yaml b/deployments/staging/docker-compose.yaml index f640aa2..5283aae 100644 --- a/deployments/staging/docker-compose.yaml +++ b/deployments/staging/docker-compose.yaml @@ -16,6 +16,9 @@ services: PG_CRED: 'host=10.8.0.5 port=5433 user=squiz password=Redalert2 dbname=squiz sslmode=disable' REDIS_HOST: '10.8.0.5:6379' REDIS_PASSWORD: 'Redalert2' - REDIS_DB: 2 + REDIS_DB: 2 + PUBLIC_KEY: $PUBLIC_KEY + PRIVATE_KEY: $PRIVATE_KEY + ports: - 10.8.0.5:1491:1490 diff --git a/go.mod b/go.mod index e3b86e1..3c84c12 100644 --- a/go.mod +++ b/go.mod @@ -34,6 +34,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/rivo/uniseg v0.4.7 // indirect + github.com/tealeg/xlsx v1.0.5 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasthttp v1.54.0 // indirect github.com/valyala/tcplisten v1.0.0 // indirect diff --git a/go.sum b/go.sum index 143dc94..c710a2d 100644 --- a/go.sum +++ b/go.sum @@ -83,6 +83,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/tealeg/xlsx v1.0.5 h1:+f8oFmvY8Gw1iUXzPk+kz+4GpbDZPK1FhPiQRd+ypgE= +github.com/tealeg/xlsx v1.0.5/go.mod h1:btRS8dz54TDnvKNosuAqxrM1QgN1udgk9O34bDCnORM= github.com/themakers/hlog v0.0.0-20191205140925-235e0e4baddf h1:TJJm6KcBssmbWzplF5lzixXl1RBAi/ViPs1GaSOkhwo= github.com/themakers/hlog v0.0.0-20191205140925-235e0e4baddf/go.mod h1:1FsorU3vnXO9xS9SrhUp8fRb/6H/Zfll0rPt1i4GWaA= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= @@ -144,6 +146,7 @@ google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFW google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= diff --git a/service/service.go b/service/service.go index 157cf3f..e27e367 100644 --- a/service/service.go +++ b/service/service.go @@ -58,7 +58,7 @@ func New(deps ServiceDeps) *Service { func (s *Service) Register(app *fiber.App) *fiber.App { app.Post("/answer", s.PutAnswersOnePiece) app.Post("/settings", s.GetQuizData) - app.Get("/quiz/logo", s.MiniPart) + app.Get("/logo", s.MiniPart) return app } @@ -150,7 +150,6 @@ func (s *Service) GetQuizData(c *fiber.Ctx) error { showBadge := true - fmt.Println("PRIVRRRR", account.ID, account.Privileges) if priv, ok := account.Privileges["squizHideBadge"]; ok { expiration := priv.CreatedAt.Add(time.Duration(priv.Amount) * 24 * time.Hour) @@ -424,8 +423,6 @@ func (s *Service) MiniPart(ctx *fiber.Ctx) error { return ctx.Status(fiber.StatusInternalServerError).SendString(err.Error()) } - fmt.Println("OLOLO", string(shifr)) - ctx.Cookie(&fiber.Cookie{ Name: "quizUser", Value: url.QueryEscape(string(shifr)),