Add support for security token API's

Author: Mpdreamz

src/Elasticsearch.Net/Domain/RequestParameters/RequestParameters.Generated.cs

@@ -7202,28 +7202,28 @@ public class GetRoleMappingRequestParameters : FluentRequestParameters<GetRoleMa
 	///https://www.elastic.co/guide/en/x-pack/master/security-api-tokens.html#security-api-get-token
 	///</pre>
 	///</summary>
-	public class XpackSecurityGetTokenRequestParameters : FluentRequestParameters<XpackSecurityGetTokenRequestParameters> 
+	public class GetUserAccessTokenRequestParameters : FluentRequestParameters<GetUserAccessTokenRequestParameters> 
 	{
 		public override HttpMethod DefaultHttpMethod => HttpMethod.POST;
 
 		///<summary>Pretty format the returned JSON response.</summary>
-		public XpackSecurityGetTokenRequestParameters Pretty(bool pretty) => this.AddQueryString("pretty", pretty);
+		public GetUserAccessTokenRequestParameters Pretty(bool pretty) => this.AddQueryString("pretty", pretty);
 
 
 		///<summary>Return human readable values for statistics.</summary>
-		public XpackSecurityGetTokenRequestParameters Human(bool human) => this.AddQueryString("human", human);
+		public GetUserAccessTokenRequestParameters Human(bool human) => this.AddQueryString("human", human);
 
 
 		///<summary>Include the stack trace of returned errors.</summary>
-		public XpackSecurityGetTokenRequestParameters ErrorTrace(bool error_trace) => this.AddQueryString("error_trace", error_trace);
+		public GetUserAccessTokenRequestParameters ErrorTrace(bool error_trace) => this.AddQueryString("error_trace", error_trace);
 
 
 		///<summary>The URL-encoded request definition. Useful for libraries that do not accept a request body for non-POST requests.</summary>
-		public XpackSecurityGetTokenRequestParameters Source(string source) => this.AddQueryString("source", source);
+		public GetUserAccessTokenRequestParameters Source(string source) => this.AddQueryString("source", source);
 
 
 		///<summary>A comma-separated list of filters used to reduce the respone.</summary>
-		public XpackSecurityGetTokenRequestParameters FilterPath(params string[] filter_path) => this.AddQueryString("filter_path", filter_path);
+		public GetUserAccessTokenRequestParameters FilterPath(params string[] filter_path) => this.AddQueryString("filter_path", filter_path);
 
 	}
 
@@ -7262,28 +7262,28 @@ public class GetUserRequestParameters : FluentRequestParameters<GetUserRequestPa
 	///https://www.elastic.co/guide/en/x-pack/master/security-api-tokens.html#security-api-invalidate-token
 	///</pre>
 	///</summary>
-	public class XpackSecurityInvalidateTokenRequestParameters : FluentRequestParameters<XpackSecurityInvalidateTokenRequestParameters> 
+	public class InvalidateUserAccessTokenRequestParameters : FluentRequestParameters<InvalidateUserAccessTokenRequestParameters> 
 	{
 		public override HttpMethod DefaultHttpMethod => HttpMethod.DELETE;
 
 		///<summary>Pretty format the returned JSON response.</summary>
-		public XpackSecurityInvalidateTokenRequestParameters Pretty(bool pretty) => this.AddQueryString("pretty", pretty);
+		public InvalidateUserAccessTokenRequestParameters Pretty(bool pretty) => this.AddQueryString("pretty", pretty);
 
 
 		///<summary>Return human readable values for statistics.</summary>
-		public XpackSecurityInvalidateTokenRequestParameters Human(bool human) => this.AddQueryString("human", human);
+		public InvalidateUserAccessTokenRequestParameters Human(bool human) => this.AddQueryString("human", human);
 
 
 		///<summary>Include the stack trace of returned errors.</summary>
-		public XpackSecurityInvalidateTokenRequestParameters ErrorTrace(bool error_trace) => this.AddQueryString("error_trace", error_trace);
+		public InvalidateUserAccessTokenRequestParameters ErrorTrace(bool error_trace) => this.AddQueryString("error_trace", error_trace);
 
 
 		///<summary>The URL-encoded request definition. Useful for libraries that do not accept a request body for non-POST requests.</summary>
-		public XpackSecurityInvalidateTokenRequestParameters Source(string source) => this.AddQueryString("source", source);
+		public InvalidateUserAccessTokenRequestParameters Source(string source) => this.AddQueryString("source", source);
 
 
 		///<summary>A comma-separated list of filters used to reduce the respone.</summary>
-		public XpackSecurityInvalidateTokenRequestParameters FilterPath(params string[] filter_path) => this.AddQueryString("filter_path", filter_path);
+		public InvalidateUserAccessTokenRequestParameters FilterPath(params string[] filter_path) => this.AddQueryString("filter_path", filter_path);
 
 	}
 

