From 33e751f0da40915bfeee76fe66193874408232a5 Mon Sep 17 00:00:00 2001 From: "L. Ellenbeck" Date: Tue, 27 Oct 2020 11:24:36 +0100 Subject: [PATCH 1/5] Update: added api token migration coscine/issues#1125 --- src/Migrations/Migrations.csproj | 1 + .../Migration202010271100ApiTokens.cs | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 src/Migrations/Migrations/Migration202010271100ApiTokens.cs diff --git a/src/Migrations/Migrations.csproj b/src/Migrations/Migrations.csproj index 4c94387..113cbd0 100644 --- a/src/Migrations/Migrations.csproj +++ b/src/Migrations/Migrations.csproj @@ -205,6 +205,7 @@ + diff --git a/src/Migrations/Migrations/Migration202010271100ApiTokens.cs b/src/Migrations/Migrations/Migration202010271100ApiTokens.cs new file mode 100644 index 0000000..e92a723 --- /dev/null +++ b/src/Migrations/Migrations/Migration202010271100ApiTokens.cs @@ -0,0 +1,27 @@ +using FluentMigrator; + +namespace Coscine.Migrations.Migrations +{ + //yyyymmddhhmm + [Migration(202010271100)] + public class Migration202010271100ApiTokens : Migration + { + public override void Down() + { + Delete.Table("ApiTokens"); + } + + public override void Up() + { + Create.Table("ApiTokens") + .WithColumn("Id").AsGuid().PrimaryKey().WithDefault(SystemMethods.NewGuid) + .WithColumn("UserId").AsGuid().NotNullable() + .WithColumn("Creation").AsDateTime().NotNullable() + .WithColumn("Expiration").AsDateTime().NotNullable(); + + Create.ForeignKey() + .FromTable("ApiTokens").ForeignColumn("UserId") + .ToTable("Users").PrimaryColumn("Id"); + } + } +} -- GitLab From 6d8764fb078ae9891a3c149ace158f567f0c2dd5 Mon Sep 17 00:00:00 2001 From: "L. Ellenbeck" Date: Tue, 27 Oct 2020 11:48:44 +0100 Subject: [PATCH 2/5] WIP: additonal token column Topic/1125-apiTokens --- src/Migrations.Tests/Properties/AssemblyInfo.cs | 6 +++--- src/Migrations/Migrations/Migration202010271100ApiTokens.cs | 1 + src/Migrations/Properties/AssemblyInfo.cs | 6 +++--- src/Migrator/Properties/AssemblyInfo.cs | 6 +++--- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/Migrations.Tests/Properties/AssemblyInfo.cs b/src/Migrations.Tests/Properties/AssemblyInfo.cs index d8ae53c..2c3f34d 100644 --- a/src/Migrations.Tests/Properties/AssemblyInfo.cs +++ b/src/Migrations.Tests/Properties/AssemblyInfo.cs @@ -9,8 +9,8 @@ using System.Reflection; [assembly: AssemblyDescription("Migrations.Tests is a part of the CoScInE group.")] [assembly: AssemblyCompany("IT Center, RWTH Aachen University")] [assembly: AssemblyProduct("Migrations.Tests")] -[assembly: AssemblyVersion("1.6.3")] -[assembly: AssemblyFileVersion("1.6.3")] -[assembly: AssemblyInformationalVersion("1.6.3-topic-894-automa0010")] +[assembly: AssemblyVersion("1.8.0")] +[assembly: AssemblyFileVersion("1.8.0")] +[assembly: AssemblyInformationalVersion("1.8.0-topic-1125-apito0001")] [assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")] diff --git a/src/Migrations/Migrations/Migration202010271100ApiTokens.cs b/src/Migrations/Migrations/Migration202010271100ApiTokens.cs index e92a723..a87cfc9 100644 --- a/src/Migrations/Migrations/Migration202010271100ApiTokens.cs +++ b/src/Migrations/Migrations/Migration202010271100ApiTokens.cs @@ -15,6 +15,7 @@ namespace Coscine.Migrations.Migrations { Create.Table("ApiTokens") .WithColumn("Id").AsGuid().PrimaryKey().WithDefault(SystemMethods.NewGuid) + .WithColumn("Token").AsString().NotNullable() .WithColumn("UserId").AsGuid().NotNullable() .WithColumn("Creation").AsDateTime().NotNullable() .WithColumn("Expiration").AsDateTime().NotNullable(); diff --git a/src/Migrations/Properties/AssemblyInfo.cs b/src/Migrations/Properties/AssemblyInfo.cs index bb83547..56ed2e1 100644 --- a/src/Migrations/Properties/AssemblyInfo.cs +++ b/src/Migrations/Properties/AssemblyInfo.cs @@ -9,8 +9,8 @@ using System.Reflection; [assembly: AssemblyDescription("Migrations is a part of the CoScInE group.")] [assembly: AssemblyCompany("IT Center, RWTH Aachen University")] [assembly: AssemblyProduct("Migrations")] -[assembly: AssemblyVersion("1.6.3")] -[assembly: AssemblyFileVersion("1.6.3")] -[assembly: AssemblyInformationalVersion("1.6.3-topic-894-automa0010")] +[assembly: AssemblyVersion("1.8.0")] +[assembly: AssemblyFileVersion("1.8.0")] +[assembly: AssemblyInformationalVersion("1.8.0-topic-1125-apito0001")] [assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")] diff --git a/src/Migrator/Properties/AssemblyInfo.cs b/src/Migrator/Properties/AssemblyInfo.cs index 24a23d3..cea3bb9 100644 --- a/src/Migrator/Properties/AssemblyInfo.cs +++ b/src/Migrator/Properties/AssemblyInfo.cs @@ -9,8 +9,8 @@ using System.Reflection; [assembly: AssemblyDescription("Migrator is a part of the CoScInE group.")] [assembly: AssemblyCompany("IT Center, RWTH Aachen University")] [assembly: AssemblyProduct("Migrator")] -[assembly: AssemblyVersion("1.6.3")] -[assembly: AssemblyFileVersion("1.6.3")] -[assembly: AssemblyInformationalVersion("1.6.3-topic-894-automa0010")] +[assembly: AssemblyVersion("1.8.0")] +[assembly: AssemblyFileVersion("1.8.0")] +[assembly: AssemblyInformationalVersion("1.8.0-topic-1125-apito0001")] [assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")] -- GitLab From d5ccb41345e2c622232d4d8f1036c349b30395f4 Mon Sep 17 00:00:00 2001 From: "L. Ellenbeck" Date: Tue, 27 Oct 2020 12:46:40 +0100 Subject: [PATCH 3/5] WIP: added Description column Topic/1125-apiTokens --- src/Migrations.Tests/Properties/AssemblyInfo.cs | 2 +- src/Migrations/Migrations/Migration202010271100ApiTokens.cs | 1 + src/Migrations/Properties/AssemblyInfo.cs | 2 +- src/Migrator/Properties/AssemblyInfo.cs | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Migrations.Tests/Properties/AssemblyInfo.cs b/src/Migrations.Tests/Properties/AssemblyInfo.cs index 2c3f34d..e5f3608 100644 --- a/src/Migrations.Tests/Properties/AssemblyInfo.cs +++ b/src/Migrations.Tests/Properties/AssemblyInfo.cs @@ -11,6 +11,6 @@ using System.Reflection; [assembly: AssemblyProduct("Migrations.Tests")] [assembly: AssemblyVersion("1.8.0")] [assembly: AssemblyFileVersion("1.8.0")] -[assembly: AssemblyInformationalVersion("1.8.0-topic-1125-apito0001")] +[assembly: AssemblyInformationalVersion("1.8.0-topic-1125-apito0002")] [assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")] diff --git a/src/Migrations/Migrations/Migration202010271100ApiTokens.cs b/src/Migrations/Migrations/Migration202010271100ApiTokens.cs index a87cfc9..6c5e48d 100644 --- a/src/Migrations/Migrations/Migration202010271100ApiTokens.cs +++ b/src/Migrations/Migrations/Migration202010271100ApiTokens.cs @@ -16,6 +16,7 @@ namespace Coscine.Migrations.Migrations Create.Table("ApiTokens") .WithColumn("Id").AsGuid().PrimaryKey().WithDefault(SystemMethods.NewGuid) .WithColumn("Token").AsString().NotNullable() + .WithColumn("Description").AsString().NotNullable() .WithColumn("UserId").AsGuid().NotNullable() .WithColumn("Creation").AsDateTime().NotNullable() .WithColumn("Expiration").AsDateTime().NotNullable(); diff --git a/src/Migrations/Properties/AssemblyInfo.cs b/src/Migrations/Properties/AssemblyInfo.cs index 56ed2e1..0449159 100644 --- a/src/Migrations/Properties/AssemblyInfo.cs +++ b/src/Migrations/Properties/AssemblyInfo.cs @@ -11,6 +11,6 @@ using System.Reflection; [assembly: AssemblyProduct("Migrations")] [assembly: AssemblyVersion("1.8.0")] [assembly: AssemblyFileVersion("1.8.0")] -[assembly: AssemblyInformationalVersion("1.8.0-topic-1125-apito0001")] +[assembly: AssemblyInformationalVersion("1.8.0-topic-1125-apito0002")] [assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")] diff --git a/src/Migrator/Properties/AssemblyInfo.cs b/src/Migrator/Properties/AssemblyInfo.cs index cea3bb9..4af106c 100644 --- a/src/Migrator/Properties/AssemblyInfo.cs +++ b/src/Migrator/Properties/AssemblyInfo.cs @@ -11,6 +11,6 @@ using System.Reflection; [assembly: AssemblyProduct("Migrator")] [assembly: AssemblyVersion("1.8.0")] [assembly: AssemblyFileVersion("1.8.0")] -[assembly: AssemblyInformationalVersion("1.8.0-topic-1125-apito0001")] +[assembly: AssemblyInformationalVersion("1.8.0-topic-1125-apito0002")] [assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")] -- GitLab From 7286bad0f14766f25e47cf38304b824dcede7492 Mon Sep 17 00:00:00 2001 From: "L. Ellenbeck" Date: Tue, 3 Nov 2020 11:33:12 +0100 Subject: [PATCH 4/5] WIP: changes to Database coscine/issues#1125 --- src/Migrations.Tests/Properties/AssemblyInfo.cs | 2 +- src/Migrations/Migrations/Migration202010271100ApiTokens.cs | 3 +-- src/Migrations/Properties/AssemblyInfo.cs | 2 +- src/Migrator/Properties/AssemblyInfo.cs | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Migrations.Tests/Properties/AssemblyInfo.cs b/src/Migrations.Tests/Properties/AssemblyInfo.cs index e5f3608..a68ca00 100644 --- a/src/Migrations.Tests/Properties/AssemblyInfo.cs +++ b/src/Migrations.Tests/Properties/AssemblyInfo.cs @@ -11,6 +11,6 @@ using System.Reflection; [assembly: AssemblyProduct("Migrations.Tests")] [assembly: AssemblyVersion("1.8.0")] [assembly: AssemblyFileVersion("1.8.0")] -[assembly: AssemblyInformationalVersion("1.8.0-topic-1125-apito0002")] +[assembly: AssemblyInformationalVersion("1.8.0-topic-1125-apito0003")] [assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")] diff --git a/src/Migrations/Migrations/Migration202010271100ApiTokens.cs b/src/Migrations/Migrations/Migration202010271100ApiTokens.cs index 6c5e48d..fb202c2 100644 --- a/src/Migrations/Migrations/Migration202010271100ApiTokens.cs +++ b/src/Migrations/Migrations/Migration202010271100ApiTokens.cs @@ -15,10 +15,9 @@ namespace Coscine.Migrations.Migrations { Create.Table("ApiTokens") .WithColumn("Id").AsGuid().PrimaryKey().WithDefault(SystemMethods.NewGuid) - .WithColumn("Token").AsString().NotNullable() .WithColumn("Description").AsString().NotNullable() .WithColumn("UserId").AsGuid().NotNullable() - .WithColumn("Creation").AsDateTime().NotNullable() + .WithColumn("IssuedAt").AsDateTime().NotNullable() .WithColumn("Expiration").AsDateTime().NotNullable(); Create.ForeignKey() diff --git a/src/Migrations/Properties/AssemblyInfo.cs b/src/Migrations/Properties/AssemblyInfo.cs index 0449159..c9d926a 100644 --- a/src/Migrations/Properties/AssemblyInfo.cs +++ b/src/Migrations/Properties/AssemblyInfo.cs @@ -11,6 +11,6 @@ using System.Reflection; [assembly: AssemblyProduct("Migrations")] [assembly: AssemblyVersion("1.8.0")] [assembly: AssemblyFileVersion("1.8.0")] -[assembly: AssemblyInformationalVersion("1.8.0-topic-1125-apito0002")] +[assembly: AssemblyInformationalVersion("1.8.0-topic-1125-apito0003")] [assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")] diff --git a/src/Migrator/Properties/AssemblyInfo.cs b/src/Migrator/Properties/AssemblyInfo.cs index 4af106c..4f62033 100644 --- a/src/Migrator/Properties/AssemblyInfo.cs +++ b/src/Migrator/Properties/AssemblyInfo.cs @@ -11,6 +11,6 @@ using System.Reflection; [assembly: AssemblyProduct("Migrator")] [assembly: AssemblyVersion("1.8.0")] [assembly: AssemblyFileVersion("1.8.0")] -[assembly: AssemblyInformationalVersion("1.8.0-topic-1125-apito0002")] +[assembly: AssemblyInformationalVersion("1.8.0-topic-1125-apito0003")] [assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")] -- GitLab From 2cba0fd4532f494f469532aea17749a44186418f Mon Sep 17 00:00:00 2001 From: "L. Ellenbeck" Date: Tue, 3 Nov 2020 12:25:38 +0100 Subject: [PATCH 5/5] WIP: name change coscine/issues#1125 --- src/Migrations.Tests/Properties/AssemblyInfo.cs | 2 +- src/Migrations/Migrations/Migration202010271100ApiTokens.cs | 2 +- src/Migrations/Properties/AssemblyInfo.cs | 2 +- src/Migrator/Properties/AssemblyInfo.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Migrations.Tests/Properties/AssemblyInfo.cs b/src/Migrations.Tests/Properties/AssemblyInfo.cs index a68ca00..60789b8 100644 --- a/src/Migrations.Tests/Properties/AssemblyInfo.cs +++ b/src/Migrations.Tests/Properties/AssemblyInfo.cs @@ -11,6 +11,6 @@ using System.Reflection; [assembly: AssemblyProduct("Migrations.Tests")] [assembly: AssemblyVersion("1.8.0")] [assembly: AssemblyFileVersion("1.8.0")] -[assembly: AssemblyInformationalVersion("1.8.0-topic-1125-apito0003")] +[assembly: AssemblyInformationalVersion("1.8.0-topic-1125-apito0004")] [assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")] diff --git a/src/Migrations/Migrations/Migration202010271100ApiTokens.cs b/src/Migrations/Migrations/Migration202010271100ApiTokens.cs index fb202c2..4da3559 100644 --- a/src/Migrations/Migrations/Migration202010271100ApiTokens.cs +++ b/src/Migrations/Migrations/Migration202010271100ApiTokens.cs @@ -15,7 +15,7 @@ namespace Coscine.Migrations.Migrations { Create.Table("ApiTokens") .WithColumn("Id").AsGuid().PrimaryKey().WithDefault(SystemMethods.NewGuid) - .WithColumn("Description").AsString().NotNullable() + .WithColumn("Name").AsString().NotNullable() .WithColumn("UserId").AsGuid().NotNullable() .WithColumn("IssuedAt").AsDateTime().NotNullable() .WithColumn("Expiration").AsDateTime().NotNullable(); diff --git a/src/Migrations/Properties/AssemblyInfo.cs b/src/Migrations/Properties/AssemblyInfo.cs index c9d926a..97acc53 100644 --- a/src/Migrations/Properties/AssemblyInfo.cs +++ b/src/Migrations/Properties/AssemblyInfo.cs @@ -11,6 +11,6 @@ using System.Reflection; [assembly: AssemblyProduct("Migrations")] [assembly: AssemblyVersion("1.8.0")] [assembly: AssemblyFileVersion("1.8.0")] -[assembly: AssemblyInformationalVersion("1.8.0-topic-1125-apito0003")] +[assembly: AssemblyInformationalVersion("1.8.0-topic-1125-apito0004")] [assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")] diff --git a/src/Migrator/Properties/AssemblyInfo.cs b/src/Migrator/Properties/AssemblyInfo.cs index 4f62033..5355560 100644 --- a/src/Migrator/Properties/AssemblyInfo.cs +++ b/src/Migrator/Properties/AssemblyInfo.cs @@ -11,6 +11,6 @@ using System.Reflection; [assembly: AssemblyProduct("Migrator")] [assembly: AssemblyVersion("1.8.0")] [assembly: AssemblyFileVersion("1.8.0")] -[assembly: AssemblyInformationalVersion("1.8.0-topic-1125-apito0003")] +[assembly: AssemblyInformationalVersion("1.8.0-topic-1125-apito0004")] [assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")] -- GitLab