Merge pull request #38 from henrikfroehling/GH-36

Resolved GH-36
henrikfroehling · Jul 27, 2018 · 9a4fec6 · 9a4fec6
2 parents 2fc17cd + 9ab07b7
commit 9a4fec6
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 463 deletions.
diff --git a/Source/Lib/Trakt.NET/Modules/TraktAuthenticationModule.cs b/Source/Lib/Trakt.NET/Modules/TraktAuthenticationModule.cs
@@ -159,7 +159,7 @@ public Task<TraktResponse<ITraktAuthorization>> PollForAuthorizationAsync(ITrakt
         }
 
         public Task<TraktResponse<ITraktAuthorization>> RefreshAuthorizationAsync(CancellationToken cancellationToken = default)
-            => RefreshAuthorizationAsync(Authorization.RefreshToken, cancellationToken);
+            => RefreshAuthorizationAsync(Authorization?.RefreshToken, cancellationToken);
 
         public Task<TraktResponse<ITraktAuthorization>> RefreshAuthorizationAsync(string refreshToken, CancellationToken cancellationToken = default)
             => RefreshAuthorizationAsync(refreshToken, ClientId, cancellationToken);

diff --git a/Source/Lib/Trakt.NET/Requests/Authentication/AAuthorizationRequest'2.cs b/Source/Lib/Trakt.NET/Requests/Authentication/AAuthorizationRequest'2.cs
@@ -11,11 +11,5 @@ internal abstract class AAuthorizationRequest<TResponseContentType, TRequestBody
         public override TRequestBodyType RequestBody { get; set; }
 
         public override IDictionary<string, object> GetUriPathParameters() => new Dictionary<string, object>();
-
-        public override void Validate()
-        {
-            base.Validate();
-            RequestBody.Validate();
-        }
     }
 }
diff --git a/Source/Lib/Trakt.NET/Requests/Authentication/AuthorizationRevokeRequest.cs b/Source/Lib/Trakt.NET/Requests/Authentication/AuthorizationRevokeRequest.cs
@@ -10,11 +10,5 @@ internal sealed class AuthorizationRevokeRequest : APostRequest<AuthorizationRev
         public override AuthorizationRevokeRequestBody RequestBody { get; set; }
 
         public override IDictionary<string, object> GetUriPathParameters() => new Dictionary<string, object>();
-
-        public override void Validate()
-        {
-            base.Validate();
-            RequestBody.Validate();
-        }
     }
 }
diff --git a/Source/Lib/Trakt.NET/Requests/Handler/AuthenticationRequestHandler.cs b/Source/Lib/Trakt.NET/Requests/Handler/AuthenticationRequestHandler.cs
@@ -247,23 +247,8 @@ public async Task<TraktResponse<ITraktAuthorization>> PollForAuthorizationAsync(
             }
         }
 
-        public async Task<TraktResponse<ITraktAuthorization>> RefreshAuthorizationAsync(AuthorizationRefreshRequest request, CancellationToken cancellationToken = default)
-        {
-            try
-            {
-                if (!_client.Authentication.IsAuthorized)
-                    throw new TraktAuthorizationException("not authorized");
-            }
-            catch (Exception ex)
-            {
-                if (_client.Configuration.ThrowResponseExceptions)
-                    throw;
-
-                return new TraktResponse<ITraktAuthorization> { IsSuccess = false, Exception = ex };
-            }
-
-            return await ExecuteAuthorizationRequestAsync(request, true, cancellationToken).ConfigureAwait(false);
-        }
+        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)
         {