Фикс обновления токена
All checks were successful
Create and publish a Docker image / Publish image (push) Successful in 1m7s
All checks were successful
Create and publish a Docker image / Publish image (push) Successful in 1m7s
This commit is contained in:
@@ -30,6 +30,9 @@ var updateJwtCron = configuration["UPDATE_JWT_CRON"] ?? "0 0 4 ? * *";
|
|||||||
if (string.IsNullOrEmpty(configuration["TZ"]))
|
if (string.IsNullOrEmpty(configuration["TZ"]))
|
||||||
configuration["TZ"] = "Europe/Moscow";
|
configuration["TZ"] = "Europe/Moscow";
|
||||||
|
|
||||||
|
if (string.IsNullOrEmpty(configuration["MODEUS_URL"]))
|
||||||
|
configuration["MODEUS_URL"] = "https://sfedu.modeus.org/";
|
||||||
|
|
||||||
var permitLimit = int.TryParse(configuration["PERMIT_LIMIT"], out var parsedPermitLimit) ? parsedPermitLimit : 40;
|
var permitLimit = int.TryParse(configuration["PERMIT_LIMIT"], out var parsedPermitLimit) ? parsedPermitLimit : 40;
|
||||||
var timeLimit = int.TryParse(configuration["TIME_LIMIT"], out var parsedTimeLimit) ? parsedTimeLimit : 10;
|
var timeLimit = int.TryParse(configuration["TIME_LIMIT"], out var parsedTimeLimit) ? parsedTimeLimit : 10;
|
||||||
|
|
||||||
@@ -61,7 +64,11 @@ if (!string.IsNullOrEmpty(tgChatId) && !string.IsNullOrEmpty(tgToken))
|
|||||||
|
|
||||||
// Включаем MVC контроллеры
|
// Включаем MVC контроллеры
|
||||||
var mvcBuilder = builder.Services.AddControllers();
|
var mvcBuilder = builder.Services.AddControllers();
|
||||||
builder.Services.AddHttpClient<ModeusService>();
|
builder.Services.AddHttpClient("modeus", client =>
|
||||||
|
{
|
||||||
|
client.BaseAddress = new Uri(configuration["MODEUS_URL"]!);
|
||||||
|
});
|
||||||
|
builder.Services.AddSingleton<ModeusService>();
|
||||||
builder.Services.AddHttpClient("authClient");
|
builder.Services.AddHttpClient("authClient");
|
||||||
|
|
||||||
builder.Services.AddAuthentication()
|
builder.Services.AddAuthentication()
|
||||||
|
|||||||
@@ -16,13 +16,14 @@ public class ModeusService
|
|||||||
private readonly HttpClient _httpClient;
|
private readonly HttpClient _httpClient;
|
||||||
private readonly ILogger<ModeusService> _logger;
|
private readonly ILogger<ModeusService> _logger;
|
||||||
|
|
||||||
public ModeusService(HttpClient httpClient, ILogger<ModeusService> logger, IConfiguration configuration)
|
public ModeusService(IHttpClientFactory httpClientFactory,
|
||||||
|
ILogger<ModeusService> logger,
|
||||||
|
IConfiguration configuration)
|
||||||
{
|
{
|
||||||
_httpClient = httpClient;
|
_httpClient = httpClientFactory.CreateClient("modeus");
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
_configuration = configuration;
|
_configuration = configuration;
|
||||||
_httpClient.BaseAddress = new Uri("https://sfedu.modeus.org/");
|
SetToken(_configuration["TOKEN"]); // Установка предустановленного токена при инициализации, на случай если нет возможности связи с AUTH сервисом
|
||||||
SetToken(_configuration["TOKEN"]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SetToken(string? token)
|
public void SetToken(string? token)
|
||||||
|
|||||||
Reference in New Issue
Block a user