GH-37: Update post message body for revoke request

henrikfroehling · Jul 28, 2018 · a429cde · a429cde
1 parent 453ac53
commit a429cde
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 16 deletions.
diff --git a/Source/Lib/Trakt.NET/Modules/TraktAuthenticationModule.cs b/Source/Lib/Trakt.NET/Modules/TraktAuthenticationModule.cs
@@ -188,7 +188,7 @@ public Task<TraktResponse<ITraktAuthorization>> RefreshAuthorizationAsync(string
         }
 
         public Task<TraktNoContentResponse> RevokeAuthorizationAsync(CancellationToken cancellationToken = default)
-            => RevokeAuthorizationAsync(Authorization.AccessToken, cancellationToken);
+            => RevokeAuthorizationAsync(Authorization?.AccessToken, cancellationToken);
 
         public Task<TraktNoContentResponse> RevokeAuthorizationAsync(string accessToken, CancellationToken cancellationToken = default)
             => RevokeAuthorizationAsync(accessToken, ClientId, cancellationToken);
@@ -199,12 +199,14 @@ public Task<TraktNoContentResponse> RevokeAuthorizationAsync(string accessToken,
             {
                 RequestBody = new AuthorizationRevokeRequestBody
                 {
-                    AccessToken = accessToken
+                    AccessToken = accessToken,
+                    ClientId = clientId,
+                    ClientSecret = ClientSecret
                 }
             };
 
             var requestHandler = new AuthenticationRequestHandler(Client);
-            return requestHandler.RevokeAuthorizationAsync(request, clientId, cancellationToken);
+            return requestHandler.RevokeAuthorizationAsync(request, cancellationToken);
         }
     }
 }
diff --git a/Source/Lib/Trakt.NET/Requests/Authentication/AuthorizationRevokeRequest.cs b/Source/Lib/Trakt.NET/Requests/Authentication/AuthorizationRevokeRequest.cs
@@ -5,6 +5,8 @@
 
     internal sealed class AuthorizationRevokeRequest : APostRequest<AuthorizationRevokeRequestBody>
     {
+        public override AuthorizationRequirement AuthorizationRequirement => AuthorizationRequirement.NotRequired;
+
         public override string UriTemplate => "oauth/revoke";
 
         public override AuthorizationRevokeRequestBody RequestBody { get; set; }

diff --git a/Source/Lib/Trakt.NET/Requests/Authentication/AuthorizationRevokeRequestBody.cs b/Source/Lib/Trakt.NET/Requests/Authentication/AuthorizationRevokeRequestBody.cs
@@ -10,17 +10,26 @@ internal sealed class AuthorizationRevokeRequestBody : IRequestBody
     {
         internal string AccessToken { get; set; }
 
+        internal string ClientId { get; set; }
+
+        internal string ClientSecret { get; set; }
+
         public Task<string> ToJson(CancellationToken cancellationToken = default)
-        {
-            return Task.FromResult(HttpContentAsString);
-        }
+            => Task.FromResult(HttpContentAsString);
 
-        private string HttpContentAsString => $"token={AccessToken}";
+        private string HttpContentAsString => $"{{ \"token\": \"{AccessToken}\", \"client_id\": \"{ClientId}\"," +
+                                              $" \"client_secret\": \"{ClientSecret}\" }}";
 
         public void Validate()
         {
             if (string.IsNullOrEmpty(AccessToken) || AccessToken.ContainsSpace())
                 throw new ArgumentException("access token not valid", nameof(AccessToken));
+
+            if (string.IsNullOrEmpty(ClientId) || ClientId.ContainsSpace())
+                throw new ArgumentException("client id not valid", nameof(ClientId));
+
+            if (string.IsNullOrEmpty(ClientSecret) || ClientSecret.ContainsSpace())
+                throw new ArgumentException("client secret not valid", nameof(ClientSecret));
         }
     }
 }
diff --git a/Source/Lib/Trakt.NET/Requests/Handler/AuthenticationRequestHandler.cs b/Source/Lib/Trakt.NET/Requests/Handler/AuthenticationRequestHandler.cs
@@ -264,16 +264,10 @@ await _requestMessageBuilder.Reset(request)
         public Task<TraktResponse<ITraktAuthorization>> RefreshAuthorizationAsync(AuthorizationRefreshRequest request, CancellationToken cancellationToken = default)
             => ExecuteAuthorizationRequestAsync(request, true, cancellationToken);
 
-        public async Task<TraktNoContentResponse> RevokeAuthorizationAsync(AuthorizationRevokeRequest request, string clientId, CancellationToken cancellationToken = default)
+        public async Task<TraktNoContentResponse> RevokeAuthorizationAsync(AuthorizationRevokeRequest request, CancellationToken cancellationToken = default)
         {
             try
             {
-                if (!_client.Authentication.IsAuthorized)
-                    throw new TraktAuthorizationException("not authorized");
-
-                if (string.IsNullOrEmpty(clientId) || clientId.ContainsSpace())
-                    throw new ArgumentException("client id not valid", nameof(clientId));
-
                 request.Validate();
 
                 ExtendedHttpRequestMessage requestMessage =

diff --git a/Source/Lib/Trakt.NET/Requests/Handler/IAuthenticationRequestHandler.cs b/Source/Lib/Trakt.NET/Requests/Handler/IAuthenticationRequestHandler.cs
@@ -27,6 +27,6 @@ internal interface IAuthenticationRequestHandler
 
         Task<TraktResponse<ITraktAuthorization>> RefreshAuthorizationAsync(AuthorizationRefreshRequest request, CancellationToken cancellationToken = default);
 
-        Task<TraktNoContentResponse> RevokeAuthorizationAsync(AuthorizationRevokeRequest request, string clientId, CancellationToken cancellationToken = default);
+        Task<TraktNoContentResponse> RevokeAuthorizationAsync(AuthorizationRevokeRequest request, CancellationToken cancellationToken = default);
     }
 }
diff --git a/...rakt.NET.Tests/Modules/TraktAuthenticationModule/TraktAuthenticationModule_Tests_Setup.cs b/...rakt.NET.Tests/Modules/TraktAuthenticationModule/TraktAuthenticationModule_Tests_Setup.cs
@@ -53,7 +53,8 @@ public TraktAuthenticationModule_Tests()
                                                   $"\"client_secret\": \"{TraktClientSecret}\", \"redirect_uri\": " +
                                                   $"\"{TraktRedirectUri}\", \"grant_type\": \"refresh_token\" }}";
 
-            MockAuthorizationRevokePostContent = $"token={TestConstants.MOCK_ACCESS_TOKEN}";
+            MockAuthorizationRevokePostContent = $"{{ \"token\": \"{TestConstants.MOCK_ACCESS_TOKEN}\", \"client_id\": \"{TraktClientId}\"," +
+                                                 $" \"client_secret\": \"{TraktClientSecret}\" }}";
 
             MockAuthorizationPollingPostContent = $"{{ \"code\": \"{MOCK_DEVICE_CODE}\", \"client_id\": \"{TraktClientId}\", \"client_secret\": \"{TraktClientSecret}\" }}";