Skip to content
This repository has been archived by the owner on Nov 24, 2020. It is now read-only.

Commit

Permalink
GH-78: Replace comments with implementations
Browse files Browse the repository at this point in the history
  • Loading branch information
henrikfroehling committed Oct 28, 2017
1 parent 6d67406 commit 3bbb358
Show file tree
Hide file tree
Showing 2 changed files with 203 additions and 172 deletions.
22 changes: 11 additions & 11 deletions Source/Lib/TraktApiSharp/Modules/TraktAuthenticationModule.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public TraktDevice Device

public string RedirectUri { get; set; } = DEFAULT_REDIRECT_URI;

public bool IsAuthorized => Authorization != null && !Authorization.IsExpired;
public bool IsAuthorized => Authorization?.IsExpired == false;

public Task<Pair<bool, TraktResponse<TraktAuthorization>>> CheckIfAuthorizationIsExpiredOrWasRevokedAsync(bool autoRefresh = false, CancellationToken cancellationToken = default(CancellationToken))
=> _requestHandler.CheckIfAuthorizationIsExpiredOrWasRevokedAsync(autoRefresh, cancellationToken);
Expand Down Expand Up @@ -88,7 +88,7 @@ public string CreateAuthorizationUrlWithDefaultState(string clientId, string red
public Task<TraktResponse<TraktAuthorization>> GetAuthorizationAsync(string code, string clientId, string clientSecret, CancellationToken cancellationToken = default(CancellationToken))
=> GetAuthorizationAsync(code, clientId, clientSecret, RedirectUri, cancellationToken);

public async Task<TraktResponse<TraktAuthorization>> GetAuthorizationAsync(string code, string clientId, string clientSecret, string redirectUri, CancellationToken cancellationToken = default(CancellationToken))
public Task<TraktResponse<TraktAuthorization>> GetAuthorizationAsync(string code, string clientId, string clientSecret, string redirectUri, CancellationToken cancellationToken = default(CancellationToken))
{
var request = new AuthorizationRequest
{
Expand All @@ -101,13 +101,13 @@ public string CreateAuthorizationUrlWithDefaultState(string clientId, string red
}
};

return await _requestHandler.GetAuthorizationAsync(request, cancellationToken);
return _requestHandler.GetAuthorizationAsync(request, cancellationToken);
}

public Task<TraktResponse<TraktDevice>> GenerateDeviceAsync(CancellationToken cancellationToken = default(CancellationToken))
=> GenerateDeviceAsync(ClientId, cancellationToken);

public async Task<TraktResponse<TraktDevice>> GenerateDeviceAsync(string clientId, CancellationToken cancellationToken = default(CancellationToken))
public Task<TraktResponse<TraktDevice>> GenerateDeviceAsync(string clientId, CancellationToken cancellationToken = default(CancellationToken))
{
var request = new DeviceRequest
{
Expand All @@ -117,7 +117,7 @@ public string CreateAuthorizationUrlWithDefaultState(string clientId, string red
}
};

return await _requestHandler.GetDeviceAsync(request, cancellationToken);
return _requestHandler.GetDeviceAsync(request, cancellationToken);
}

public Task<TraktResponse<TraktAuthorization>> PollForAuthorizationAsync(CancellationToken cancellationToken = default(CancellationToken))
Expand All @@ -129,7 +129,7 @@ public string CreateAuthorizationUrlWithDefaultState(string clientId, string red
public Task<TraktResponse<TraktAuthorization>> PollForAuthorizationAsync(TraktDevice device, string clientId, CancellationToken cancellationToken = default(CancellationToken))
=> PollForAuthorizationAsync(device, clientId, ClientSecret, cancellationToken);

public async Task<TraktResponse<TraktAuthorization>> PollForAuthorizationAsync(TraktDevice device, string clientId, string clientSecret, CancellationToken cancellationToken = default(CancellationToken))
public Task<TraktResponse<TraktAuthorization>> PollForAuthorizationAsync(TraktDevice device, string clientId, string clientSecret, CancellationToken cancellationToken = default(CancellationToken))
{
var request = new AuthorizationPollRequest
{
Expand All @@ -141,7 +141,7 @@ public string CreateAuthorizationUrlWithDefaultState(string clientId, string red
}
};

return await _requestHandler.PollForAuthorizationAsync(request, cancellationToken);
return _requestHandler.PollForAuthorizationAsync(request, cancellationToken);
}

public Task<TraktResponse<TraktAuthorization>> RefreshAuthorizationAsync(CancellationToken cancellationToken = default(CancellationToken))
Expand All @@ -156,7 +156,7 @@ public string CreateAuthorizationUrlWithDefaultState(string clientId, string red
public Task<TraktResponse<TraktAuthorization>> RefreshAuthorizationAsync(string refreshToken, string clientId, string clientSecret, CancellationToken cancellationToken = default(CancellationToken))
=> RefreshAuthorizationAsync(refreshToken, clientId, clientSecret, RedirectUri, cancellationToken);

public async Task<TraktResponse<TraktAuthorization>> RefreshAuthorizationAsync(string refreshToken, string clientId, string clientSecret, string redirectUri, CancellationToken cancellationToken = default(CancellationToken))
public Task<TraktResponse<TraktAuthorization>> RefreshAuthorizationAsync(string refreshToken, string clientId, string clientSecret, string redirectUri, CancellationToken cancellationToken = default(CancellationToken))
{
var request = new AuthorizationRefreshRequest
{
Expand All @@ -169,7 +169,7 @@ public string CreateAuthorizationUrlWithDefaultState(string clientId, string red
}
};

return await _requestHandler.RefreshAuthorizationAsync(request, cancellationToken);
return _requestHandler.RefreshAuthorizationAsync(request, cancellationToken);
}

public Task<TraktNoContentResponse> RevokeAuthorizationAsync(CancellationToken cancellationToken = default(CancellationToken))
Expand All @@ -178,7 +178,7 @@ public string CreateAuthorizationUrlWithDefaultState(string clientId, string red
public Task<TraktNoContentResponse> RevokeAuthorizationAsync(string accessToken, CancellationToken cancellationToken = default(CancellationToken))
=> RevokeAuthorizationAsync(accessToken, ClientId, cancellationToken);

public async Task<TraktNoContentResponse> RevokeAuthorizationAsync(string accessToken, string clientId, CancellationToken cancellationToken = default(CancellationToken))
public Task<TraktNoContentResponse> RevokeAuthorizationAsync(string accessToken, string clientId, CancellationToken cancellationToken = default(CancellationToken))
{
var request = new AuthorizationRevokeRequest
{
Expand All @@ -188,7 +188,7 @@ public string CreateAuthorizationUrlWithDefaultState(string clientId, string red
}
};

return await _requestHandler.RevokeAuthorizationAsync(request, clientId, cancellationToken);
return _requestHandler.RevokeAuthorizationAsync(request, clientId, cancellationToken);
}
}
}
Loading

0 comments on commit 3bbb358

Please sign in to comment.