Add ability to get game version on login

ProjectLighthouse/Controllers/LoginController.cs

@@ -1,6 +1,8 @@
 #nullable enable
 using System.IO;
 using System.Threading.Tasks;
+using Kettu;
+using LBPUnion.ProjectLighthouse.Logging;
 using LBPUnion.ProjectLighthouse.Types;
 using LBPUnion.ProjectLighthouse.Types.Settings;
 using Microsoft.AspNetCore.Mvc;
@@ -20,7 +22,7 @@ namespace LBPUnion.ProjectLighthouse.Controllers
         }
 
         [HttpPost]
-        public async Task<IActionResult> Login()
+        public async Task<IActionResult> Login([FromQuery] string titleId)
         {
             string body = await new StreamReader(this.Request.Body).ReadToEndAsync();
 
@@ -33,13 +35,17 @@ namespace LBPUnion.ProjectLighthouse.Controllers
             {
                 loginData = null;
             }
-
             if (loginData == null) return this.BadRequest();
 
-            Token? token = await this.database.AuthenticateUser(loginData);
+            Token? token = await this.database.AuthenticateUser(loginData, titleId);
-
             if (token == null) return this.StatusCode(403, "");
 
+            Logger.Log
+            (
+                $"Successfully logged in user {(await this.database.UserFromToken(token))!.Username} as {token.GameVersion} client ({titleId})",
+                LoggerLevelLogin.Instance
+            );
+
             return this.Ok
             (
                 new LoginResult

ProjectLighthouse/Database.cs

@@ -1,6 +1,8 @@
 using System.Linq;
 using System.Threading.Tasks;
+using Kettu;
 using LBPUnion.ProjectLighthouse.Helpers;
+using LBPUnion.ProjectLighthouse.Logging;
 using LBPUnion.ProjectLighthouse.Types;
 using LBPUnion.ProjectLighthouse.Types.Levels;
 using LBPUnion.ProjectLighthouse.Types.Profiles;
@@ -50,7 +52,7 @@ namespace LBPUnion.ProjectLighthouse
         }
 
         #nullable enable
-        public async Task<Token?> AuthenticateUser(LoginData loginData)
+        public async Task<Token?> AuthenticateUser(LoginData loginData, string titleId = "")
         {
             // TODO: don't use psn name to authenticate
             User user = await this.Users.FirstOrDefaultAsync(u => u.Username == loginData.Username) ?? await this.CreateUser(loginData.Username);
@@ -59,8 +61,15 @@ namespace LBPUnion.ProjectLighthouse
             {
                 UserToken = HashHelper.GenerateAuthToken(),
                 UserId = user.UserId,
+                GameVersion = GameVersionHelper.FromTitleId(titleId),
             };
 
+            if (token.GameVersion == GameVersion.Unknown)
+            {
+                Logger.Log($"Unknown GameVersion for TitleId {titleId}", LoggerLevelLogin.Instance);
+                return null;
+            }
+
             this.Tokens.Add(token);
             await this.SaveChangesAsync();
 
@@ -75,6 +84,8 @@ namespace LBPUnion.ProjectLighthouse
             return await this.Users.Include(u => u.Location).FirstOrDefaultAsync(u => u.UserId == token.UserId);
         }
 
+        public async Task<User?> UserFromToken(Token token) => await this.UserFromAuthToken(token.UserToken);
+
         public async Task<User?> UserFromRequest(HttpRequest request)
         {
             if (!request.Cookies.TryGetValue("MM_AUTH", out string? mmAuth) || mmAuth == null) return null;

ProjectLighthouse/Helpers/GameVersionHelper.cs

@@ -6,7 +6,7 @@ namespace LBPUnion.ProjectLighthouse.Helpers
     public class GameVersionHelper
     {
         // https://www.serialstation.com/games/b89b4eb4-4e4c-4e54-b72b-f7f9dbfac125
-        public readonly string[] LittleBigPlanet1TitleIds =
+        public static readonly string[] LittleBigPlanet1TitleIds =
         {
             "BCES00141",
             "BCAS20091",
@@ -29,7 +29,7 @@ namespace LBPUnion.ProjectLighthouse.Helpers
         };
 
         // https://serialstation.com/games/35e69aba-1872-4fd7-9d39-11ce75924040
-        public readonly string[] LittleBigPlanet2TitleIds =
+        public static readonly string[] LittleBigPlanet2TitleIds =
         {
             "BCUS98249",
             "BCES01086",
@@ -49,7 +49,7 @@ namespace LBPUnion.ProjectLighthouse.Helpers
 
         // https://www.serialstation.com/games/b62d53d9-fdff-4463-8134-64b81e1cbd50
         // includes PS4 games
-        public readonly string[] LittleBigPlanet3TitleIds =
+        public static readonly string[] LittleBigPlanet3TitleIds =
         {
             "CUSA00063",
             "CUSA00693",
@@ -76,11 +76,11 @@ namespace LBPUnion.ProjectLighthouse.Helpers
             "CUSA01304",
         };
 
-        public GameVersion FromTitleId(string titleId)
+        public static GameVersion FromTitleId(string titleId)
         {
-            if (this.LittleBigPlanet1TitleIds.Contains(titleId)) return GameVersion.LittleBigPlanet1;
+            if (LittleBigPlanet1TitleIds.Contains(titleId)) return GameVersion.LittleBigPlanet1;
-            if (this.LittleBigPlanet2TitleIds.Contains(titleId)) return GameVersion.LittleBigPlanet2;
+            if (LittleBigPlanet2TitleIds.Contains(titleId)) return GameVersion.LittleBigPlanet2;
-            if (this.LittleBigPlanet3TitleIds.Contains(titleId)) return GameVersion.LittleBigPlanet3;
+            if (LittleBigPlanet3TitleIds.Contains(titleId)) return GameVersion.LittleBigPlanet3;
 
             return GameVersion.Unknown;
         }

ProjectLighthouse/Logging/LoggerLevels.cs

@@ -27,6 +27,12 @@ namespace LBPUnion.ProjectLighthouse.Logging
         public override string Name => "Filter";
     }
 
+    public class LoggerLevelLogin : LoggerLevel
+    {
+        public static readonly LoggerLevelLogin Instance = new();
+        public override string Name => "Login";
+    }
+
     public class LoggerLevelAspNet : LoggerLevel
     {
 

ProjectLighthouse/Migrations/20211104031327_AddGameVersionToToken.Designer.cs

@@ -0,0 +1,463 @@
+// <auto-generated />
+using LBPUnion.ProjectLighthouse;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+namespace ProjectLighthouse.Migrations
+{
+    [DbContext(typeof(Database))]
+    [Migration("20211104031327_AddGameVersionToToken")]
+    partial class AddGameVersionToToken
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("Relational:MaxIdentifierLength", 64)
+                .HasAnnotation("ProductVersion", "5.0.11");
+
+            modelBuilder.Entity("LBPUnion.ProjectLighthouse.Types.HeartedProfile", b =>
+                {
+                    b.Property<int>("HeartedProfileId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<int>("HeartedUserId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("UserId")
+                        .HasColumnType("int");
+
+                    b.HasKey("HeartedProfileId");
+
+                    b.HasIndex("HeartedUserId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("HeartedProfiles");
+                });
+
+            modelBuilder.Entity("LBPUnion.ProjectLighthouse.Types.Levels.HeartedLevel", b =>
+                {
+                    b.Property<int>("HeartedLevelId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<int>("SlotId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("UserId")
+                        .HasColumnType("int");
+
+                    b.HasKey("HeartedLevelId");
+
+                    b.HasIndex("SlotId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("HeartedLevels");
+                });
+
+            modelBuilder.Entity("LBPUnion.ProjectLighthouse.Types.Levels.QueuedLevel", b =>
+                {
+                    b.Property<int>("QueuedLevelId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<int>("SlotId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("UserId")
+                        .HasColumnType("int");
+
+                    b.HasKey("QueuedLevelId");
+
+                    b.HasIndex("SlotId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("QueuedLevels");
+                });
+
+            modelBuilder.Entity("LBPUnion.ProjectLighthouse.Types.Levels.Slot", b =>
+                {
+                    b.Property<int>("SlotId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("AuthorLabels")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("BackgroundHash")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("CreatorId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<long>("FirstUploaded")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("IconHash")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("InitiallyLocked")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<long>("LastUpdated")
+                        .HasColumnType("bigint");
+
+                    b.Property<bool>("Lbp1Only")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int>("LocationId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("MaximumPlayers")
+                        .HasColumnType("int");
+
+                    b.Property<int>("MinimumPlayers")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("MoveRequired")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ResourceCollection")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("RootLevel")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("Shareable")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("SubLevel")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("TeamPick")
+                        .HasColumnType("tinyint(1)");
+
+                    b.HasKey("SlotId");
+
+                    b.HasIndex("CreatorId");
+
+                    b.HasIndex("LocationId");
+
+                    b.ToTable("Slots");
+                });
+
+            modelBuilder.Entity("LBPUnion.ProjectLighthouse.Types.Profiles.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Message")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("PosterUserId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("TargetUserId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("ThumbsDown")
+                        .HasColumnType("int");
+
+                    b.Property<int>("ThumbsUp")
+                        .HasColumnType("int");
+
+                    b.Property<long>("Timestamp")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("CommentId");
+
+                    b.HasIndex("PosterUserId");
+
+                    b.HasIndex("TargetUserId");
+
+                    b.ToTable("Comments");
+                });
+
+            modelBuilder.Entity("LBPUnion.ProjectLighthouse.Types.Profiles.LastMatch", b =>
+                {
+                    b.Property<int>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<long>("Timestamp")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("UserId");
+
+                    b.ToTable("LastMatches");
+                });
+
+            modelBuilder.Entity("LBPUnion.ProjectLighthouse.Types.Profiles.Location", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<int>("X")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Y")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Locations");
+                });
+
+            modelBuilder.Entity("LBPUnion.ProjectLighthouse.Types.Score", b =>
+                {
+                    b.Property<int>("ScoreId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("PlayerIdCollection")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("Points")
+                        .HasColumnType("int");
+
+                    b.Property<int>("SlotId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("int");
+
+                    b.HasKey("ScoreId");
+
+                    b.HasIndex("SlotId");
+
+                    b.ToTable("Scores");
+                });
+
+            modelBuilder.Entity("LBPUnion.ProjectLighthouse.Types.Token", b =>
+                {
+                    b.Property<int>("TokenId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<int>("GameVersion")
+                        .HasColumnType("int");
+
+                    b.Property<int>("UserId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("UserToken")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("TokenId");
+
+                    b.ToTable("Tokens");
+                });
+
+            modelBuilder.Entity("LBPUnion.ProjectLighthouse.Types.User", b =>
+                {
+                    b.Property<int>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Biography")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("BooHash")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("CommentCount")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("CommentsEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int>("FavouriteSlotCount")
+                        .HasColumnType("int");
+
+                    b.Property<int>("FavouriteUserCount")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Game")
+                        .HasColumnType("int");
+
+                    b.Property<int>("HeartCount")
+                        .HasColumnType("int");
+
+                    b.Property<string>("IconHash")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("Lists")
+                        .HasColumnType("int");
+
+                    b.Property<int>("LocationId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("LolCatFtwCount")
+                        .HasColumnType("int");
+
+                    b.Property<int>("PhotosByMeCount")
+                        .HasColumnType("int");
+
+                    b.Property<int>("PhotosWithMeCount")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Pins")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PlanetHash")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("ReviewCount")
+                        .HasColumnType("int");
+
+                    b.Property<int>("StaffChallengeBronzeCount")
+                        .HasColumnType("int");
+
+                    b.Property<int>("StaffChallengeGoldCount")
+                        .HasColumnType("int");
+
+                    b.Property<int>("StaffChallengeSilverCount")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Username")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("YayHash")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("UserId");
+
+                    b.HasIndex("LocationId");
+
+                    b.ToTable("Users");
+                });
+
+            modelBuilder.Entity("LBPUnion.ProjectLighthouse.Types.HeartedProfile", b =>
+                {
+                    b.HasOne("LBPUnion.ProjectLighthouse.Types.User", "HeartedUser")
+                        .WithMany()
+                        .HasForeignKey("HeartedUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("LBPUnion.ProjectLighthouse.Types.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("HeartedUser");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("LBPUnion.ProjectLighthouse.Types.Levels.HeartedLevel", b =>
+                {
+                    b.HasOne("LBPUnion.ProjectLighthouse.Types.Levels.Slot", "Slot")
+                        .WithMany()
+                        .HasForeignKey("SlotId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("LBPUnion.ProjectLighthouse.Types.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Slot");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("LBPUnion.ProjectLighthouse.Types.Levels.QueuedLevel", b =>
+                {
+                    b.HasOne("LBPUnion.ProjectLighthouse.Types.Levels.Slot", "Slot")
+                        .WithMany()
+                        .HasForeignKey("SlotId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("LBPUnion.ProjectLighthouse.Types.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Slot");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("LBPUnion.ProjectLighthouse.Types.Levels.Slot", b =>
+                {
+                    b.HasOne("LBPUnion.ProjectLighthouse.Types.User", "Creator")
+                        .WithMany()
+                        .HasForeignKey("CreatorId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("LBPUnion.ProjectLighthouse.Types.Profiles.Location", "Location")
+                        .WithMany()
+                        .HasForeignKey("LocationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Creator");
+
+                    b.Navigation("Location");
+                });
+
+            modelBuilder.Entity("LBPUnion.ProjectLighthouse.Types.Profiles.Comment", b =>
+                {
+                    b.HasOne("LBPUnion.ProjectLighthouse.Types.User", "Poster")
+                        .WithMany()
+                        .HasForeignKey("PosterUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("LBPUnion.ProjectLighthouse.Types.User", "Target")
+                        .WithMany()
+                        .HasForeignKey("TargetUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Poster");
+
+                    b.Navigation("Target");
+                });
+
+            modelBuilder.Entity("LBPUnion.ProjectLighthouse.Types.Score", b =>
+                {
+                    b.HasOne("LBPUnion.ProjectLighthouse.Types.Levels.Slot", "Slot")
+                        .WithMany()
+                        .HasForeignKey("SlotId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Slot");
+                });
+
+            modelBuilder.Entity("LBPUnion.ProjectLighthouse.Types.User", b =>
+                {
+                    b.HasOne("LBPUnion.ProjectLighthouse.Types.Profiles.Location", "Location")
+                        .WithMany()
+                        .HasForeignKey("LocationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Location");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

ProjectLighthouse/Migrations/20211104031327_AddGameVersionToToken.cs

@@ -0,0 +1,26 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace ProjectLighthouse.Migrations
+{
+    public partial class AddGameVersionToToken : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.Sql("DELETE FROM Tokens;"); // Wipe all old tokens
+            
+            migrationBuilder.AddColumn<int>(
+                name: "GameVersion",
+                table: "Tokens",
+                type: "int",
+                nullable: false,
+                defaultValue: 3);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "GameVersion",
+                table: "Tokens");
+        }
+    }
+}

ProjectLighthouse/Migrations/DatabaseModelSnapshot.cs

@@ -246,6 +246,9 @@ namespace ProjectLighthouse.Migrations
                         .ValueGeneratedOnAdd()
                         .HasColumnType("int");
 
+                    b.Property<int>("GameVersion")
+                        .HasColumnType("int");
+
                     b.Property<int>("UserId")
                         .HasColumnType("int");
 

ProjectLighthouse/ProjectLighthouse.csproj

@@ -23,8 +23,4 @@
         <Compile Remove="Types\SlotXsd.cs" />
     </ItemGroup>
 
-    <ItemGroup>
-        <Folder Include="logs" />
-    </ItemGroup>
-
 </Project>

ProjectLighthouse/Types/GameVersion.cs

@@ -2,9 +2,9 @@ namespace LBPUnion.ProjectLighthouse.Types
 {
     public enum GameVersion
     {
-        LittleBigPlanet1,
+        LittleBigPlanet1 = 0,
-        LittleBigPlanet2,
+        LittleBigPlanet2 = 1,
-        LittleBigPlanet3,
+        LittleBigPlanet3 = 2,
-        Unknown,
+        Unknown = 3,
     }
 }

ProjectLighthouse/Types/Token.cs

@@ -9,6 +9,9 @@ namespace LBPUnion.ProjectLighthouse.Types
         public int TokenId { get; set; }
 
         public int UserId { get; set; }
+
         public string UserToken { get; set; }
+
+        public GameVersion GameVersion { get; set; }
     }
 }