Add Filter to support search without using search= (#81)

AlfonsoCampodonico · web-flow · commit f0da575405d0 · 2021-08-24T14:37:24.000-04:00
diff --git a/NGitLab/Impl/MergeRequestChangeClient.cs b/NGitLab/Impl/MergeRequestChangeClient.cs
@@ -20,6 +20,6 @@ public MergeRequestChangeClient(API api, string projectPath, int mergeRequestIid
             _changesPath = projectPath + "/merge_requests/" + iid + "/changes";
         }
 
-        public MergeRequestChange MergeRequestChange =>  _api.Get().To<MergeRequestChange>(_changesPath);
+        public MergeRequestChange MergeRequestChange => _api.Get().To<MergeRequestChange>(_changesPath);
     }
 }
diff --git a/NGitLab/Impl/ReleaseClient.cs b/NGitLab/Impl/ReleaseClient.cs
@@ -19,7 +19,7 @@ public ReleaseClient(API api, int projectId)
             _releasesPath = projectPath + "/releases";
         }
 
-        public IEnumerable<ReleaseInfo> All  => _api.Get().GetAll<ReleaseInfo>(_releasesPath);
+        public IEnumerable<ReleaseInfo> All => _api.Get().GetAll<ReleaseInfo>(_releasesPath);
 
         public ReleaseInfo this[string tagName] => _api.Get().To<ReleaseInfo>($"{_releasesPath}/{Uri.EscapeDataString(tagName)}");
 
diff --git a/NGitLab/Impl/UserClient.cs b/NGitLab/Impl/UserClient.cs
@@ -34,6 +34,14 @@ public IEnumerable<User> Get(UserQuery query)
             url = Utils.AddParameter(url, "per_page", query.PerPage);
             url = Utils.AddParameter(url, "order_by", query.OrderBy);
             url = Utils.AddParameter(url, "sort", query.Sort);
+            url = Utils.AddParameter(url, "extern_uid", query.ExternalUid);
+            url = Utils.AddParameter(url, "provider", query.Provider);
+            url = Utils.AddParameter(url, "without_projects", query.WithoutProjects);
+            url = Utils.AddParameter(url, "created_before", query.CreatedBefore);
+            url = Utils.AddParameter(url, "created_after", query.CreatedAfter);
+            url = Utils.AddParameter(url, "with_custom_attributes", query.WithCustomAttributes);
+            url = Utils.AddParameter(url, "two_factor", query.TwoFactor);
+            url = Utils.AddParameter(url, "admins", query.IsAdmin);
 
             return _api.Get().GetAll<User>(url);
         }
diff --git a/NGitLab/Models/Change.cs b/NGitLab/Models/Change.cs
@@ -5,28 +5,28 @@ namespace NGitLab.Models
     [DataContract]
     public class Change
     {
-        [DataMember(Name="old_path")]
+        [DataMember(Name = "old_path")]
         public string OldPath { get; set; }
 
-        [DataMember(Name="new_path")]
+        [DataMember(Name = "new_path")]
         public string NewPath { get; set; }
 
-        [DataMember(Name="a_mode")]
+        [DataMember(Name = "a_mode")]
         public long AMode { get; set; }
 
-        [DataMember(Name="b_mode")]
+        [DataMember(Name = "b_mode")]
         public long BMode { get; set; }
 
-        [DataMember(Name="new_file")]
+        [DataMember(Name = "new_file")]
         public bool NewFile { get; set; }
 
-        [DataMember(Name="renamed_file")]
+        [DataMember(Name = "renamed_file")]
         public bool RenamedFile { get; set; }
 
-        [DataMember(Name="deleted_file")]
+        [DataMember(Name = "deleted_file")]
         public bool DeletedFile { get; set; }
 
-        [DataMember(Name="diff")]
+        [DataMember(Name = "diff")]
         public string Diff { get; set; }
     }
 }
