Continuing work on the behaviors, first working results with the Auth…

…enticationProvider
dapplo · Nov 17, 2016 · 08f2064 · 08f2064
1 parent 889bb09
commit 08f2064
Show file tree

Hide file tree

Showing 29 changed files with 1,552 additions and 111 deletions.
diff --git a/Dapplo.CaliburnMicro.Demo.Addon/Dapplo.CaliburnMicro.Demo.Addon.csproj b/Dapplo.CaliburnMicro.Demo.Addon/Dapplo.CaliburnMicro.Demo.Addon.csproj
@@ -42,8 +42,8 @@
       <HintPath>..\packages\Caliburn.Micro.3.0.1\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Dapplo.Addons, Version=0.3.88.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.0.3.88\lib\net45\Dapplo.Addons.dll</HintPath>
+    <Reference Include="Dapplo.Addons, Version=0.3.89.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Dapplo.Addons.0.3.89\lib\net45\Dapplo.Addons.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Dapplo.Config, Version=0.4.2.0, Culture=neutral, processorArchitecture=MSIL">

diff --git a/Dapplo.CaliburnMicro.Demo.Addon/ViewModels/AddonSettingsViewModel.cs b/Dapplo.CaliburnMicro.Demo.Addon/ViewModels/AddonSettingsViewModel.cs
@@ -27,10 +27,12 @@
 
 using System.ComponentModel.Composition;
 using Caliburn.Micro;
+using Dapplo.CaliburnMicro.Behaviors.Security;
 using Dapplo.CaliburnMicro.Configuration;
 using Dapplo.CaliburnMicro.Demo.Addon.Languages;
 using Dapplo.CaliburnMicro.Demo.UseCases.Configuration;
 using Dapplo.CaliburnMicro.Extensions;
+using Dapplo.CaliburnMicro.Security;
 
 #endregion
 
@@ -45,6 +47,10 @@ public sealed class AddonSettingsViewModel : ConfigScreen, IPartImportsSatisfied
 		[Import]
 		private IEventAggregator EventAggregator { get; set; }
 
+
+		[Import]
+		private IAuthenticationProvider AuthenticationProvider { get; set; }
+
 		public AddonSettingsViewModel()
 		{
 			ParentId = nameof(ConfigIds.Addons);
@@ -59,5 +65,18 @@ public void DoSomething()
 		{
 			EventAggregator.PublishOnUIThread("Addon button clicked");
 		}
+
+		public void AddAdmin()
+		{
+			var authenticationProvider = AuthenticationProvider as SimpleAuthenticationProvider;
+			authenticationProvider?.AddPermission("Admin");
+
+		}
+		public void RemoveAdmin()
+		{
+			var authenticationProvider = AuthenticationProvider as SimpleAuthenticationProvider;
+			authenticationProvider?.RemovePermission("Admin");
+
+		}
 	}
 }
diff --git a/Dapplo.CaliburnMicro.Demo.Addon/Views/AddonSettingsView.xaml b/Dapplo.CaliburnMicro.Demo.Addon/Views/AddonSettingsView.xaml
@@ -3,11 +3,13 @@
 			xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 			xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 			xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-			xmlns:security="clr-namespace:Dapplo.CaliburnMicro.Security;assembly=Dapplo.CaliburnMicro"
+			xmlns:security1="clr-namespace:Dapplo.CaliburnMicro.Behaviors.Security;assembly=Dapplo.CaliburnMicro"
 			mc:Ignorable="d"
 			d:DesignHeight="300" d:DesignWidth="300">
 	<StackPanel>
 		<Button x:Name="DoSomething" Content="Do something!" />
