Merge pull request #27 from OctopusDeploy/enh-mediatorcontracts

Moving message contracts out of server

Author: uglybugger

source/Octopus.Data/Model/Href.cs

@@ -2,11 +2,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json;
-using Octopus.Data.Resources.Users;
 
 namespace Octopus.Data.Model.User
 {
-    public sealed class Identity : IEquatable<Identity>, IEquatable<IdentityResource>
+    public sealed class Identity : IEquatable<Identity>
     {
         public Identity(string identityProviderName)
         {
@@ -45,60 +44,6 @@ public bool Equals(Identity other)
             });
         }
 
-        public bool Equals(IdentityResource other)
-        {
-            if (ReferenceEquals(null, other)) return false;
-            if (IdentityProviderName != other.IdentityProviderName) return false;
-            return Claims.All(kvp =>
-            {
-                if (!kvp.Value.IsIdentifyingClaim || kvp.Value.IsServerSideOnly)
-                    return true;
-                if (!other.Claims.ContainsKey(kvp.Key))
-                    return false;
-                var existingClaimValue = kvp.Value.Value;
-                var bothClaimsAreNullOrWhitespace = string.IsNullOrWhiteSpace(existingClaimValue) &&
-                    string.IsNullOrWhiteSpace(other.Claims[kvp.Key].Value);
-                var existingClaimHasValueAndMatches = !string.IsNullOrWhiteSpace(existingClaimValue) &&
-                    existingClaimValue.Equals(other.Claims[kvp.Key].Value,
-                        StringComparison.OrdinalIgnoreCase);
-                return bothClaimsAreNullOrWhitespace || existingClaimHasValueAndMatches;
-            });
-        }
-
-        public IdentityResource ToResource()
-        {
-            return new IdentityResource(IdentityProviderName)
-                .WithClaims(Claims);
-        }
-
-        internal Identity WithClaims(Dictionary<string, IdentityClaimResource> claims)
-        {
-            foreach (var kvp in claims)
-                if (Claims.ContainsKey(kvp.Key))
-                    Claims[kvp.Key].Value = kvp.Value.Value;
-                else
-                    Claims.Add(kvp.Key, new IdentityClaim(kvp.Value.Value, kvp.Value.IsIdentifyingClaim));
-            return this;
-        }
-
-        public Identity WithClaim(string type, string value, bool isIdentifyingClaim, bool isServerSideOnly = false)
-        {
-            if (Claims.ContainsKey(type))
-            {
-                var claim = Claims[type];
-                claim.Value = value;
-                claim.IsIdentifyingClaim = isIdentifyingClaim;
-                claim.IsServerSideOnly = isServerSideOnly;
-            }
-            else
-            {
-                var claim = new IdentityClaim(value, isIdentifyingClaim, isServerSideOnly);
-                Claims.Add(type, claim);
-            }
-
-            return this;
-        }
-
         public override bool Equals(object obj)
         {
             if (ReferenceEquals(null, obj)) return false;

source/Octopus.Data/Model/LinkCollection.cs

@@ -22,7 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="icon.png" Pack="true" PackagePath="\"/>
+    <None Include="icon.png" Pack="true" PackagePath="\" />
   </ItemGroup>
 
 </Project>