diff --git a/internal/app/app.go b/internal/app/app.go index c4e88cc..2d0de1e 100644 --- a/internal/app/app.go +++ b/internal/app/app.go @@ -94,9 +94,10 @@ func Run(ctx context.Context, config initialize.Config, logger *zap.Logger) erro }) cntrlDeps := controllers.Deps{ - Service: svc, - Logger: logger, - Verify: tools.NewVerify(config.IntegrationSecret, config.IntegrationID), + Service: svc, + Logger: logger, + Verify: tools.NewVerify(config.IntegrationSecret, config.IntegrationID), + RedirectURL: config.RedirectURL, } controller := controllers.NewController(cntrlDeps) diff --git a/internal/controllers/initial.go b/internal/controllers/initial.go index e32bb4c..01713aa 100644 --- a/internal/controllers/initial.go +++ b/internal/controllers/initial.go @@ -8,9 +8,10 @@ import ( ) type Deps struct { - Service *service.Service - Logger *zap.Logger - Verify *tools.Verify + Service *service.Service + Logger *zap.Logger + Verify *tools.Verify + RedirectURL string } type Controller struct { @@ -54,16 +55,18 @@ func (c *Controller) Name() string { } type WebhookController struct { - service *service.Service - logger *zap.Logger - verify *tools.Verify + service *service.Service + logger *zap.Logger + verify *tools.Verify + redirectURL string } func NewWebhookController(deps Deps) *WebhookController { return &WebhookController{ - service: deps.Service, - logger: deps.Logger, - verify: deps.Verify, + service: deps.Service, + logger: deps.Logger, + verify: deps.Verify, + redirectURL: deps.RedirectURL, } } diff --git a/internal/controllers/webhook.go b/internal/controllers/webhook.go index 38829ab..08faa16 100644 --- a/internal/controllers/webhook.go +++ b/internal/controllers/webhook.go @@ -48,7 +48,7 @@ func (c *WebhookController) WebhookCreate(ctx *fiber.Ctx) error { return ctx.Status(fiber.StatusInternalServerError).SendString("Internal Server Error") } - return ctx.Redirect("https://squiz.pena.digital/integrations") + return ctx.Redirect(c.redirectURL) } // todo проверить надо diff --git a/internal/initialize/config.go b/internal/initialize/config.go index b14a437..831a1a5 100644 --- a/internal/initialize/config.go +++ b/internal/initialize/config.go @@ -27,6 +27,7 @@ type Config struct { // секрет интеграции IntegrationSecret string `env:"INTEGRATION_SECRET" envDefault:"tNK3LwL4ovP0OBK4jKDHJ3646PqRJDOKQYgY6P2t6DCuV8LEzDzszTDY0Fhwmzc8"` AmoStorageURL string `env:"AMO_STORAGE_URL" envDefault:"https://drive-b.amocrm.ru"` + RedirectURL string `env:"REDIRECT_URL" envDefault:"https://squiz.pena.digital/integrations"` } func LoadConfig() (*Config, error) {