Fix client init in telegram && rest admin services #57
|
|
@ -3,15 +3,17 @@ package clientcontrollers
|
|||
import (
|
||||
configcore "bitrix_balancer_api/core/config"
|
||||
database "bitrix_balancer_api/core/db"
|
||||
"bitrix_balancer_api/core/lib/external/tgkit"
|
||||
redismodule "bitrix_balancer_api/core/lib/internally/redis"
|
||||
"errors"
|
||||
"fmt"
|
||||
)
|
||||
|
||||
type ClientsExternal struct {
|
||||
Config *configcore.Config
|
||||
Redis *redismodule.ModuleRedis
|
||||
DB *database.ModuleDB
|
||||
Config *configcore.Config
|
||||
Redis *redismodule.ModuleRedis
|
||||
DB *database.ModuleDB
|
||||
Telegram *tgkit.Client
|
||||
}
|
||||
|
||||
func ReturnClientsExternal(cfgOptions *configcore.ConfigLoadOptions) (ClientsExternal, error) {
|
||||
|
|
@ -43,5 +45,16 @@ func ReturnClientsExternal(cfgOptions *configcore.ConfigLoadOptions) (ClientsExt
|
|||
clientsExternal.DB = dbClient
|
||||
}
|
||||
|
||||
if cfgOptions.Telegram {
|
||||
tgKitClient, err := tgkit.GetClient(tgkit.ClientConfig{
|
||||
Token: cfg.Telegram.BotToken,
|
||||
Proxy: &tgkit.ProxyConfig{},
|
||||
})
|
||||
if err != nil {
|
||||
return clientsExternal, errors.New(fmt.Sprintf("failed to get tg client: %v", err))
|
||||
}
|
||||
clientsExternal.Telegram = tgKitClient
|
||||
}
|
||||
|
||||
return clientsExternal, nil
|
||||
}
|
||||
|
|
|
|||
|
|
@ -121,6 +121,7 @@ func getClientsExternal() (clientcontrollers.ClientsExternal, error) {
|
|||
options := &configcore.ConfigLoadOptions{
|
||||
Redis: true,
|
||||
Database: true,
|
||||
Telegram: true,
|
||||
Secrets: configcore.SecretsOptions{
|
||||
AuthJWT: configcore.AuthJWTOptions{
|
||||
Admin: true,
|
||||
|
|
@ -140,6 +141,7 @@ func initInternalProvider(clientsExternal clientcontrollers.ClientsExternal) (*t
|
|||
Config: clientsExternal.Config,
|
||||
RedisClient: clientsExternal.Redis,
|
||||
Database: clientsExternal.DB,
|
||||
TGBotClient: clientsExternal.Telegram,
|
||||
}, nil
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ package main
|
|||
|
||||
import (
|
||||
configcore "bitrix_balancer_api/core/config"
|
||||
"bitrix_balancer_api/core/lib/external/tgkit"
|
||||
clientcontrollers "bitrix_balancer_api/core/lib/internally/client-controllers"
|
||||
tgupdatehandler "bitrix_balancer_api/telegram_service/common/update"
|
||||
"bitrix_balancer_api/telegram_service/scheduler"
|
||||
|
|
@ -57,19 +56,11 @@ func getClientsExternal() (clientcontrollers.ClientsExternal, error) {
|
|||
}
|
||||
|
||||
func initInternalProvider(cfg *configcore.Config, clientsExternal clientcontrollers.ClientsExternal) (*types.InternalProviderControl, error) {
|
||||
tgKitClient, err := tgkit.GetClient(tgkit.ClientConfig{
|
||||
Token: cfg.Telegram.BotToken,
|
||||
Proxy: &tgkit.ProxyConfig{},
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &types.InternalProviderControl{
|
||||
Config: cfg,
|
||||
Database: clientsExternal.DB,
|
||||
RedisClient: clientsExternal.Redis,
|
||||
TGBotClient: tgKitClient,
|
||||
TGBotClient: clientsExternal.Telegram,
|
||||
}, nil
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue