Merge branch 'master' of github.com:Squidex/squidex into feature-rules

# Conflicts:
#	src/Squidex/Config/Domain/WriteModule.cs

src/Squidex.Domain.Users/IUserEvents.cs

@@ -0,0 +1,17 @@
+// ==========================================================================
+//  IUserEvents.cs
+//  Squidex Headless CMS
+// ==========================================================================
+//  Copyright (c) Squidex Group
+//  All rights reserved.
+// ==========================================================================
+
+using Squidex.Shared.Users;
+
+namespace Squidex.Domain.Users
+{
+    public interface IUserEvents
+    {
+        void OnUserRegistered(IUser user);
+    }
+}

src/Squidex.Domain.Users/NoopUserEvents.cs

@@ -0,0 +1,19 @@
+// ==========================================================================
+//  NoopUserEvents.cs
+//  Squidex Headless CMS
+// ==========================================================================
+//  Copyright (c) Squidex Group
+//  All rights reserved.
+// ==========================================================================
+
+using Squidex.Shared.Users;
+
+namespace Squidex.Domain.Users
+{
+    public sealed class NoopUserEvents : IUserEvents
+    {
+        public void OnUserRegistered(IUser user)
+        {
+        }
+    }
+}

src/Squidex/Config/Domain/WriteModule.cs

@@ -15,6 +15,7 @@ using Squidex.Domain.Apps.Write.Assets;
 using Squidex.Domain.Apps.Write.Contents;
 using Squidex.Domain.Apps.Write.Rules;
 using Squidex.Domain.Apps.Write.Schemas;
+using Squidex.Domain.Users;
 using Squidex.Infrastructure.CQRS.Commands;
 using Squidex.Pipeline.CommandMiddlewares;
 
@@ -31,6 +32,18 @@ namespace Squidex.Config.Domain
 
         protected override void Load(ContainerBuilder builder)
         {
+            builder.RegisterType<NoopUserEvents>()
+                .As<IUserEvents>()
+                .SingleInstance();
+
+            builder.RegisterType<JintScriptEngine>()
+                .As<IScriptEngine>()
+                .SingleInstance();
+
+            builder.RegisterType<ContentVersionLoader>()
+                .As<IContentVersionLoader>()
+                .SingleInstance();
+
             builder.RegisterType<ETagCommandMiddleware>()
                 .As<ICommandMiddleware>()
                 .SingleInstance();
@@ -51,14 +64,6 @@ namespace Squidex.Config.Domain
                 .As<ICommandMiddleware>()
                 .SingleInstance();
 
-            builder.RegisterType<JintScriptEngine>()
-                .As<IScriptEngine>()
-                .SingleInstance();
-
-            builder.RegisterType<ContentVersionLoader>()
-                .As<IContentVersionLoader>()
-                .SingleInstance();
-
             builder.RegisterType<AppCommandMiddleware>()
                 .As<ICommandMiddleware>()
                 .SingleInstance();
@@ -79,10 +84,6 @@ namespace Squidex.Config.Domain
                 .As<ICommandMiddleware>()
                 .SingleInstance();
 
-            builder.RegisterType<ETagCommandMiddleware>()
-                .As<ICommandMiddleware>()
-                .SingleInstance();
-
             builder.Register<DomainObjectFactoryFunction<AppDomainObject>>(c => (id => new AppDomainObject(id, -1)))
                 .AsSelf()
                 .SingleInstance();

src/Squidex/Controllers/Api/Assets/AssetContentController.cs

@@ -23,7 +23,6 @@ namespace Squidex.Controllers.Api.Assets
     /// <summary>
     /// Uploads and retrieves assets.
     /// </summary>
-    [ApiAuthorize]
     [ApiExceptionFilter]
     [AppApi]
     [SwaggerTag(nameof(Assets))]

src/Squidex/Controllers/UI/Account/AccountController.cs

@@ -35,6 +35,7 @@ namespace Squidex.Controllers.UI.Account
         private readonly SignInManager<IUser> signInManager;
         private readonly UserManager<IUser> userManager;
         private readonly IUserFactory userFactory;
+        private readonly IUserEvents userEvents;
         private readonly IOptions<MyIdentityOptions> identityOptions;
         private readonly IOptions<MyUrlsOptions> urlOptions;
         private readonly ISemanticLog log;
@@ -44,6 +45,7 @@ namespace Squidex.Controllers.UI.Account
             SignInManager<IUser> signInManager,
             UserManager<IUser> userManager,
             IUserFactory userFactory,
+            IUserEvents userEvents,
             IOptions<MyIdentityOptions> identityOptions,
             IOptions<MyUrlsOptions> urlOptions,
             ISemanticLog log,
@@ -51,6 +53,7 @@ namespace Squidex.Controllers.UI.Account
         {
             this.log = log;
             this.urlOptions = urlOptions;
+            this.userEvents = userEvents;
             this.userManager = userManager;
             this.userFactory = userFactory;
             this.interactions = interactions;
@@ -242,6 +245,8 @@ namespace Squidex.Controllers.UI.Account
                         await LockAsync(user, isFirst) &&
                         await LoginAsync(externalLogin);
 
+                    userEvents.OnUserRegistered(user);
+
                     if (user.IsLocked)
                     {
                         return View(nameof(LockedOut));

src/Squidex/Pipeline/Swagger/SwaggerHelper.cs

@@ -84,7 +84,7 @@ namespace Squidex.Pipeline.Swagger
             var tokenUrl = urlOptions.BuildUrl($"{Constants.IdentityPrefix}/connect/token");
 
             var securityDocs = LoadDocs("security");
-            var securityDescription = securityDocs.Replace("<TOKEN_URL>", tokenUrl);
+            var securityText = securityDocs.Replace("<TOKEN_URL>", tokenUrl);
 
             var result =
                 new SwaggerSecurityScheme
@@ -100,7 +100,7 @@ namespace Squidex.Pipeline.Swagger
                         { SquidexRoles.AppReader, "Client (readonly) or App contributor with Editor permission." },
                         { SquidexRoles.AppDeveloper, "App contributor with Developer permission." }
                     },
-                    Description = securityDescription
+                    Description = securityText
                 };
 
             return result;