yep

Gameboard.ShogiUI.Sockets/ShogiUserClaimsTransformer.cs

@@ -1,43 +1,44 @@
-using Gameboard.ShogiUI.Sockets.Repositories;
+using Gameboard.ShogiUI.Sockets.Extensions;
+using Gameboard.ShogiUI.Sockets.Repositories;
 using Microsoft.AspNetCore.Authentication;
-using System.Linq;
 using System.Security.Claims;
-using System.Threading.Tasks;
 
 namespace Gameboard.ShogiUI.Sockets
 {
-  /// <summary>
-  /// Standardizes the claims from third party issuers. Also registers new msal users in the database.
-  /// </summary>
-  public class ShogiUserClaimsTransformer : IClaimsTransformation
-  {
-    private static readonly string MsalUsernameClaim = "preferred_username";
-    private readonly IGameboardRepository gameboardRepository;
+	/// <summary>
+	/// Standardizes the claims from third party issuers. Also registers new msal users in the database.
+	/// </summary>
+	public class ShogiUserClaimsTransformer : IClaimsTransformation
+	{
+		private readonly IGameboardRepository gameboardRepository;
 
-    public ShogiUserClaimsTransformer(IGameboardRepository gameboardRepository)
-    {
-      this.gameboardRepository = gameboardRepository;
-    }
+		public ShogiUserClaimsTransformer(IGameboardRepository gameboardRepository)
+		{
+			this.gameboardRepository = gameboardRepository;
+		}
 
-    public async Task<ClaimsPrincipal> TransformAsync(ClaimsPrincipal principal)
-    {
-      var nameClaim = principal.Claims.FirstOrDefault(c => c.Type == MsalUsernameClaim);
-      if (nameClaim != default)
-      {
-        var user = await gameboardRepository.ReadUser(nameClaim.Value);
-        if (user == null)
-        {
-          var newUser = Models.User.CreateMsalUser(nameClaim.Value);
-          await gameboardRepository.CreateUser(newUser);
-          user = newUser;
-        }
+		public async Task<ClaimsPrincipal> TransformAsync(ClaimsPrincipal principal)
+		{
+			var id = principal.UserId();
+			if (!string.IsNullOrWhiteSpace(id))
+			{
+				var user = await gameboardRepository.ReadUser(id);
+				if (user == null)
+				{
+					var newUser = principal.IsMicrosoft()
+						? Models.User.CreateMsalUser(id)
+						: Models.User.CreateGuestUser(id);
 
-        if (user != null)
-        {
-          return new ClaimsPrincipal(user.CreateClaimsIdentity());
-        }
-      }
-      return principal;
-    }
-  }
+					await gameboardRepository.CreateUser(newUser);
+					user = newUser;
+				}
+
+				if (user != null)
+				{
+					return new ClaimsPrincipal(user.CreateClaimsIdentity());
+				}
+			}
+			return principal;
+		}
+	}
 }