-		<Button x:Name="AdminButton" Content="Only visible when admin rights are available!" security:AuthenticationVisibility.Permission="Admin"/>
+		<Button x:Name="AddAdmin" Content="Add admin permission" security1:AuthenticationEnabled.Permission="Admin" security1:AuthenticationEnabled.WhenPermissionMissing="true" security1:AuthenticationEnabled.WhenPermission="false"/>
+		<Button x:Name="RemoveAdmin" Content="Remove admin permission" security1:AuthenticationEnabled.Permission="Admin" />
+		<Label Content="You have the 'Admin' permission" security1:AuthenticationVisibility.Permission="Admin" />
 	</StackPanel>
 </UserControl>
diff --git a/Dapplo.CaliburnMicro.Demo.Addon/packages.config b/Dapplo.CaliburnMicro.Demo.Addon/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="Caliburn.Micro" version="3.0.1" targetFramework="net452" />
   <package id="Caliburn.Micro.Core" version="3.0.1" targetFramework="net452" />
-  <package id="Dapplo.Addons" version="0.3.88" targetFramework="net452" />
+  <package id="Dapplo.Addons" version="0.3.89" targetFramework="net452" />
   <package id="Dapplo.Config" version="0.4.2" targetFramework="net452" />
   <package id="Dapplo.InterfaceImpl" version="0.2.5" targetFramework="net452" />
   <package id="Dapplo.Log" version="1.0.22" targetFramework="net452" />

diff --git a/Dapplo.CaliburnMicro.Demo/Dapplo.CaliburnMicro.Demo.csproj b/Dapplo.CaliburnMicro.Demo/Dapplo.CaliburnMicro.Demo.csproj
@@ -54,8 +54,8 @@
       <HintPath>..\packages\Caliburn.Micro.3.0.1\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Dapplo.Addons, Version=0.3.88.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.0.3.88\lib\net45\Dapplo.Addons.dll</HintPath>
+    <Reference Include="Dapplo.Addons, Version=0.3.89.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Dapplo.Addons.0.3.89\lib\net45\Dapplo.Addons.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Dapplo.Config, Version=0.4.2.0, Culture=neutral, processorArchitecture=MSIL">

diff --git a/Dapplo.CaliburnMicro.Demo/Services/AuthenticationProvider.cs b/Dapplo.CaliburnMicro.Demo/Services/AuthenticationProvider.cs
@@ -25,8 +25,8 @@
 
 #region Usings
 
-using System.Collections.Generic;
 using System.ComponentModel.Composition;
+using Dapplo.CaliburnMicro.Behaviors.Security;
 using Dapplo.CaliburnMicro.Security;
 
 #endregion
@@ -42,7 +42,7 @@ public class AuthenticationProvider : SimpleAuthenticationProvider
 	{
 		public AuthenticationProvider()
 		{
-			Permissions = new List<string> {"Developer"};
+			AddPermission("Admin");
 		}
 	}
 }
diff --git a/Dapplo.CaliburnMicro.Demo/UseCases/ContextMenu/SomeWindowMenuItems.cs b/Dapplo.CaliburnMicro.Demo/UseCases/ContextMenu/SomeWindowMenuItems.cs
@@ -25,7 +25,6 @@
 
 #region Usings
 
-using System;
 using System.ComponentModel.Composition;
 using Caliburn.Micro;
 using Dapplo.CaliburnMicro.Demo.Languages;

diff --git a/Dapplo.CaliburnMicro.Demo/UseCases/ContextMenu/ViewModels/DemoTrayIconViewModel.cs b/Dapplo.CaliburnMicro.Demo/UseCases/ContextMenu/ViewModels/DemoTrayIconViewModel.cs
@@ -32,7 +32,6 @@
 using System.Windows;
 using System.Windows.Media;
 using Caliburn.Micro;
-using Dapplo.CaliburnMicro.Behaviors;
 using Dapplo.CaliburnMicro.Demo.Languages;
 using Dapplo.CaliburnMicro.Demo.ViewModels;
 using Dapplo.CaliburnMicro.Menu;

