Got things compiling

Author: mattbrailsford

src/Our.Umbraco.AuthU/Component/MigrationsRunnerComponent.cs

@@ -5,7 +5,7 @@
 using Umbraco.Core.Migrations.Upgrade;
 using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
-using Our.Umbraco.AuthU.Data.Migrations.Plans;
+using Our.Umbraco.AuthU.Data.Migrations;
 
 namespace Our.Umbraco.AuthU.Component
 {
@@ -32,8 +32,8 @@ public void Initialize()
         {
             try
             {
-                //Create the oAuth tables
-                var upgrader = new Upgrader(new RegisterOAuthTables());
+                var plan = new AuthUMigrationPlan();
+                var upgrader = new Upgrader(plan);
 
                 upgrader.Execute(_scopeProvider, _migrationBuilder, _keyValueService, _logger);
             }
@@ -44,8 +44,6 @@ public void Initialize()
         }
 
         public void Terminate()
-        {
-
-        }
+        { }
     }
 }

src/Our.Umbraco.AuthU/Composer/MigrationRunnerComposer.cs

@@ -7,12 +7,12 @@ namespace Our.Umbraco.AuthU.Composer
     /// <summary>
     /// This class registers components at umbraco start up.
     /// </summary>
-    class MigrationRunnerComposer : IUserComposer
+    internal class MigrationRunnerComposer : IUserComposer
     {
         public void Compose(Composition composition)
         {
-            //Registers the Migrations Runner component, this creates the tables
-            //required for the oAuth stores.
+            // Registers the Migrations Runner component, this creates the tables
+            // required for the oAuth stores.
             composition.Components().Append<MigrationsRunnerComponent>();
         }
     }

src/Our.Umbraco.AuthU/Data/Helpers/AuthUKeyValueHelper.cs

@@ -1,13 +1,13 @@
 using Umbraco.Core.Migrations;
 
