Improvements to auto configure and permission markup extensions

src/Moryx.ClientFramework.Kernel/HeartOfLead.cs

@@ -2,8 +2,10 @@
 // Licensed under the Apache License, Version 2.0
 
 using System;
+using System.Configuration;
 using System.Diagnostics;
 using System.Globalization;
+using System.IdentityModel.Configuration;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -109,6 +111,9 @@ public void Initialize()
             // Will parse the exe arguments
             ParseCommandLineArguments();
 
+            // Will prepare config for authorization
+            PrepareAuthorization();
+
             // Create global container and configure config manager
             CreateContainer();
 
@@ -190,6 +195,29 @@ private void ParseCommandLineArguments()
                 Environment.Exit(1);
         }
 
+        /// <summary>
+        /// Initializes configuration for authorization
+        /// </summary>
+        private static void PrepareAuthorization()
+        {
+            var config = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
+            const string sectionName = "system.identityModel";
+            try
+            {
+                if (config.Sections.Get(sectionName) == null)
+                {
+                    config.Sections.Add(sectionName, new SystemIdentityModelSection());
+                    config.Save();
+                    ConfigurationManager.RefreshSection(sectionName);
+                }
+            }
+            catch
+            {
+                //Error during authorization preparation
+                throw;
+            }
+        }
+
         /// <summary>
         /// Configures the thread context.
         /// </summary>

src/Moryx.ClientFramework.Kernel/HeartOfLeadExtension.cs

@@ -1,44 +1,19 @@
-using System;
-using System.Configuration;
-using System.IdentityModel.Configuration;
-using System.IdentityModel.Services;
+using System.IdentityModel.Services;
 using System.Security.Claims;
 
 namespace Moryx.ClientFramework.Kernel
 {
+    /// <summary>
+    /// Extensions for the <see cref="HeartOfLead"/>
+    /// </summary>
     public static class HeartOfLeadExtension
     {
         /// <summary>
         /// Method to register a custom ClaimsAuthorizationManager
         /// </summary>
         public static void EnableAuthorization(this HeartOfLead hol, ClaimsAuthorizationManager authorizationManager)
         {
-            var config = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
-            var sectionName = "system.identityModel";
-            try
-            {
-                if (config.Sections.Get(sectionName) == null)
-                {
-                    config.Sections.Add(sectionName, new SystemIdentityModelSection());
-                    config.Save();
-                    ConfigurationManager.RefreshSection(sectionName);
-                }
-                if (authorizationManager != null)
-                    FederatedAuthentication.FederationConfiguration.IdentityConfiguration.ClaimsAuthorizationManager = authorizationManager;
-            }
-            catch (Exception e)
-            {
-                //Error during authorization preparation
-                throw;
-            }
-        }
-
-        /// <summary>
-        /// Method to authorize the current principal to perform every action on any resource
-        /// </summary>
-        public static void AuthorizeEverything(this HeartOfLead hol)
-        {
-            hol.EnableAuthorization(null);
+            FederatedAuthentication.FederationConfiguration.IdentityConfiguration.ClaimsAuthorizationManager = authorizationManager;
         }
     }
 }

src/Moryx.ClientFramework/Principals/BooleanPermissionExtension.cs

@@ -8,7 +8,7 @@ namespace Moryx.ClientFramework.Principals
     /// <summary>
     /// Extension to determine the boolean result depends to the permission
     /// </summary>
