From e6a153380c720e386137904498b78b5488868f13 Mon Sep 17 00:00:00 2001 From: crupest Date: Thu, 20 Feb 2020 19:08:49 +0800 Subject: Update packages. --- Timeline.Tests/Timeline.Tests.csproj | 6 +++--- Timeline/Timeline.csproj | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Timeline.Tests/Timeline.Tests.csproj b/Timeline.Tests/Timeline.Tests.csproj index 40e8cda2..00c1e103 100644 --- a/Timeline.Tests/Timeline.Tests.csproj +++ b/Timeline.Tests/Timeline.Tests.csproj @@ -11,14 +11,14 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/Timeline/Timeline.csproj b/Timeline/Timeline.csproj index 08999f82..a20048a9 100644 --- a/Timeline/Timeline.csproj +++ b/Timeline/Timeline.csproj @@ -21,10 +21,10 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive -- cgit v1.2.3 From 6cf3c7891fe8a810b20bb799db9f3fb97414c4de Mon Sep 17 00:00:00 2001 From: crupest Date: Fri, 21 Feb 2020 11:59:58 +0800 Subject: Migrate to use sqlite. --- Timeline.Tests/Helpers/TestApplication.cs | 24 +- Timeline/Configs/DatabaseConfig.cs | 11 - Timeline/Configs/JwtConfig.cs | 15 -- Timeline/Configs/JwtConfiguration.cs | 15 ++ Timeline/Entities/DatabaseContext.cs | 19 +- .../20200105150407_Initialize.Designer.cs | 269 ++++++++++++++++++++ Timeline/Migrations/20200105150407_Initialize.cs | 217 +++++++++++++++++ .../20200131100517_RefactorUser.Designer.cs | 243 +++++++++++++++++++ Timeline/Migrations/20200131100517_RefactorUser.cs | 129 ++++++++++ .../Migrations/DatabaseContextModelSnapshot.cs | 241 ++++++++++++++++++ .../20200105150407_Initialize.Designer.cs | 269 -------------------- .../20200105150407_Initialize.cs | 217 ----------------- .../20200131100517_RefactorUser.Designer.cs | 243 ------------------- .../20200131100517_RefactorUser.cs | 129 ---------- .../DevelopmentDatabaseContextModelSnapshot.cs | 241 ------------------ .../20191031064541_Initialize.Designer.cs | 137 ----------- .../20191031064541_Initialize.cs | 105 -------- .../20191120104512_InitTimeline.Designer.cs | 270 --------------------- .../20191120104512_InitTimeline.cs | 229 ----------------- ...20200105151839_RenameTimelineMember.Designer.cs | 270 --------------------- .../20200105151839_RenameTimelineMember.cs | 107 -------- .../20200131152033_RefactorUser.Designer.cs | 244 ------------------- .../20200131152033_RefactorUser.cs | 55 ----- .../ProductionDatabaseContextModelSnapshot.cs | 242 ------------------ Timeline/Program.cs | 4 +- Timeline/Properties/launchSettings.json | 3 +- Timeline/Services/UserTokenService.cs | 4 +- Timeline/Startup.cs | 35 +-- Timeline/Timeline.csproj | 2 - Timeline/appsettings.Development.json | 6 - Timeline/appsettings.Production.json | 5 - Timeline/appsettings.json | 5 +- 32 files changed, 1155 insertions(+), 2850 deletions(-) delete mode 100644 Timeline/Configs/DatabaseConfig.cs delete mode 100644 Timeline/Configs/JwtConfig.cs create mode 100644 Timeline/Configs/JwtConfiguration.cs create mode 100644 Timeline/Migrations/20200105150407_Initialize.Designer.cs create mode 100644 Timeline/Migrations/20200105150407_Initialize.cs create mode 100644 Timeline/Migrations/20200131100517_RefactorUser.Designer.cs create mode 100644 Timeline/Migrations/20200131100517_RefactorUser.cs create mode 100644 Timeline/Migrations/DatabaseContextModelSnapshot.cs delete mode 100644 Timeline/Migrations/DevelopmentDatabase/20200105150407_Initialize.Designer.cs delete mode 100644 Timeline/Migrations/DevelopmentDatabase/20200105150407_Initialize.cs delete mode 100644 Timeline/Migrations/DevelopmentDatabase/20200131100517_RefactorUser.Designer.cs delete mode 100644 Timeline/Migrations/DevelopmentDatabase/20200131100517_RefactorUser.cs delete mode 100644 Timeline/Migrations/DevelopmentDatabase/DevelopmentDatabaseContextModelSnapshot.cs delete mode 100644 Timeline/Migrations/ProductionDatabase/20191031064541_Initialize.Designer.cs delete mode 100644 Timeline/Migrations/ProductionDatabase/20191031064541_Initialize.cs delete mode 100644 Timeline/Migrations/ProductionDatabase/20191120104512_InitTimeline.Designer.cs delete mode 100644 Timeline/Migrations/ProductionDatabase/20191120104512_InitTimeline.cs delete mode 100644 Timeline/Migrations/ProductionDatabase/20200105151839_RenameTimelineMember.Designer.cs delete mode 100644 Timeline/Migrations/ProductionDatabase/20200105151839_RenameTimelineMember.cs delete mode 100644 Timeline/Migrations/ProductionDatabase/20200131152033_RefactorUser.Designer.cs delete mode 100644 Timeline/Migrations/ProductionDatabase/20200131152033_RefactorUser.cs delete mode 100644 Timeline/Migrations/ProductionDatabase/ProductionDatabaseContextModelSnapshot.cs delete mode 100644 Timeline/appsettings.Production.json diff --git a/Timeline.Tests/Helpers/TestApplication.cs b/Timeline.Tests/Helpers/TestApplication.cs index bc5deeec..5fbc2fb0 100644 --- a/Timeline.Tests/Helpers/TestApplication.cs +++ b/Timeline.Tests/Helpers/TestApplication.cs @@ -1,9 +1,11 @@ using Microsoft.AspNetCore.Mvc.Testing; -using Microsoft.AspNetCore.TestHost; using Microsoft.Data.Sqlite; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using System; +using System.Collections.Generic; +using System.IO; using Timeline.Entities; namespace Timeline.Tests.Helpers @@ -14,25 +16,37 @@ namespace Timeline.Tests.Helpers public WebApplicationFactory Factory { get; } + public string WorkDir { get; } + public TestApplication(WebApplicationFactory factory) { + WorkDir = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName()); + Directory.CreateDirectory(WorkDir); + DatabaseConnection = new SqliteConnection("Data Source=:memory:;"); DatabaseConnection.Open(); - var options = new DbContextOptionsBuilder() + var options = new DbContextOptionsBuilder() .UseSqlite(DatabaseConnection) .Options; - using (var context = new DevelopmentDatabaseContext(options)) + using (var context = new DatabaseContext(options)) { context.Database.EnsureCreated(); } Factory = factory.WithWebHostBuilder(builder => { + builder.ConfigureAppConfiguration((context, config) => + { + config.AddInMemoryCollection(new Dictionary + { + ["WorkDir"] = WorkDir + }); + }); builder.ConfigureServices(services => { - services.AddDbContext(options => + services.AddDbContext(options => { options.UseSqlite(DatabaseConnection); }); @@ -44,6 +58,8 @@ namespace Timeline.Tests.Helpers { DatabaseConnection.Close(); DatabaseConnection.Dispose(); + + Directory.Delete(WorkDir, true); } } } diff --git a/Timeline/Configs/DatabaseConfig.cs b/Timeline/Configs/DatabaseConfig.cs deleted file mode 100644 index e1231bcd..00000000 --- a/Timeline/Configs/DatabaseConfig.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace Timeline.Configs -{ - public class DatabaseConfig - { - public bool UseDevelopment { get; set; } = false; - - public string ConnectionString { get; set; } = default!; - - public string DevelopmentConnectionString { get; set; } = default!; - } -} diff --git a/Timeline/Configs/JwtConfig.cs b/Timeline/Configs/JwtConfig.cs deleted file mode 100644 index 8a17825e..00000000 --- a/Timeline/Configs/JwtConfig.cs +++ /dev/null @@ -1,15 +0,0 @@ -namespace Timeline.Configs -{ - public class JwtConfig - { - public string Issuer { get; set; } = default!; - public string Audience { get; set; } = default!; - public string SigningKey { get; set; } = default!; - - /// - /// Set the default value of expire offset of jwt token. - /// Unit is second. Default is 3600 * 24 seconds, aka 1 day. - /// - public long DefaultExpireOffset { get; set; } = 3600 * 24; - } -} diff --git a/Timeline/Configs/JwtConfiguration.cs b/Timeline/Configs/JwtConfiguration.cs new file mode 100644 index 00000000..fc27f4ee --- /dev/null +++ b/Timeline/Configs/JwtConfiguration.cs @@ -0,0 +1,15 @@ +namespace Timeline.Configs +{ + public class JwtConfiguration + { + public string Issuer { get; set; } = default!; + public string Audience { get; set; } = default!; + public string SigningKey { get; set; } = default!; + + /// + /// Set the default value of expire offset of jwt token. + /// Unit is second. Default is 3600 * 24 seconds, aka 1 day. + /// + public long DefaultExpireOffset { get; set; } = 3600 * 24; + } +} diff --git a/Timeline/Entities/DatabaseContext.cs b/Timeline/Entities/DatabaseContext.cs index cac33379..18e3e660 100644 --- a/Timeline/Entities/DatabaseContext.cs +++ b/Timeline/Entities/DatabaseContext.cs @@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore; namespace Timeline.Entities { - public abstract class DatabaseContext : DbContext + public class DatabaseContext : DbContext { public DatabaseContext(DbContextOptions options) : base(options) @@ -22,21 +22,4 @@ namespace Timeline.Entities public DbSet TimelinePosts { get; set; } = default!; public DbSet TimelineMembers { get; set; } = default!; } - public class ProductionDatabaseContext : DatabaseContext - { - public ProductionDatabaseContext(DbContextOptions options) - : base(options) - { - - } - } - - public class DevelopmentDatabaseContext : DatabaseContext - { - public DevelopmentDatabaseContext(DbContextOptions options) - : base(options) - { - - } - } } diff --git a/Timeline/Migrations/20200105150407_Initialize.Designer.cs b/Timeline/Migrations/20200105150407_Initialize.Designer.cs new file mode 100644 index 00000000..5594262a --- /dev/null +++ b/Timeline/Migrations/20200105150407_Initialize.Designer.cs @@ -0,0 +1,269 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Timeline.Entities; + +namespace Timeline.Migrations.DevelopmentDatabase +{ + [DbContext(typeof(DatabaseContext))] + [Migration("20200105150407_Initialize")] + partial class Initialize + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "3.1.0"); + + modelBuilder.Entity("Timeline.Entities.TimelineEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("INTEGER"); + + b.Property("CreateTime") + .HasColumnName("create_time") + .HasColumnType("TEXT"); + + b.Property("Description") + .HasColumnName("description") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnName("name") + .HasColumnType("TEXT"); + + b.Property("OwnerId") + .HasColumnName("owner") + .HasColumnType("INTEGER"); + + b.Property("Visibility") + .HasColumnName("visibility") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("OwnerId"); + + b.ToTable("timelines"); + }); + + modelBuilder.Entity("Timeline.Entities.TimelineMemberEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("INTEGER"); + + b.Property("TimelineId") + .HasColumnName("timeline") + .HasColumnType("INTEGER"); + + b.Property("UserId") + .HasColumnName("user") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("TimelineId"); + + b.HasIndex("UserId"); + + b.ToTable("timeline_members"); + }); + + modelBuilder.Entity("Timeline.Entities.TimelinePostEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("INTEGER"); + + b.Property("AuthorId") + .HasColumnName("author") + .HasColumnType("INTEGER"); + + b.Property("Content") + .HasColumnName("content") + .HasColumnType("TEXT"); + + b.Property("LastUpdated") + .HasColumnName("last_updated") + .HasColumnType("TEXT"); + + b.Property("Time") + .HasColumnName("time") + .HasColumnType("TEXT"); + + b.Property("TimelineId") + .HasColumnName("timeline") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AuthorId"); + + b.HasIndex("TimelineId"); + + b.ToTable("timeline_posts"); + }); + + modelBuilder.Entity("Timeline.Entities.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("INTEGER"); + + b.Property("EncryptedPassword") + .IsRequired() + .HasColumnName("password") + .HasColumnType("TEXT"); + + b.Property("Name") + .IsRequired() + .HasColumnName("name") + .HasColumnType("TEXT") + .HasMaxLength(26); + + b.Property("RoleString") + .IsRequired() + .HasColumnName("roles") + .HasColumnType("TEXT"); + + b.Property("Version") + .ValueGeneratedOnAdd() + .HasColumnName("version") + .HasColumnType("INTEGER") + .HasDefaultValue(0L); + + b.HasKey("Id"); + + b.HasIndex("Name") + .IsUnique(); + + b.ToTable("users"); + }); + + modelBuilder.Entity("Timeline.Entities.UserAvatar", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("INTEGER"); + + b.Property("Data") + .HasColumnName("data") + .HasColumnType("BLOB"); + + b.Property("ETag") + .HasColumnName("etag") + .HasColumnType("TEXT") + .HasMaxLength(30); + + b.Property("LastModified") + .HasColumnName("last_modified") + .HasColumnType("TEXT"); + + b.Property("Type") + .HasColumnName("type") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("user_avatars"); + }); + + modelBuilder.Entity("Timeline.Entities.UserDetail", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("INTEGER"); + + b.Property("Nickname") + .HasColumnName("nickname") + .HasColumnType("TEXT") + .HasMaxLength(26); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("user_details"); + }); + + modelBuilder.Entity("Timeline.Entities.TimelineEntity", b => + { + b.HasOne("Timeline.Entities.User", "Owner") + .WithMany("Timelines") + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Timeline.Entities.TimelineMemberEntity", b => + { + b.HasOne("Timeline.Entities.TimelineEntity", "Timeline") + .WithMany("Members") + .HasForeignKey("TimelineId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Timeline.Entities.User", "User") + .WithMany("TimelinesJoined") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Timeline.Entities.TimelinePostEntity", b => + { + b.HasOne("Timeline.Entities.User", "Author") + .WithMany("TimelinePosts") + .HasForeignKey("AuthorId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Timeline.Entities.TimelineEntity", "Timeline") + .WithMany("Posts") + .HasForeignKey("TimelineId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Timeline.Entities.UserAvatar", b => + { + b.HasOne("Timeline.Entities.User", null) + .WithOne("Avatar") + .HasForeignKey("Timeline.Entities.UserAvatar", "UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Timeline.Entities.UserDetail", b => + { + b.HasOne("Timeline.Entities.User", null) + .WithOne("Detail") + .HasForeignKey("Timeline.Entities.UserDetail", "UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Timeline/Migrations/20200105150407_Initialize.cs b/Timeline/Migrations/20200105150407_Initialize.cs new file mode 100644 index 00000000..c6efaa4b --- /dev/null +++ b/Timeline/Migrations/20200105150407_Initialize.cs @@ -0,0 +1,217 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +namespace Timeline.Migrations.DevelopmentDatabase +{ + public partial class Initialize : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "users", + columns: table => new + { + id = table.Column(nullable: false) + .Annotation("Sqlite:Autoincrement", true), + name = table.Column(maxLength: 26, nullable: false), + password = table.Column(nullable: false), + roles = table.Column(nullable: false), + version = table.Column(nullable: false, defaultValue: 0L) + .Annotation("Sqlite:Autoincrement", true) + }, + constraints: table => + { + table.PrimaryKey("PK_users", x => x.id); + }); + + migrationBuilder.CreateTable( + name: "timelines", + columns: table => new + { + id = table.Column(nullable: false) + .Annotation("Sqlite:Autoincrement", true), + name = table.Column(nullable: true), + description = table.Column(nullable: true), + owner = table.Column(nullable: false), + visibility = table.Column(nullable: false), + create_time = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_timelines", x => x.id); + table.ForeignKey( + name: "FK_timelines_users_owner", + column: x => x.owner, + principalTable: "users", + principalColumn: "id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "user_avatars", + columns: table => new + { + id = table.Column(nullable: false) + .Annotation("Sqlite:Autoincrement", true), + data = table.Column(nullable: true), + type = table.Column(nullable: true), + etag = table.Column(maxLength: 30, nullable: true), + last_modified = table.Column(nullable: false), + UserId = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_user_avatars", x => x.id); + table.ForeignKey( + name: "FK_user_avatars_users_UserId", + column: x => x.UserId, + principalTable: "users", + principalColumn: "id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "user_details", + columns: table => new + { + id = table.Column(nullable: false) + .Annotation("Sqlite:Autoincrement", true), + nickname = table.Column(maxLength: 26, nullable: true), + UserId = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_user_details", x => x.id); + table.ForeignKey( + name: "FK_user_details_users_UserId", + column: x => x.UserId, + principalTable: "users", + principalColumn: "id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "timeline_members", + columns: table => new + { + id = table.Column(nullable: false) + .Annotation("Sqlite:Autoincrement", true), + user = table.Column(nullable: false), + timeline = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_timeline_members", x => x.id); + table.ForeignKey( + name: "FK_timeline_members_timelines_timeline", + column: x => x.timeline, + principalTable: "timelines", + principalColumn: "id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_timeline_members_users_user", + column: x => x.user, + principalTable: "users", + principalColumn: "id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "timeline_posts", + columns: table => new + { + id = table.Column(nullable: false) + .Annotation("Sqlite:Autoincrement", true), + timeline = table.Column(nullable: false), + author = table.Column(nullable: false), + content = table.Column(nullable: true), + time = table.Column(nullable: false), + last_updated = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_timeline_posts", x => x.id); + table.ForeignKey( + name: "FK_timeline_posts_users_author", + column: x => x.author, + principalTable: "users", + principalColumn: "id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_timeline_posts_timelines_timeline", + column: x => x.timeline, + principalTable: "timelines", + principalColumn: "id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateIndex( + name: "IX_timeline_members_timeline", + table: "timeline_members", + column: "timeline"); + + migrationBuilder.CreateIndex( + name: "IX_timeline_members_user", + table: "timeline_members", + column: "user"); + + migrationBuilder.CreateIndex( + name: "IX_timeline_posts_author", + table: "timeline_posts", + column: "author"); + + migrationBuilder.CreateIndex( + name: "IX_timeline_posts_timeline", + table: "timeline_posts", + column: "timeline"); + + migrationBuilder.CreateIndex( + name: "IX_timelines_owner", + table: "timelines", + column: "owner"); + + migrationBuilder.CreateIndex( + name: "IX_user_avatars_UserId", + table: "user_avatars", + column: "UserId", + unique: true); + + migrationBuilder.CreateIndex( + name: "IX_user_details_UserId", + table: "user_details", + column: "UserId", + unique: true); + + migrationBuilder.CreateIndex( + name: "IX_users_name", + table: "users", + column: "name", + unique: true); + + // Add a init user. Username is "administrator". Password is "crupest". + migrationBuilder.InsertData("users", new string[] { "name", "password", "roles" }, + new object[] { "administrator", "AQAAAAEAACcQAAAAENsspZrk8Wo+UuMyg6QuWJsNvRg6gVu4K/TumVod3h9GVLX9zDVuQQds3o7V8QWJ2w==", "user,admin" }); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "timeline_members"); + + migrationBuilder.DropTable( + name: "timeline_posts"); + + migrationBuilder.DropTable( + name: "user_avatars"); + + migrationBuilder.DropTable( + name: "user_details"); + + migrationBuilder.DropTable( + name: "timelines"); + + migrationBuilder.DropTable( + name: "users"); + } + } +} diff --git a/Timeline/Migrations/20200131100517_RefactorUser.Designer.cs b/Timeline/Migrations/20200131100517_RefactorUser.Designer.cs new file mode 100644 index 00000000..f494810a --- /dev/null +++ b/Timeline/Migrations/20200131100517_RefactorUser.Designer.cs @@ -0,0 +1,243 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Timeline.Entities; + +namespace Timeline.Migrations.DevelopmentDatabase +{ + [DbContext(typeof(DatabaseContext))] + [Migration("20200131100517_RefactorUser")] + partial class RefactorUser + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "3.1.1"); + + modelBuilder.Entity("Timeline.Entities.TimelineEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("INTEGER"); + + b.Property("CreateTime") + .HasColumnName("create_time") + .HasColumnType("TEXT"); + + b.Property("Description") + .HasColumnName("description") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnName("name") + .HasColumnType("TEXT"); + + b.Property("OwnerId") + .HasColumnName("owner") + .HasColumnType("INTEGER"); + + b.Property("Visibility") + .HasColumnName("visibility") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("OwnerId"); + + b.ToTable("timelines"); + }); + + modelBuilder.Entity("Timeline.Entities.TimelineMemberEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("INTEGER"); + + b.Property("TimelineId") + .HasColumnName("timeline") + .HasColumnType("INTEGER"); + + b.Property("UserId") + .HasColumnName("user") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("TimelineId"); + + b.HasIndex("UserId"); + + b.ToTable("timeline_members"); + }); + + modelBuilder.Entity("Timeline.Entities.TimelinePostEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("INTEGER"); + + b.Property("AuthorId") + .HasColumnName("author") + .HasColumnType("INTEGER"); + + b.Property("Content") + .HasColumnName("content") + .HasColumnType("TEXT"); + + b.Property("LastUpdated") + .HasColumnName("last_updated") + .HasColumnType("TEXT"); + + b.Property("Time") + .HasColumnName("time") + .HasColumnType("TEXT"); + + b.Property("TimelineId") + .HasColumnName("timeline") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AuthorId"); + + b.HasIndex("TimelineId"); + + b.ToTable("timeline_posts"); + }); + + modelBuilder.Entity("Timeline.Entities.UserAvatarEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("INTEGER"); + + b.Property("Data") + .HasColumnName("data") + .HasColumnType("BLOB"); + + b.Property("ETag") + .HasColumnName("etag") + .HasColumnType("TEXT") + .HasMaxLength(30); + + b.Property("LastModified") + .HasColumnName("last_modified") + .HasColumnType("TEXT"); + + b.Property("Type") + .HasColumnName("type") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnName("user") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("user_avatars"); + }); + + modelBuilder.Entity("Timeline.Entities.UserEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("INTEGER"); + + b.Property("Nickname") + .HasColumnName("nickname") + .HasColumnType("TEXT") + .HasMaxLength(100); + + b.Property("Password") + .IsRequired() + .HasColumnName("password") + .HasColumnType("TEXT"); + + b.Property("Roles") + .IsRequired() + .HasColumnName("roles") + .HasColumnType("TEXT"); + + b.Property("Username") + .IsRequired() + .HasColumnName("username") + .HasColumnType("TEXT") + .HasMaxLength(26); + + b.Property("Version") + .ValueGeneratedOnAdd() + .HasColumnName("version") + .HasColumnType("INTEGER") + .HasDefaultValue(0L); + + b.HasKey("Id"); + + b.HasIndex("Username") + .IsUnique(); + + b.ToTable("users"); + }); + + modelBuilder.Entity("Timeline.Entities.TimelineEntity", b => + { + b.HasOne("Timeline.Entities.UserEntity", "Owner") + .WithMany("Timelines") + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Timeline.Entities.TimelineMemberEntity", b => + { + b.HasOne("Timeline.Entities.TimelineEntity", "Timeline") + .WithMany("Members") + .HasForeignKey("TimelineId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Timeline.Entities.UserEntity", "User") + .WithMany("TimelinesJoined") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Timeline.Entities.TimelinePostEntity", b => + { + b.HasOne("Timeline.Entities.UserEntity", "Author") + .WithMany("TimelinePosts") + .HasForeignKey("AuthorId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Timeline.Entities.TimelineEntity", "Timeline") + .WithMany("Posts") + .HasForeignKey("TimelineId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Timeline.Entities.UserAvatarEntity", b => + { + b.HasOne("Timeline.Entities.UserEntity", "User") + .WithOne("Avatar") + .HasForeignKey("Timeline.Entities.UserAvatarEntity", "UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Timeline/Migrations/20200131100517_RefactorUser.cs b/Timeline/Migrations/20200131100517_RefactorUser.cs new file mode 100644 index 00000000..ade65eb1 --- /dev/null +++ b/Timeline/Migrations/20200131100517_RefactorUser.cs @@ -0,0 +1,129 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +namespace Timeline.Migrations.DevelopmentDatabase +{ + public partial class RefactorUser : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.RenameColumn(name: "name", table: "users", newName: "username"); + migrationBuilder.RenameIndex(name: "IX_users_name", table: "users", newName: "IX_users_username"); + + migrationBuilder.AddColumn( + name: "nickname", + table: "users", + maxLength: 100, + nullable: true); + + migrationBuilder.Sql(@" +UPDATE users + SET nickname = ( + SELECT nickname + FROM user_details + WHERE user_details.UserId = users.id + ); + "); + + /* + migrationBuilder.RenameColumn(name: "UserId", table: "user_avatars", newName: "user"); + + migrationBuilder.DropForeignKey( + name: "FK_user_avatars_users_UserId", + table: "user_avatars"); + + migrationBuilder.AddForeignKey( + name: "FK_user_avatars_users_user", + table: "user_avatars", + column: "user", + principalTable: "users", + principalColumn: "id", + onDelete: ReferentialAction.Cascade); + + migrationBuilder.RenameIndex( + name: "IX_user_avatars_UserId", + table: "user_avatars", + newName: "IX_user_avatars_user"); + */ + + migrationBuilder.Sql(@" +CREATE TABLE user_avatars_backup ( + id INTEGER NOT NULL + CONSTRAINT PK_user_avatars PRIMARY KEY AUTOINCREMENT, + data BLOB, + type TEXT, + etag TEXT, + last_modified TEXT NOT NULL, + user INTEGER NOT NULL, + CONSTRAINT FK_user_avatars_users_user FOREIGN KEY ( + user + ) + REFERENCES users (id) ON DELETE CASCADE +); + +INSERT INTO user_avatars_backup (id, data, type, etag, last_modified, user) + SELECT id, data, type, etag, last_modified, UserId FROM user_avatars; + +DROP TABLE user_avatars; + +ALTER TABLE user_avatars_backup + RENAME TO user_avatars; + +CREATE UNIQUE INDEX IX_user_avatars_user ON user_avatars (user); + "); + + // migrationBuilder.DropTable(name: "user_details"); + + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.Sql(@" +CREATE TABLE user_avatars_backup ( + id INTEGER NOT NULL + CONSTRAINT PK_user_avatars PRIMARY KEY AUTOINCREMENT, + data BLOB, + type TEXT, + etag TEXT, + last_modified TEXT NOT NULL, + UserId INTEGER NOT NULL, + CONSTRAINT FK_user_avatars_users_UserId FOREIGN KEY ( + user + ) + REFERENCES users (id) ON DELETE CASCADE +); + +INSERT INTO user_avatars_backup (id, data, type, etag, last_modified, UserId) + SELECT id, data, type, etag, last_modified, user FROM user_avatars; + +DROP TABLE user_avatars; + +ALTER TABLE user_avatars_backup + RENAME TO user_avatars; + +CREATE UNIQUE INDEX IX_user_avatars_UserId ON user_avatars (UserId); + "); + + migrationBuilder.Sql(@" +CREATE TABLE users_backup ( + id INTEGER NOT NULL + CONSTRAINT PK_users PRIMARY KEY AUTOINCREMENT, + name TEXT NOT NULL, + password TEXT NOT NULL, + roles TEXT NOT NULL, + version INTEGER NOT NULL + DEFAULT 0 +); + +INSERT INTO users_backup (id, name, password, roles, version) + SELECT id, username, password, roles, version FROM users; + +DROP TABLE users; + +ALTER TABLE users_backup + RENAME TO users; + +CREATE UNIQUE INDEX IX_users_name ON users (name); + "); + } + } +} diff --git a/Timeline/Migrations/DatabaseContextModelSnapshot.cs b/Timeline/Migrations/DatabaseContextModelSnapshot.cs new file mode 100644 index 00000000..e635a1b1 --- /dev/null +++ b/Timeline/Migrations/DatabaseContextModelSnapshot.cs @@ -0,0 +1,241 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Timeline.Entities; + +namespace Timeline.Migrations.DevelopmentDatabase +{ + [DbContext(typeof(DatabaseContext))] + partial class DatabaseContextModelSnapshot : ModelSnapshot + { + protected override void BuildModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "3.1.1"); + + modelBuilder.Entity("Timeline.Entities.TimelineEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("INTEGER"); + + b.Property("CreateTime") + .HasColumnName("create_time") + .HasColumnType("TEXT"); + + b.Property("Description") + .HasColumnName("description") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnName("name") + .HasColumnType("TEXT"); + + b.Property("OwnerId") + .HasColumnName("owner") + .HasColumnType("INTEGER"); + + b.Property("Visibility") + .HasColumnName("visibility") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("OwnerId"); + + b.ToTable("timelines"); + }); + + modelBuilder.Entity("Timeline.Entities.TimelineMemberEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("INTEGER"); + + b.Property("TimelineId") + .HasColumnName("timeline") + .HasColumnType("INTEGER"); + + b.Property("UserId") + .HasColumnName("user") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("TimelineId"); + + b.HasIndex("UserId"); + + b.ToTable("timeline_members"); + }); + + modelBuilder.Entity("Timeline.Entities.TimelinePostEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("INTEGER"); + + b.Property("AuthorId") + .HasColumnName("author") + .HasColumnType("INTEGER"); + + b.Property("Content") + .HasColumnName("content") + .HasColumnType("TEXT"); + + b.Property("LastUpdated") + .HasColumnName("last_updated") + .HasColumnType("TEXT"); + + b.Property("Time") + .HasColumnName("time") + .HasColumnType("TEXT"); + + b.Property("TimelineId") + .HasColumnName("timeline") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AuthorId"); + + b.HasIndex("TimelineId"); + + b.ToTable("timeline_posts"); + }); + + modelBuilder.Entity("Timeline.Entities.UserAvatarEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("INTEGER"); + + b.Property("Data") + .HasColumnName("data") + .HasColumnType("BLOB"); + + b.Property("ETag") + .HasColumnName("etag") + .HasColumnType("TEXT") + .HasMaxLength(30); + + b.Property("LastModified") + .HasColumnName("last_modified") + .HasColumnType("TEXT"); + + b.Property("Type") + .HasColumnName("type") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnName("user") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("user_avatars"); + }); + + modelBuilder.Entity("Timeline.Entities.UserEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("INTEGER"); + + b.Property("Nickname") + .HasColumnName("nickname") + .HasColumnType("TEXT") + .HasMaxLength(100); + + b.Property("Password") + .IsRequired() + .HasColumnName("password") + .HasColumnType("TEXT"); + + b.Property("Roles") + .IsRequired() + .HasColumnName("roles") + .HasColumnType("TEXT"); + + b.Property("Username") + .IsRequired() + .HasColumnName("username") + .HasColumnType("TEXT") + .HasMaxLength(26); + + b.Property("Version") + .ValueGeneratedOnAdd() + .HasColumnName("version") + .HasColumnType("INTEGER") + .HasDefaultValue(0L); + + b.HasKey("Id"); + + b.HasIndex("Username") + .IsUnique(); + + b.ToTable("users"); + }); + + modelBuilder.Entity("Timeline.Entities.TimelineEntity", b => + { + b.HasOne("Timeline.Entities.UserEntity", "Owner") + .WithMany("Timelines") + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Timeline.Entities.TimelineMemberEntity", b => + { + b.HasOne("Timeline.Entities.TimelineEntity", "Timeline") + .WithMany("Members") + .HasForeignKey("TimelineId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Timeline.Entities.UserEntity", "User") + .WithMany("TimelinesJoined") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Timeline.Entities.TimelinePostEntity", b => + { + b.HasOne("Timeline.Entities.UserEntity", "Author") + .WithMany("TimelinePosts") + .HasForeignKey("AuthorId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Timeline.Entities.TimelineEntity", "Timeline") + .WithMany("Posts") + .HasForeignKey("TimelineId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Timeline.Entities.UserAvatarEntity", b => + { + b.HasOne("Timeline.Entities.UserEntity", "User") + .WithOne("Avatar") + .HasForeignKey("Timeline.Entities.UserAvatarEntity", "UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Timeline/Migrations/DevelopmentDatabase/20200105150407_Initialize.Designer.cs b/Timeline/Migrations/DevelopmentDatabase/20200105150407_Initialize.Designer.cs deleted file mode 100644 index 6fe1044c..00000000 --- a/Timeline/Migrations/DevelopmentDatabase/20200105150407_Initialize.Designer.cs +++ /dev/null @@ -1,269 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Timeline.Entities; - -namespace Timeline.Migrations.DevelopmentDatabase -{ - [DbContext(typeof(DevelopmentDatabaseContext))] - [Migration("20200105150407_Initialize")] - partial class Initialize - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "3.1.0"); - - modelBuilder.Entity("Timeline.Entities.TimelineEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("INTEGER"); - - b.Property("CreateTime") - .HasColumnName("create_time") - .HasColumnType("TEXT"); - - b.Property("Description") - .HasColumnName("description") - .HasColumnType("TEXT"); - - b.Property("Name") - .HasColumnName("name") - .HasColumnType("TEXT"); - - b.Property("OwnerId") - .HasColumnName("owner") - .HasColumnType("INTEGER"); - - b.Property("Visibility") - .HasColumnName("visibility") - .HasColumnType("INTEGER"); - - b.HasKey("Id"); - - b.HasIndex("OwnerId"); - - b.ToTable("timelines"); - }); - - modelBuilder.Entity("Timeline.Entities.TimelineMemberEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("INTEGER"); - - b.Property("TimelineId") - .HasColumnName("timeline") - .HasColumnType("INTEGER"); - - b.Property("UserId") - .HasColumnName("user") - .HasColumnType("INTEGER"); - - b.HasKey("Id"); - - b.HasIndex("TimelineId"); - - b.HasIndex("UserId"); - - b.ToTable("timeline_members"); - }); - - modelBuilder.Entity("Timeline.Entities.TimelinePostEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("INTEGER"); - - b.Property("AuthorId") - .HasColumnName("author") - .HasColumnType("INTEGER"); - - b.Property("Content") - .HasColumnName("content") - .HasColumnType("TEXT"); - - b.Property("LastUpdated") - .HasColumnName("last_updated") - .HasColumnType("TEXT"); - - b.Property("Time") - .HasColumnName("time") - .HasColumnType("TEXT"); - - b.Property("TimelineId") - .HasColumnName("timeline") - .HasColumnType("INTEGER"); - - b.HasKey("Id"); - - b.HasIndex("AuthorId"); - - b.HasIndex("TimelineId"); - - b.ToTable("timeline_posts"); - }); - - modelBuilder.Entity("Timeline.Entities.User", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("INTEGER"); - - b.Property("EncryptedPassword") - .IsRequired() - .HasColumnName("password") - .HasColumnType("TEXT"); - - b.Property("Name") - .IsRequired() - .HasColumnName("name") - .HasColumnType("TEXT") - .HasMaxLength(26); - - b.Property("RoleString") - .IsRequired() - .HasColumnName("roles") - .HasColumnType("TEXT"); - - b.Property("Version") - .ValueGeneratedOnAdd() - .HasColumnName("version") - .HasColumnType("INTEGER") - .HasDefaultValue(0L); - - b.HasKey("Id"); - - b.HasIndex("Name") - .IsUnique(); - - b.ToTable("users"); - }); - - modelBuilder.Entity("Timeline.Entities.UserAvatar", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("INTEGER"); - - b.Property("Data") - .HasColumnName("data") - .HasColumnType("BLOB"); - - b.Property("ETag") - .HasColumnName("etag") - .HasColumnType("TEXT") - .HasMaxLength(30); - - b.Property("LastModified") - .HasColumnName("last_modified") - .HasColumnType("TEXT"); - - b.Property("Type") - .HasColumnName("type") - .HasColumnType("TEXT"); - - b.Property("UserId") - .HasColumnType("INTEGER"); - - b.HasKey("Id"); - - b.HasIndex("UserId") - .IsUnique(); - - b.ToTable("user_avatars"); - }); - - modelBuilder.Entity("Timeline.Entities.UserDetail", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("INTEGER"); - - b.Property("Nickname") - .HasColumnName("nickname") - .HasColumnType("TEXT") - .HasMaxLength(26); - - b.Property("UserId") - .HasColumnType("INTEGER"); - - b.HasKey("Id"); - - b.HasIndex("UserId") - .IsUnique(); - - b.ToTable("user_details"); - }); - - modelBuilder.Entity("Timeline.Entities.TimelineEntity", b => - { - b.HasOne("Timeline.Entities.User", "Owner") - .WithMany("Timelines") - .HasForeignKey("OwnerId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Timeline.Entities.TimelineMemberEntity", b => - { - b.HasOne("Timeline.Entities.TimelineEntity", "Timeline") - .WithMany("Members") - .HasForeignKey("TimelineId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Timeline.Entities.User", "User") - .WithMany("TimelinesJoined") - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Timeline.Entities.TimelinePostEntity", b => - { - b.HasOne("Timeline.Entities.User", "Author") - .WithMany("TimelinePosts") - .HasForeignKey("AuthorId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Timeline.Entities.TimelineEntity", "Timeline") - .WithMany("Posts") - .HasForeignKey("TimelineId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Timeline.Entities.UserAvatar", b => - { - b.HasOne("Timeline.Entities.User", null) - .WithOne("Avatar") - .HasForeignKey("Timeline.Entities.UserAvatar", "UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Timeline.Entities.UserDetail", b => - { - b.HasOne("Timeline.Entities.User", null) - .WithOne("Detail") - .HasForeignKey("Timeline.Entities.UserDetail", "UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/Timeline/Migrations/DevelopmentDatabase/20200105150407_Initialize.cs b/Timeline/Migrations/DevelopmentDatabase/20200105150407_Initialize.cs deleted file mode 100644 index c6efaa4b..00000000 --- a/Timeline/Migrations/DevelopmentDatabase/20200105150407_Initialize.cs +++ /dev/null @@ -1,217 +0,0 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace Timeline.Migrations.DevelopmentDatabase -{ - public partial class Initialize : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "users", - columns: table => new - { - id = table.Column(nullable: false) - .Annotation("Sqlite:Autoincrement", true), - name = table.Column(maxLength: 26, nullable: false), - password = table.Column(nullable: false), - roles = table.Column(nullable: false), - version = table.Column(nullable: false, defaultValue: 0L) - .Annotation("Sqlite:Autoincrement", true) - }, - constraints: table => - { - table.PrimaryKey("PK_users", x => x.id); - }); - - migrationBuilder.CreateTable( - name: "timelines", - columns: table => new - { - id = table.Column(nullable: false) - .Annotation("Sqlite:Autoincrement", true), - name = table.Column(nullable: true), - description = table.Column(nullable: true), - owner = table.Column(nullable: false), - visibility = table.Column(nullable: false), - create_time = table.Column(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_timelines", x => x.id); - table.ForeignKey( - name: "FK_timelines_users_owner", - column: x => x.owner, - principalTable: "users", - principalColumn: "id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "user_avatars", - columns: table => new - { - id = table.Column(nullable: false) - .Annotation("Sqlite:Autoincrement", true), - data = table.Column(nullable: true), - type = table.Column(nullable: true), - etag = table.Column(maxLength: 30, nullable: true), - last_modified = table.Column(nullable: false), - UserId = table.Column(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_user_avatars", x => x.id); - table.ForeignKey( - name: "FK_user_avatars_users_UserId", - column: x => x.UserId, - principalTable: "users", - principalColumn: "id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "user_details", - columns: table => new - { - id = table.Column(nullable: false) - .Annotation("Sqlite:Autoincrement", true), - nickname = table.Column(maxLength: 26, nullable: true), - UserId = table.Column(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_user_details", x => x.id); - table.ForeignKey( - name: "FK_user_details_users_UserId", - column: x => x.UserId, - principalTable: "users", - principalColumn: "id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "timeline_members", - columns: table => new - { - id = table.Column(nullable: false) - .Annotation("Sqlite:Autoincrement", true), - user = table.Column(nullable: false), - timeline = table.Column(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_timeline_members", x => x.id); - table.ForeignKey( - name: "FK_timeline_members_timelines_timeline", - column: x => x.timeline, - principalTable: "timelines", - principalColumn: "id", - onDelete: ReferentialAction.Cascade); - table.ForeignKey( - name: "FK_timeline_members_users_user", - column: x => x.user, - principalTable: "users", - principalColumn: "id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "timeline_posts", - columns: table => new - { - id = table.Column(nullable: false) - .Annotation("Sqlite:Autoincrement", true), - timeline = table.Column(nullable: false), - author = table.Column(nullable: false), - content = table.Column(nullable: true), - time = table.Column(nullable: false), - last_updated = table.Column(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_timeline_posts", x => x.id); - table.ForeignKey( - name: "FK_timeline_posts_users_author", - column: x => x.author, - principalTable: "users", - principalColumn: "id", - onDelete: ReferentialAction.Cascade); - table.ForeignKey( - name: "FK_timeline_posts_timelines_timeline", - column: x => x.timeline, - principalTable: "timelines", - principalColumn: "id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateIndex( - name: "IX_timeline_members_timeline", - table: "timeline_members", - column: "timeline"); - - migrationBuilder.CreateIndex( - name: "IX_timeline_members_user", - table: "timeline_members", - column: "user"); - - migrationBuilder.CreateIndex( - name: "IX_timeline_posts_author", - table: "timeline_posts", - column: "author"); - - migrationBuilder.CreateIndex( - name: "IX_timeline_posts_timeline", - table: "timeline_posts", - column: "timeline"); - - migrationBuilder.CreateIndex( - name: "IX_timelines_owner", - table: "timelines", - column: "owner"); - - migrationBuilder.CreateIndex( - name: "IX_user_avatars_UserId", - table: "user_avatars", - column: "UserId", - unique: true); - - migrationBuilder.CreateIndex( - name: "IX_user_details_UserId", - table: "user_details", - column: "UserId", - unique: true); - - migrationBuilder.CreateIndex( - name: "IX_users_name", - table: "users", - column: "name", - unique: true); - - // Add a init user. Username is "administrator". Password is "crupest". - migrationBuilder.InsertData("users", new string[] { "name", "password", "roles" }, - new object[] { "administrator", "AQAAAAEAACcQAAAAENsspZrk8Wo+UuMyg6QuWJsNvRg6gVu4K/TumVod3h9GVLX9zDVuQQds3o7V8QWJ2w==", "user,admin" }); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "timeline_members"); - - migrationBuilder.DropTable( - name: "timeline_posts"); - - migrationBuilder.DropTable( - name: "user_avatars"); - - migrationBuilder.DropTable( - name: "user_details"); - - migrationBuilder.DropTable( - name: "timelines"); - - migrationBuilder.DropTable( - name: "users"); - } - } -} diff --git a/Timeline/Migrations/DevelopmentDatabase/20200131100517_RefactorUser.Designer.cs b/Timeline/Migrations/DevelopmentDatabase/20200131100517_RefactorUser.Designer.cs deleted file mode 100644 index 13e322c8..00000000 --- a/Timeline/Migrations/DevelopmentDatabase/20200131100517_RefactorUser.Designer.cs +++ /dev/null @@ -1,243 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Timeline.Entities; - -namespace Timeline.Migrations.DevelopmentDatabase -{ - [DbContext(typeof(DevelopmentDatabaseContext))] - [Migration("20200131100517_RefactorUser")] - partial class RefactorUser - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "3.1.1"); - - modelBuilder.Entity("Timeline.Entities.TimelineEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("INTEGER"); - - b.Property("CreateTime") - .HasColumnName("create_time") - .HasColumnType("TEXT"); - - b.Property("Description") - .HasColumnName("description") - .HasColumnType("TEXT"); - - b.Property("Name") - .HasColumnName("name") - .HasColumnType("TEXT"); - - b.Property("OwnerId") - .HasColumnName("owner") - .HasColumnType("INTEGER"); - - b.Property("Visibility") - .HasColumnName("visibility") - .HasColumnType("INTEGER"); - - b.HasKey("Id"); - - b.HasIndex("OwnerId"); - - b.ToTable("timelines"); - }); - - modelBuilder.Entity("Timeline.Entities.TimelineMemberEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("INTEGER"); - - b.Property("TimelineId") - .HasColumnName("timeline") - .HasColumnType("INTEGER"); - - b.Property("UserId") - .HasColumnName("user") - .HasColumnType("INTEGER"); - - b.HasKey("Id"); - - b.HasIndex("TimelineId"); - - b.HasIndex("UserId"); - - b.ToTable("timeline_members"); - }); - - modelBuilder.Entity("Timeline.Entities.TimelinePostEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("INTEGER"); - - b.Property("AuthorId") - .HasColumnName("author") - .HasColumnType("INTEGER"); - - b.Property("Content") - .HasColumnName("content") - .HasColumnType("TEXT"); - - b.Property("LastUpdated") - .HasColumnName("last_updated") - .HasColumnType("TEXT"); - - b.Property("Time") - .HasColumnName("time") - .HasColumnType("TEXT"); - - b.Property("TimelineId") - .HasColumnName("timeline") - .HasColumnType("INTEGER"); - - b.HasKey("Id"); - - b.HasIndex("AuthorId"); - - b.HasIndex("TimelineId"); - - b.ToTable("timeline_posts"); - }); - - modelBuilder.Entity("Timeline.Entities.UserAvatarEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("INTEGER"); - - b.Property("Data") - .HasColumnName("data") - .HasColumnType("BLOB"); - - b.Property("ETag") - .HasColumnName("etag") - .HasColumnType("TEXT") - .HasMaxLength(30); - - b.Property("LastModified") - .HasColumnName("last_modified") - .HasColumnType("TEXT"); - - b.Property("Type") - .HasColumnName("type") - .HasColumnType("TEXT"); - - b.Property("UserId") - .HasColumnName("user") - .HasColumnType("INTEGER"); - - b.HasKey("Id"); - - b.HasIndex("UserId") - .IsUnique(); - - b.ToTable("user_avatars"); - }); - - modelBuilder.Entity("Timeline.Entities.UserEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("INTEGER"); - - b.Property("Nickname") - .HasColumnName("nickname") - .HasColumnType("TEXT") - .HasMaxLength(100); - - b.Property("Password") - .IsRequired() - .HasColumnName("password") - .HasColumnType("TEXT"); - - b.Property("Roles") - .IsRequired() - .HasColumnName("roles") - .HasColumnType("TEXT"); - - b.Property("Username") - .IsRequired() - .HasColumnName("username") - .HasColumnType("TEXT") - .HasMaxLength(26); - - b.Property("Version") - .ValueGeneratedOnAdd() - .HasColumnName("version") - .HasColumnType("INTEGER") - .HasDefaultValue(0L); - - b.HasKey("Id"); - - b.HasIndex("Username") - .IsUnique(); - - b.ToTable("users"); - }); - - modelBuilder.Entity("Timeline.Entities.TimelineEntity", b => - { - b.HasOne("Timeline.Entities.UserEntity", "Owner") - .WithMany("Timelines") - .HasForeignKey("OwnerId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Timeline.Entities.TimelineMemberEntity", b => - { - b.HasOne("Timeline.Entities.TimelineEntity", "Timeline") - .WithMany("Members") - .HasForeignKey("TimelineId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Timeline.Entities.UserEntity", "User") - .WithMany("TimelinesJoined") - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Timeline.Entities.TimelinePostEntity", b => - { - b.HasOne("Timeline.Entities.UserEntity", "Author") - .WithMany("TimelinePosts") - .HasForeignKey("AuthorId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Timeline.Entities.TimelineEntity", "Timeline") - .WithMany("Posts") - .HasForeignKey("TimelineId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Timeline.Entities.UserAvatarEntity", b => - { - b.HasOne("Timeline.Entities.UserEntity", "User") - .WithOne("Avatar") - .HasForeignKey("Timeline.Entities.UserAvatarEntity", "UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/Timeline/Migrations/DevelopmentDatabase/20200131100517_RefactorUser.cs b/Timeline/Migrations/DevelopmentDatabase/20200131100517_RefactorUser.cs deleted file mode 100644 index ade65eb1..00000000 --- a/Timeline/Migrations/DevelopmentDatabase/20200131100517_RefactorUser.cs +++ /dev/null @@ -1,129 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -namespace Timeline.Migrations.DevelopmentDatabase -{ - public partial class RefactorUser : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.RenameColumn(name: "name", table: "users", newName: "username"); - migrationBuilder.RenameIndex(name: "IX_users_name", table: "users", newName: "IX_users_username"); - - migrationBuilder.AddColumn( - name: "nickname", - table: "users", - maxLength: 100, - nullable: true); - - migrationBuilder.Sql(@" -UPDATE users - SET nickname = ( - SELECT nickname - FROM user_details - WHERE user_details.UserId = users.id - ); - "); - - /* - migrationBuilder.RenameColumn(name: "UserId", table: "user_avatars", newName: "user"); - - migrationBuilder.DropForeignKey( - name: "FK_user_avatars_users_UserId", - table: "user_avatars"); - - migrationBuilder.AddForeignKey( - name: "FK_user_avatars_users_user", - table: "user_avatars", - column: "user", - principalTable: "users", - principalColumn: "id", - onDelete: ReferentialAction.Cascade); - - migrationBuilder.RenameIndex( - name: "IX_user_avatars_UserId", - table: "user_avatars", - newName: "IX_user_avatars_user"); - */ - - migrationBuilder.Sql(@" -CREATE TABLE user_avatars_backup ( - id INTEGER NOT NULL - CONSTRAINT PK_user_avatars PRIMARY KEY AUTOINCREMENT, - data BLOB, - type TEXT, - etag TEXT, - last_modified TEXT NOT NULL, - user INTEGER NOT NULL, - CONSTRAINT FK_user_avatars_users_user FOREIGN KEY ( - user - ) - REFERENCES users (id) ON DELETE CASCADE -); - -INSERT INTO user_avatars_backup (id, data, type, etag, last_modified, user) - SELECT id, data, type, etag, last_modified, UserId FROM user_avatars; - -DROP TABLE user_avatars; - -ALTER TABLE user_avatars_backup - RENAME TO user_avatars; - -CREATE UNIQUE INDEX IX_user_avatars_user ON user_avatars (user); - "); - - // migrationBuilder.DropTable(name: "user_details"); - - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.Sql(@" -CREATE TABLE user_avatars_backup ( - id INTEGER NOT NULL - CONSTRAINT PK_user_avatars PRIMARY KEY AUTOINCREMENT, - data BLOB, - type TEXT, - etag TEXT, - last_modified TEXT NOT NULL, - UserId INTEGER NOT NULL, - CONSTRAINT FK_user_avatars_users_UserId FOREIGN KEY ( - user - ) - REFERENCES users (id) ON DELETE CASCADE -); - -INSERT INTO user_avatars_backup (id, data, type, etag, last_modified, UserId) - SELECT id, data, type, etag, last_modified, user FROM user_avatars; - -DROP TABLE user_avatars; - -ALTER TABLE user_avatars_backup - RENAME TO user_avatars; - -CREATE UNIQUE INDEX IX_user_avatars_UserId ON user_avatars (UserId); - "); - - migrationBuilder.Sql(@" -CREATE TABLE users_backup ( - id INTEGER NOT NULL - CONSTRAINT PK_users PRIMARY KEY AUTOINCREMENT, - name TEXT NOT NULL, - password TEXT NOT NULL, - roles TEXT NOT NULL, - version INTEGER NOT NULL - DEFAULT 0 -); - -INSERT INTO users_backup (id, name, password, roles, version) - SELECT id, username, password, roles, version FROM users; - -DROP TABLE users; - -ALTER TABLE users_backup - RENAME TO users; - -CREATE UNIQUE INDEX IX_users_name ON users (name); - "); - } - } -} diff --git a/Timeline/Migrations/DevelopmentDatabase/DevelopmentDatabaseContextModelSnapshot.cs b/Timeline/Migrations/DevelopmentDatabase/DevelopmentDatabaseContextModelSnapshot.cs deleted file mode 100644 index 5da49dbe..00000000 --- a/Timeline/Migrations/DevelopmentDatabase/DevelopmentDatabaseContextModelSnapshot.cs +++ /dev/null @@ -1,241 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Timeline.Entities; - -namespace Timeline.Migrations.DevelopmentDatabase -{ - [DbContext(typeof(DevelopmentDatabaseContext))] - partial class DevelopmentDatabaseContextModelSnapshot : ModelSnapshot - { - protected override void BuildModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "3.1.1"); - - modelBuilder.Entity("Timeline.Entities.TimelineEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("INTEGER"); - - b.Property("CreateTime") - .HasColumnName("create_time") - .HasColumnType("TEXT"); - - b.Property("Description") - .HasColumnName("description") - .HasColumnType("TEXT"); - - b.Property("Name") - .HasColumnName("name") - .HasColumnType("TEXT"); - - b.Property("OwnerId") - .HasColumnName("owner") - .HasColumnType("INTEGER"); - - b.Property("Visibility") - .HasColumnName("visibility") - .HasColumnType("INTEGER"); - - b.HasKey("Id"); - - b.HasIndex("OwnerId"); - - b.ToTable("timelines"); - }); - - modelBuilder.Entity("Timeline.Entities.TimelineMemberEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("INTEGER"); - - b.Property("TimelineId") - .HasColumnName("timeline") - .HasColumnType("INTEGER"); - - b.Property("UserId") - .HasColumnName("user") - .HasColumnType("INTEGER"); - - b.HasKey("Id"); - - b.HasIndex("TimelineId"); - - b.HasIndex("UserId"); - - b.ToTable("timeline_members"); - }); - - modelBuilder.Entity("Timeline.Entities.TimelinePostEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("INTEGER"); - - b.Property("AuthorId") - .HasColumnName("author") - .HasColumnType("INTEGER"); - - b.Property("Content") - .HasColumnName("content") - .HasColumnType("TEXT"); - - b.Property("LastUpdated") - .HasColumnName("last_updated") - .HasColumnType("TEXT"); - - b.Property("Time") - .HasColumnName("time") - .HasColumnType("TEXT"); - - b.Property("TimelineId") - .HasColumnName("timeline") - .HasColumnType("INTEGER"); - - b.HasKey("Id"); - - b.HasIndex("AuthorId"); - - b.HasIndex("TimelineId"); - - b.ToTable("timeline_posts"); - }); - - modelBuilder.Entity("Timeline.Entities.UserAvatarEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("INTEGER"); - - b.Property("Data") - .HasColumnName("data") - .HasColumnType("BLOB"); - - b.Property("ETag") - .HasColumnName("etag") - .HasColumnType("TEXT") - .HasMaxLength(30); - - b.Property("LastModified") - .HasColumnName("last_modified") - .HasColumnType("TEXT"); - - b.Property("Type") - .HasColumnName("type") - .HasColumnType("TEXT"); - - b.Property("UserId") - .HasColumnName("user") - .HasColumnType("INTEGER"); - - b.HasKey("Id"); - - b.HasIndex("UserId") - .IsUnique(); - - b.ToTable("user_avatars"); - }); - - modelBuilder.Entity("Timeline.Entities.UserEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("INTEGER"); - - b.Property("Nickname") - .HasColumnName("nickname") - .HasColumnType("TEXT") - .HasMaxLength(100); - - b.Property("Password") - .IsRequired() - .HasColumnName("password") - .HasColumnType("TEXT"); - - b.Property("Roles") - .IsRequired() - .HasColumnName("roles") - .HasColumnType("TEXT"); - - b.Property("Username") - .IsRequired() - .HasColumnName("username") - .HasColumnType("TEXT") - .HasMaxLength(26); - - b.Property("Version") - .ValueGeneratedOnAdd() - .HasColumnName("version") - .HasColumnType("INTEGER") - .HasDefaultValue(0L); - - b.HasKey("Id"); - - b.HasIndex("Username") - .IsUnique(); - - b.ToTable("users"); - }); - - modelBuilder.Entity("Timeline.Entities.TimelineEntity", b => - { - b.HasOne("Timeline.Entities.UserEntity", "Owner") - .WithMany("Timelines") - .HasForeignKey("OwnerId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Timeline.Entities.TimelineMemberEntity", b => - { - b.HasOne("Timeline.Entities.TimelineEntity", "Timeline") - .WithMany("Members") - .HasForeignKey("TimelineId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Timeline.Entities.UserEntity", "User") - .WithMany("TimelinesJoined") - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Timeline.Entities.TimelinePostEntity", b => - { - b.HasOne("Timeline.Entities.UserEntity", "Author") - .WithMany("TimelinePosts") - .HasForeignKey("AuthorId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Timeline.Entities.TimelineEntity", "Timeline") - .WithMany("Posts") - .HasForeignKey("TimelineId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Timeline.Entities.UserAvatarEntity", b => - { - b.HasOne("Timeline.Entities.UserEntity", "User") - .WithOne("Avatar") - .HasForeignKey("Timeline.Entities.UserAvatarEntity", "UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/Timeline/Migrations/ProductionDatabase/20191031064541_Initialize.Designer.cs b/Timeline/Migrations/ProductionDatabase/20191031064541_Initialize.Designer.cs deleted file mode 100644 index cd584b3c..00000000 --- a/Timeline/Migrations/ProductionDatabase/20191031064541_Initialize.Designer.cs +++ /dev/null @@ -1,137 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Timeline.Entities; - -namespace Timeline.Migrations.ProductionDatabase -{ - [DbContext(typeof(ProductionDatabaseContext))] - [Migration("20191031064541_Initialize")] - partial class Initialize - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "3.0.0") - .HasAnnotation("Relational:MaxIdentifierLength", 64); - - modelBuilder.Entity("Timeline.Entities.User", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("bigint"); - - b.Property("EncryptedPassword") - .IsRequired() - .HasColumnName("password") - .HasColumnType("longtext"); - - b.Property("Name") - .IsRequired() - .HasColumnName("name") - .HasColumnType("varchar(26)") - .HasMaxLength(26); - - b.Property("RoleString") - .IsRequired() - .HasColumnName("roles") - .HasColumnType("longtext"); - - b.Property("Version") - .ValueGeneratedOnAdd() - .HasColumnName("version") - .HasColumnType("bigint") - .HasDefaultValue(0L); - - b.HasKey("Id"); - - b.HasIndex("Name") - .IsUnique(); - - b.ToTable("users"); - }); - - modelBuilder.Entity("Timeline.Entities.UserAvatar", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("bigint"); - - b.Property("Data") - .HasColumnName("data") - .HasColumnType("longblob"); - - b.Property("ETag") - .HasColumnName("etag") - .HasColumnType("varchar(30)") - .HasMaxLength(30); - - b.Property("LastModified") - .HasColumnName("last_modified") - .HasColumnType("datetime(6)"); - - b.Property("Type") - .HasColumnName("type") - .HasColumnType("longtext"); - - b.Property("UserId") - .HasColumnType("bigint"); - - b.HasKey("Id"); - - b.HasIndex("UserId") - .IsUnique(); - - b.ToTable("user_avatars"); - }); - - modelBuilder.Entity("Timeline.Entities.UserDetail", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("bigint"); - - b.Property("Nickname") - .HasColumnName("nickname") - .HasColumnType("varchar(26)") - .HasMaxLength(26); - - b.Property("UserId") - .HasColumnType("bigint"); - - b.HasKey("Id"); - - b.HasIndex("UserId") - .IsUnique(); - - b.ToTable("user_details"); - }); - - modelBuilder.Entity("Timeline.Entities.UserAvatar", b => - { - b.HasOne("Timeline.Entities.User", null) - .WithOne("Avatar") - .HasForeignKey("Timeline.Entities.UserAvatar", "UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Timeline.Entities.UserDetail", b => - { - b.HasOne("Timeline.Entities.User", null) - .WithOne("Detail") - .HasForeignKey("Timeline.Entities.UserDetail", "UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/Timeline/Migrations/ProductionDatabase/20191031064541_Initialize.cs b/Timeline/Migrations/ProductionDatabase/20191031064541_Initialize.cs deleted file mode 100644 index dc989a96..00000000 --- a/Timeline/Migrations/ProductionDatabase/20191031064541_Initialize.cs +++ /dev/null @@ -1,105 +0,0 @@ -using System; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace Timeline.Migrations.ProductionDatabase -{ - public partial class Initialize : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "users", - columns: table => new - { - id = table.Column(nullable: false) - .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - name = table.Column(maxLength: 26, nullable: false), - password = table.Column(nullable: false), - roles = table.Column(nullable: false), - version = table.Column(nullable: false, defaultValue: 0L) - }, - constraints: table => - { - table.PrimaryKey("PK_users", x => x.id); - }); - - migrationBuilder.CreateTable( - name: "user_avatars", - columns: table => new - { - id = table.Column(nullable: false) - .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - data = table.Column(nullable: true), - type = table.Column(nullable: true), - etag = table.Column(maxLength: 30, nullable: true), - last_modified = table.Column(nullable: false), - UserId = table.Column(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_user_avatars", x => x.id); - table.ForeignKey( - name: "FK_user_avatars_users_UserId", - column: x => x.UserId, - principalTable: "users", - principalColumn: "id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "user_details", - columns: table => new - { - id = table.Column(nullable: false) - .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - nickname = table.Column(maxLength: 26, nullable: true), - UserId = table.Column(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_user_details", x => x.id); - table.ForeignKey( - name: "FK_user_details_users_UserId", - column: x => x.UserId, - principalTable: "users", - principalColumn: "id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateIndex( - name: "IX_user_avatars_UserId", - table: "user_avatars", - column: "UserId", - unique: true); - - migrationBuilder.CreateIndex( - name: "IX_user_details_UserId", - table: "user_details", - column: "UserId", - unique: true); - - migrationBuilder.CreateIndex( - name: "IX_users_name", - table: "users", - column: "name", - unique: true); - - // Add a init user. Username is "administrator". Password is "crupest". - migrationBuilder.InsertData("users", new string[] { "name", "password", "roles" }, - new object[] { "administrator", "AQAAAAEAACcQAAAAENsspZrk8Wo+UuMyg6QuWJsNvRg6gVu4K/TumVod3h9GVLX9zDVuQQds3o7V8QWJ2w==", "user,admin" }); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "user_avatars"); - - migrationBuilder.DropTable( - name: "user_details"); - - migrationBuilder.DropTable( - name: "users"); - } - } -} diff --git a/Timeline/Migrations/ProductionDatabase/20191120104512_InitTimeline.Designer.cs b/Timeline/Migrations/ProductionDatabase/20191120104512_InitTimeline.Designer.cs deleted file mode 100644 index d50e8330..00000000 --- a/Timeline/Migrations/ProductionDatabase/20191120104512_InitTimeline.Designer.cs +++ /dev/null @@ -1,270 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Timeline.Entities; - -namespace Timeline.Migrations.ProductionDatabase -{ - [DbContext(typeof(ProductionDatabaseContext))] - [Migration("20191120104512_InitTimeline")] - partial class InitTimeline - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "3.0.1") - .HasAnnotation("Relational:MaxIdentifierLength", 64); - - modelBuilder.Entity("Timeline.Entities.TimelineEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("bigint"); - - b.Property("CreateTime") - .HasColumnName("create_time") - .HasColumnType("datetime(6)"); - - b.Property("Description") - .HasColumnName("description") - .HasColumnType("longtext CHARACTER SET utf8mb4"); - - b.Property("Name") - .HasColumnName("name") - .HasColumnType("longtext CHARACTER SET utf8mb4"); - - b.Property("OwnerId") - .HasColumnName("owner") - .HasColumnType("bigint"); - - b.Property("Visibility") - .HasColumnName("visibility") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("OwnerId"); - - b.ToTable("timelines"); - }); - - modelBuilder.Entity("Timeline.Entities.TimelineMemberEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("bigint"); - - b.Property("TimelineId") - .HasColumnName("timeline") - .HasColumnType("bigint"); - - b.Property("UserId") - .HasColumnName("user") - .HasColumnType("bigint"); - - b.HasKey("Id"); - - b.HasIndex("TimelineId"); - - b.HasIndex("UserId"); - - b.ToTable("TimelineMembers"); - }); - - modelBuilder.Entity("Timeline.Entities.TimelinePostEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("bigint"); - - b.Property("AuthorId") - .HasColumnName("author") - .HasColumnType("bigint"); - - b.Property("Content") - .HasColumnName("content") - .HasColumnType("longtext CHARACTER SET utf8mb4"); - - b.Property("LastUpdated") - .HasColumnName("last_updated") - .HasColumnType("datetime(6)"); - - b.Property("Time") - .HasColumnName("time") - .HasColumnType("datetime(6)"); - - b.Property("TimelineId") - .HasColumnName("timeline") - .HasColumnType("bigint"); - - b.HasKey("Id"); - - b.HasIndex("AuthorId"); - - b.HasIndex("TimelineId"); - - b.ToTable("timeline_posts"); - }); - - modelBuilder.Entity("Timeline.Entities.User", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("bigint"); - - b.Property("EncryptedPassword") - .IsRequired() - .HasColumnName("password") - .HasColumnType("longtext CHARACTER SET utf8mb4"); - - b.Property("Name") - .IsRequired() - .HasColumnName("name") - .HasColumnType("varchar(26) CHARACTER SET utf8mb4") - .HasMaxLength(26); - - b.Property("RoleString") - .IsRequired() - .HasColumnName("roles") - .HasColumnType("longtext CHARACTER SET utf8mb4"); - - b.Property("Version") - .ValueGeneratedOnAdd() - .HasColumnName("version") - .HasColumnType("bigint") - .HasDefaultValue(0L); - - b.HasKey("Id"); - - b.HasIndex("Name") - .IsUnique(); - - b.ToTable("users"); - }); - - modelBuilder.Entity("Timeline.Entities.UserAvatar", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("bigint"); - - b.Property("Data") - .HasColumnName("data") - .HasColumnType("longblob"); - - b.Property("ETag") - .HasColumnName("etag") - .HasColumnType("varchar(30) CHARACTER SET utf8mb4") - .HasMaxLength(30); - - b.Property("LastModified") - .HasColumnName("last_modified") - .HasColumnType("datetime(6)"); - - b.Property("Type") - .HasColumnName("type") - .HasColumnType("longtext CHARACTER SET utf8mb4"); - - b.Property("UserId") - .HasColumnType("bigint"); - - b.HasKey("Id"); - - b.HasIndex("UserId") - .IsUnique(); - - b.ToTable("user_avatars"); - }); - - modelBuilder.Entity("Timeline.Entities.UserDetail", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("bigint"); - - b.Property("Nickname") - .HasColumnName("nickname") - .HasColumnType("varchar(26) CHARACTER SET utf8mb4") - .HasMaxLength(26); - - b.Property("UserId") - .HasColumnType("bigint"); - - b.HasKey("Id"); - - b.HasIndex("UserId") - .IsUnique(); - - b.ToTable("user_details"); - }); - - modelBuilder.Entity("Timeline.Entities.TimelineEntity", b => - { - b.HasOne("Timeline.Entities.User", "Owner") - .WithMany("Timelines") - .HasForeignKey("OwnerId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Timeline.Entities.TimelineMemberEntity", b => - { - b.HasOne("Timeline.Entities.TimelineEntity", "Timeline") - .WithMany("Members") - .HasForeignKey("TimelineId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Timeline.Entities.User", "User") - .WithMany("TimelinesJoined") - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Timeline.Entities.TimelinePostEntity", b => - { - b.HasOne("Timeline.Entities.User", "Author") - .WithMany("TimelinePosts") - .HasForeignKey("AuthorId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Timeline.Entities.TimelineEntity", "Timeline") - .WithMany("Posts") - .HasForeignKey("TimelineId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Timeline.Entities.UserAvatar", b => - { - b.HasOne("Timeline.Entities.User", null) - .WithOne("Avatar") - .HasForeignKey("Timeline.Entities.UserAvatar", "UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Timeline.Entities.UserDetail", b => - { - b.HasOne("Timeline.Entities.User", null) - .WithOne("Detail") - .HasForeignKey("Timeline.Entities.UserDetail", "UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/Timeline/Migrations/ProductionDatabase/20191120104512_InitTimeline.cs b/Timeline/Migrations/ProductionDatabase/20191120104512_InitTimeline.cs deleted file mode 100644 index 9b80ad30..00000000 --- a/Timeline/Migrations/ProductionDatabase/20191120104512_InitTimeline.cs +++ /dev/null @@ -1,229 +0,0 @@ -using System; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace Timeline.Migrations.ProductionDatabase -{ - public partial class InitTimeline : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AlterColumn( - name: "roles", - table: "users", - nullable: false, - oldClrType: typeof(string), - oldType: "longtext"); - - migrationBuilder.AlterColumn( - name: "name", - table: "users", - maxLength: 26, - nullable: false, - oldClrType: typeof(string), - oldType: "varchar(26)", - oldMaxLength: 26); - - migrationBuilder.AlterColumn( - name: "password", - table: "users", - nullable: false, - oldClrType: typeof(string), - oldType: "longtext"); - - migrationBuilder.AlterColumn( - name: "nickname", - table: "user_details", - maxLength: 26, - nullable: true, - oldClrType: typeof(string), - oldType: "varchar(26)", - oldMaxLength: 26, - oldNullable: true); - - migrationBuilder.AlterColumn( - name: "type", - table: "user_avatars", - nullable: true, - oldClrType: typeof(string), - oldType: "longtext", - oldNullable: true); - - migrationBuilder.AlterColumn( - name: "etag", - table: "user_avatars", - maxLength: 30, - nullable: true, - oldClrType: typeof(string), - oldType: "varchar(30)", - oldMaxLength: 30, - oldNullable: true); - - migrationBuilder.CreateTable( - name: "timelines", - columns: table => new - { - id = table.Column(nullable: false) - .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - name = table.Column(nullable: true), - description = table.Column(nullable: true), - owner = table.Column(nullable: false), - visibility = table.Column(nullable: false), - create_time = table.Column(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_timelines", x => x.id); - table.ForeignKey( - name: "FK_timelines_users_owner", - column: x => x.owner, - principalTable: "users", - principalColumn: "id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "timeline_posts", - columns: table => new - { - id = table.Column(nullable: false) - .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - timeline = table.Column(nullable: false), - author = table.Column(nullable: false), - content = table.Column(nullable: true), - time = table.Column(nullable: false), - last_updated = table.Column(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_timeline_posts", x => x.id); - table.ForeignKey( - name: "FK_timeline_posts_users_author", - column: x => x.author, - principalTable: "users", - principalColumn: "id", - onDelete: ReferentialAction.Cascade); - table.ForeignKey( - name: "FK_timeline_posts_timelines_timeline", - column: x => x.timeline, - principalTable: "timelines", - principalColumn: "id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "TimelineMembers", - columns: table => new - { - id = table.Column(nullable: false) - .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - user = table.Column(nullable: false), - timeline = table.Column(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_TimelineMembers", x => x.id); - table.ForeignKey( - name: "FK_TimelineMembers_timelines_timeline", - column: x => x.timeline, - principalTable: "timelines", - principalColumn: "id", - onDelete: ReferentialAction.Cascade); - table.ForeignKey( - name: "FK_TimelineMembers_users_user", - column: x => x.user, - principalTable: "users", - principalColumn: "id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateIndex( - name: "IX_timeline_posts_author", - table: "timeline_posts", - column: "author"); - - migrationBuilder.CreateIndex( - name: "IX_timeline_posts_timeline", - table: "timeline_posts", - column: "timeline"); - - migrationBuilder.CreateIndex( - name: "IX_TimelineMembers_timeline", - table: "TimelineMembers", - column: "timeline"); - - migrationBuilder.CreateIndex( - name: "IX_TimelineMembers_user", - table: "TimelineMembers", - column: "user"); - - migrationBuilder.CreateIndex( - name: "IX_timelines_owner", - table: "timelines", - column: "owner"); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "timeline_posts"); - - migrationBuilder.DropTable( - name: "TimelineMembers"); - - migrationBuilder.DropTable( - name: "timelines"); - - migrationBuilder.AlterColumn( - name: "roles", - table: "users", - type: "longtext", - nullable: false, - oldClrType: typeof(string)); - - migrationBuilder.AlterColumn( - name: "name", - table: "users", - type: "varchar(26)", - maxLength: 26, - nullable: false, - oldClrType: typeof(string), - oldMaxLength: 26); - - migrationBuilder.AlterColumn( - name: "password", - table: "users", - type: "longtext", - nullable: false, - oldClrType: typeof(string)); - - migrationBuilder.AlterColumn( - name: "nickname", - table: "user_details", - type: "varchar(26)", - maxLength: 26, - nullable: true, - oldClrType: typeof(string), - oldMaxLength: 26, - oldNullable: true); - - migrationBuilder.AlterColumn( - name: "type", - table: "user_avatars", - type: "longtext", - nullable: true, - oldClrType: typeof(string), - oldNullable: true); - - migrationBuilder.AlterColumn( - name: "etag", - table: "user_avatars", - type: "varchar(30)", - maxLength: 30, - nullable: true, - oldClrType: typeof(string), - oldMaxLength: 30, - oldNullable: true); - } - } -} diff --git a/Timeline/Migrations/ProductionDatabase/20200105151839_RenameTimelineMember.Designer.cs b/Timeline/Migrations/ProductionDatabase/20200105151839_RenameTimelineMember.Designer.cs deleted file mode 100644 index 356406fa..00000000 --- a/Timeline/Migrations/ProductionDatabase/20200105151839_RenameTimelineMember.Designer.cs +++ /dev/null @@ -1,270 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Timeline.Entities; - -namespace Timeline.Migrations.ProductionDatabase -{ - [DbContext(typeof(ProductionDatabaseContext))] - [Migration("20200105151839_RenameTimelineMember")] - partial class RenameTimelineMember - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "3.1.0") - .HasAnnotation("Relational:MaxIdentifierLength", 64); - - modelBuilder.Entity("Timeline.Entities.TimelineEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("bigint"); - - b.Property("CreateTime") - .HasColumnName("create_time") - .HasColumnType("datetime(6)"); - - b.Property("Description") - .HasColumnName("description") - .HasColumnType("longtext CHARACTER SET utf8mb4"); - - b.Property("Name") - .HasColumnName("name") - .HasColumnType("longtext CHARACTER SET utf8mb4"); - - b.Property("OwnerId") - .HasColumnName("owner") - .HasColumnType("bigint"); - - b.Property("Visibility") - .HasColumnName("visibility") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("OwnerId"); - - b.ToTable("timelines"); - }); - - modelBuilder.Entity("Timeline.Entities.TimelineMemberEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("bigint"); - - b.Property("TimelineId") - .HasColumnName("timeline") - .HasColumnType("bigint"); - - b.Property("UserId") - .HasColumnName("user") - .HasColumnType("bigint"); - - b.HasKey("Id"); - - b.HasIndex("TimelineId"); - - b.HasIndex("UserId"); - - b.ToTable("timeline_members"); - }); - - modelBuilder.Entity("Timeline.Entities.TimelinePostEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("bigint"); - - b.Property("AuthorId") - .HasColumnName("author") - .HasColumnType("bigint"); - - b.Property("Content") - .HasColumnName("content") - .HasColumnType("longtext CHARACTER SET utf8mb4"); - - b.Property("LastUpdated") - .HasColumnName("last_updated") - .HasColumnType("datetime(6)"); - - b.Property("Time") - .HasColumnName("time") - .HasColumnType("datetime(6)"); - - b.Property("TimelineId") - .HasColumnName("timeline") - .HasColumnType("bigint"); - - b.HasKey("Id"); - - b.HasIndex("AuthorId"); - - b.HasIndex("TimelineId"); - - b.ToTable("timeline_posts"); - }); - - modelBuilder.Entity("Timeline.Entities.User", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("bigint"); - - b.Property("EncryptedPassword") - .IsRequired() - .HasColumnName("password") - .HasColumnType("longtext CHARACTER SET utf8mb4"); - - b.Property("Name") - .IsRequired() - .HasColumnName("name") - .HasColumnType("varchar(26) CHARACTER SET utf8mb4") - .HasMaxLength(26); - - b.Property("RoleString") - .IsRequired() - .HasColumnName("roles") - .HasColumnType("longtext CHARACTER SET utf8mb4"); - - b.Property("Version") - .ValueGeneratedOnAdd() - .HasColumnName("version") - .HasColumnType("bigint") - .HasDefaultValue(0L); - - b.HasKey("Id"); - - b.HasIndex("Name") - .IsUnique(); - - b.ToTable("users"); - }); - - modelBuilder.Entity("Timeline.Entities.UserAvatar", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("bigint"); - - b.Property("Data") - .HasColumnName("data") - .HasColumnType("longblob"); - - b.Property("ETag") - .HasColumnName("etag") - .HasColumnType("varchar(30) CHARACTER SET utf8mb4") - .HasMaxLength(30); - - b.Property("LastModified") - .HasColumnName("last_modified") - .HasColumnType("datetime(6)"); - - b.Property("Type") - .HasColumnName("type") - .HasColumnType("longtext CHARACTER SET utf8mb4"); - - b.Property("UserId") - .HasColumnType("bigint"); - - b.HasKey("Id"); - - b.HasIndex("UserId") - .IsUnique(); - - b.ToTable("user_avatars"); - }); - - modelBuilder.Entity("Timeline.Entities.UserDetail", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("bigint"); - - b.Property("Nickname") - .HasColumnName("nickname") - .HasColumnType("varchar(26) CHARACTER SET utf8mb4") - .HasMaxLength(26); - - b.Property("UserId") - .HasColumnType("bigint"); - - b.HasKey("Id"); - - b.HasIndex("UserId") - .IsUnique(); - - b.ToTable("user_details"); - }); - - modelBuilder.Entity("Timeline.Entities.TimelineEntity", b => - { - b.HasOne("Timeline.Entities.User", "Owner") - .WithMany("Timelines") - .HasForeignKey("OwnerId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Timeline.Entities.TimelineMemberEntity", b => - { - b.HasOne("Timeline.Entities.TimelineEntity", "Timeline") - .WithMany("Members") - .HasForeignKey("TimelineId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Timeline.Entities.User", "User") - .WithMany("TimelinesJoined") - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Timeline.Entities.TimelinePostEntity", b => - { - b.HasOne("Timeline.Entities.User", "Author") - .WithMany("TimelinePosts") - .HasForeignKey("AuthorId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Timeline.Entities.TimelineEntity", "Timeline") - .WithMany("Posts") - .HasForeignKey("TimelineId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Timeline.Entities.UserAvatar", b => - { - b.HasOne("Timeline.Entities.User", null) - .WithOne("Avatar") - .HasForeignKey("Timeline.Entities.UserAvatar", "UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Timeline.Entities.UserDetail", b => - { - b.HasOne("Timeline.Entities.User", null) - .WithOne("Detail") - .HasForeignKey("Timeline.Entities.UserDetail", "UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/Timeline/Migrations/ProductionDatabase/20200105151839_RenameTimelineMember.cs b/Timeline/Migrations/ProductionDatabase/20200105151839_RenameTimelineMember.cs deleted file mode 100644 index 8aef42d7..00000000 --- a/Timeline/Migrations/ProductionDatabase/20200105151839_RenameTimelineMember.cs +++ /dev/null @@ -1,107 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -namespace Timeline.Migrations.ProductionDatabase -{ - public partial class RenameTimelineMember : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropForeignKey( - name: "FK_TimelineMembers_timelines_timeline", - table: "TimelineMembers"); - - migrationBuilder.DropForeignKey( - name: "FK_TimelineMembers_users_user", - table: "TimelineMembers"); - - migrationBuilder.DropPrimaryKey( - name: "PK_TimelineMembers", - table: "TimelineMembers"); - - migrationBuilder.RenameTable( - name: "TimelineMembers", - newName: "timeline_members"); - - migrationBuilder.RenameIndex( - name: "IX_TimelineMembers_user", - table: "timeline_members", - newName: "IX_timeline_members_user"); - - migrationBuilder.RenameIndex( - name: "IX_TimelineMembers_timeline", - table: "timeline_members", - newName: "IX_timeline_members_timeline"); - - migrationBuilder.AddPrimaryKey( - name: "PK_timeline_members", - table: "timeline_members", - column: "id"); - - migrationBuilder.AddForeignKey( - name: "FK_timeline_members_timelines_timeline", - table: "timeline_members", - column: "timeline", - principalTable: "timelines", - principalColumn: "id", - onDelete: ReferentialAction.Cascade); - - migrationBuilder.AddForeignKey( - name: "FK_timeline_members_users_user", - table: "timeline_members", - column: "user", - principalTable: "users", - principalColumn: "id", - onDelete: ReferentialAction.Cascade); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropForeignKey( - name: "FK_timeline_members_timelines_timeline", - table: "timeline_members"); - - migrationBuilder.DropForeignKey( - name: "FK_timeline_members_users_user", - table: "timeline_members"); - - migrationBuilder.DropPrimaryKey( - name: "PK_timeline_members", - table: "timeline_members"); - - migrationBuilder.RenameTable( - name: "timeline_members", - newName: "TimelineMembers"); - - migrationBuilder.RenameIndex( - name: "IX_timeline_members_user", - table: "TimelineMembers", - newName: "IX_TimelineMembers_user"); - - migrationBuilder.RenameIndex( - name: "IX_timeline_members_timeline", - table: "TimelineMembers", - newName: "IX_TimelineMembers_timeline"); - - migrationBuilder.AddPrimaryKey( - name: "PK_TimelineMembers", - table: "TimelineMembers", - column: "id"); - - migrationBuilder.AddForeignKey( - name: "FK_TimelineMembers_timelines_timeline", - table: "TimelineMembers", - column: "timeline", - principalTable: "timelines", - principalColumn: "id", - onDelete: ReferentialAction.Cascade); - - migrationBuilder.AddForeignKey( - name: "FK_TimelineMembers_users_user", - table: "TimelineMembers", - column: "user", - principalTable: "users", - principalColumn: "id", - onDelete: ReferentialAction.Cascade); - } - } -} diff --git a/Timeline/Migrations/ProductionDatabase/20200131152033_RefactorUser.Designer.cs b/Timeline/Migrations/ProductionDatabase/20200131152033_RefactorUser.Designer.cs deleted file mode 100644 index bb0bb5af..00000000 --- a/Timeline/Migrations/ProductionDatabase/20200131152033_RefactorUser.Designer.cs +++ /dev/null @@ -1,244 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Timeline.Entities; - -namespace Timeline.Migrations.ProductionDatabase -{ - [DbContext(typeof(ProductionDatabaseContext))] - [Migration("20200131152033_RefactorUser")] - partial class RefactorUser - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "3.1.1") - .HasAnnotation("Relational:MaxIdentifierLength", 64); - - modelBuilder.Entity("Timeline.Entities.TimelineEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("bigint"); - - b.Property("CreateTime") - .HasColumnName("create_time") - .HasColumnType("datetime(6)"); - - b.Property("Description") - .HasColumnName("description") - .HasColumnType("longtext CHARACTER SET utf8mb4"); - - b.Property("Name") - .HasColumnName("name") - .HasColumnType("longtext CHARACTER SET utf8mb4"); - - b.Property("OwnerId") - .HasColumnName("owner") - .HasColumnType("bigint"); - - b.Property("Visibility") - .HasColumnName("visibility") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("OwnerId"); - - b.ToTable("timelines"); - }); - - modelBuilder.Entity("Timeline.Entities.TimelineMemberEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("bigint"); - - b.Property("TimelineId") - .HasColumnName("timeline") - .HasColumnType("bigint"); - - b.Property("UserId") - .HasColumnName("user") - .HasColumnType("bigint"); - - b.HasKey("Id"); - - b.HasIndex("TimelineId"); - - b.HasIndex("UserId"); - - b.ToTable("timeline_members"); - }); - - modelBuilder.Entity("Timeline.Entities.TimelinePostEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("bigint"); - - b.Property("AuthorId") - .HasColumnName("author") - .HasColumnType("bigint"); - - b.Property("Content") - .HasColumnName("content") - .HasColumnType("longtext CHARACTER SET utf8mb4"); - - b.Property("LastUpdated") - .HasColumnName("last_updated") - .HasColumnType("datetime(6)"); - - b.Property("Time") - .HasColumnName("time") - .HasColumnType("datetime(6)"); - - b.Property("TimelineId") - .HasColumnName("timeline") - .HasColumnType("bigint"); - - b.HasKey("Id"); - - b.HasIndex("AuthorId"); - - b.HasIndex("TimelineId"); - - b.ToTable("timeline_posts"); - }); - - modelBuilder.Entity("Timeline.Entities.UserAvatarEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("bigint"); - - b.Property("Data") - .HasColumnName("data") - .HasColumnType("longblob"); - - b.Property("ETag") - .HasColumnName("etag") - .HasColumnType("varchar(30) CHARACTER SET utf8mb4") - .HasMaxLength(30); - - b.Property("LastModified") - .HasColumnName("last_modified") - .HasColumnType("datetime(6)"); - - b.Property("Type") - .HasColumnName("type") - .HasColumnType("longtext CHARACTER SET utf8mb4"); - - b.Property("UserId") - .HasColumnName("user") - .HasColumnType("bigint"); - - b.HasKey("Id"); - - b.HasIndex("UserId") - .IsUnique(); - - b.ToTable("user_avatars"); - }); - - modelBuilder.Entity("Timeline.Entities.UserEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("bigint"); - - b.Property("Nickname") - .HasColumnName("nickname") - .HasColumnType("varchar(100) CHARACTER SET utf8mb4") - .HasMaxLength(100); - - b.Property("Password") - .IsRequired() - .HasColumnName("password") - .HasColumnType("longtext CHARACTER SET utf8mb4"); - - b.Property("Roles") - .IsRequired() - .HasColumnName("roles") - .HasColumnType("longtext CHARACTER SET utf8mb4"); - - b.Property("Username") - .IsRequired() - .HasColumnName("username") - .HasColumnType("varchar(26) CHARACTER SET utf8mb4") - .HasMaxLength(26); - - b.Property("Version") - .ValueGeneratedOnAdd() - .HasColumnName("version") - .HasColumnType("bigint") - .HasDefaultValue(0L); - - b.HasKey("Id"); - - b.HasIndex("Username") - .IsUnique(); - - b.ToTable("users"); - }); - - modelBuilder.Entity("Timeline.Entities.TimelineEntity", b => - { - b.HasOne("Timeline.Entities.UserEntity", "Owner") - .WithMany("Timelines") - .HasForeignKey("OwnerId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Timeline.Entities.TimelineMemberEntity", b => - { - b.HasOne("Timeline.Entities.TimelineEntity", "Timeline") - .WithMany("Members") - .HasForeignKey("TimelineId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Timeline.Entities.UserEntity", "User") - .WithMany("TimelinesJoined") - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Timeline.Entities.TimelinePostEntity", b => - { - b.HasOne("Timeline.Entities.UserEntity", "Author") - .WithMany("TimelinePosts") - .HasForeignKey("AuthorId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Timeline.Entities.TimelineEntity", "Timeline") - .WithMany("Posts") - .HasForeignKey("TimelineId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Timeline.Entities.UserAvatarEntity", b => - { - b.HasOne("Timeline.Entities.UserEntity", "User") - .WithOne("Avatar") - .HasForeignKey("Timeline.Entities.UserAvatarEntity", "UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/Timeline/Migrations/ProductionDatabase/20200131152033_RefactorUser.cs b/Timeline/Migrations/ProductionDatabase/20200131152033_RefactorUser.cs deleted file mode 100644 index a0ca5212..00000000 --- a/Timeline/Migrations/ProductionDatabase/20200131152033_RefactorUser.cs +++ /dev/null @@ -1,55 +0,0 @@ -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace Timeline.Migrations.ProductionDatabase -{ - public partial class RefactorUser : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.Sql(@" -START TRANSACTION; - -ALTER TABLE `users` - CHANGE COLUMN `name` `username` varchar (26) NOT NULL, - RENAME INDEX IX_users_name TO IX_users_username, - ADD `nickname` varchar(100) CHARACTER SET utf8mb4 NULL; - -UPDATE users - SET nickname = ( - SELECT nickname - FROM user_details - WHERE user_details.UserId = users.id - ); - -ALTER TABLE `user_avatars` - CHANGE COLUMN `UserId` `user` bigint (20) NOT NULL, - RENAME INDEX IX_user_avatars_UserId TO IX_user_avatars_user, - DROP FOREIGN KEY FK_user_avatars_users_UserId, - ADD CONSTRAINT FK_user_avatars_users_user FOREIGN KEY (`user`) REFERENCES `users` (`id`) ON DELETE CASCADE; - -COMMIT; - "); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.Sql(@" -START TRANSACTION; - -ALTER TABLE `users` - CHANGE COLUMN `username` `name` varchar (26) NOT NULL, - RENAME INDEX IX_users_username TO IX_users_name, - DROP COLUMN `nickname`; - -ALTER TABLE `user_avatars` - CHANGE COLUMN `user` `UserId` bigint (20) NOT NULL, - RENAME INDEX IX_user_avatars_user TO IX_user_avatars_UserId, - DROP FOREIGN KEY FK_user_avatars_users_user, - ADD CONSTRAINT FK_user_avatars_users_UserId FOREIGN KEY (`UserId`) REFERENCES `users` (`id`) ON DELETE CASCADE; - -COMMIT; - "); - } - } -} diff --git a/Timeline/Migrations/ProductionDatabase/ProductionDatabaseContextModelSnapshot.cs b/Timeline/Migrations/ProductionDatabase/ProductionDatabaseContextModelSnapshot.cs deleted file mode 100644 index bfc9b768..00000000 --- a/Timeline/Migrations/ProductionDatabase/ProductionDatabaseContextModelSnapshot.cs +++ /dev/null @@ -1,242 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Timeline.Entities; - -namespace Timeline.Migrations.ProductionDatabase -{ - [DbContext(typeof(ProductionDatabaseContext))] - partial class ProductionDatabaseContextModelSnapshot : ModelSnapshot - { - protected override void BuildModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "3.1.1") - .HasAnnotation("Relational:MaxIdentifierLength", 64); - - modelBuilder.Entity("Timeline.Entities.TimelineEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("bigint"); - - b.Property("CreateTime") - .HasColumnName("create_time") - .HasColumnType("datetime(6)"); - - b.Property("Description") - .HasColumnName("description") - .HasColumnType("longtext CHARACTER SET utf8mb4"); - - b.Property("Name") - .HasColumnName("name") - .HasColumnType("longtext CHARACTER SET utf8mb4"); - - b.Property("OwnerId") - .HasColumnName("owner") - .HasColumnType("bigint"); - - b.Property("Visibility") - .HasColumnName("visibility") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("OwnerId"); - - b.ToTable("timelines"); - }); - - modelBuilder.Entity("Timeline.Entities.TimelineMemberEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("bigint"); - - b.Property("TimelineId") - .HasColumnName("timeline") - .HasColumnType("bigint"); - - b.Property("UserId") - .HasColumnName("user") - .HasColumnType("bigint"); - - b.HasKey("Id"); - - b.HasIndex("TimelineId"); - - b.HasIndex("UserId"); - - b.ToTable("timeline_members"); - }); - - modelBuilder.Entity("Timeline.Entities.TimelinePostEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("bigint"); - - b.Property("AuthorId") - .HasColumnName("author") - .HasColumnType("bigint"); - - b.Property("Content") - .HasColumnName("content") - .HasColumnType("longtext CHARACTER SET utf8mb4"); - - b.Property("LastUpdated") - .HasColumnName("last_updated") - .HasColumnType("datetime(6)"); - - b.Property("Time") - .HasColumnName("time") - .HasColumnType("datetime(6)"); - - b.Property("TimelineId") - .HasColumnName("timeline") - .HasColumnType("bigint"); - - b.HasKey("Id"); - - b.HasIndex("AuthorId"); - - b.HasIndex("TimelineId"); - - b.ToTable("timeline_posts"); - }); - - modelBuilder.Entity("Timeline.Entities.UserAvatarEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("bigint"); - - b.Property("Data") - .HasColumnName("data") - .HasColumnType("longblob"); - - b.Property("ETag") - .HasColumnName("etag") - .HasColumnType("varchar(30) CHARACTER SET utf8mb4") - .HasMaxLength(30); - - b.Property("LastModified") - .HasColumnName("last_modified") - .HasColumnType("datetime(6)"); - - b.Property("Type") - .HasColumnName("type") - .HasColumnType("longtext CHARACTER SET utf8mb4"); - - b.Property("UserId") - .HasColumnName("user") - .HasColumnType("bigint"); - - b.HasKey("Id"); - - b.HasIndex("UserId") - .IsUnique(); - - b.ToTable("user_avatars"); - }); - - modelBuilder.Entity("Timeline.Entities.UserEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id") - .HasColumnType("bigint"); - - b.Property("Nickname") - .HasColumnName("nickname") - .HasColumnType("varchar(100) CHARACTER SET utf8mb4") - .HasMaxLength(100); - - b.Property("Password") - .IsRequired() - .HasColumnName("password") - .HasColumnType("longtext CHARACTER SET utf8mb4"); - - b.Property("Roles") - .IsRequired() - .HasColumnName("roles") - .HasColumnType("longtext CHARACTER SET utf8mb4"); - - b.Property("Username") - .IsRequired() - .HasColumnName("username") - .HasColumnType("varchar(26) CHARACTER SET utf8mb4") - .HasMaxLength(26); - - b.Property("Version") - .ValueGeneratedOnAdd() - .HasColumnName("version") - .HasColumnType("bigint") - .HasDefaultValue(0L); - - b.HasKey("Id"); - - b.HasIndex("Username") - .IsUnique(); - - b.ToTable("users"); - }); - - modelBuilder.Entity("Timeline.Entities.TimelineEntity", b => - { - b.HasOne("Timeline.Entities.UserEntity", "Owner") - .WithMany("Timelines") - .HasForeignKey("OwnerId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Timeline.Entities.TimelineMemberEntity", b => - { - b.HasOne("Timeline.Entities.TimelineEntity", "Timeline") - .WithMany("Members") - .HasForeignKey("TimelineId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Timeline.Entities.UserEntity", "User") - .WithMany("TimelinesJoined") - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Timeline.Entities.TimelinePostEntity", b => - { - b.HasOne("Timeline.Entities.UserEntity", "Author") - .WithMany("TimelinePosts") - .HasForeignKey("AuthorId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Timeline.Entities.TimelineEntity", "Timeline") - .WithMany("Posts") - .HasForeignKey("TimelineId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Timeline.Entities.UserAvatarEntity", b => - { - b.HasOne("Timeline.Entities.UserEntity", "User") - .WithOne("Avatar") - .HasForeignKey("Timeline.Entities.UserAvatarEntity", "UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/Timeline/Program.cs b/Timeline/Program.cs index b44aafde..1a7a723a 100644 --- a/Timeline/Program.cs +++ b/Timeline/Program.cs @@ -1,7 +1,6 @@ using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.FileProviders; using Microsoft.Extensions.Hosting; using System.Resources; @@ -16,8 +15,7 @@ namespace Timeline CreateWebHostBuilder(args) .ConfigureAppConfiguration((context, config) => { - if (context.HostingEnvironment.IsProduction()) - config.AddJsonFile(new PhysicalFileProvider("/etc/webapp/timeline/"), "config.json", true, true); + config.AddEnvironmentVariables("TIMELINE_"); }) .Build().Run(); } diff --git a/Timeline/Properties/launchSettings.json b/Timeline/Properties/launchSettings.json index 2daf38db..3819fe0f 100644 --- a/Timeline/Properties/launchSettings.json +++ b/Timeline/Properties/launchSettings.json @@ -3,7 +3,8 @@ "Timeline": { "commandName": "Project", "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" + "ASPNETCORE_ENVIRONMENT": "Development", + "TIMELINE_WORKDIR": "D:\\timeline-development" } } } diff --git a/Timeline/Services/UserTokenService.cs b/Timeline/Services/UserTokenService.cs index cf7286f4..731eb1db 100644 --- a/Timeline/Services/UserTokenService.cs +++ b/Timeline/Services/UserTokenService.cs @@ -43,13 +43,13 @@ namespace Timeline.Services { private const string VersionClaimType = "timeline_version"; - private readonly IOptionsMonitor _jwtConfig; + private readonly IOptionsMonitor _jwtConfig; private readonly IClock _clock; private readonly JwtSecurityTokenHandler _tokenHandler = new JwtSecurityTokenHandler(); private SymmetricSecurityKey _tokenSecurityKey; - public JwtUserTokenService(IOptionsMonitor jwtConfig, IClock clock) + public JwtUserTokenService(IOptionsMonitor jwtConfig, IClock clock) { _jwtConfig = jwtConfig; _clock = clock; diff --git a/Timeline/Startup.cs b/Timeline/Startup.cs index 2640a061..f305c39d 100644 --- a/Timeline/Startup.cs +++ b/Timeline/Startup.cs @@ -8,9 +8,8 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Hosting; -using Pomelo.EntityFrameworkCore.MySql.Infrastructure; -using Pomelo.EntityFrameworkCore.MySql.Storage; using System; +using System.IO; using System.Text.Json.Serialization; using Timeline.Auth; using Timeline.Configs; @@ -37,6 +36,12 @@ namespace Timeline // This method gets called by the runtime. Use this method to add services to the container. public void ConfigureServices(IServiceCollection services) { + var workDir = Configuration.GetValue("WorkDir"); + if (workDir == null) + { + throw new InvalidOperationException("Please set a work directory first."); + } + services.AddControllers(setup => { setup.InputFormatters.Add(new StringInputFormatter()); @@ -51,7 +56,7 @@ namespace Timeline options.InvalidModelStateResponseFactory = InvalidModelResponseFactory.Factory; }); - services.Configure(Configuration.GetSection(nameof(JwtConfig))); + services.Configure(Configuration.GetSection("Jwt")); services.AddAuthentication(AuthenticationConstants.Scheme) .AddScheme(AuthenticationConstants.Scheme, AuthenticationConstants.DisplayName, o => { }); services.AddAuthorization(); @@ -94,27 +99,11 @@ namespace Timeline services.TryAddSingleton(); - var databaseConfig = Configuration.GetSection(nameof(DatabaseConfig)).Get(); - - if (databaseConfig.UseDevelopment) + var dbConnectionString = $"Data Source={Path.Combine(workDir, "timeline.db")}"; + services.AddDbContext(options => { - services.AddDbContext(options => - { - if (databaseConfig.DevelopmentConnectionString == null) - throw new InvalidOperationException("DatabaseConfig.DevelopmentConnectionString is not set. Please set it as a sqlite connection string."); - options.UseSqlite(databaseConfig.DevelopmentConnectionString); - }); - } - else - { - services.AddDbContext(options => - { - if (databaseConfig.ConnectionString == null) - throw new InvalidOperationException("DatabaseConfig.ConnectionString is not set. Please set it as a mysql connection string."); - options.UseMySql(databaseConfig.ConnectionString, - mySqlOptions => mySqlOptions.ServerVersion(new ServerVersion(new Version(5, 7), ServerType.MySql))); - }); - } + options.UseSqlite(dbConnectionString); + }); } diff --git a/Timeline/Timeline.csproj b/Timeline/Timeline.csproj index a20048a9..e82e80f9 100644 --- a/Timeline/Timeline.csproj +++ b/Timeline/Timeline.csproj @@ -28,8 +28,6 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - diff --git a/Timeline/appsettings.Development.json b/Timeline/appsettings.Development.json index 50eb9256..a2880cbf 100644 --- a/Timeline/appsettings.Development.json +++ b/Timeline/appsettings.Development.json @@ -5,11 +5,5 @@ "System": "Information", "Microsoft": "Information" } - }, - "DatabaseConfig": { - "UseDevelopment": true - }, - "JwtConfig": { - "SigningKey": "this is very very very very very long secret" } } diff --git a/Timeline/appsettings.Production.json b/Timeline/appsettings.Production.json deleted file mode 100644 index 5d3db1bc..00000000 --- a/Timeline/appsettings.Production.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "DatabaseConfig": { - "UseDevelopment": false - } -} diff --git a/Timeline/appsettings.json b/Timeline/appsettings.json index 61491ff5..d55d0597 100644 --- a/Timeline/appsettings.json +++ b/Timeline/appsettings.json @@ -4,9 +4,10 @@ "Default": "Warning" } }, - "JwtConfig": { + "Jwt": { "Issuer": "api.crupest.xyz", - "Audience": "api.crupest.xyz" + "Audience": "api.crupest.xyz", + "SigningKey": "this is very very very very very long secret" }, "Cors": [ "https://www.crupest.xyz", "https://crupest.xyz" ] } -- cgit v1.2.3 From 1d5d0c85e24fe9f30d587dc714f1cd7a233c8073 Mon Sep 17 00:00:00 2001 From: crupest Date: Fri, 21 Feb 2020 15:10:37 +0800 Subject: Move jwt token key from configuration to database and auto generatable. --- Timeline.Tests/Helpers/TestApplication.cs | 6 + Timeline/Configs/JwtConfiguration.cs | 1 - Timeline/Entities/DatabaseContext.cs | 4 +- Timeline/Entities/JwtTokenEntity.cs | 17 ++ .../20200105150407_Initialize.Designer.cs | 2 +- Timeline/Migrations/20200105150407_Initialize.cs | 2 +- .../20200131100517_RefactorUser.Designer.cs | 2 +- Timeline/Migrations/20200131100517_RefactorUser.cs | 2 +- .../20200221064341_AddJwtToken.Designer.cs | 260 +++++++++++++++++++++ Timeline/Migrations/20200221064341_AddJwtToken.cs | 45 ++++ .../Migrations/DatabaseContextModelSnapshot.cs | 21 +- Timeline/Program.cs | 4 - Timeline/Properties/launchSettings.json | 2 +- .../Services/UserTokenService.Designer.cs | 72 ++++++ Timeline/Resources/Services/UserTokenService.resx | 123 ++++++++++ Timeline/Services/PathProvider.cs | 41 ++++ Timeline/Services/UserTokenService.cs | 19 +- Timeline/Startup.cs | 9 +- Timeline/Timeline.csproj | 9 + Timeline/appsettings.json | 1 - 20 files changed, 615 insertions(+), 27 deletions(-) create mode 100644 Timeline/Entities/JwtTokenEntity.cs create mode 100644 Timeline/Migrations/20200221064341_AddJwtToken.Designer.cs create mode 100644 Timeline/Migrations/20200221064341_AddJwtToken.cs create mode 100644 Timeline/Resources/Services/UserTokenService.Designer.cs create mode 100644 Timeline/Resources/Services/UserTokenService.resx create mode 100644 Timeline/Services/PathProvider.cs diff --git a/Timeline.Tests/Helpers/TestApplication.cs b/Timeline.Tests/Helpers/TestApplication.cs index 5fbc2fb0..52c2f2e2 100644 --- a/Timeline.Tests/Helpers/TestApplication.cs +++ b/Timeline.Tests/Helpers/TestApplication.cs @@ -7,6 +7,7 @@ using System; using System.Collections.Generic; using System.IO; using Timeline.Entities; +using Timeline.Migrations; namespace Timeline.Tests.Helpers { @@ -33,6 +34,11 @@ namespace Timeline.Tests.Helpers using (var context = new DatabaseContext(options)) { context.Database.EnsureCreated(); + context.JwtToken.Add(new JwtTokenEntity + { + Key = JwtTokenGenerateHelper.GenerateKey() + }); + context.SaveChanges(); } Factory = factory.WithWebHostBuilder(builder => diff --git a/Timeline/Configs/JwtConfiguration.cs b/Timeline/Configs/JwtConfiguration.cs index fc27f4ee..af8052de 100644 --- a/Timeline/Configs/JwtConfiguration.cs +++ b/Timeline/Configs/JwtConfiguration.cs @@ -4,7 +4,6 @@ { public string Issuer { get; set; } = default!; public string Audience { get; set; } = default!; - public string SigningKey { get; set; } = default!; /// /// Set the default value of expire offset of jwt token. diff --git a/Timeline/Entities/DatabaseContext.cs b/Timeline/Entities/DatabaseContext.cs index 18e3e660..039cbd51 100644 --- a/Timeline/Entities/DatabaseContext.cs +++ b/Timeline/Entities/DatabaseContext.cs @@ -4,10 +4,9 @@ namespace Timeline.Entities { public class DatabaseContext : DbContext { - public DatabaseContext(DbContextOptions options) + public DatabaseContext(DbContextOptions options) : base(options) { - } protected override void OnModelCreating(ModelBuilder modelBuilder) @@ -21,5 +20,6 @@ namespace Timeline.Entities public DbSet Timelines { get; set; } = default!; public DbSet TimelinePosts { get; set; } = default!; public DbSet TimelineMembers { get; set; } = default!; + public DbSet JwtToken { get; set; } = default!; } } diff --git a/Timeline/Entities/JwtTokenEntity.cs b/Timeline/Entities/JwtTokenEntity.cs new file mode 100644 index 00000000..40cb230a --- /dev/null +++ b/Timeline/Entities/JwtTokenEntity.cs @@ -0,0 +1,17 @@ +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Timeline.Entities +{ + [Table("jwt_token")] + public class JwtTokenEntity + { + [Column("id"), Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)] + public long Id { get; set; } + + [Required, Column("key")] +#pragma warning disable CA1819 // Properties should not return arrays + public byte[] Key { get; set; } = default!; +#pragma warning restore CA1819 // Properties should not return arrays + } +} diff --git a/Timeline/Migrations/20200105150407_Initialize.Designer.cs b/Timeline/Migrations/20200105150407_Initialize.Designer.cs index 5594262a..ca93fcb3 100644 --- a/Timeline/Migrations/20200105150407_Initialize.Designer.cs +++ b/Timeline/Migrations/20200105150407_Initialize.Designer.cs @@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Timeline.Entities; -namespace Timeline.Migrations.DevelopmentDatabase +namespace Timeline.Migrations { [DbContext(typeof(DatabaseContext))] [Migration("20200105150407_Initialize")] diff --git a/Timeline/Migrations/20200105150407_Initialize.cs b/Timeline/Migrations/20200105150407_Initialize.cs index c6efaa4b..2881ee64 100644 --- a/Timeline/Migrations/20200105150407_Initialize.cs +++ b/Timeline/Migrations/20200105150407_Initialize.cs @@ -1,7 +1,7 @@ using System; using Microsoft.EntityFrameworkCore.Migrations; -namespace Timeline.Migrations.DevelopmentDatabase +namespace Timeline.Migrations { public partial class Initialize : Migration { diff --git a/Timeline/Migrations/20200131100517_RefactorUser.Designer.cs b/Timeline/Migrations/20200131100517_RefactorUser.Designer.cs index f494810a..fb5e8a30 100644 --- a/Timeline/Migrations/20200131100517_RefactorUser.Designer.cs +++ b/Timeline/Migrations/20200131100517_RefactorUser.Designer.cs @@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Timeline.Entities; -namespace Timeline.Migrations.DevelopmentDatabase +namespace Timeline.Migrations { [DbContext(typeof(DatabaseContext))] [Migration("20200131100517_RefactorUser")] diff --git a/Timeline/Migrations/20200131100517_RefactorUser.cs b/Timeline/Migrations/20200131100517_RefactorUser.cs index ade65eb1..533f4bc4 100644 --- a/Timeline/Migrations/20200131100517_RefactorUser.cs +++ b/Timeline/Migrations/20200131100517_RefactorUser.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace Timeline.Migrations.DevelopmentDatabase +namespace Timeline.Migrations { public partial class RefactorUser : Migration { diff --git a/Timeline/Migrations/20200221064341_AddJwtToken.Designer.cs b/Timeline/Migrations/20200221064341_AddJwtToken.Designer.cs new file mode 100644 index 00000000..56596249 --- /dev/null +++ b/Timeline/Migrations/20200221064341_AddJwtToken.Designer.cs @@ -0,0 +1,260 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Timeline.Entities; + +namespace Timeline.Migrations +{ + [DbContext(typeof(DatabaseContext))] + [Migration("20200221064341_AddJwtToken")] + partial class AddJwtToken + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "3.1.2"); + + modelBuilder.Entity("Timeline.Entities.JwtTokenEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("INTEGER"); + + b.Property("Token") + .IsRequired() + .HasColumnName("token") + .HasColumnType("BLOB"); + + b.HasKey("Id"); + + b.ToTable("jwt_token"); + }); + + modelBuilder.Entity("Timeline.Entities.TimelineEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("INTEGER"); + + b.Property("CreateTime") + .HasColumnName("create_time") + .HasColumnType("TEXT"); + + b.Property("Description") + .HasColumnName("description") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnName("name") + .HasColumnType("TEXT"); + + b.Property("OwnerId") + .HasColumnName("owner") + .HasColumnType("INTEGER"); + + b.Property("Visibility") + .HasColumnName("visibility") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("OwnerId"); + + b.ToTable("timelines"); + }); + + modelBuilder.Entity("Timeline.Entities.TimelineMemberEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("INTEGER"); + + b.Property("TimelineId") + .HasColumnName("timeline") + .HasColumnType("INTEGER"); + + b.Property("UserId") + .HasColumnName("user") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("TimelineId"); + + b.HasIndex("UserId"); + + b.ToTable("timeline_members"); + }); + + modelBuilder.Entity("Timeline.Entities.TimelinePostEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("INTEGER"); + + b.Property("AuthorId") + .HasColumnName("author") + .HasColumnType("INTEGER"); + + b.Property("Content") + .HasColumnName("content") + .HasColumnType("TEXT"); + + b.Property("LastUpdated") + .HasColumnName("last_updated") + .HasColumnType("TEXT"); + + b.Property("Time") + .HasColumnName("time") + .HasColumnType("TEXT"); + + b.Property("TimelineId") + .HasColumnName("timeline") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AuthorId"); + + b.HasIndex("TimelineId"); + + b.ToTable("timeline_posts"); + }); + + modelBuilder.Entity("Timeline.Entities.UserAvatarEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("INTEGER"); + + b.Property("Data") + .HasColumnName("data") + .HasColumnType("BLOB"); + + b.Property("ETag") + .HasColumnName("etag") + .HasColumnType("TEXT") + .HasMaxLength(30); + + b.Property("LastModified") + .HasColumnName("last_modified") + .HasColumnType("TEXT"); + + b.Property("Type") + .HasColumnName("type") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnName("user") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("user_avatars"); + }); + + modelBuilder.Entity("Timeline.Entities.UserEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("INTEGER"); + + b.Property("Nickname") + .HasColumnName("nickname") + .HasColumnType("TEXT") + .HasMaxLength(100); + + b.Property("Password") + .IsRequired() + .HasColumnName("password") + .HasColumnType("TEXT"); + + b.Property("Roles") + .IsRequired() + .HasColumnName("roles") + .HasColumnType("TEXT"); + + b.Property("Username") + .IsRequired() + .HasColumnName("username") + .HasColumnType("TEXT") + .HasMaxLength(26); + + b.Property("Version") + .ValueGeneratedOnAdd() + .HasColumnName("version") + .HasColumnType("INTEGER") + .HasDefaultValue(0L); + + b.HasKey("Id"); + + b.HasIndex("Username") + .IsUnique(); + + b.ToTable("users"); + }); + + modelBuilder.Entity("Timeline.Entities.TimelineEntity", b => + { + b.HasOne("Timeline.Entities.UserEntity", "Owner") + .WithMany("Timelines") + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Timeline.Entities.TimelineMemberEntity", b => + { + b.HasOne("Timeline.Entities.TimelineEntity", "Timeline") + .WithMany("Members") + .HasForeignKey("TimelineId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Timeline.Entities.UserEntity", "User") + .WithMany("TimelinesJoined") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Timeline.Entities.TimelinePostEntity", b => + { + b.HasOne("Timeline.Entities.UserEntity", "Author") + .WithMany("TimelinePosts") + .HasForeignKey("AuthorId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Timeline.Entities.TimelineEntity", "Timeline") + .WithMany("Posts") + .HasForeignKey("TimelineId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Timeline.Entities.UserAvatarEntity", b => + { + b.HasOne("Timeline.Entities.UserEntity", "User") + .WithOne("Avatar") + .HasForeignKey("Timeline.Entities.UserAvatarEntity", "UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Timeline/Migrations/20200221064341_AddJwtToken.cs b/Timeline/Migrations/20200221064341_AddJwtToken.cs new file mode 100644 index 00000000..628970c6 --- /dev/null +++ b/Timeline/Migrations/20200221064341_AddJwtToken.cs @@ -0,0 +1,45 @@ +using System; +using System.Security.Cryptography; +using Microsoft.EntityFrameworkCore.Migrations; + +namespace Timeline.Migrations +{ + public static class JwtTokenGenerateHelper + { + public static byte[] GenerateKey() + { + using var random = RandomNumberGenerator.Create(); + var key = new byte[16]; + random.GetBytes(key); + return key; + } + } + + public partial class AddJwtToken : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "jwt_token", + columns: table => new + { + id = table.Column(nullable: false) + .Annotation("Sqlite:Autoincrement", true), + key = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_jwt_token", x => x.id); + }); + + + migrationBuilder.InsertData("jwt_token", "key", JwtTokenGenerateHelper.GenerateKey()); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "jwt_token"); + } + } +} diff --git a/Timeline/Migrations/DatabaseContextModelSnapshot.cs b/Timeline/Migrations/DatabaseContextModelSnapshot.cs index e635a1b1..d5f9c0e4 100644 --- a/Timeline/Migrations/DatabaseContextModelSnapshot.cs +++ b/Timeline/Migrations/DatabaseContextModelSnapshot.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Timeline.Entities; -namespace Timeline.Migrations.DevelopmentDatabase +namespace Timeline.Migrations { [DbContext(typeof(DatabaseContext))] partial class DatabaseContextModelSnapshot : ModelSnapshot @@ -14,7 +14,24 @@ namespace Timeline.Migrations.DevelopmentDatabase { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "3.1.1"); + .HasAnnotation("ProductVersion", "3.1.2"); + + modelBuilder.Entity("Timeline.Entities.JwtTokenEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("INTEGER"); + + b.Property("Token") + .IsRequired() + .HasColumnName("token") + .HasColumnType("BLOB"); + + b.HasKey("Id"); + + b.ToTable("jwt_token"); + }); modelBuilder.Entity("Timeline.Entities.TimelineEntity", b => { diff --git a/Timeline/Program.cs b/Timeline/Program.cs index 1a7a723a..125fccbc 100644 --- a/Timeline/Program.cs +++ b/Timeline/Program.cs @@ -13,10 +13,6 @@ namespace Timeline public static void Main(string[] args) { CreateWebHostBuilder(args) - .ConfigureAppConfiguration((context, config) => - { - config.AddEnvironmentVariables("TIMELINE_"); - }) .Build().Run(); } diff --git a/Timeline/Properties/launchSettings.json b/Timeline/Properties/launchSettings.json index 3819fe0f..4bae443c 100644 --- a/Timeline/Properties/launchSettings.json +++ b/Timeline/Properties/launchSettings.json @@ -4,7 +4,7 @@ "commandName": "Project", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development", - "TIMELINE_WORKDIR": "D:\\timeline-development" + "ASPNETCORE_WORKDIR": "D:\\timeline-development" } } } diff --git a/Timeline/Resources/Services/UserTokenService.Designer.cs b/Timeline/Resources/Services/UserTokenService.Designer.cs new file mode 100644 index 00000000..3c3c7e41 --- /dev/null +++ b/Timeline/Resources/Services/UserTokenService.Designer.cs @@ -0,0 +1,72 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Timeline.Resources.Services { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class UserTokenService { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal UserTokenService() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Timeline.Resources.Services.UserTokenService", typeof(UserTokenService).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized string similar to Jwt token key is not set in database. Maybe you forget to migrate the database.. + /// + internal static string JwtKeyNotExist { + get { + return ResourceManager.GetString("JwtKeyNotExist", resourceCulture); + } + } + } +} diff --git a/Timeline/Resources/Services/UserTokenService.resx b/Timeline/Resources/Services/UserTokenService.resx new file mode 100644 index 00000000..1ce78427 --- /dev/null +++ b/Timeline/Resources/Services/UserTokenService.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Jwt token key is not set in database. Maybe you forget to migrate the database. + + \ No newline at end of file diff --git a/Timeline/Services/PathProvider.cs b/Timeline/Services/PathProvider.cs new file mode 100644 index 00000000..15e66972 --- /dev/null +++ b/Timeline/Services/PathProvider.cs @@ -0,0 +1,41 @@ +using Microsoft.Extensions.Configuration; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Threading.Tasks; + +namespace Timeline.Services +{ + public interface IPathProvider + { + public string GetWorkingDirectory(); + public string GetDatabaseFilePath(); + } + + public class PathProvider : IPathProvider + { + const string DatabaseFileName = "timeline.db"; + + private readonly IConfiguration _configuration; + + private readonly string _workingDirectory; + + + public PathProvider(IConfiguration configuration) + { + _configuration = configuration; + _workingDirectory = configuration.GetValue("WorkDir"); + } + + public string GetWorkingDirectory() + { + return _workingDirectory; + } + + public string GetDatabaseFilePath() + { + return Path.Combine(_workingDirectory, DatabaseFileName); + } + } +} diff --git a/Timeline/Services/UserTokenService.cs b/Timeline/Services/UserTokenService.cs index 731eb1db..86f3a0f7 100644 --- a/Timeline/Services/UserTokenService.cs +++ b/Timeline/Services/UserTokenService.cs @@ -3,9 +3,10 @@ using Microsoft.IdentityModel.Tokens; using System; using System.Globalization; using System.IdentityModel.Tokens.Jwt; +using System.Linq; using System.Security.Claims; -using System.Text; using Timeline.Configs; +using Timeline.Entities; namespace Timeline.Services { @@ -49,16 +50,19 @@ namespace Timeline.Services private readonly JwtSecurityTokenHandler _tokenHandler = new JwtSecurityTokenHandler(); private SymmetricSecurityKey _tokenSecurityKey; - public JwtUserTokenService(IOptionsMonitor jwtConfig, IClock clock) + public JwtUserTokenService(IOptionsMonitor jwtConfig, IClock clock, DatabaseContext database) { _jwtConfig = jwtConfig; _clock = clock; - _tokenSecurityKey = new SymmetricSecurityKey(Encoding.ASCII.GetBytes(jwtConfig.CurrentValue.SigningKey)); - jwtConfig.OnChange(config => + var key = database.JwtToken.Select(t => t.Key).SingleOrDefault(); + + if (key == null) { - _tokenSecurityKey = new SymmetricSecurityKey(Encoding.ASCII.GetBytes(config.SigningKey)); - }); + throw new InvalidOperationException(Resources.Services.UserTokenService.JwtKeyNotExist); + } + + _tokenSecurityKey = new SymmetricSecurityKey(key); } public string GenerateToken(UserTokenInfo tokenInfo) @@ -77,8 +81,7 @@ namespace Timeline.Services Subject = identity, Issuer = config.Issuer, Audience = config.Audience, - SigningCredentials = new SigningCredentials( - new SymmetricSecurityKey(Encoding.ASCII.GetBytes(config.SigningKey)), SecurityAlgorithms.HmacSha384), + SigningCredentials = new SigningCredentials(_tokenSecurityKey, SecurityAlgorithms.HmacSha384), IssuedAt = _clock.GetCurrentTime(), Expires = tokenInfo.ExpireAt.GetValueOrDefault(_clock.GetCurrentTime().AddSeconds(config.DefaultExpireOffset)), NotBefore = _clock.GetCurrentTime() // I must explicitly set this or it will use the current time by default and mock is not work in which case test will not pass. diff --git a/Timeline/Startup.cs b/Timeline/Startup.cs index f305c39d..14bd14cc 100644 --- a/Timeline/Startup.cs +++ b/Timeline/Startup.cs @@ -9,7 +9,6 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Hosting; using System; -using System.IO; using System.Text.Json.Serialization; using Timeline.Auth; using Timeline.Configs; @@ -84,6 +83,8 @@ namespace Timeline }); } + services.AddScoped(); + services.AddAutoMapper(GetType().Assembly); services.AddTransient(); @@ -99,10 +100,10 @@ namespace Timeline services.TryAddSingleton(); - var dbConnectionString = $"Data Source={Path.Combine(workDir, "timeline.db")}"; - services.AddDbContext(options => + services.AddDbContext((services, options )=> { - options.UseSqlite(dbConnectionString); + var pathProvider = services.GetRequiredService(); + options.UseSqlite($"Data Source={pathProvider.GetDatabaseFilePath()}"); }); } diff --git a/Timeline/Timeline.csproj b/Timeline/Timeline.csproj index e82e80f9..2dcc3c9f 100644 --- a/Timeline/Timeline.csproj +++ b/Timeline/Timeline.csproj @@ -117,6 +117,11 @@ True UserService.resx + + True + True + UserTokenService.resx + @@ -185,5 +190,9 @@ ResXFileCodeGenerator UserService.Designer.cs + + ResXFileCodeGenerator + UserTokenService.Designer.cs + diff --git a/Timeline/appsettings.json b/Timeline/appsettings.json index d55d0597..09840cd6 100644 --- a/Timeline/appsettings.json +++ b/Timeline/appsettings.json @@ -7,7 +7,6 @@ "Jwt": { "Issuer": "api.crupest.xyz", "Audience": "api.crupest.xyz", - "SigningKey": "this is very very very very very long secret" }, "Cors": [ "https://www.crupest.xyz", "https://crupest.xyz" ] } -- cgit v1.2.3 From 90e5eb7672e58745d1c41c28051375582d22e6ec Mon Sep 17 00:00:00 2001 From: crupest Date: Fri, 21 Feb 2020 19:52:35 +0800 Subject: Migrate at runtime in production environment. --- Timeline/Program.cs | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/Timeline/Program.cs b/Timeline/Program.cs index 125fccbc..c49f74b0 100644 --- a/Timeline/Program.cs +++ b/Timeline/Program.cs @@ -1,8 +1,10 @@ using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using System.Resources; +using Timeline.Entities; [assembly: NeutralResourcesLanguage("en")] @@ -12,8 +14,19 @@ namespace Timeline { public static void Main(string[] args) { - CreateWebHostBuilder(args) - .Build().Run(); + var host = CreateWebHostBuilder(args).Build(); + + var env = host.Services.GetRequiredService(); + if (env.IsProduction()) + { + using (var scope = host.Services.CreateScope()) + { + var databaseContext = scope.ServiceProvider.GetRequiredService(); + databaseContext.Database.Migrate(); + } + } + + host.Run(); } public static IWebHostBuilder CreateWebHostBuilder(string[] args) => -- cgit v1.2.3