diff --git a/Dapplo.CaliburnMicro.Demo/UseCases/ContextMenu/WizardMenuItem.cs b/Dapplo.CaliburnMicro.Demo/UseCases/ContextMenu/WizardMenuItem.cs
@@ -26,7 +26,9 @@
 #region Usings
 
 using System.ComponentModel.Composition;
+using System.Security.Permissions;
 using Caliburn.Micro;
+using Dapplo.CaliburnMicro.Behaviors.Security;
 using Dapplo.CaliburnMicro.Demo.Languages;
 using Dapplo.CaliburnMicro.Demo.UseCases.Wizard.ViewModels;
 using Dapplo.CaliburnMicro.Extensions;
@@ -41,6 +43,7 @@ namespace Dapplo.CaliburnMicro.Demo.UseCases.ContextMenu
 	/// This will add an extry for the wizard to the context menu
 	/// </summary>
 	[Export("contextmenu", typeof(IMenuItem))]
+	[UiEnabledPermissions(Permissions = "Admin")]
 	public sealed class WizardMenuItem : MenuItem
 	{
 		[Import]

diff --git a/Dapplo.CaliburnMicro.Demo/packages.config b/Dapplo.CaliburnMicro.Demo/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="Caliburn.Micro" version="3.0.1" targetFramework="net452" />
   <package id="Caliburn.Micro.Core" version="3.0.1" targetFramework="net452" />
-  <package id="Dapplo.Addons" version="0.3.88" targetFramework="net452" />
+  <package id="Dapplo.Addons" version="0.3.89" targetFramework="net452" />
   <package id="Dapplo.Config" version="0.4.2" targetFramework="net452" />
   <package id="Dapplo.InterfaceImpl" version="0.2.5" targetFramework="net452" />
   <package id="Dapplo.Log" version="1.0.22" targetFramework="net452" />

diff --git a/Dapplo.CaliburnMicro.NotifyIconWpf/Dapplo.CaliburnMicro.NotifyIconWpf.csproj b/Dapplo.CaliburnMicro.NotifyIconWpf/Dapplo.CaliburnMicro.NotifyIconWpf.csproj
@@ -47,8 +47,8 @@
       <HintPath>..\packages\Caliburn.Micro.3.0.1\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Dapplo.Addons, Version=0.3.88.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.0.3.88\lib\net45\Dapplo.Addons.dll</HintPath>
+    <Reference Include="Dapplo.Addons, Version=0.3.89.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Dapplo.Addons.0.3.89\lib\net45\Dapplo.Addons.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Dapplo.Log, Version=1.0.22.0, Culture=neutral, processorArchitecture=MSIL">

diff --git a/Dapplo.CaliburnMicro.NotifyIconWpf/ViewModels/TrayIconViewModel.cs b/Dapplo.CaliburnMicro.NotifyIconWpf/ViewModels/TrayIconViewModel.cs
@@ -32,6 +32,7 @@
 using System.Windows;
 using Caliburn.Micro;
 using Dapplo.CaliburnMicro.Behaviors;
+using Dapplo.CaliburnMicro.Behaviors.Security;
 using Dapplo.CaliburnMicro.Menu;
 using Dapplo.CaliburnMicro.Tree;
 using Dapplo.Log;
@@ -125,6 +126,7 @@ protected void ConfigureMenuItems(IEnumerable<IMenuItem> menuItems)
 
 			foreach (var contextMenuItem in items.CreateTree())
 			{
+				//UiEnabledPermissionsAttribute.ApplyBehaviorWhenAttribute(contextMenuItem);
 				TrayMenuItems.Add(contextMenuItem);
 			}
 		}

diff --git a/Dapplo.CaliburnMicro.NotifyIconWpf/packages.config b/Dapplo.CaliburnMicro.NotifyIconWpf/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="Caliburn.Micro" version="3.0.1" targetFramework="net452" />
   <package id="Caliburn.Micro.Core" version="3.0.1" targetFramework="net452" />
