Merge pull request #81 from knippers/master

including the UUID in templates
jscarle · Jun 18, 2024 · 7536293 · 7536293
2 parents a91a440 + 443ca04
commit 7536293
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 11 deletions.
diff --git a/OnePassword.NET.Tests/TestTemplates.cs b/OnePassword.NET.Tests/TestTemplates.cs
@@ -55,15 +55,14 @@ public void GetTemplatesByEnum()
 
         Run(RunType.Test, () =>
         {
-            foreach (var enumValue in Enum.GetValues(typeof(Category)))
+            foreach (var enumValue in Enum.GetValues<Category>())
             {
-                var enumMember = (Category)enumValue;
-                if (enumMember is Category.Custom or Category.Unknown)
+                if (enumValue is Category.Custom or Category.Unknown)
                     continue;
 
-                var enumMemberString = enumMember.ToEnumString();
+                var enumMemberString = enumValue.ToEnumString();
 
-                var template = OnePassword.GetTemplate(enumMember);
+                var template = OnePassword.GetTemplate(enumValue);
 
                 Assert.Multiple(() =>
                 {

diff --git a/OnePassword.NET/Templates/ITemplate.cs b/OnePassword.NET/Templates/ITemplate.cs
@@ -5,6 +5,11 @@
 /// </summary>
 public interface ITemplate : IEquatable<ITemplate>, IComparable<ITemplate>, IComparable
 {
+    /// <summary>
+    /// The template UUID.
+    /// </summary>
+    string Uuid { get; }
+
     /// <summary>
     /// The template name.
     /// </summary>

diff --git a/OnePassword.NET/Templates/Template.cs b/OnePassword.NET/Templates/Template.cs
@@ -6,6 +6,11 @@ namespace OnePassword.Templates;
 /// <summary>Represents a 1Password template.</summary>
 public sealed class Template : ItemBase, ITemplate, ICloneable
 {
+    /// <inheritdoc />
+    [JsonInclude]
+    [JsonPropertyName("uuid")]
+    public string Uuid { get; internal set; } = "";
+
     /// <inheritdoc />
     [JsonInclude]
     [JsonPropertyName("name")]
@@ -67,7 +72,7 @@ public Template Clone()
     public bool Equals(ITemplate? other)
     {
         if (other is null) return false;
-        return ReferenceEquals(this, other) || string.Equals(Name, other.Name, StringComparison.OrdinalIgnoreCase);
+        return ReferenceEquals(this, other) || string.Equals(Uuid, other.Uuid, StringComparison.OrdinalIgnoreCase);
     }
 
     /// <inheritdoc />
@@ -82,14 +87,14 @@ public int CompareTo(object? obj)
     public int CompareTo(ITemplate? other)
     {
         if (other is null) return 1;
-        return ReferenceEquals(this, other) ? 0 : string.Compare(Name, other.Name, StringComparison.Ordinal);
+        return ReferenceEquals(this, other) ? 0 : string.Compare(Uuid, other.Uuid, StringComparison.Ordinal);
     }
 
     /// <inheritdoc />
     public override int GetHashCode() =>
         // ReSharper disable once NonReadonlyMemberInGetHashCode
         // Name can only be set by internal methods.
-        StringComparer.OrdinalIgnoreCase.GetHashCode(Name);
+        StringComparer.OrdinalIgnoreCase.GetHashCode(Uuid) + StringComparer.OrdinalIgnoreCase.GetHashCode(Name);
 
     /// <inheritdoc />
     object ICloneable.Clone() => Clone();

diff --git a/OnePassword.NET/Templates/TemplateInfo.cs b/OnePassword.NET/Templates/TemplateInfo.cs
@@ -3,6 +3,11 @@
 /// <summary>Describes a 1Password template.</summary>
 public sealed class TemplateInfo : ITemplate
 {
+    /// <inheritdoc />
+    [JsonInclude]
+    [JsonPropertyName("uuid")]
+    public string Uuid { get; internal set; } = "";
+
     /// <inheritdoc />
     [JsonInclude]
     [JsonPropertyName("name")]
@@ -54,7 +59,7 @@ public sealed class TemplateInfo : ITemplate
     public bool Equals(ITemplate? other)
     {
         if (other is null) return false;
-        return ReferenceEquals(this, other) || string.Equals(Name, other.Name, StringComparison.OrdinalIgnoreCase);
+        return ReferenceEquals(this, other) || string.Equals(Uuid, other.Uuid, StringComparison.OrdinalIgnoreCase);
     }
 
     /// <inheritdoc />
@@ -69,14 +74,14 @@ public int CompareTo(object? obj)
     public int CompareTo(ITemplate? other)
     {
         if (other is null) return 1;
-        return ReferenceEquals(this, other) ? 0 : string.Compare(Name, other.Name, StringComparison.Ordinal);
+        return ReferenceEquals(this, other) ? 0 : string.Compare(Uuid, other.Uuid, StringComparison.Ordinal);
     }
 
     /// <inheritdoc />
     public override int GetHashCode() =>
         // ReSharper disable once NonReadonlyMemberInGetHashCode
         // Name can only be set by internal methods.
-        StringComparer.OrdinalIgnoreCase.GetHashCode(Name);
+        StringComparer.OrdinalIgnoreCase.GetHashCode(Uuid) + StringComparer.OrdinalIgnoreCase.GetHashCode(Name);
 
     private static int NullSafeCompareTo(TemplateInfo? a, ITemplate? b)
     {