-    public class BooleanPermissionExtension : PermissionExtension
+    public class BooleanPermissionExtension : PermissionExtensionBase
     {
         /// <summary>
         /// Flag to inverse the boolean result

src/Moryx.ClientFramework/Principals/GridLengthPermissionExtension.cs

@@ -8,7 +8,7 @@ namespace Moryx.ClientFramework.Principals
     /// <summary>
     /// Extension to determine the length of a grid depends to the permission
     /// </summary>
-    public class GridLengthPermissionExtension : PermissionExtension
+    public class GridLengthPermissionExtension : PermissionExtensionBase
     {
         /// <inheritdoc />
         protected override object ProvidePermissionBasedValue(bool hasPermission)

src/Moryx.ClientFramework/Principals/PermissionExtension.cs → src/Moryx.ClientFramework/Principals/PermissionExtensionBase.cs

@@ -6,7 +6,6 @@
 using System.Reflection;
 using System.Text.RegularExpressions;
 using System.Windows;
-using System.Windows.Controls;
 using System.Windows.Markup;
 using System.Xaml;
 
@@ -15,7 +14,7 @@ namespace Moryx.ClientFramework.Principals
     /// <summary>
     /// Base class for permission based value determination
     /// </summary>
-    public abstract class PermissionExtension : MarkupExtension
+    public abstract class PermissionExtensionBase : MarkupExtension
     {
         #region Fields and Properties
 
@@ -39,9 +38,9 @@ public abstract class PermissionExtension : MarkupExtension
         /// <summary>
         /// Constructor to prepare the extension to get information about changed principals
         /// </summary>
-        protected PermissionExtension()
+        protected PermissionExtensionBase()
         {
-            ClaimsPrincipalSync.PrincipalChanged += OnPrincipalChanged;      
+            ClaimsPrincipalSync.PrincipalChanged += OnPrincipalChanged;
         }
 
         private void OnPrincipalChanged(object sender, EventArgs args)
@@ -70,14 +69,17 @@ private void OnPrincipalChanged(object sender, EventArgs args)
         public override object ProvideValue(IServiceProvider serviceProvider)
         {
             // If resource was not specified, tried to determine from host control
-            if (Resource == null && serviceProvider.GetService(typeof(IRootObjectProvider)) is IRootObjectProvider root)
+            if (string.IsNullOrEmpty(Resource) && serviceProvider.GetService(typeof(IRootObjectProvider)) is IRootObjectProvider root)
             {
-                // Try to read from user control permissions
-                if (root.RootObject is UserControl control && control.Resources[UserControlPermissions.Key] is UserControlPermissions controlPermissions)
+                // Try to read from root attached property
+                var rootElement = root.RootObject as DependencyObject;
+                var defaultResource = rootElement?.GetValue(PermissionProvider.DefaultResourceProperty);
+                if (defaultResource != null)
                 {
-                    Resource = controlPermissions.Resource;
+                    Resource = (string) defaultResource;
                 }
-                else
+
+                if (string.IsNullOrEmpty(Resource))
                 {
                     var regex = new Regex(@"^\w+\.\w+");
                     Resource = regex.Match(root.RootObject?.GetType().Namespace ?? "Moryx").Value;

src/Moryx.ClientFramework/Principals/PermissionProvider.cs

@@ -0,0 +1,35 @@
+// Copyright (c) 2021, Phoenix Contact GmbH & Co. KG
+// Licensed under the Apache License, Version 2.0
+
+using System.Windows;
+
+namespace Moryx.ClientFramework.Principals
+{
+    /// <summary>
+    /// Class to provide attached dependency property for permission based authorization
+    /// </summary>
+    public class PermissionProvider : DependencyObject
+    {
+        /// <summary>
+        /// Property to handle the default resource for the <see cref="PermissionExtensionBase"/>
+        /// </summary>
+        public static readonly DependencyProperty DefaultResourceProperty = DependencyProperty.RegisterAttached(
+            "DefaultResource", typeof(string), typeof(PermissionProvider), new PropertyMetadata(default(string)));
+
+        /// <summary>
+        /// Sets the default resource
+        /// </summary>
+        public static void SetDefaultResource(DependencyObject element, string value)
+        {
+            element.SetValue(DefaultResourceProperty, value);
+        }
+
+        /// <summary>
+        /// Returns the default resource
+        /// </summary>
+        public static string GetDefaultResource(DependencyObject element)
+        {
+            return (string) element.GetValue(DefaultResourceProperty);
+        }
+    }
+}

src/Moryx.ClientFramework/Principals/VisibilityPermissionExtension.cs

@@ -9,7 +9,7 @@ namespace Moryx.ClientFramework.Principals
     /// <summary>
     /// Extension to determine the visibility depends to the permission
     /// </summary>
-    public class VisibilityPermissionExtension : PermissionExtension
+    public class VisibilityPermissionExtension : PermissionExtensionBase
     {
         /// <summary>
         /// Flag to inverse the visibility result