-  <package id="Dapplo.Addons" version="0.3.88" targetFramework="net45" />
+  <package id="Dapplo.Addons" version="0.3.89" targetFramework="net45" />
   <package id="Dapplo.Log" version="1.0.22" targetFramework="net45" />
   <package id="Dapplo.Utils" version="1.0.128" targetFramework="net45" />
   <package id="Hardcodet.NotifyIcon.Wpf" version="1.0.8" targetFramework="net45" />

diff --git a/Dapplo.CaliburnMicro/Behaviors/AttachedBehavior.cs b/Dapplo.CaliburnMicro/Behaviors/AttachedBehavior.cs
@@ -73,42 +73,42 @@ private static string GetNextPropertyName()
 		/// <summary>
 		/// Update (or create) the Behavior for the DependencyObject
 		/// </summary>
-		/// <param name="host"></param>
-		public void Update(DependencyObject host)
+		/// <param name="host">DependencyObject</param>
+		/// <param name="propertyChangedEventArgs">DependencyPropertyChangedEventArgs</param>
+		public void Update(DependencyObject host, DependencyPropertyChangedEventArgs propertyChangedEventArgs)
 		{
 			Contract.Requires(host != null);
 
 			var behavior = (IBehavior) host.GetValue(_property);
 
 			if (behavior == null)
 			{
-				TryCreateBehavior(host);
+				TryCreateBehavior(host, propertyChangedEventArgs);
 			}
 			else
 			{
-				UpdateBehavior(host, behavior);
+				UpdateBehavior(host, behavior, propertyChangedEventArgs);
 			}
 		}
 
-		private void TryCreateBehavior(DependencyObject host)
+		private void TryCreateBehavior(DependencyObject host, DependencyPropertyChangedEventArgs propertyChangedEventArgs)
 		{
 			var behavior = _behaviorFactory(host);
 
-			if (behavior.IsApplicable())
+			if (!behavior.IsApplicable())
 			{
-				behavior.Attach();
-
-				host.SetValue(_property, behavior);
-
-				behavior.Update();
+				return;
 			}
+			behavior.Attach();
+			host.SetValue(_property, behavior);
+			behavior.Update(propertyChangedEventArgs);
 		}
 