diff --git a/NGitLab/Models/DiffRefs.cs b/NGitLab/Models/DiffRefs.cs
@@ -6,7 +6,7 @@ namespace NGitLab.Models
     public class DiffRefs
     {
         [field: DataMember(Name = "base_sha")]
-        public string BaseSha { get; set;  }
+        public string BaseSha { get; set; }
 
         [DataMember(Name = "head_sha")]
         public string HeadSha { get; set; }
diff --git a/NGitLab/Models/Identity.cs b/NGitLab/Models/Identity.cs
@@ -10,5 +10,8 @@ public class Identity
 
         [DataMember(Name = "extern_uid")]
         public string ExternUid;
+
+        [DataMember(Name = "saml_provider_id")]
+        public int? SamlProviderId;
     }
 }
diff --git a/NGitLab/Models/MergeRequestApprove.cs b/NGitLab/Models/MergeRequestApprove.cs
@@ -15,6 +15,6 @@ public class MergeRequestApprove
         /// (optional) - Current user’s password. Required if Require user password to approve is enabled in the project settings.
         /// </summary>
         [DataMember(Name = "approval_password ")]
-        public string ApprovalPassword  { get; set; }
+        public string ApprovalPassword { get; set; }
     }
 }
diff --git a/NGitLab/Models/MergeRequestChange.cs b/NGitLab/Models/MergeRequestChange.cs
@@ -5,7 +5,7 @@ namespace NGitLab.Models
     [DataContract]
     public class MergeRequestChange
     {
-        [DataMember(Name="changes")]
+        [DataMember(Name = "changes")]
         public Change[] Changes { get; set; }
     }
 }
diff --git a/NGitLab/Models/MergeRequestState.cs b/NGitLab/Models/MergeRequestState.cs
@@ -2,12 +2,12 @@
 {
     public enum MergeRequestState
     {
-// ReSharper disable InconsistentNaming
+        // ReSharper disable InconsistentNaming
         opened,
         closed,
         merged,
         locked,
 
-// ReSharper restore InconsistentNaming
+        // ReSharper restore InconsistentNaming
     }
 }
diff --git a/NGitLab/Models/TwoFactorState.cs b/NGitLab/Models/TwoFactorState.cs
@@ -0,0 +1,12 @@
+﻿using System.Runtime.Serialization;
+
+namespace NGitLab.Models
+{
+    public enum TwoFactorState
+    {
+        [EnumMember(Value = "enabled")]
+        Enabled,
+        [EnumMember(Value = "disabled")]
+        Disabled,
+    }
+}
diff --git a/NGitLab/Models/User.cs b/NGitLab/Models/User.cs
@@ -13,14 +13,35 @@ public class User
         [DataMember(Name = "id")]
         public int Id;
 
+        [DataMember(Name = "name")]
+        public string Name;
+
         [DataMember(Name = "username")]
         public string Username;
 
-        [DataMember(Name = "email")]
-        public string Email;
+        [DataMember(Name = "state")]
+        public string State;
 
-        [DataMember(Name = "name")]
-        public string Name;
+        [DataMember(Name = "avatar_url")]
+        public string AvatarURL;
+
+        [DataMember(Name = "web_url")]
+        public string WebURL;
+
+        [DataMember(Name = "created_at")]
+        public DateTime CreatedAt;
+
+        [DataMember(Name = "bio")]
+        public string Bio;
+
+        [DataMember(Name = "bio_html")]
+        public string BioHtml;
+
+        [DataMember(Name = "location")]
+        public string Location;
+
+        [DataMember(Name = "public_email")]
+        public string PublicEmail;
 
         [DataMember(Name = "skype")]
         public string Skype;
@@ -31,41 +52,50 @@ public class User
         [DataMember(Name = "twitter")]
         public string Twitter;
 
-        [DataMember(Name = "state")]
-        public string State;
+        [DataMember(Name = "website_url")]
+        public string WebsiteURL;
 
-        [DataMember(Name = "blocked")]
-        public bool Blocked;
+        [DataMember(Name = "organization")]
+        public string Organization;
 
-        [DataMember(Name = "created_at")]
-        public DateTime CreatedAt;
+        [DataMember(Name = "job_title")]
+        public string JobTitle;
 
-        [DataMember(Name = "last_activity_on")]
-        public DateTime LastActivityOn;
+        [DataMember(Name = "bot")]
+        public bool Bot;
 
-        [DataMember(Name = "avatar_url")]
-        public string AvatarURL;
+        [DataMember(Name = "work_information")]
+        public string WorkInformation;
 
