diff --git a/Octokit.Tests/Clients/AuthorizationsClientTests.cs b/Octokit.Tests/Clients/AuthorizationsClientTests.cs index 58510712..1f0f13d5 100644 --- a/Octokit.Tests/Clients/AuthorizationsClientTests.cs +++ b/Octokit.Tests/Clients/AuthorizationsClientTests.cs @@ -290,9 +290,9 @@ namespace Octokit.Tests.Clients authEndpoint.CheckApplicationAuthentication("clientId", "accessToken"); - client.Received().Get( - Arg.Is(u => u.ToString() == "applications/clientId/tokens/accessToken"), - null); + client.Received().Post( + Arg.Is(u => u.ToString() == "applications/clientId/token"), + Arg.Is(o => o.GetType().GetProperty("access_token").GetValue(o).ToString() == "accessToken")); } [Fact] @@ -318,9 +318,9 @@ namespace Octokit.Tests.Clients authEndpoint.ResetApplicationAuthentication("clientId", "accessToken"); - client.Received().Post( - Arg.Is(u => u.ToString() == "applications/clientId/tokens/accessToken"), - Args.Object); + client.Received().Patch( + Arg.Is(u => u.ToString() == "applications/clientId/token"), + Arg.Is(o => o.GetType().GetProperty("access_token").GetValue(o).ToString() == "accessToken")); } [Fact] @@ -347,7 +347,8 @@ namespace Octokit.Tests.Clients authEndpoint.RevokeApplicationAuthentication("clientId", "accessToken"); client.Received().Delete( - Arg.Is(u => u.ToString() == "applications/clientId/tokens/accessToken")); + Arg.Is(u => u.ToString() == "applications/clientId/token"), + Arg.Is(o => o.GetType().GetProperty("access_token").GetValue(o).ToString() == "accessToken")); } [Fact] diff --git a/Octokit/Clients/AuthorizationsClient.cs b/Octokit/Clients/AuthorizationsClient.cs index e58a8f67..d2cdf158 100644 --- a/Octokit/Clients/AuthorizationsClient.cs +++ b/Octokit/Clients/AuthorizationsClient.cs @@ -341,8 +341,13 @@ namespace Octokit Ensure.ArgumentNotNullOrEmptyString(clientId, nameof(clientId)); Ensure.ArgumentNotNullOrEmptyString(accessToken, nameof(accessToken)); - var endpoint = ApiUrls.ApplicationAuthorization(clientId, accessToken); - return ApiConnection.Get(endpoint, null); + var requestData = new + { + access_token = accessToken + }; + + var endpoint = ApiUrls.ApplicationAuthorization(clientId); + return ApiConnection.Post(endpoint, requestData); } /// @@ -360,9 +365,13 @@ namespace Octokit Ensure.ArgumentNotNullOrEmptyString(clientId, nameof(clientId)); Ensure.ArgumentNotNullOrEmptyString(accessToken, nameof(accessToken)); - var requestData = new { }; + var requestData = new + { + access_token = accessToken + }; - return ApiConnection.Post(ApiUrls.ApplicationAuthorization(clientId, accessToken), requestData); + var endpoint = ApiUrls.ApplicationAuthorization(clientId); + return ApiConnection.Patch(endpoint, requestData); } /// @@ -380,8 +389,13 @@ namespace Octokit Ensure.ArgumentNotNullOrEmptyString(clientId, nameof(clientId)); Ensure.ArgumentNotNullOrEmptyString(accessToken, nameof(accessToken)); - return ApiConnection.Delete( - ApiUrls.ApplicationAuthorization(clientId, accessToken)); + var requestData = new + { + access_token = accessToken + }; + + var endpoint = ApiUrls.ApplicationAuthorization(clientId); + return ApiConnection.Delete(endpoint, requestData); } /// diff --git a/Octokit/Helpers/ApiUrls.Authorizations.cs b/Octokit/Helpers/ApiUrls.Authorizations.cs index 4cae9842..66112e2c 100644 --- a/Octokit/Helpers/ApiUrls.Authorizations.cs +++ b/Octokit/Helpers/ApiUrls.Authorizations.cs @@ -36,12 +36,7 @@ namespace Octokit public static Uri ApplicationAuthorization(string clientId) { - return "applications/{0}/tokens".FormatUri(clientId); - } - - public static Uri ApplicationAuthorization(string clientId, string accessToken) - { - return "applications/{0}/tokens/{1}".FormatUri(clientId, accessToken); + return "applications/{0}/token".FormatUri(clientId); } } }