-namespace Our.Umbraco.AuthU.Data.Migrations.UmbracoDbOAuthRefreshTokenStore
+namespace Our.Umbraco.AuthU.Data.Migrations
 {
     /// <summary>
     /// Simple migration to create the DeviceId column on the OAuthRefreshToken Table
     /// </summary>
-    internal class AddDeviceIdColumn : MigrationBase
+    internal class AddDeviceIdColumnToOAuthRefreshTokenTable : MigrationBase
     {
-        public AddDeviceIdColumn(IMigrationContext context) : base(context)
+        public AddDeviceIdColumnToOAuthRefreshTokenTable(IMigrationContext context) : base(context)
         { }
 
         public override void Migrate()

…freshTokenStore/Add/AddDeviceIdColumn.cs …eviceIdColumnToOAuthRefreshTokenTable.cssrc/Our.Umbraco.AuthU/Data/Migrations/UmbracoDbOAuthRefreshTokenStore/Add/AddDeviceIdColumn.cs renamed to src/Our.Umbraco.AuthU/Data/Migrations/AddDeviceIdColumnToOAuthRefreshTokenTable.cs src/Our.Umbraco.AuthU/Data/Migrations/UmbracoDbOAuthRefreshTokenStore/Add/AddDeviceIdColumn.cs renamed to src/Our.Umbraco.AuthU/Data/Migrations/AddDeviceIdColumnToOAuthRefreshTokenTable.cs

@@ -0,0 +1,28 @@
+using Umbraco.Core.Migrations;
+
+namespace Our.Umbraco.AuthU.Data.Migrations
+{
+    /// <summary>
+    /// This is the plan that runs the AuthU Migrations
+    /// </summary>
+    internal class AuthUMigrationPlan : MigrationPlan
+    {
+        /// <summary>
+        /// Add the demo id if preferred
+        /// </summary>
+        /// <param name="CreateDemoClient"></param>
+        public AuthUMigrationPlan() : base("AuthU")
+        {
+            From(InitialState)
+                .To<CreateOAuthClientTable>("CreateOAuthClientTable")
+                .To<CreateOAuthRefreshTokenTable>("CreateOAuthRefreshTokenTable")
+                .To<AddDeviceIdColumnToOAuthRefreshTokenTable>("AddDeviceIdColumnToOAuthRefreshTokenTable")
+                .To<CreateDemoOAuthClient>("CreateDemoOAuthClient");
+        }
+
+        /// <summary>
+        /// Using the helper method to get the AuthU Key 'Umbraco.Core.Upgrader.State+AuthU' Value
+        /// </summary>
+        public override string InitialState => string.Empty;
+    }
+}

src/Our.Umbraco.AuthU/Data/Migrations/AuthUMigrationPlan.cs

@@ -1,14 +1,14 @@
 using Our.Umbraco.AuthU.Models;
 using Umbraco.Core.Migrations;
 
-namespace Our.Umbraco.AuthU.Data.Migrations.UmbracoDbOAuthClientStore
+namespace Our.Umbraco.AuthU.Data.Migrations
 {
     /// <summary>
     /// Simple migration to add a demo client to the OAuthClient Table
     /// </summary>
-    internal class CreateDemoClient : MigrationBase
+    internal class CreateDemoOAuthClient : MigrationBase
     {
-        public CreateDemoClient(IMigrationContext context) : base(context)
+        public CreateDemoOAuthClient(IMigrationContext context) : base(context)
         { }
 
         public override void Migrate()

…coDbOAuthClientStore/CreateDemoClient.cs …Data/Migrations/CreateDemoOAuthClient.cssrc/Our.Umbraco.AuthU/Data/Migrations/UmbracoDbOAuthClientStore/CreateDemoClient.cs renamed to src/Our.Umbraco.AuthU/Data/Migrations/CreateDemoOAuthClient.cs src/Our.Umbraco.AuthU/Data/Migrations/UmbracoDbOAuthClientStore/CreateDemoClient.cs renamed to src/Our.Umbraco.AuthU/Data/Migrations/CreateDemoOAuthClient.cs

@@ -1,14 +1,14 @@
 using Our.Umbraco.AuthU.Models;
 using Umbraco.Core.Migrations;
 
-namespace Our.Umbraco.AuthU.Data.Migrations.UmbracoDbOAuthClientStore
+namespace Our.Umbraco.AuthU.Data.Migrations
 {
     /// <summary>
     /// Simple migration to create the OAuthClient Table
     /// </summary>
-    internal class CreateAuthClientStoreTable : MigrationBase
+    internal class CreateOAuthClientTable : MigrationBase
 	{
-		public CreateAuthClientStoreTable(IMigrationContext context) 
+		public CreateOAuthClientTable(IMigrationContext context) 
 			: base(context)
 		{ }
 

…tStore/Add/CreateAuthClientStoreTable.cs …ata/Migrations/CreateOAuthClientTable.cssrc/Our.Umbraco.AuthU/Data/Migrations/UmbracoDbOAuthClientStore/Add/CreateAuthClientStoreTable.cs renamed to src/Our.Umbraco.AuthU/Data/Migrations/CreateOAuthClientTable.cs src/Our.Umbraco.AuthU/Data/Migrations/UmbracoDbOAuthClientStore/Add/CreateAuthClientStoreTable.cs renamed to src/Our.Umbraco.AuthU/Data/Migrations/CreateOAuthClientTable.cs

@@ -1,14 +1,14 @@
 using Our.Umbraco.AuthU.Models;
 using Umbraco.Core.Migrations;
 
-namespace Our.Umbraco.AuthU.Data.Migrations.UmbracoDbOAuthRefreshTokenStore
+namespace Our.Umbraco.AuthU.Data.Migrations
 {
     /// <summary>
     /// Simple migration to create the OAuthRefreshToken Table
     /// </summary>
-    internal class CreateAuthRefreshTokenStoreTable : MigrationBase
+    internal class CreateOAuthRefreshTokenTable : MigrationBase
     {
-        public CreateAuthRefreshTokenStoreTable(IMigrationContext context) : base(context)
+        public CreateOAuthRefreshTokenTable(IMigrationContext context) : base(context)
         { }
 
         public override void Migrate()