-        [DataMember(Name = "bio")]
-        public string Bio;
+        [DataMember(Name = "followers")]
+        public int Followers;
 
-        [DataMember(Name = "color_scheme_id")]
-        public int ColorSchemeId;
+        [DataMember(Name = "following")]
+        public int Following;
+
+        [DataMember(Name = "last_sign_in_at")]
+        public DateTime LastSignIn;
+
+        [DataMember(Name = "confirmed_at")]
+        public DateTime ConfirmedAt;
+
+        [DataMember(Name = "last_activity_on")]
+        public DateTime LastActivityOn;
+
+        [DataMember(Name = "email")]
+        public string Email;
 
         [DataMember(Name = "theme_id")]
         public int ThemeId;
 
-        [DataMember(Name = "website_url")]
-        public string WebsiteURL;
-
-        [DataMember(Name = "is_admin")]
-        public bool IsAdmin;
+        [DataMember(Name = "color_scheme_id")]
+        public int ColorSchemeId;
 
-        [DataMember(Name = "can_create_group")]
-        public bool CanCreateGroup;
+        [DataMember(Name = "projects_limit")]
+        public int ProjectsLimit;
 
-        [DataMember(Name = "can_create_project")]
-        public bool CanCreateProject;
+        [DataMember(Name = "current_sign_in")]
+        public DateTime CurrentSignIn;
 
         [DataMember(Name = "identities")]
         public Identity[] Identities;
@@ -77,5 +107,47 @@ public class User
         [Obsolete("This does not match GitLab's Api. Use Identities.ExternUid instead.")]
         [DataMember(Name = "extern_uid")]
         public string ExternUid;
+
+        [DataMember(Name = "blocked")]
+        public bool Blocked;
+
+        [DataMember(Name = "can_create_group")]
+        public bool CanCreateGroup;
+
+        [DataMember(Name = "can_create_project")]
+        public bool CanCreateProject;
+
+        [DataMember(Name = "two_factor_enabled")]
+        public bool TwoFactorEnabled;
+
+        [DataMember(Name = "external")]
+        public bool External;
+
+        [DataMember(Name = "private_profile")]
+        public bool PrivateProfile;
+
+        [DataMember(Name = "commit_email")]
+        public string CommitEmail;
+
+        [DataMember(Name = "shared_runners_minutes_limit")]
+        public int SharedRunnersMinutesLimit;
+
+        [DataMember(Name = "extra_shared_runners_minutes_limit")]
+        public int ExtraSharedRunnersMinutesLimit;
+
+        [DataMember(Name = "is_admin")]
+        public bool IsAdmin;
+
+        [DataMember(Name = "note")]
+        public string Note;
+
+        [DataMember(Name = "using_license_seat")]
+        public bool UsingLicenseSeat;
+
+        [DataMember(Name = "is_auditor")]
+        public bool IsAuditor;
+
+        [DataMember(Name = "provisioned_by_group_id")]
+        public int ProvisionedByGroupId;
     }
 }
diff --git a/NGitLab/Models/UserQuery.cs b/NGitLab/Models/UserQuery.cs
@@ -1,4 +1,7 @@
-﻿namespace NGitLab
+using System;
+using NGitLab.Models;
+
+namespace NGitLab
 {
     public class UserQuery
     {
@@ -46,5 +49,48 @@ public class UserQuery
         /// (Admin only) Order users in asc or desc order. Default is descending
         /// </summary>
         public string Sort { get; set; }
+
+        /// <summary>
+        /// (Admin only) Search users based on external UID
+        /// </summary>
+        public string ExternalUid { get; set; }
+
+        /// <summary>
+        /// (Admin only) Search users based on Provider
+        /// </summary>
+        public string Provider { get; set; }
+
+        /// <summary>
+        /// (Admin only) Search for users without projects
+        /// </summary>
+        public bool? WithoutProjects { get; set; }
+
+        /// <summary>
+        /// (Admin only) Search for users created before specified date time
+        /// Format: "YYYY-MM-DDThh:mm:ss.sTZD" eg. "2001-01-02T00:00:00.060Z"
+        /// </summary>
+        public DateTime? CreatedBefore { get; set; }
+
+        /// <summary>
+        /// (Admin only) Search for users created after specified date time
+        /// Format: "YYYY-MM-DDThh:mm:ss.sTZD" eg. "2001-01-02T00:00:00.060Z"
+        /// </summary>
+        public DateTime? CreatedAfter { get; set; }
+
+        /// <summary>
+        /// (Admin only) Include the users custom attributes in the response
+        /// </summary>
+        public bool? WithCustomAttributes { get; set; }
+
+        /// <summary>
+        /// (Admin only) Gets users that have two factor either enabled or disabled
+        /// Possible values: "enabled", "disabled"
+        /// </summary>
+        public TwoFactorState? TwoFactor { get; set; }
+
+        /// <summary>
+        /// (Admin only)If true, get only users that are Admin
+        /// </summary>
+        public bool? IsAdmin { get; set; }
     }
 }
