Merge branch 'v15/dev' into v15/bugfix/offline-notifcation

Author: madsrasmussen

src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateDocumentControllerBase.cs

@@ -17,21 +17,18 @@ protected UpdateDocumentControllerBase(IAuthorizationService authorizationServic
 
     protected async Task<IActionResult> HandleRequest(Guid id, UpdateDocumentRequestModel requestModel, Func<Task<IActionResult>> authorizedHandler)
     {
-        // TODO This have temporarily been uncommented, to support the client sends values from all cultures, even when the user do not have access to the languages.
-        // The values are ignored in the ContentEditingService
+        // We intentionally don't pass in cultures here.
+        // This is to support the client sending values for all cultures even if the user doesn't have access to the language.
+        // Values for unauthorized languages are later ignored in the ContentEditingService.
+        AuthorizationResult authorizationResult = await _authorizationService.AuthorizeResourceAsync(
+            User,
+            ContentPermissionResource.WithKeys(ActionUpdate.ActionLetter, id),
+            AuthorizationPolicies.ContentPermissionByResource);
 
-        // IEnumerable<string> cultures = requestModel.Variants
-        //     .Where(v => v.Culture is not null)
-        //     .Select(v => v.Culture!);
-        // AuthorizationResult authorizationResult = await _authorizationService.AuthorizeResourceAsync(
-        //     User,
-        //     ContentPermissionResource.WithKeys(ActionUpdate.ActionLetter, id, cultures),
-        //     AuthorizationPolicies.ContentPermissionByResource);
-        //
-        // if (!authorizationResult.Succeeded)
-        // {
-        //     return Forbidden();
-        // }
+        if (authorizationResult.Succeeded is false)
+        {
+            return Forbidden();
+        }
 
         return await authorizedHandler();
     }

src/Umbraco.Cms.Api.Management/Factories/UserPresentationFactory.cs

@@ -143,6 +143,10 @@ public async Task<CurrenUserConfigurationResponseModel> CreateCurrentUserConfigu
             KeepUserLoggedIn = _securitySettings.KeepUserLoggedIn,
             UsernameIsEmail = _securitySettings.UsernameIsEmail,
             PasswordConfiguration = _passwordConfigurationPresentationFactory.CreatePasswordConfigurationResponseModel(),
+
+            // You should not be able to change any password or set 2fa if any providers has deny local login set.
+            AllowChangePassword = _externalLoginProviders.HasDenyLocalLogin() is false,
+            AllowTwoFactor = _externalLoginProviders.HasDenyLocalLogin() is false,
         };
 
         return await Task.FromResult(model);

src/Umbraco.Cms.Api.Management/OpenApi.json

@@ -35929,6 +35929,8 @@
       },
       "CurrenUserConfigurationResponseModel": {
         "required": [
+          "allowChangePassword",
+          "allowTwoFactor",
           "keepUserLoggedIn",
           "passwordConfiguration",
           "usernameIsEmail"
@@ -35948,6 +35950,12 @@
                 "$ref": "#/components/schemas/PasswordConfigurationResponseModel"
               }
             ]
+          },
+          "allowChangePassword": {
+            "type": "boolean"
+          },
+          "allowTwoFactor": {
+            "type": "boolean"
           }
         },
         "additionalProperties": false
@@ -35970,14 +35978,11 @@
           "mediaStartNodeIds",
           "name",
           "permissions",
+          "userGroupIds",
           "userName"
         ],
         "type": "object",
         "properties": {
-          "id": {
-            "type": "string",
-            "format": "uuid"
-          },
           "email": {
             "type": "string"
           },
@@ -35987,6 +35992,21 @@
           "name": {
             "type": "string"
           },
+          "userGroupIds": {
+            "uniqueItems": true,
+            "type": "array",
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/ReferenceByIdModel"
+                }
+              ]
+            }
+          },
+          "id": {
+            "type": "string",
+            "format": "uuid"
+          },
           "languageIsoCode": {
             "type": "string",
             "nullable": true
@@ -37786,6 +37806,16 @@
             "type": "string",
             "format": "date-time",
             "nullable": true
+          },
+          "scheduledPublishDate": {
+            "type": "string",
+            "format": "date-time",
+            "nullable": true
+          },
+          "scheduledUnpublishDate": {
+            "type": "string",
+            "format": "date-time",
+            "nullable": true
           }
         },
         "additionalProperties": false

src/Umbraco.Cms.Api.Management/ViewModels/User/Current/CurrenUserConfigurationResponseModel.cs

@@ -1,7 +1,8 @@
-using Umbraco.Cms.Api.Management.ViewModels.Security;
+using Umbraco.Cms.Api.Management.ViewModels.Security;
 
 namespace Umbraco.Cms.Api.Management.ViewModels.User.Current;
 