src/Elasticsearch.Net/ElasticLowLevelClient.Generated.cs

@@ -9306,7 +9306,7 @@ public ElasticsearchResponse<T> XpackSecurityGetRoleMapping<T>(Func<GetRoleMappi
 	    ///</summary>
 		///<param name="body">The token request to get</param>
 		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
-		public ElasticsearchResponse<T> XpackSecurityGetToken<T>(PostData<object> body, Func<XpackSecurityGetTokenRequestParameters, XpackSecurityGetTokenRequestParameters> requestParameters = null)
+		public ElasticsearchResponse<T> XpackSecurityGetToken<T>(PostData<object> body, Func<GetUserAccessTokenRequestParameters, GetUserAccessTokenRequestParameters> requestParameters = null)
 			where T : class => this.DoRequest<T>(POST, Url($"_xpack/security/oauth2/token"), body, _params(requestParameters));
 
 		///<summary>Represents a POST on /_xpack/security/oauth2/token
@@ -9320,7 +9320,7 @@ public ElasticsearchResponse<T> XpackSecurityGetToken<T>(PostData<object> body,
 	    ///</summary>
 		///<param name="body">The token request to get</param>
 		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
-		public Task<ElasticsearchResponse<T>> XpackSecurityGetTokenAsync<T>(PostData<object> body, Func<XpackSecurityGetTokenRequestParameters, XpackSecurityGetTokenRequestParameters> requestParameters = null, CancellationToken cancellationToken = default(CancellationToken))
+		public Task<ElasticsearchResponse<T>> XpackSecurityGetTokenAsync<T>(PostData<object> body, Func<GetUserAccessTokenRequestParameters, GetUserAccessTokenRequestParameters> requestParameters = null, CancellationToken cancellationToken = default(CancellationToken))
 			where T : class => this.DoRequestAsync<T>(POST, Url($"_xpack/security/oauth2/token"), cancellationToken, body, _params(requestParameters));
 
 		///<summary>Represents a GET on /_xpack/security/user/{username}
@@ -9388,7 +9388,7 @@ public ElasticsearchResponse<T> XpackSecurityGetUser<T>(Func<GetUserRequestParam
 	    ///</summary>
 		///<param name="body">The token to invalidate</param>
 		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
-		public ElasticsearchResponse<T> XpackSecurityInvalidateToken<T>(PostData<object> body, Func<XpackSecurityInvalidateTokenRequestParameters, XpackSecurityInvalidateTokenRequestParameters> requestParameters = null)
+		public ElasticsearchResponse<T> XpackSecurityInvalidateToken<T>(PostData<object> body, Func<InvalidateUserAccessTokenRequestParameters, InvalidateUserAccessTokenRequestParameters> requestParameters = null)
 			where T : class => this.DoRequest<T>(DELETE, Url($"_xpack/security/oauth2/token"), body, _params(requestParameters));
 
 		///<summary>Represents a DELETE on /_xpack/security/oauth2/token
@@ -9402,7 +9402,7 @@ public ElasticsearchResponse<T> XpackSecurityInvalidateToken<T>(PostData<object>
 	    ///</summary>
 		///<param name="body">The token to invalidate</param>
 		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
-		public Task<ElasticsearchResponse<T>> XpackSecurityInvalidateTokenAsync<T>(PostData<object> body, Func<XpackSecurityInvalidateTokenRequestParameters, XpackSecurityInvalidateTokenRequestParameters> requestParameters = null, CancellationToken cancellationToken = default(CancellationToken))
+		public Task<ElasticsearchResponse<T>> XpackSecurityInvalidateTokenAsync<T>(PostData<object> body, Func<InvalidateUserAccessTokenRequestParameters, InvalidateUserAccessTokenRequestParameters> requestParameters = null, CancellationToken cancellationToken = default(CancellationToken))
 			where T : class => this.DoRequestAsync<T>(DELETE, Url($"_xpack/security/oauth2/token"), cancellationToken, body, _params(requestParameters));
 
 		///<summary>Represents a PUT on /_xpack/security/role/{name}

src/Elasticsearch.Net/IElasticLowLevelClient.Generated.cs

@@ -8662,7 +8662,7 @@ public partial interface IElasticLowLevelClient
 		///</summary>
 		///<param name="body">The token request to get</param>
 		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
-		ElasticsearchResponse<T> XpackSecurityGetToken<T>(PostData<object> body, Func<XpackSecurityGetTokenRequestParameters, XpackSecurityGetTokenRequestParameters> requestParameters = null) where T : class;
+		ElasticsearchResponse<T> XpackSecurityGetToken<T>(PostData<object> body, Func<GetUserAccessTokenRequestParameters, GetUserAccessTokenRequestParameters> requestParameters = null) where T : class;
 
 		///<summary>Represents a POST on /_xpack/security/oauth2/token
 		///<para></para>Returns: A task of ElasticsearchResponse&lt;T&gt; where the behaviour depends on the type of T:
@@ -8675,7 +8675,7 @@ public partial interface IElasticLowLevelClient
 		///</summary>
 		///<param name="body">The token request to get</param>
 		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
-		Task<ElasticsearchResponse<T>> XpackSecurityGetTokenAsync<T>(PostData<object> body, Func<XpackSecurityGetTokenRequestParameters, XpackSecurityGetTokenRequestParameters> requestParameters = null, CancellationToken cancellationToken = default(CancellationToken)) where T : class;
+		Task<ElasticsearchResponse<T>> XpackSecurityGetTokenAsync<T>(PostData<object> body, Func<GetUserAccessTokenRequestParameters, GetUserAccessTokenRequestParameters> requestParameters = null, CancellationToken cancellationToken = default(CancellationToken)) where T : class;
 
 		///<summary>Represents a GET on /_xpack/security/user/{username}
 		///<para></para>Returns: ElasticsearchResponse&lt;T&gt; where the behavior depends on the type of T:
@@ -8738,7 +8738,7 @@ public partial interface IElasticLowLevelClient
 		///</summary>
 		///<param name="body">The token to invalidate</param>
 		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
-		ElasticsearchResponse<T> XpackSecurityInvalidateToken<T>(PostData<object> body, Func<XpackSecurityInvalidateTokenRequestParameters, XpackSecurityInvalidateTokenRequestParameters> requestParameters = null) where T : class;
+		ElasticsearchResponse<T> XpackSecurityInvalidateToken<T>(PostData<object> body, Func<InvalidateUserAccessTokenRequestParameters, InvalidateUserAccessTokenRequestParameters> requestParameters = null) where T : class;
 
 		///<summary>Represents a DELETE on /_xpack/security/oauth2/token
 		///<para></para>Returns: A task of ElasticsearchResponse&lt;T&gt; where the behaviour depends on the type of T:
@@ -8751,7 +8751,7 @@ public partial interface IElasticLowLevelClient
 		///</summary>
 		///<param name="body">The token to invalidate</param>
 		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
-		Task<ElasticsearchResponse<T>> XpackSecurityInvalidateTokenAsync<T>(PostData<object> body, Func<XpackSecurityInvalidateTokenRequestParameters, XpackSecurityInvalidateTokenRequestParameters> requestParameters = null, CancellationToken cancellationToken = default(CancellationToken)) where T : class;
+		Task<ElasticsearchResponse<T>> XpackSecurityInvalidateTokenAsync<T>(PostData<object> body, Func<InvalidateUserAccessTokenRequestParameters, InvalidateUserAccessTokenRequestParameters> requestParameters = null, CancellationToken cancellationToken = default(CancellationToken)) where T : class;
 
 		///<summary>Represents a PUT on /_xpack/security/role/{name}
 		///<para></para>Returns: ElasticsearchResponse&lt;T&gt; where the behavior depends on the type of T:

src/Nest/XPack/Security/User/DisableUser/ElasticClient-DisableUser.cs

@@ -24,7 +24,7 @@ public partial class ElasticClient
 	{
 		/// <inheritdoc/>
 		public IDisableUserResponse DisableUser(Name username, Func<DisableUserDescriptor, IDisableUserRequest> selector = null) =>
-			this.DisableUser(selector.InvokeOrDefault(new DisableUserDescriptor()));
+			this.DisableUser(selector.InvokeOrDefault(new DisableUserDescriptor().Username(username)));
 
 		/// <inheritdoc/>
 		public IDisableUserResponse DisableUser(IDisableUserRequest request) =>
@@ -35,7 +35,7 @@ public IDisableUserResponse DisableUser(IDisableUserRequest request) =>
 
 		/// <inheritdoc/>
 		public Task<IDisableUserResponse> DisableUserAsync(Name username, Func<DisableUserDescriptor, IDisableUserRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
-			this.DisableUserAsync(selector.InvokeOrDefault(new DisableUserDescriptor()), cancellationToken);
+			this.DisableUserAsync(selector.InvokeOrDefault(new DisableUserDescriptor().Username(username)), cancellationToken);
 
 		/// <inheritdoc/>
 		public Task<IDisableUserResponse> DisableUserAsync(IDisableUserRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>

src/Nest/XPack/Security/User/GetUserAccessToken/AccessTokenGrantType.cs

@@ -0,0 +1,12 @@
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace Nest
+{
+	[JsonConverter(typeof(StringEnumConverter))]
+	public enum AccessTokenGrantType
+	{
+		[EnumMember(Value = "password")] Password
+	}
+}

src/Nest/XPack/Security/User/GetUserAccessToken/ElasticClient-GetUserAccessToken.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Threading.Tasks;
+using Elasticsearch.Net;
+using System.Threading;
+
+namespace Nest
+{
+	public partial interface IElasticClient
+	{
+		/// <inheritdoc/>
+		IGetUserAccessTokenResponse GetUserAccessToken(string username, string password, Func<GetUserAccessTokenDescriptor, IGetUserAccessTokenRequest> selector = null);
+
+		/// <inheritdoc/>
+		IGetUserAccessTokenResponse GetUserAccessToken(IGetUserAccessTokenRequest request);
+
+		/// <inheritdoc/>
+		Task<IGetUserAccessTokenResponse> GetUserAccessTokenAsync(string username, string password, Func<GetUserAccessTokenDescriptor, IGetUserAccessTokenRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
+
+		/// <inheritdoc/>
+		Task<IGetUserAccessTokenResponse> GetUserAccessTokenAsync(IGetUserAccessTokenRequest request, CancellationToken cancellationToken = default(CancellationToken));
+	}
+
+	public partial class ElasticClient
+	{
+		/// <inheritdoc/>
+		public IGetUserAccessTokenResponse GetUserAccessToken(string username, string password, Func<GetUserAccessTokenDescriptor, IGetUserAccessTokenRequest> selector = null) =>
+			this.GetUserAccessToken(selector.InvokeOrDefault(new GetUserAccessTokenDescriptor(username, password)));
+
+		/// <inheritdoc/>
+		public IGetUserAccessTokenResponse GetUserAccessToken(IGetUserAccessTokenRequest request) =>
+			this.Dispatcher.Dispatch<IGetUserAccessTokenRequest, GetUserAccessTokenRequestParameters, GetUserAccessTokenResponse>(
+				request,
+				(p, d) =>this.LowLevelDispatch.XpackSecurityGetTokenDispatch<GetUserAccessTokenResponse>(p, d)
+			);
+
+		/// <inheritdoc/>
+		public Task<IGetUserAccessTokenResponse> GetUserAccessTokenAsync(string username, string password, Func<GetUserAccessTokenDescriptor, IGetUserAccessTokenRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken)) =>
+			this.GetUserAccessTokenAsync(selector.InvokeOrDefault(new GetUserAccessTokenDescriptor(username, password)), cancellationToken);
+
+		/// <inheritdoc/>
+		public Task<IGetUserAccessTokenResponse> GetUserAccessTokenAsync(IGetUserAccessTokenRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
+			this.Dispatcher.DispatchAsync<IGetUserAccessTokenRequest, GetUserAccessTokenRequestParameters, GetUserAccessTokenResponse, IGetUserAccessTokenResponse>(
+				request,
+				cancellationToken,
+				(p, d, c) => this.LowLevelDispatch.XpackSecurityGetTokenDispatchAsync<GetUserAccessTokenResponse>(p, d, c)
+			);
+	}
+}

src/Nest/XPack/Security/User/GetUserAccessToken/GetUserAccessTokenRequest.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace Nest
+{
+	public partial interface IGetUserAccessTokenRequest
+	{
+		[JsonProperty("username")]
+		string Username { get; set; }
+		[JsonProperty("password")]
+		string Password { get; set; }
+		[JsonProperty("scope")]
+		string Scope { get; set; }
+		[JsonProperty("grant_type")]
+		AccessTokenGrantType GrantType { get; set; }
+	}
+
+	public partial class GetUserAccessTokenRequest
+	{
+		[JsonProperty("username")]
+		string IGetUserAccessTokenRequest.Username { get; set; }
+		[JsonProperty("password")]
+		string IGetUserAccessTokenRequest.Password { get; set; }
+
+		public GetUserAccessTokenRequest(string username, string password)
+		{
+			var self = (IGetUserAccessTokenRequest) this;
+			self.Username = username;
+			self.Password = password;
+		}
+
+		public AccessTokenGrantType GrantType { get; set; } = AccessTokenGrantType.Password;
+
+		public string Scope { get; set; }
+	}
+
+	[DescriptorFor("XpackSecurityGetToken")]
+	public partial class GetUserAccessTokenDescriptor
+	{
+		AccessTokenGrantType IGetUserAccessTokenRequest.GrantType { get; set; } = AccessTokenGrantType.Password;
+		string IGetUserAccessTokenRequest.Username { get; set; }
+		string IGetUserAccessTokenRequest.Password { get; set; }
+		string IGetUserAccessTokenRequest.Scope { get; set; }
+
+		public GetUserAccessTokenDescriptor(string username, string password)
+		{
+			var self = (IGetUserAccessTokenRequest) this;
+			self.Username = username;
+			self.Password = password;
+		}
+
+		public GetUserAccessTokenDescriptor GrantType(AccessTokenGrantType type) => Assign(a=>a.GrantType = type);
+		public GetUserAccessTokenDescriptor Scope(string scope) => Assign(a=>a.Scope = scope);
+	}
+}

src/Nest/XPack/Security/User/GetUserAccessToken/GetUserAccessTokenResponse.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Newtonsoft.Json;
+
+namespace Nest
+{
+	public interface IGetUserAccessTokenResponse : IResponse
+	{
+		[JsonProperty("access_token")]
+		string AccessToken { get; set; }
+		[JsonProperty("type")]
+		string Type { get; set; }
+		[JsonProperty("expires_in")]
+		long ExpiresIn { get; set; }
+		[JsonProperty("scope")]
+		string Scope { get; set; }
+	}
+
+	public class GetUserAccessTokenResponse : ResponseBase, IGetUserAccessTokenResponse
+	{
+		public string AccessToken { get; set; }
+		public string Type { get; set; }
+		public long ExpiresIn { get; set; }
+		public string Scope { get; set; }
+	}
+}