Баг: показывать телеграм в профиле, даже если нет аватарки (#3301)

fixes #3286

Author: leotsarev

src/JoinRpg.Portal/Infrastructure/Authentication/ExternalLoginProfileExtractor.cs

@@ -45,12 +45,11 @@ public async Task TryExtractTelegramProfile(JoinIdentityUser user, Dictionary<st
 
         await userService.SetNameIfNotSetWithoutAccessChecks(user.Id, userFullName);
 
-        var avatar = loginInfo.GetValueOrDefault("photo_url");
+        var avatar = AvatarInfo.FromOptional(loginInfo.GetValueOrDefault("photo_url"), 50);
 
-        if (avatar is not null)
-        {
-            await userService.SetTelegramIfNotSetWithoutAccessChecks(user.Id, new TelegramId(long.Parse(loginInfo["id"]), prefferedName), new AvatarInfo(new Uri(avatar), 50, 50));
-        }
+        var telegramId = new TelegramId(long.Parse(loginInfo["id"]), prefferedName);
+
+        await userService.SetTelegramIfNotSetWithoutAccessChecks(user.Id, telegramId, avatar);
     }
 
     private static UserFullName TryGetUserName(ExternalLoginInfo loginInfo)

src/JoinRpg.PrimitiveTypes/AvatarInfo.cs

@@ -7,4 +7,6 @@ public AvatarInfo(Uri uri, int size)
     {
 
     }
+
+    public static AvatarInfo? FromOptional(string? uri, int size) => uri is null ? null : new AvatarInfo(new Uri(uri), size);
 }

src/JoinRpg.Services.Impl/UserServiceImpl.cs

@@ -143,15 +143,18 @@ async Task IUserService.SetVkIfNotSetWithoutAccessChecks(int userId, VkId vkId,
         await UnitOfWork.SaveChangesAsync();
     }
 
-    async Task IUserService.SetTelegramIfNotSetWithoutAccessChecks(int userId, TelegramId telegramId, AvatarInfo avatarInfo)
+    async Task IUserService.SetTelegramIfNotSetWithoutAccessChecks(int userId, TelegramId telegramId, AvatarInfo? avatarInfo)
     {
         logger.LogInformation("About to link user: {userId} to {telegramId}", userId, telegramId);
         var user = await UserRepository.WithProfile(userId);
 
         user.Extra ??= new UserExtra();
         user.Extra.Telegram = string.IsNullOrWhiteSpace(telegramId.UserName?.Value) ? user.Extra.Telegram : telegramId.UserName;
 
-        await AddSocialAvatarImplAsync(avatarInfo, user, "telegram");
+        if (avatarInfo is not null)
+        {
+            await AddSocialAvatarImplAsync(avatarInfo, user, "telegram");
+        }
 
         await UnitOfWork.SaveChangesAsync();
     }

src/JoinRpg.Services.Interfaces/IUserService.cs

@@ -1,5 +1,4 @@
 using JoinRpg.DataModel;
-using JoinRpg.PrimitiveTypes;
 
 namespace JoinRpg.Services.Interfaces;
 
@@ -22,7 +21,7 @@ public interface IUserService
     Task SetVkIfNotSetWithoutAccessChecks(int id, VkId vkId, AvatarInfo avatarInfo);
 
 
-    Task SetTelegramIfNotSetWithoutAccessChecks(int id, TelegramId telegramId, AvatarInfo avatarInfo);
+    Task SetTelegramIfNotSetWithoutAccessChecks(int id, TelegramId telegramId, AvatarInfo? avatarInfo);
     Task RemoveVkFromProfile(int id);
     Task RemoveTelegramFromProfile(int id);
 }