diff --git a/NGitLab/PublicAPI.Unshipped.txt b/NGitLab/PublicAPI.Unshipped.txt

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,6 @@ public MergeRequestChangeClient(API api, string projectPath, int mergeRequestIid`
`20`	`20`	`_changesPath = projectPath + "/merge_requests/" + iid + "/changes";`
`21`	`21`	`}`
`22`	`22`
`23`		`- public MergeRequestChange MergeRequestChange => _api.Get().To<MergeRequestChange>(_changesPath);`
	`23`	`+ public MergeRequestChange MergeRequestChange => _api.Get().To<MergeRequestChange>(_changesPath);`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public ReleaseClient(API api, int projectId)`
`19`	`19`	`_releasesPath = projectPath + "/releases";`
`20`	`20`	`}`
`21`	`21`
`22`		`- public IEnumerable<ReleaseInfo> All => _api.Get().GetAll<ReleaseInfo>(_releasesPath);`
	`22`	`+ public IEnumerable<ReleaseInfo> All => _api.Get().GetAll<ReleaseInfo>(_releasesPath);`
`23`	`23`
`24`	`24`	`public ReleaseInfo this[string tagName] => _api.Get().To<ReleaseInfo>($"{_releasesPath}/{Uri.EscapeDataString(tagName)}");`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace NGitLab.Models`
`6`	`6`	`public class DiffRefs`
`7`	`7`	`{`
`8`	`8`	`[field: DataMember(Name = "base_sha")]`
`9`		`- public string BaseSha { get; set; }`
	`9`	`+ public string BaseSha { get; set; }`
`10`	`10`
`11`	`11`	`[DataMember(Name = "head_sha")]`
`12`	`12`	`public string HeadSha { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,8 @@ public class Identity`
`10`	`10`
`11`	`11`	`[DataMember(Name = "extern_uid")]`
`12`	`12`	`public string ExternUid;`
	`13`	`+`
	`14`	`+ [DataMember(Name = "saml_provider_id")]`
	`15`	`+ public int? SamlProviderId;`
`13`	`16`	`}`
`14`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,6 @@ public class MergeRequestApprove`
`15`	`15`	`/// (optional) - Current user’s password. Required if Require user password to approve is enabled in the project settings.`
`16`	`16`	`/// </summary>`
`17`	`17`	`[DataMember(Name = "approval_password ")]`
`18`		`- public string ApprovalPassword { get; set; }`
	`18`	`+ public string ApprovalPassword { get; set; }`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ namespace NGitLab.Models`
`5`	`5`	`[DataContract]`
`6`	`6`	`public class MergeRequestChange`
`7`	`7`	`{`
`8`		`- [DataMember(Name="changes")]`
	`8`	`+ [DataMember(Name = "changes")]`
`9`	`9`	`public Change[] Changes { get; set; }`
`10`	`10`	`}`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,12 @@`
`2`	`2`	`{`
`3`	`3`	`public enum MergeRequestState`
`4`	`4`	`{`
`5`		`-// ReSharper disable InconsistentNaming`
	`5`	`+ // ReSharper disable InconsistentNaming`
`6`	`6`	`opened,`
`7`	`7`	`closed,`
`8`	`8`	`merged,`
`9`	`9`	`locked,`
`10`	`10`
`11`		`-// ReSharper restore InconsistentNaming`
	`11`	`+ // ReSharper restore InconsistentNaming`
`12`	`12`	`}`
`13`	`13`	`}`