Merge branch 'develop'

Author: mattbrailsford

README.md

@@ -7,19 +7,30 @@ AuthU is an add-on library to [Umbraco](https://github.com/umbraco/umbraco-cms)
 
     PM> Install-Package Our.Umbraco.AuthU
 
-There's also a nightly Nuget feed: [`https://www.myget.org/F/umbraco-authu/api/v2`](https://www.myget.org/F/umbraco-authu/api/v2)
-
 ## Configuration
-AuthU is configured using the `OAuth.ConfigureEndpoint` helper inside an Umbraco `ApplicationEventHandler` like so:
-````csharp 
-    public class Boostrap : ApplicationEventHandler
+In order to configure AuthU you will first of all need to create an Umbraco composer + compontent combination like so:
+````csharp
+    public class AuthUConfigComponent : IComponent
     {
-        protected override void ApplicationStarted(UmbracoApplicationBase app, ApplicationContext ctx)
+        public void Initialize()
         {
-            OAuth.ConfigureEndpoint(...);
+            // Configuration goes here
         }
+
+        public void Terminate() { }
     }
+
+    public class AuthUConfigComposer : ComponentComposer<AuthUConfigComponent>
+    { }
 ````
+
+From within the `Initialize` method, you can then configure your endpoint(s) via the `OAuth.ConfigureEndpoint` helper like so:
+````csharp 
+    ...
+    OAuth.ConfigureEndpoint(...);
+    ...
+````
+
 ### Basic Configuration
 For the most basic OAuth implementation, the following minimal configuration is all that is needed:
 ````csharp 

appveyor.yml

@@ -1,7 +1,7 @@
 image: Visual Studio 2017
 
 # version format
-version: 1.0.3.{build}
+version: 1.0.4.{build}
 
 # UMBRACO_PACKAGE_PRERELEASE_SUFFIX if a rtm release build this should be blank, otherwise if empty will default to alpha
 # example UMBRACO_PACKAGE_PRERELEASE_SUFFIX=beta
@@ -22,15 +22,6 @@ artifacts:
   - path: artifacts\*.zip
 
 deploy:
-    # MyGet Deployment for builds & releases
-  - provider: NuGet
-    server: https://www.myget.org/F/umbraco-authu/api/v2/package
-    symbol_server: https://www.myget.org/F/umbraco-authu/symbols/api/v2/package
-    api_key:
-      secure: gHDTL46KZcLzj6J8m//TJgaCOJCl9ixR//rXjO18HRlCsfPYYz7dU81u2D5zd+ZN
-    artifact: /.*\.nupkg/
-    on:
-      branch: develop
 
     # GitHub Deployment for releases
   - provider: GitHub

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

@@ -0,0 +1,18 @@
+using Umbraco.Core;
+using Umbraco.Core.Composing;
+
+namespace Our.Umbraco.AuthU.Composing
+{
+    /// <summary>
+    /// This class registers components at umbraco start up.
+    /// </summary>
+    internal 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/Composing/MigrationsRunnerComponent.cs

@@ -0,0 +1,49 @@
+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;
+
+namespace Our.Umbraco.AuthU.Composing
+{
+    /// <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
+            {
+                var plan = new AuthUMigrationPlan();
+                var upgrader = new Upgrader(plan);
+
+                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/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/AddDeviceIdColumnToOAuthRefreshTokenTable.cs

@@ -0,0 +1,20 @@
+using Umbraco.Core.Migrations;
+
+namespace Our.Umbraco.AuthU.Data.Migrations
+{
+    /// <summary>
+    /// Simple migration to create the DeviceId column on the OAuthRefreshToken Table
+    /// </summary>
+    internal class AddDeviceIdColumnToOAuthRefreshTokenTable : MigrationBase
+    {
+        public AddDeviceIdColumnToOAuthRefreshTokenTable(IMigrationContext context) : base(context)
+        { }
+
+        public override void Migrate()
+        {
+            if (!ColumnExists("OAuthRefreshToken", "DeviceId"))
+                Alter.Table("OAuthRefreshToken").AddColumn("DeviceId").AsString().Nullable();
+        }
+
+    }
+}

src/Our.Umbraco.AuthU/Data/Migrations/AuthUMigrationPlan.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/BaseMigration.cs

@@ -0,0 +1,31 @@
+using Our.Umbraco.AuthU.Models;
+using Umbraco.Core.Migrations;
+
+namespace Our.Umbraco.AuthU.Data.Migrations
+{
+    /// <summary>
+    /// Simple migration to add a demo client to the OAuthClient Table
+    /// </summary>
+    internal class CreateDemoOAuthClient : MigrationBase
+    {
+        public CreateDemoOAuthClient(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 = "*"
+                });
+            }
+        }
+    }
+}

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

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