Merge branch 'ma/prevent-external-registration' of https://github.com…

…/OrchardCMS/OrchardCore into ma/prevent-external-registration

src/OrchardCore.Modules/OrchardCore.Contents/Controllers/AdminController.cs

@@ -530,16 +530,13 @@ public async Task<IActionResult> DiscardDraft(string contentItemId, string retur
             return Forbid();
         }
 
-        if (contentItem != null)
-        {
-            await _contentManager.DiscardDraftAsync(contentItem);
+        await _contentManager.DiscardDraftAsync(contentItem);
 
-            var typeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
+        var typeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
 
-            await _notifier.SuccessAsync(string.IsNullOrWhiteSpace(typeDefinition?.DisplayName)
-                ? H["The draft has been removed."]
-                : H["The {0} draft has been removed.", typeDefinition.DisplayName]);
-        }
+        await _notifier.SuccessAsync(string.IsNullOrWhiteSpace(typeDefinition?.DisplayName)
+            ? H["The draft has been removed."]
+            : H["The {0} draft has been removed.", typeDefinition.DisplayName]);
 
         return Url.IsLocalUrl(returnUrl)
             ? this.LocalRedirect(returnUrl, true)

src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentFieldDisplayDriver.cs

@@ -166,24 +166,19 @@ Task<IDisplayResult> IContentFieldDisplayDriver.BuildEditorAsync(ContentPart con
 
         var field = contentPart.GetOrCreate<TField>(partFieldDefinition.Name);
 
-        if (field != null)
-        {
-            BuildPrefix(typePartDefinition, partFieldDefinition, context.HtmlFieldPrefix);
+        BuildPrefix(typePartDefinition, partFieldDefinition, context.HtmlFieldPrefix);
 
-            var fieldEditorContext = new BuildFieldEditorContext(contentPart, typePartDefinition, partFieldDefinition, context);
+        var fieldEditorContext = new BuildFieldEditorContext(contentPart, typePartDefinition, partFieldDefinition, context);
 
-            _typePartDefinition = typePartDefinition;
-            _partFieldDefinition = partFieldDefinition;
+        _typePartDefinition = typePartDefinition;
+        _partFieldDefinition = partFieldDefinition;
 
-            var result = EditAsync(field, fieldEditorContext);
+        var result = EditAsync(field, fieldEditorContext);
 
-            _typePartDefinition = null;
-            _partFieldDefinition = null;
-
-            return result;
-        }
+        _typePartDefinition = null;
+        _partFieldDefinition = null;
 
-        return Task.FromResult(default(IDisplayResult));
+        return result;
     }
 
     async Task<IDisplayResult> IContentFieldDisplayDriver.UpdateEditorAsync(ContentPart contentPart, ContentPartFieldDefinition partFieldDefinition, ContentTypePartDefinition typePartDefinition, UpdateEditorContext context)

src/OrchardCore/OrchardCore.DisplayManagement/Views/ShapeResult.cs

@@ -187,17 +187,14 @@ private async Task ApplyImplementationAsync(BuildShapeContext context, string di
             newShapeMetadata.Wrappers.Clear();
         }
 
-        if (placement != null)
+        if (placement.Alternates != null)
         {
-            if (placement.Alternates != null)
-            {
-                newShapeMetadata.Alternates.AddRange(placement.Alternates);
-            }
+            newShapeMetadata.Alternates.AddRange(placement.Alternates);
+        }
 
-            if (placement.Wrappers != null)
-            {
-                newShapeMetadata.Wrappers.AddRange(placement.Wrappers);
-            }
+        if (placement.Wrappers != null)
+        {
+            newShapeMetadata.Wrappers.AddRange(placement.Wrappers);
         }
 
         var parentShape = context.Shape;

src/OrchardCore/OrchardCore.Infrastructure/Shells.Database/Configuration/DatabaseShellConfigurationSources.cs

@@ -74,9 +74,7 @@ public async Task AddSourcesAsync(string tenant, IConfigurationBuilder builder)
         if (configuration is not null)
         {
             var configurationString = configuration.ToJsonString(JOptions.Default);
-            using var stream = new MemoryStream(Encoding.UTF8.GetBytes(configurationString));
-
-            builder.AddTenantJsonStream(stream);
+            builder.AddTenantJsonStream(new MemoryStream(Encoding.UTF8.GetBytes(configurationString)));
         }
     }
 

src/OrchardCore/OrchardCore.Infrastructure/Shells.Database/Configuration/DatabaseShellsSettingsSources.cs

@@ -42,9 +42,7 @@ public async Task AddSourcesAsync(IConfigurationBuilder builder)
         if (document.ShellsSettings is not null)
         {
             var shellsSettingsString = document.ShellsSettings.ToJsonString(JOptions.Default);
-            using var stream = new MemoryStream(Encoding.UTF8.GetBytes(shellsSettingsString));
-
-            builder.AddTenantJsonStream(stream);
+            builder.AddTenantJsonStream(new MemoryStream(Encoding.UTF8.GetBytes(shellsSettingsString)));
         }
     }
 
@@ -55,9 +53,7 @@ public async Task AddSourcesAsync(string tenant, IConfigurationBuilder builder)
         {
             var shellSettings = new JsonObject { [tenant] = document.ShellsSettings[tenant] };
             var shellSettingsString = shellSettings.ToJsonString(JOptions.Default);
-            using var stream = new MemoryStream(Encoding.UTF8.GetBytes(shellSettingsString));
-
-            builder.AddTenantJsonStream(stream);
+            builder.AddTenantJsonStream(new MemoryStream(Encoding.UTF8.GetBytes(shellSettingsString)));
         }
     }
 

src/OrchardCore/OrchardCore.Users.Core/CommonPermissions.cs

@@ -21,7 +21,7 @@ public static class CommonPermissions
 
     public static readonly Permission ListUsers = new("ListUsers", "List all users", [EditUsers, DeleteUsers]);
 
-    public static readonly Permission AssignRoleToUsers = new("AssignRoleToUsers", "Assign any role to users", [EditUsers], true);
+    public static readonly Permission AssignRoleToUsers = new("AssignRoleToUsers", "Assign any role to users", true);
 
     public static readonly Permission DisableTwoFactorAuthenticationForUsers = new("DisableTwoFactorAuthenticationForUsers", "Disable two-factor authentication for any user", [ManageUsers], true);
 

src/docs/releases/3.0.0.md

@@ -63,3 +63,7 @@ The following obsolete settings were removed from `LoginSettings` class
 #### Login View Update
 
 The `ExternalLogin` action has been removed from the `Account` controller. If you are using a custom `Login.cshtml` view or `Login` template, please update the external login form action. As of this update, the `ExternalLogin` action has been relocated to the `ExternalAuthentications` controller.
+
+#### AssignRoleToUsers Permission Update
+
+The `AssignRoleToUsers` permission is no longer implicitly granted by `EditUsers`. To maintain the same behavior, make sure to explicitly assign the `AssignRoleToUsers` permission to any role that already has the `EditUsers` permission.

src/docs/requirements.txt

@@ -1,5 +1,5 @@
 mkdocs>=1.6.1
-mkdocs-material>=9.5.45
+mkdocs-material>=9.5.46
 mkdocs-git-authors-plugin>=0.9.2
 mkdocs-git-revision-date-localized-plugin>=1.3.0
 pymdown-extensions>=10.12.0