From fa36bb07a7f897aa95d0b1a92ad28f275d72b605 Mon Sep 17 00:00:00 2001 From: Stuart Cam Date: Tue, 9 Jul 2019 17:07:04 +1000 Subject: [PATCH 1/4] Implement additional fields on invalidate user token requests --- .../InvalidateUserAccessTokenRequest.cs | 60 ++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/src/Nest/XPack/Security/User/InvalidateUserAccessToken/InvalidateUserAccessTokenRequest.cs b/src/Nest/XPack/Security/User/InvalidateUserAccessToken/InvalidateUserAccessTokenRequest.cs index 7da5e5f1761..c3ab62e0a34 100644 --- a/src/Nest/XPack/Security/User/InvalidateUserAccessToken/InvalidateUserAccessTokenRequest.cs +++ b/src/Nest/XPack/Security/User/InvalidateUserAccessToken/InvalidateUserAccessTokenRequest.cs @@ -2,25 +2,83 @@ namespace Nest { + /// + /// Invalidates one or more access tokens or refresh tokens. + /// [MapsApi("security.invalidate_token.json")] public partial interface IInvalidateUserAccessTokenRequest { + /// + /// An access token. + /// This parameter cannot be used any of , or are used. + /// [DataMember(Name ="token")] string Token { get; set; } + + /// + /// A refresh token. + /// This parameter cannot be used any of , or are used. + /// + [DataMember(Name = "refresh_token")] + string RefreshToken { get; set; } + + /// + /// The name of an authentication realm. + /// This parameter cannot be used with either or . + /// + [DataMember(Name = "realm_name")] + string RealmName { get; set; } + + /// + /// The username of a user. + /// This parameter cannot be used with either or . + /// + [DataMember(Name = "username")] + string Username { get; set; } } + public partial class InvalidateUserAccessTokenRequest { public InvalidateUserAccessTokenRequest(string token) => ((IInvalidateUserAccessTokenRequest)this).Token = token; - [DataMember(Name ="token")] + /// string IInvalidateUserAccessTokenRequest.Token { get; set; } + + /// + string IInvalidateUserAccessTokenRequest.RefreshToken { get; set; } + + /// + string IInvalidateUserAccessTokenRequest.RealmName { get; set; } + + /// + string IInvalidateUserAccessTokenRequest.Username { get; set; } } public partial class InvalidateUserAccessTokenDescriptor { + /// public InvalidateUserAccessTokenDescriptor(string token) => ((IInvalidateUserAccessTokenRequest)this).Token = token; + /// + public InvalidateUserAccessTokenDescriptor RefreshToken(string refreshToken) => Assign(refreshToken, (a, v) => a.RefreshToken = v); + + /// + public InvalidateUserAccessTokenDescriptor RealmName(string realmName) => Assign(realmName, (a, v) => a.RealmName = v); + + /// + public InvalidateUserAccessTokenDescriptor Username(string username) => Assign(username, (a, v) => a.Username = v); + + /// string IInvalidateUserAccessTokenRequest.Token { get; set; } + + /// + string IInvalidateUserAccessTokenRequest.RefreshToken { get; set; } + + /// + string IInvalidateUserAccessTokenRequest.RealmName { get; set; } + + /// + string IInvalidateUserAccessTokenRequest.Username { get; set; } } } From 3566b685f0345c237129b7d45a42021a712455dc Mon Sep 17 00:00:00 2001 From: Stuart Cam Date: Wed, 10 Jul 2019 12:10:25 +1000 Subject: [PATCH 2/4] Add error details to response --- .../InvalidateUserAccessTokenResponse.cs | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/Nest/XPack/Security/User/InvalidateUserAccessToken/InvalidateUserAccessTokenResponse.cs b/src/Nest/XPack/Security/User/InvalidateUserAccessToken/InvalidateUserAccessTokenResponse.cs index 3d7651ca6c5..eb39c9d3f81 100644 --- a/src/Nest/XPack/Security/User/InvalidateUserAccessToken/InvalidateUserAccessTokenResponse.cs +++ b/src/Nest/XPack/Security/User/InvalidateUserAccessToken/InvalidateUserAccessTokenResponse.cs @@ -1,16 +1,33 @@ -using System.Runtime.Serialization; +using System.Collections.Generic; +using System.Runtime.Serialization; +using Elasticsearch.Net; namespace Nest { public class InvalidateUserAccessTokenResponse : ResponseBase { + /// + /// The number of the tokens that were invalidated as part of this request. + /// [DataMember(Name = "invalidated_tokens")] public long InvalidatedTokens { get; internal set; } + /// + /// The number of tokens that were already invalidated. + /// [DataMember(Name = "previously_invalidated_tokens")] public long PreviouslyInvalidatedTokens { get; internal set; } + /// + /// The number of errors that were encountered when invalidating the tokens. + /// [DataMember(Name = "error_count")] public long ErrorCount { get; internal set; } + + /// + /// Details about these errors. This field is not present in the response when there are no errors. + /// + [DataMember(Name = "error_details")] + public IReadOnlyCollection ErrorDetails { get; internal set; } = EmptyReadOnly.Collection; } } From 03889493fee89241b8af7444a71cb52a56e612d5 Mon Sep 17 00:00:00 2001 From: Stuart Cam Date: Fri, 12 Jul 2019 12:59:01 +1000 Subject: [PATCH 3/4] Update src/Nest/XPack/Security/User/InvalidateUserAccessToken/InvalidateUserAccessTokenRequest.cs Co-Authored-By: Russ Cam --- .../InvalidateUserAccessTokenRequest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Nest/XPack/Security/User/InvalidateUserAccessToken/InvalidateUserAccessTokenRequest.cs b/src/Nest/XPack/Security/User/InvalidateUserAccessToken/InvalidateUserAccessTokenRequest.cs index c3ab62e0a34..5dea7a66f61 100644 --- a/src/Nest/XPack/Security/User/InvalidateUserAccessToken/InvalidateUserAccessTokenRequest.cs +++ b/src/Nest/XPack/Security/User/InvalidateUserAccessToken/InvalidateUserAccessTokenRequest.cs @@ -10,7 +10,7 @@ public partial interface IInvalidateUserAccessTokenRequest { /// /// An access token. - /// This parameter cannot be used any of , or are used. + /// This parameter cannot be used if any of , or are used. /// [DataMember(Name ="token")] string Token { get; set; } From e8b98e5b3623130b2c63b01b41142fdbacf91251 Mon Sep 17 00:00:00 2001 From: Stuart Cam Date: Fri, 12 Jul 2019 13:09:31 +1000 Subject: [PATCH 4/4] Fix inherit doc references --- .../InvalidateUserAccessTokenRequest.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Nest/XPack/Security/User/InvalidateUserAccessToken/InvalidateUserAccessTokenRequest.cs b/src/Nest/XPack/Security/User/InvalidateUserAccessToken/InvalidateUserAccessTokenRequest.cs index c3ab62e0a34..332a1baabd5 100644 --- a/src/Nest/XPack/Security/User/InvalidateUserAccessToken/InvalidateUserAccessTokenRequest.cs +++ b/src/Nest/XPack/Security/User/InvalidateUserAccessToken/InvalidateUserAccessTokenRequest.cs @@ -42,16 +42,16 @@ public partial class InvalidateUserAccessTokenRequest { public InvalidateUserAccessTokenRequest(string token) => ((IInvalidateUserAccessTokenRequest)this).Token = token; - /// + /// string IInvalidateUserAccessTokenRequest.Token { get; set; } - /// + /// string IInvalidateUserAccessTokenRequest.RefreshToken { get; set; } - /// + /// string IInvalidateUserAccessTokenRequest.RealmName { get; set; } - /// + /// string IInvalidateUserAccessTokenRequest.Username { get; set; } } @@ -69,16 +69,16 @@ public partial class InvalidateUserAccessTokenDescriptor /// public InvalidateUserAccessTokenDescriptor Username(string username) => Assign(username, (a, v) => a.Username = v); - /// + /// string IInvalidateUserAccessTokenRequest.Token { get; set; } - /// + /// string IInvalidateUserAccessTokenRequest.RefreshToken { get; set; } - /// + /// string IInvalidateUserAccessTokenRequest.RealmName { get; set; } - /// + /// string IInvalidateUserAccessTokenRequest.Username { get; set; } } }