diff --git a/src/telegram-service/Deal.Telegram/Deal.Telegram.csproj b/src/telegram-service/Deal.Telegram/Deal.Telegram.csproj
index 6f91c32..2e4c92a 100644
--- a/src/telegram-service/Deal.Telegram/Deal.Telegram.csproj
+++ b/src/telegram-service/Deal.Telegram/Deal.Telegram.csproj
@@ -35,6 +35,9 @@
единый источник вместо копий в трёх сервисах. -->
+
+
diff --git a/src/telegram-service/Deal.Telegram/Sessions/TenantSession.cs b/src/telegram-service/Deal.Telegram/Sessions/TenantSession.cs
index 3fabfeb..0ec3a25 100644
--- a/src/telegram-service/Deal.Telegram/Sessions/TenantSession.cs
+++ b/src/telegram-service/Deal.Telegram/Sessions/TenantSession.cs
@@ -1,3 +1,4 @@
+using Deal.Contracts.Integrations.Models;
using Deal.Telegram.Telegram;
using Grpc.Core;
@@ -244,7 +245,7 @@ public sealed class TenantSession : IAsyncDisposable
throw;
}
- if (nextStep == "password")
+ if (nextStep == TelegramAuthPhases.Password)
{
_phase = AuthPhase.Password;
return Snapshot();
diff --git a/src/telegram-service/Deal.Telegram/Telegram/WTelegramSessionClient.cs b/src/telegram-service/Deal.Telegram/Telegram/WTelegramSessionClient.cs
index 211670e..de4682f 100644
--- a/src/telegram-service/Deal.Telegram/Telegram/WTelegramSessionClient.cs
+++ b/src/telegram-service/Deal.Telegram/Telegram/WTelegramSessionClient.cs
@@ -1,4 +1,5 @@
using System.Globalization;
+using Deal.Contracts.Integrations.Models;
using Deal.Telegram.Caching;
using Deal.Telegram.Sessions;
using Grpc.Core;
@@ -31,6 +32,12 @@ public sealed class WTelegramSessionClient : ISessionClient
// Ёмкость LRU-кэша сущностей пользователей (последние использованные имена).
private const int UserEntityCacheCapacity = 2000;
+ // Ключ конфигурации WTelegramClient с api_id приложения.
+ private const string ApiIdKey = "api_id";
+
+ // Ключ конфигурации WTelegramClient с api_hash приложения.
+ private const string ApiHashKey = "api_hash";
+
// LRU-кэш access_hash сущностей (ключ — подписанный id диалога; заполняется из ответов).
private readonly LruCache _entityAccessHashes = new(AccessHashCacheCapacity);
@@ -128,7 +135,7 @@ public sealed class WTelegramSessionClient : ISessionClient
catch (RpcException exception) when (exception.Code == 401 && exception.Message == "SESSION_PASSWORD_NEEDED")
{
// Включён 2FA — следующий шаг: облачный пароль (submit_password).
- return "password";
+ return TelegramAuthPhases.Password;
}
catch (RpcException exception) when (exception.Code == 400 && exception.Message == "PHONE_CODE_INVALID")
{
@@ -729,8 +736,8 @@ public sealed class WTelegramSessionClient : ISessionClient
private string? ConfigProvider(string what)
=> what switch
{
- "api_id" => _apiId.ToString(System.Globalization.CultureInfo.InvariantCulture),
- "api_hash" => _apiHash,
+ ApiIdKey => _apiId.ToString(System.Globalization.CultureInfo.InvariantCulture),
+ ApiHashKey => _apiHash,
_ => null,
};
diff --git a/src/telegram-service/Deal.Telegram/TelegramServiceImpl.cs b/src/telegram-service/Deal.Telegram/TelegramServiceImpl.cs
index 7e7c24b..8b9daed 100644
--- a/src/telegram-service/Deal.Telegram/TelegramServiceImpl.cs
+++ b/src/telegram-service/Deal.Telegram/TelegramServiceImpl.cs
@@ -1,3 +1,4 @@
+using Deal.Contracts.Integrations.Models;
using Deal.Grpc.Telegram;
using Deal.Telegram.Core;
using Deal.Telegram.Dialogs;
@@ -106,7 +107,7 @@ public sealed class TelegramServiceImpl : TelegramService.TelegramServiceBase
TenantSessionSnapshot snapshot = await ExecuteAsync(
tenantId,
ct => _sessionFarm.StartPhoneAsync(tenantId, request.ApiId, request.ApiHash, request.Phone, ct),
- "start_phone",
+ TelegramOperations.StartPhone,
context).ConfigureAwait(false);
return new StartPhoneReply { Phase = PhaseToString(snapshot.Phase) };
@@ -122,7 +123,7 @@ public sealed class TelegramServiceImpl : TelegramService.TelegramServiceBase
TenantSessionSnapshot snapshot = await ExecuteAsync(
tenantId,
ct => _sessionFarm.StartQrAsync(tenantId, request.ApiId, request.ApiHash, ct),
- "start_qr",
+ TelegramOperations.StartQr,
context).ConfigureAwait(false);
var reply = new StartQrReply { Phase = PhaseToString(snapshot.Phase) };
@@ -144,7 +145,7 @@ public sealed class TelegramServiceImpl : TelegramService.TelegramServiceBase
TenantSessionSnapshot snapshot = await ExecuteAsync(
tenantId,
ct => _sessionFarm.SendCodeAsync(tenantId, request.Code, ct),
- "send_code",
+ TelegramOperations.SendCode,
context).ConfigureAwait(false);
return new SendCodeReply { Phase = PhaseToString(snapshot.Phase) };
@@ -160,7 +161,7 @@ public sealed class TelegramServiceImpl : TelegramService.TelegramServiceBase
TenantSessionSnapshot snapshot = await ExecuteAsync(
tenantId,
ct => _sessionFarm.SendPasswordAsync(tenantId, request.Password, ct),
- "send_password",
+ TelegramOperations.SendPassword,
context).ConfigureAwait(false);
return new SendPasswordReply { Phase = PhaseToString(snapshot.Phase) };
@@ -176,7 +177,7 @@ public sealed class TelegramServiceImpl : TelegramService.TelegramServiceBase
await ExecuteAsync(
tenantId,
ct => _sessionFarm.LogoutAsync(tenantId, ct),
- "logout",
+ TelegramOperations.Logout,
context).ConfigureAwait(false);
_catalog.Reset(tenantId);
@@ -208,7 +209,7 @@ public sealed class TelegramServiceImpl : TelegramService.TelegramServiceBase
result.Entries.AddRange(entries);
return result;
},
- "refresh_dialogs",
+ TelegramOperations.RefreshDialogs,
context).ConfigureAwait(false);
return reply;
}
@@ -257,7 +258,7 @@ public sealed class TelegramServiceImpl : TelegramService.TelegramServiceBase
int processed = await ExecuteAsync(
tenantId,
ct => _backfill.ExecuteAsync(tenantId, request.DialogId, request.Force, ct),
- "backfill",
+ TelegramOperations.Backfill,
context).ConfigureAwait(false);
return new BackfillReply { Processed = processed };
}
@@ -285,7 +286,7 @@ public sealed class TelegramServiceImpl : TelegramService.TelegramServiceBase
await _sessionFarm.MarkReadAsync(tenantId, request.DialogId, ct).ConfigureAwait(false);
return result;
},
- "read_recent",
+ TelegramOperations.ReadRecent,
context).ConfigureAwait(false);
return reply;
}
@@ -323,7 +324,7 @@ public sealed class TelegramServiceImpl : TelegramService.TelegramServiceBase
Time = message.DateMs,
};
},
- "read_source",
+ TelegramOperations.ReadSource,
context).ConfigureAwait(false);
return reply;
}
@@ -349,7 +350,7 @@ public sealed class TelegramServiceImpl : TelegramService.TelegramServiceBase
result.Results.AddRange(found.Select(DialogProtoMapper.ToEntry));
return result;
},
- "search",
+ TelegramOperations.Search,
context).ConfigureAwait(false);
return reply;
}
@@ -371,7 +372,7 @@ public sealed class TelegramServiceImpl : TelegramService.TelegramServiceBase
.ConfigureAwait(false);
return new GetInfoReply { Info = DiscoveryProtoMapper.ToChannelInfo(info) };
},
- "discovery_info",
+ TelegramOperations.DiscoveryInfo,
context).ConfigureAwait(false);
return reply;
}
@@ -393,7 +394,7 @@ public sealed class TelegramServiceImpl : TelegramService.TelegramServiceBase
.ConfigureAwait(false);
return DiscoveryProtoMapper.ToReadForEvalReply(result);
},
- "discovery_read",
+ TelegramOperations.DiscoveryRead,
context).ConfigureAwait(false);
return reply;
}
@@ -414,7 +415,7 @@ public sealed class TelegramServiceImpl : TelegramService.TelegramServiceBase
await _discovery.JoinAsync(tenantId, normalizedUsername, ct).ConfigureAwait(false);
return true;
},
- "join",
+ TelegramOperations.Join,
context).ConfigureAwait(false);
return new JoinReply { Ok = true };
}
@@ -434,7 +435,7 @@ public sealed class TelegramServiceImpl : TelegramService.TelegramServiceBase
await _discovery.LeaveAsync(tenantId, request.DialogId, ct).ConfigureAwait(false);
return true;
},
- "leave",
+ TelegramOperations.Leave,
context).ConfigureAwait(false);
return new LeaveReply { Ok = true };
}
@@ -534,12 +535,12 @@ public sealed class TelegramServiceImpl : TelegramService.TelegramServiceBase
private static string PhaseToString(AuthPhase phase)
=> phase switch
{
- AuthPhase.Phone => "phone",
- AuthPhase.Code => "code",
- AuthPhase.Password => "password",
- AuthPhase.Qr => "qr",
- AuthPhase.Ready => "ready",
- _ => "idle",
+ AuthPhase.Phone => TelegramAuthPhases.Phone,
+ AuthPhase.Code => TelegramAuthPhases.Code,
+ AuthPhase.Password => TelegramAuthPhases.Password,
+ AuthPhase.Qr => TelegramAuthPhases.Qr,
+ AuthPhase.Ready => TelegramAuthPhases.Ready,
+ _ => TelegramAuthPhases.Idle,
};
// Доменная ошибка сессии → RpcException контракта (код + detail = текст причины).