Merge pull request #38 from marccameron3d/umb8upgrade

Umbraco 8 Update

Author: mattbrailsford

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

@@ -0,0 +1,51 @@
+using System;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Migrations;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Migrations.Upgrade;
+using Umbraco.Core.Scoping;
+using Umbraco.Core.Services;
+using Our.Umbraco.AuthU.Data.Migrations.Plans;
+
+namespace Our.Umbraco.AuthU.Component
+{
+    /// <summary>
+    /// This creates a component we can register as umbraco 8 starts up
+    /// This is done in MigrationRunnerComposer.cs
+    /// </summary>
+    internal class MigrationsRunnerComponent : IComponent
+    {
+        private readonly IScopeProvider _scopeProvider;
+        private readonly IMigrationBuilder _migrationBuilder;
+        private readonly IKeyValueService _keyValueService;
+        private readonly ILogger _logger;
+
+        public MigrationsRunnerComponent(IScopeProvider scopeProvider, IMigrationBuilder migrationBuilder, IKeyValueService keyValueService, ILogger logger)
+        {
+            _scopeProvider = scopeProvider;
+            _migrationBuilder = migrationBuilder;
+            _keyValueService = keyValueService;
+            _logger = logger;
+        }
+
+        public void Initialize()
+        {
+            try
+            {
+                //Create the oAuth tables
+                var upgrader = new Upgrader(new RegisterOAuthTables());
+
+                upgrader.Execute(_scopeProvider, _migrationBuilder, _keyValueService, _logger);
+            }
+            catch (Exception e)
+            {
+                Current.Logger.Error<MigrationsRunnerComponent>($"Error running Migration Planner migration", e);
+            }
+        }
+
+        public void Terminate()
+        {
+
+        }
+    }
+}

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

@@ -0,0 +1,19 @@
+using Our.Umbraco.AuthU.Component;
+using Umbraco.Core;
+using Umbraco.Core.Composing;
+
+namespace Our.Umbraco.AuthU.Composer
+{
+    /// <summary>
+    /// This class registers components at umbraco start up.
+    /// </summary>
+    class MigrationRunnerComposer : IUserComposer
+    {
+        public void Compose(Composition composition)
+        {
+            //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

@@ -0,0 +1,31 @@
+using Our.Umbraco.AuthU.Models;
+using Umbraco.Core.Composing;
+
+namespace Our.Umbraco.AuthU.Data.Helpers
+{
+    /// <summary>
+    /// This is a helper to retrieve the latest store value, created to allow us to run migrations
+    /// without storing the key anywhere else.
+    /// [umbracoKeyValue] - Umbraco.Core.Upgrader.State+AuthU
+    /// </summary>
+    public static class AuthUKeyValueHelper
+    {
+        public static string GetValue()
+        {
+            string authUState = string.Empty;
+
+            using (var scope = Current.ScopeProvider.CreateScope())
+            {
+                var database = scope.Database;               
+                var existing = database.SingleOrDefault<UmbracoKeyValue>("SELECT * FROM [umbracoKeyValue] WHERE [key] = 'Umbraco.Core.Upgrader.State+AuthU'");
+                if (existing != null)
+                {
+                    authUState = existing.Value;
+                }
+                scope.Complete();
+            }
+
+            return authUState;
+        }
+    }
+}

src/Our.Umbraco.AuthU/Data/InMemoryOAuthClientStore.cs

@@ -14,7 +14,7 @@ public InMemoryOAuthClientStore(IEnumerable<OAuthClient> clients)
         {
             foreach (var client in clients)
             {
-                client.Secret = client.Secret.GenerateHash();
+                client.Secret = client.Secret.GenerateOAuthHash();
             }
 
             this._clients = clients;

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

@@ -0,0 +1,21 @@
+using Our.Umbraco.AuthU.Models;
+using Umbraco.Core.Migrations;
+
+namespace Our.Umbraco.AuthU.Data.Migrations.UmbracoDbOAuthClientStore
+{
+    /// <summary>
+    /// Simple migration to create the OAuthClient Table
+    /// </summary>
+    internal class CreateAuthClientStoreTable : MigrationBase
+	{
+		public CreateAuthClientStoreTable(IMigrationContext context) 
+			: base(context)
+		{ }
+
+        public override void Migrate()
+        {
+            if (!TableExists("OAuthClient"))
+                Create.Table<OAuthClient>().Do();
+        }
+    }
+}

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

@@ -0,0 +1,31 @@
+using Our.Umbraco.AuthU.Models;
+using Umbraco.Core.Migrations;
+
+namespace Our.Umbraco.AuthU.Data.Migrations.UmbracoDbOAuthClientStore
+{
+    /// <summary>
+    /// Simple migration to add a demo client to the OAuthClient Table
+    /// </summary>
+    internal class CreateDemoClient : MigrationBase
+    {
+        public CreateDemoClient(IMigrationContext context) : base(context)
+        { }
+
+        public override void Migrate()
+        {
+            var existing = Database.SingleOrDefault<OAuthClient>($"SELECT 1 FROM [OAuthClient] WHERE [ClientId] = @0", "DemoClient");
+            if (existing == null)
+            {
+                Database.Save(new OAuthClient
+                {
+                    ClientId = "DemoClient",
+                    Name = "Demo Client",
+                    Secret = "demo",
+                    SecurityLevel = SecurityLevel.Insecure,
+                    RefreshTokenLifeTime = 14400,
+                    AllowedOrigin = "*"
+                });
+            }
+        }
+    }
+}