+// TODO (V16): Correct the spelling on this class name, it should be CurrentUserConfigurationResponseModel.
 public class CurrenUserConfigurationResponseModel
 {
     public bool KeepUserLoggedIn { get; set; }
@@ -10,4 +11,8 @@ public class CurrenUserConfigurationResponseModel
     public bool UsernameIsEmail { get; set; }
 
     public required PasswordConfigurationResponseModel PasswordConfiguration { get; set; }
+
+    public bool AllowChangePassword { get; set; }
+
+    public bool AllowTwoFactor { get; set; }
 }

src/Umbraco.Core/Routing/NewDefaultUrlProvider.cs

@@ -117,7 +117,7 @@ public virtual IEnumerable<UrlInfo> GetOtherUrls(int id, Uri current)
 
             // although we are passing in culture here, if any node in this path is invariant, it ignores the culture anyways so this is ok
             var route = GetLegacyRouteFormatById(key, culture);
-            if (route == null)
+            if (route == null || route == "#")
             {
                 continue;
             }

src/Umbraco.Web.UI.Client/src/assets/lang/da-dk.ts

@@ -536,10 +536,14 @@ export default {
 		linkToMedia: 'Link til medie',
 		selectContentStartNode: 'Vælg startnode for indhold',
 		selectMedia: 'Vælg medie',
+		chooseMedia: 'Vælg medie',
+		chooseMediaStartNode: 'Vælg startnode for medie',
 		selectMediaType: 'Vælg medietype',
 		selectIcon: 'Vælg ikon',
 		selectItem: 'Vælg item',
 		selectLink: 'Vælg link',
+		addLink: 'Tilføj Link',
+		updateLink: 'Opdater Link',
 		selectMacro: 'Vælg makro',
 		selectContent: 'Vælg indhold',
 		selectContentType: 'Vælg indholdstype',

src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts

@@ -568,10 +568,13 @@ export default {
 		linkToMedia: 'Link to media',
 		selectContentStartNode: 'Select content start node',
 		selectMedia: 'Select media',
+		chooseMediaStartNode: 'Choose Media Start nodes',
 		selectMediaType: 'Select media type',
 		selectIcon: 'Select icon',
 		selectItem: 'Select item',
 		selectLink: 'Configure link',
+		addLink: 'Add Link',
+		updateLink: 'Update Link',
 		selectMacro: 'Select macro',
 		selectContent: 'Select content',
 		selectContentType: 'Select content type',

src/Umbraco.Web.UI.Client/src/assets/lang/en.ts

@@ -559,10 +559,14 @@ export default {
 		selectContentStartNode: 'Select content start node',
 		selectEvent: 'Select event',
 		selectMedia: 'Select media',
+		chooseMedia: 'Choose media',
+		chooseMediaStartNode: 'Choose Media Start nodes',
 		selectMediaType: 'Select media type',
 		selectIcon: 'Select icon',
 		selectItem: 'Select item',
 		selectLink: 'Configure link',
+		addLink: 'Add Link',
+		updateLink: 'Update Link',
 		selectMacro: 'Select macro',
 		selectContent: 'Select content',
 		selectContentType: 'Select content type',

src/Umbraco.Web.UI.Client/src/external/backend-api/src/types.gen.ts

@@ -470,6 +470,8 @@ export type CurrenUserConfigurationResponseModel = {
      */
     usernameIsEmail: boolean;
     passwordConfiguration: (PasswordConfigurationResponseModel);
+    allowChangePassword: boolean;
+    allowTwoFactor: boolean;
 };
 
 export type DatabaseInstallRequestModel = {

src/Umbraco.Web.UI.Client/src/external/tiptap/extensions/tiptap-div.extension.ts

@@ -0,0 +1,32 @@
+import { Node, mergeAttributes } from '@tiptap/core';
+
+export interface DivOptions {
+	/**
+	 * HTML attributes to add to the element.
+	 * @default {}
+	 * @example { class: 'foo' }
+	 */
+	HTMLAttributes: Record<string, any>;
+}
+
+export const Div = Node.create<DivOptions>({
+	name: 'div',
+
+	priority: 50,
+
+	group: 'block',
+
+	content: 'inline*',
+
+	addOptions() {
+		return { HTMLAttributes: {} };
+	},
+
+	parseHTML() {
+		return [{ tag: 'div' }];
+	},
+
+	renderHTML({ HTMLAttributes }) {
+		return ['div', mergeAttributes(this.options.HTMLAttributes, HTMLAttributes), 0];
+	},
+});