mirror of
https://github.com/Kareadita/Kavita.git
synced 2026-06-06 14:55:19 -04:00
No more JWTs for Scripts + Polish (#4274)
Co-authored-by: Amelia <77553571+Fesaa@users.noreply.github.com>
This commit is contained in:
Joe Milazzo
GitHub
+256
-156
@@ -103,18 +103,6 @@ public sealed class DataContext : IdentityDbContext<AppUser, AppRole, int,
|
||||
base.OnModelCreating(builder);
|
||||
|
||||
|
||||
builder.Entity<AppUser>()
|
||||
.HasMany(ur => ur.UserRoles)
|
||||
.WithOne(u => u.User)
|
||||
.HasForeignKey(ur => ur.UserId)
|
||||
.IsRequired();
|
||||
|
||||
builder.Entity<AppRole>()
|
||||
.HasMany(ur => ur.UserRoles)
|
||||
.WithOne(u => u.Role)
|
||||
.HasForeignKey(ur => ur.RoleId)
|
||||
.IsRequired();
|
||||
|
||||
builder.Entity<SeriesRelation>()
|
||||
.HasOne(pt => pt.Series)
|
||||
.WithMany(p => p.Relations)
|
||||
@@ -130,6 +118,79 @@ public sealed class DataContext : IdentityDbContext<AppUser, AppRole, int,
|
||||
|
||||
|
||||
|
||||
builder.Entity<ExternalSeriesMetadata>()
|
||||
.HasOne(em => em.Series)
|
||||
.WithOne(s => s.ExternalSeriesMetadata)
|
||||
.HasForeignKey<ExternalSeriesMetadata>(em => em.SeriesId)
|
||||
.OnDelete(DeleteBehavior.Cascade);
|
||||
|
||||
builder.Entity<AppUserCollection>()
|
||||
.Property(b => b.AgeRating)
|
||||
.HasDefaultValue(AgeRating.Unknown);
|
||||
|
||||
#region Library
|
||||
|
||||
builder.Entity<Library>()
|
||||
.Property(b => b.AllowScrobbling)
|
||||
.HasDefaultValue(true);
|
||||
builder.Entity<Library>()
|
||||
.Property(b => b.AllowMetadataMatching)
|
||||
.HasDefaultValue(true);
|
||||
builder.Entity<Library>()
|
||||
.Property(b => b.EnableMetadata)
|
||||
.HasDefaultValue(true);
|
||||
builder.Entity<Library>()
|
||||
.Property(l => l.DefaultLanguage)
|
||||
.HasDefaultValue(string.Empty);
|
||||
|
||||
#endregion
|
||||
|
||||
#region Chapter
|
||||
builder.Entity<Chapter>()
|
||||
.Property(b => b.WebLinks)
|
||||
.HasDefaultValue(string.Empty);
|
||||
|
||||
|
||||
builder.Entity<Chapter>()
|
||||
.Property(b => b.ISBN)
|
||||
.HasDefaultValue(string.Empty);
|
||||
|
||||
// Configure the many-to-many relationship for Chapter and Person
|
||||
builder.Entity<ChapterPeople>()
|
||||
.HasKey(cp => new { cp.ChapterId, cp.PersonId, cp.Role });
|
||||
|
||||
builder.Entity<ChapterPeople>()
|
||||
.HasOne(cp => cp.Chapter)
|
||||
.WithMany(c => c.People)
|
||||
.HasForeignKey(cp => cp.ChapterId);
|
||||
|
||||
builder.Entity<ChapterPeople>()
|
||||
.HasOne(cp => cp.Person)
|
||||
.WithMany(p => p.ChapterPeople)
|
||||
.HasForeignKey(cp => cp.PersonId)
|
||||
.OnDelete(DeleteBehavior.Cascade);
|
||||
|
||||
|
||||
builder.Entity<Chapter>()
|
||||
.Property(sm => sm.KPlusOverrides)
|
||||
.HasJsonConversion([])
|
||||
.HasColumnType("TEXT")
|
||||
.HasDefaultValue(new List<MetadataSettingField>());
|
||||
#endregion
|
||||
|
||||
#region User & Preferences
|
||||
builder.Entity<AppUser>()
|
||||
.HasMany(ur => ur.UserRoles)
|
||||
.WithOne(u => u.User)
|
||||
.HasForeignKey(ur => ur.UserId)
|
||||
.IsRequired();
|
||||
|
||||
builder.Entity<AppRole>()
|
||||
.HasMany(ur => ur.UserRoles)
|
||||
.WithOne(u => u.Role)
|
||||
.HasForeignKey(ur => ur.RoleId)
|
||||
.IsRequired();
|
||||
|
||||
builder.Entity<AppUserPreferences>()
|
||||
.Property(b => b.BookThemeName)
|
||||
.HasDefaultValue("Dark");
|
||||
@@ -162,150 +223,6 @@ public sealed class DataContext : IdentityDbContext<AppUser, AppRole, int,
|
||||
.Property(b => b.PromptForRereadsAfter)
|
||||
.HasDefaultValue(30);
|
||||
|
||||
builder.Entity<Library>()
|
||||
.Property(b => b.AllowScrobbling)
|
||||
.HasDefaultValue(true);
|
||||
builder.Entity<Library>()
|
||||
.Property(b => b.AllowMetadataMatching)
|
||||
.HasDefaultValue(true);
|
||||
builder.Entity<Library>()
|
||||
.Property(b => b.EnableMetadata)
|
||||
.HasDefaultValue(true);
|
||||
builder.Entity<Library>()
|
||||
.Property(l => l.DefaultLanguage)
|
||||
.HasDefaultValue(string.Empty);
|
||||
|
||||
builder.Entity<Chapter>()
|
||||
.Property(b => b.WebLinks)
|
||||
.HasDefaultValue(string.Empty);
|
||||
builder.Entity<SeriesMetadata>()
|
||||
.Property(b => b.WebLinks)
|
||||
.HasDefaultValue(string.Empty);
|
||||
|
||||
builder.Entity<Chapter>()
|
||||
.Property(b => b.ISBN)
|
||||
.HasDefaultValue(string.Empty);
|
||||
|
||||
builder.Entity<AppUserDashboardStream>()
|
||||
.Property(b => b.StreamType)
|
||||
.HasDefaultValue(DashboardStreamType.SmartFilter);
|
||||
builder.Entity<AppUserDashboardStream>()
|
||||
.HasIndex(e => e.Visible)
|
||||
.IsUnique(false);
|
||||
|
||||
builder.Entity<AppUserSideNavStream>()
|
||||
.Property(b => b.StreamType)
|
||||
.HasDefaultValue(SideNavStreamType.SmartFilter);
|
||||
builder.Entity<AppUserSideNavStream>()
|
||||
.HasIndex(e => e.Visible)
|
||||
.IsUnique(false);
|
||||
|
||||
builder.Entity<ExternalSeriesMetadata>()
|
||||
.HasOne(em => em.Series)
|
||||
.WithOne(s => s.ExternalSeriesMetadata)
|
||||
.HasForeignKey<ExternalSeriesMetadata>(em => em.SeriesId)
|
||||
.OnDelete(DeleteBehavior.Cascade);
|
||||
|
||||
builder.Entity<AppUserCollection>()
|
||||
.Property(b => b.AgeRating)
|
||||
.HasDefaultValue(AgeRating.Unknown);
|
||||
|
||||
// Configure the many-to-many relationship for Movie and Person
|
||||
builder.Entity<ChapterPeople>()
|
||||
.HasKey(cp => new { cp.ChapterId, cp.PersonId, cp.Role });
|
||||
|
||||
builder.Entity<ChapterPeople>()
|
||||
.HasOne(cp => cp.Chapter)
|
||||
.WithMany(c => c.People)
|
||||
.HasForeignKey(cp => cp.ChapterId);
|
||||
|
||||
builder.Entity<ChapterPeople>()
|
||||
.HasOne(cp => cp.Person)
|
||||
.WithMany(p => p.ChapterPeople)
|
||||
.HasForeignKey(cp => cp.PersonId)
|
||||
.OnDelete(DeleteBehavior.Cascade);
|
||||
|
||||
|
||||
builder.Entity<SeriesMetadataPeople>()
|
||||
.HasKey(smp => new { smp.SeriesMetadataId, smp.PersonId, smp.Role });
|
||||
|
||||
builder.Entity<SeriesMetadataPeople>()
|
||||
.HasOne(smp => smp.SeriesMetadata)
|
||||
.WithMany(sm => sm.People)
|
||||
.HasForeignKey(smp => smp.SeriesMetadataId);
|
||||
|
||||
builder.Entity<SeriesMetadataPeople>()
|
||||
.HasOne(smp => smp.Person)
|
||||
.WithMany(p => p.SeriesMetadataPeople)
|
||||
.HasForeignKey(smp => smp.PersonId)
|
||||
.OnDelete(DeleteBehavior.Cascade);
|
||||
|
||||
builder.Entity<SeriesMetadataPeople>()
|
||||
.Property(b => b.OrderWeight)
|
||||
.HasDefaultValue(0);
|
||||
|
||||
builder.Entity<MetadataSettings>()
|
||||
.Property(x => x.AgeRatingMappings)
|
||||
.HasJsonConversion([]);
|
||||
|
||||
// Ensure blacklist is stored as a JSON array
|
||||
builder.Entity<MetadataSettings>()
|
||||
.Property(x => x.Blacklist)
|
||||
.HasJsonConversion([]);
|
||||
builder.Entity<MetadataSettings>()
|
||||
.Property(x => x.Whitelist)
|
||||
.HasJsonConversion([]);
|
||||
builder.Entity<MetadataSettings>()
|
||||
.Property(x => x.Overrides)
|
||||
.HasJsonConversion([]);
|
||||
|
||||
// Configure one-to-many relationship
|
||||
builder.Entity<MetadataSettings>()
|
||||
.HasMany(x => x.FieldMappings)
|
||||
.WithOne(x => x.MetadataSettings)
|
||||
.HasForeignKey(x => x.MetadataSettingsId)
|
||||
.OnDelete(DeleteBehavior.Cascade);
|
||||
|
||||
builder.Entity<MetadataSettings>()
|
||||
.Property(b => b.Enabled)
|
||||
.HasDefaultValue(true);
|
||||
builder.Entity<MetadataSettings>()
|
||||
.Property(b => b.EnableCoverImage)
|
||||
.HasDefaultValue(true);
|
||||
|
||||
builder.Entity<AppUserReadingProfile>()
|
||||
.Property(b => b.BookThemeName)
|
||||
.HasDefaultValue("Dark");
|
||||
builder.Entity<AppUserReadingProfile>()
|
||||
.Property(b => b.BackgroundColor)
|
||||
.HasDefaultValue("#000000");
|
||||
builder.Entity<AppUserReadingProfile>()
|
||||
.Property(b => b.BookReaderWritingStyle)
|
||||
.HasDefaultValue(WritingStyle.Horizontal);
|
||||
builder.Entity<AppUserReadingProfile>()
|
||||
.Property(b => b.AllowAutomaticWebtoonReaderDetection)
|
||||
.HasDefaultValue(true);
|
||||
|
||||
builder.Entity<AppUserReadingProfile>()
|
||||
.Property(rp => rp.LibraryIds)
|
||||
.HasJsonConversion([])
|
||||
.HasColumnType("TEXT");
|
||||
builder.Entity<AppUserReadingProfile>()
|
||||
.Property(rp => rp.SeriesIds)
|
||||
.HasJsonConversion([])
|
||||
.HasColumnType("TEXT");
|
||||
|
||||
builder.Entity<SeriesMetadata>()
|
||||
.Property(sm => sm.KPlusOverrides)
|
||||
.HasJsonConversion([])
|
||||
.HasColumnType("TEXT")
|
||||
.HasDefaultValue(new List<MetadataSettingField>());
|
||||
builder.Entity<Chapter>()
|
||||
.Property(sm => sm.KPlusOverrides)
|
||||
.HasJsonConversion([])
|
||||
.HasColumnType("TEXT")
|
||||
.HasDefaultValue(new List<MetadataSettingField>());
|
||||
|
||||
builder.Entity<AppUserPreferences>()
|
||||
.Property(a => a.BookReaderHighlightSlots)
|
||||
.HasJsonConversion([])
|
||||
@@ -333,11 +250,60 @@ public sealed class DataContext : IdentityDbContext<AppUser, AppRole, int,
|
||||
.HasJsonConversion(new AppUserOpdsPreferences())
|
||||
.HasColumnType("TEXT")
|
||||
.HasDefaultValue(new AppUserOpdsPreferences());
|
||||
#endregion
|
||||
|
||||
#region AppUserReadingProfile
|
||||
builder.Entity<AppUserReadingProfile>()
|
||||
.Property(b => b.BookThemeName)
|
||||
.HasDefaultValue("Dark");
|
||||
builder.Entity<AppUserReadingProfile>()
|
||||
.Property(b => b.BackgroundColor)
|
||||
.HasDefaultValue("#000000");
|
||||
builder.Entity<AppUserReadingProfile>()
|
||||
.Property(b => b.BookReaderWritingStyle)
|
||||
.HasDefaultValue(WritingStyle.Horizontal);
|
||||
builder.Entity<AppUserReadingProfile>()
|
||||
.Property(b => b.AllowAutomaticWebtoonReaderDetection)
|
||||
.HasDefaultValue(true);
|
||||
|
||||
builder.Entity<AppUserReadingProfile>()
|
||||
.Property(rp => rp.LibraryIds)
|
||||
.HasJsonConversion([])
|
||||
.HasColumnType("TEXT");
|
||||
builder.Entity<AppUserReadingProfile>()
|
||||
.Property(rp => rp.SeriesIds)
|
||||
.HasJsonConversion([])
|
||||
.HasColumnType("TEXT");
|
||||
#endregion
|
||||
|
||||
#region AppUser Streams
|
||||
|
||||
builder.Entity<AppUserDashboardStream>()
|
||||
.Property(b => b.StreamType)
|
||||
.HasDefaultValue(DashboardStreamType.SmartFilter);
|
||||
builder.Entity<AppUserDashboardStream>()
|
||||
.HasIndex(e => e.Visible)
|
||||
.IsUnique(false);
|
||||
|
||||
builder.Entity<AppUserSideNavStream>()
|
||||
.Property(b => b.StreamType)
|
||||
.HasDefaultValue(SideNavStreamType.SmartFilter);
|
||||
builder.Entity<AppUserSideNavStream>()
|
||||
.HasIndex(e => e.Visible)
|
||||
.IsUnique(false);
|
||||
|
||||
#endregion
|
||||
|
||||
#region Annoations
|
||||
|
||||
builder.Entity<AppUserAnnotation>()
|
||||
.PrimitiveCollection(a => a.Likes)
|
||||
.HasDefaultValue(new List<int>());
|
||||
|
||||
#endregion
|
||||
|
||||
|
||||
#region Reading Sessions & History
|
||||
builder.Entity<AppUserReadingSession>()
|
||||
.Property(b => b.IsActive)
|
||||
.HasDefaultValue(true);
|
||||
@@ -361,7 +327,9 @@ public sealed class DataContext : IdentityDbContext<AppUser, AppRole, int,
|
||||
.HasJsonConversion([])
|
||||
.HasColumnType("TEXT")
|
||||
.HasDefaultValue(new List<ClientInfoData>());
|
||||
#endregion
|
||||
|
||||
#region Client Device
|
||||
builder.Entity<ClientDevice>()
|
||||
.Property(sm => sm.CurrentClientInfo)
|
||||
.HasJsonConversion(new ClientInfoData())
|
||||
@@ -373,6 +341,9 @@ public sealed class DataContext : IdentityDbContext<AppUser, AppRole, int,
|
||||
.HasJsonConversion(new ClientInfoData())
|
||||
.HasColumnType("TEXT")
|
||||
.HasDefaultValue(new ClientInfoData());
|
||||
#endregion
|
||||
|
||||
#region SeriesMetadata
|
||||
|
||||
builder.Entity<SeriesMetadata>()
|
||||
.HasMany(sm => sm.Tags)
|
||||
@@ -384,9 +355,138 @@ public sealed class DataContext : IdentityDbContext<AppUser, AppRole, int,
|
||||
.WithMany(t => t.SeriesMetadatas)
|
||||
.UsingEntity<GenreSeriesMetadata>();
|
||||
|
||||
builder.Entity<SeriesMetadata>()
|
||||
.Property(sm => sm.KPlusOverrides)
|
||||
.HasJsonConversion([])
|
||||
.HasColumnType("TEXT")
|
||||
.HasDefaultValue(new List<MetadataSettingField>());
|
||||
|
||||
builder.Entity<SeriesMetadataPeople>()
|
||||
.HasKey(smp => new { smp.SeriesMetadataId, smp.PersonId, smp.Role });
|
||||
|
||||
builder.Entity<SeriesMetadataPeople>()
|
||||
.HasOne(smp => smp.SeriesMetadata)
|
||||
.WithMany(sm => sm.People)
|
||||
.HasForeignKey(smp => smp.SeriesMetadataId);
|
||||
|
||||
builder.Entity<SeriesMetadataPeople>()
|
||||
.HasOne(smp => smp.Person)
|
||||
.WithMany(p => p.SeriesMetadataPeople)
|
||||
.HasForeignKey(smp => smp.PersonId)
|
||||
.OnDelete(DeleteBehavior.Cascade);
|
||||
|
||||
builder.Entity<SeriesMetadataPeople>()
|
||||
.Property(b => b.OrderWeight)
|
||||
.HasDefaultValue(0);
|
||||
|
||||
builder.Entity<MetadataSettings>()
|
||||
.Property(x => x.AgeRatingMappings)
|
||||
.HasJsonConversion([]);
|
||||
|
||||
builder.Entity<SeriesMetadata>()
|
||||
.Property(b => b.WebLinks)
|
||||
.HasDefaultValue(string.Empty);
|
||||
|
||||
// Ensure blacklist is stored as a JSON array
|
||||
builder.Entity<MetadataSettings>()
|
||||
.Property(x => x.Blacklist)
|
||||
.HasJsonConversion([]);
|
||||
builder.Entity<MetadataSettings>()
|
||||
.Property(x => x.Whitelist)
|
||||
.HasJsonConversion([]);
|
||||
builder.Entity<MetadataSettings>()
|
||||
.Property(x => x.Overrides)
|
||||
.HasJsonConversion([]);
|
||||
|
||||
// Configure one-to-many relationship
|
||||
builder.Entity<MetadataSettings>()
|
||||
.HasMany(x => x.FieldMappings)
|
||||
.WithOne(x => x.MetadataSettings)
|
||||
.HasForeignKey(x => x.MetadataSettingsId)
|
||||
.OnDelete(DeleteBehavior.Cascade);
|
||||
|
||||
builder.Entity<MetadataSettings>()
|
||||
.Property(b => b.Enabled)
|
||||
.HasDefaultValue(true);
|
||||
builder.Entity<MetadataSettings>()
|
||||
.Property(b => b.EnableCoverImage)
|
||||
.HasDefaultValue(true);
|
||||
|
||||
#endregion
|
||||
|
||||
#region AppUserAuthKey
|
||||
builder.Entity<AppUserAuthKey>()
|
||||
.Property(a => a.Provider)
|
||||
.HasDefaultValue(AuthKeyProvider.User);
|
||||
#endregion
|
||||
|
||||
#region AppUserBookmark
|
||||
builder.Entity<AppUserBookmark>(entity =>
|
||||
{
|
||||
entity.HasOne(b => b.Series)
|
||||
.WithMany()
|
||||
.HasForeignKey(b => b.SeriesId)
|
||||
.OnDelete(DeleteBehavior.Cascade);
|
||||
|
||||
entity.HasOne(b => b.Volume)
|
||||
.WithMany()
|
||||
.HasForeignKey(b => b.VolumeId)
|
||||
.OnDelete(DeleteBehavior.Cascade);
|
||||
|
||||
entity.HasOne(b => b.Chapter)
|
||||
.WithMany()
|
||||
.HasForeignKey(b => b.ChapterId)
|
||||
.OnDelete(DeleteBehavior.Cascade);
|
||||
|
||||
entity.HasOne(b => b.AppUser)
|
||||
.WithMany(u => u.Bookmarks)
|
||||
.HasForeignKey(b => b.AppUserId)
|
||||
.OnDelete(DeleteBehavior.Cascade);
|
||||
});
|
||||
#endregion
|
||||
|
||||
#region Search Indexes
|
||||
// Series indexes for search
|
||||
builder.Entity<Series>(entity =>
|
||||
{
|
||||
entity.HasIndex(s => s.NormalizedName)
|
||||
.HasDatabaseName("IX_Series_NormalizedName");
|
||||
|
||||
entity.HasIndex(s => s.LibraryId)
|
||||
.HasDatabaseName("IX_Series_LibraryId");
|
||||
});
|
||||
|
||||
builder.Entity<SeriesMetadata>(entity =>
|
||||
{
|
||||
entity.HasIndex(sm => sm.AgeRating)
|
||||
.HasDatabaseName("IX_SeriesMetadata_AgeRating");
|
||||
|
||||
// This composite helps age-restricted queries
|
||||
entity.HasIndex(sm => new { sm.SeriesId, sm.AgeRating })
|
||||
.HasDatabaseName("IX_SeriesMetadata_SeriesId_AgeRating");
|
||||
});
|
||||
|
||||
// Chapter indexes
|
||||
builder.Entity<Chapter>(entity =>
|
||||
{
|
||||
entity.HasIndex(c => c.TitleName)
|
||||
.HasDatabaseName("IX_Chapter_TitleName");
|
||||
});
|
||||
|
||||
// MangaFile indexes (admin search)
|
||||
builder.Entity<MangaFile>(entity =>
|
||||
{
|
||||
entity.HasIndex(f => f.FilePath)
|
||||
.HasDatabaseName("IX_MangaFile_FilePath");
|
||||
});
|
||||
|
||||
// AppUserBookmark composite for user lookups
|
||||
builder.Entity<AppUserBookmark>(entity =>
|
||||
{
|
||||
entity.HasIndex(b => new { b.AppUserId, b.SeriesId })
|
||||
.HasDatabaseName("IX_AppUserBookmark_AppUserId_SeriesId");
|
||||
});
|
||||
#endregion
|
||||
}
|
||||
|
||||
#nullable enable
|
||||
|
||||
Reference in New Issue
Block a user