-		private void UpdateBehavior(DependencyObject host, IBehavior behavior)
+		private void UpdateBehavior(DependencyObject host, IBehavior behavior, DependencyPropertyChangedEventArgs propertyChangedEventArgs)
 		{
 			if (behavior.IsApplicable())
 			{
-				behavior.Update();
+				behavior.Update(propertyChangedEventArgs);
 			}
 			else
 			{

diff --git a/Dapplo.CaliburnMicro/Behaviors/Behavior.cs b/Dapplo.CaliburnMicro/Behaviors/Behavior.cs
@@ -44,12 +44,12 @@ public abstract class Behavior<THost> : IBehavior where THost : DependencyObject
 		/// <summary>
 		/// Constructor
 		/// </summary>
-		/// <param name="host">DependencyObject</param>
-		protected Behavior(THost host)
+		/// <param name="uiElement">DependencyObject</param>
+		protected Behavior(THost uiElement)
 		{
-			Contract.Requires(host is THost, "Host is not the expected type");
+			Contract.Requires(uiElement is THost, "Host is not the expected type");
 
-			_hostReference = new WeakReference(host);
+			_hostReference = new WeakReference(uiElement);
 		}
 
 		private THost GetHost()
@@ -86,8 +86,9 @@ protected virtual void Detach(THost host)
 		/// <summary>
 		/// Let the behavior update it's "stuffT for the specified host
 		/// </summary>
-		/// <param name="host">THost which extends DependencyObject</param>
-		protected abstract void Update(THost host);
+		/// <param name="uiElement">THost which extends DependencyObject</param>
+		/// <param name="dependencyPropertyChangedEventArgs">DependencyPropertyChangedEventArgs</param>
+		protected abstract void Update(THost uiElement, DependencyPropertyChangedEventArgs? dependencyPropertyChangedEventArgs);
 
 		/// <summary>
 		/// Let the behavior update it's "stuffT for the specified host
@@ -138,13 +139,13 @@ public void Detach()
 		}
 
 		/// <inheritdoc />
-		public void Update()
+		public void Update(DependencyPropertyChangedEventArgs? dependencyPropertyChangedEventArgs)
 		{
 			var host = GetHost();
 
 			if (host != null)
 			{
-				Update(host);
+				Update(host, dependencyPropertyChangedEventArgs);
 			}
 		}
 

diff --git a/Dapplo.CaliburnMicro/Behaviors/BooleanVisibility.cs b/Dapplo.CaliburnMicro/Behaviors/BooleanVisibility.cs
@@ -69,9 +69,9 @@ public static class BooleanVisibility
 
 		private static readonly AttachedBehavior Behavior = AttachedBehavior.Register(host => new BooleanVisibilityBehavior((UIElement)host));
 
-		private static void OnVisibilityChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+		private static void OnVisibilityChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
 		{
-			Behavior.Update(d);
+			Behavior.Update(dependencyObject, dependencyPropertyChangedEventArgs);
 		}
 
 		/// <summary>
@@ -151,15 +151,15 @@ public static Visibility GetWhenFalse(UIElement uiElement)
 		/// </summary>
 		private sealed class BooleanVisibilityBehavior : Behavior<UIElement>
 		{
-			internal BooleanVisibilityBehavior(UIElement host) : base(host)
+			internal BooleanVisibilityBehavior(UIElement uiElement) : base(uiElement)
 			{
 				// Does not propagate external changes in visibility to binding source - that will be
 				// covered in a future post
 			}
 
-			protected override void Update(UIElement host)
+			protected override void Update(UIElement uiElement, DependencyPropertyChangedEventArgs? dependencyPropertyChangedEventArgs)
 			{
-				host.Visibility = GetValue(host) ? GetWhenTrue(host) : GetWhenFalse(host);
+				uiElement.Visibility = GetValue(uiElement) ? GetWhenTrue(uiElement) : GetWhenFalse(uiElement);
 			}
 		}
 	}

diff --git a/Dapplo.CaliburnMicro/Behaviors/EnumVisibility.cs b/Dapplo.CaliburnMicro/Behaviors/EnumVisibility.cs
@@ -85,7 +85,7 @@ public static class EnumVisibility
 		/// <param name="dependencyPropertyChangedEventArgs">DependencyPropertyChangedEventArgs</param>
 		private static void OnArgumentsChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
 		{
-			Behavior.Update(dependencyObject);
+			Behavior.Update(dependencyObject, dependencyPropertyChangedEventArgs);
 		}
 
 		/// <summary>
@@ -182,17 +182,17 @@ public static void SetWhenNotMatched(UIElement uiElement, Visibility visibility)
 		/// </summary>
 		private sealed class EnumVisibilityBehavior : Behavior<UIElement>
 		{
-			private readonly EnumCheck _enumCheck = new EnumCheck();
+			private readonly ValueChecker<object> _enumCheck = new ValueChecker<object>();
 
-			internal EnumVisibilityBehavior(UIElement host) : base(host)
+			internal EnumVisibilityBehavior(UIElement uiElement) : base(uiElement)
 			{
 			}
 
-			protected override void Update(UIElement host)
+			protected override void Update(UIElement uiElement, DependencyPropertyChangedEventArgs? dependencyPropertyChangedEventArgs)
 			{
-				_enumCheck.Update(GetValue(host), GetTargetValue(host));
+				_enumCheck.Update(GetValue(uiElement), GetTargetValue(uiElement));
 
-				host.Visibility = _enumCheck.IsMatch ? GetWhenMatched(host) : GetWhenNotMatched(host);
+				uiElement.Visibility = _enumCheck.IsMatch ? GetWhenMatched(uiElement) : GetWhenNotMatched(uiElement);
 			}
 		}
 	}