zoriya/octokit.net
1
0
Fork 0
mirror of https://github.com/zoriya/octokit.net.git synced 2026-06-08 12:42:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #878 from octokit/fingerprint-in-body

Browse Source 
Use non-deprecated auth endpoint
This commit is contained in:
Phil Haack
2015-09-04 09:52:55 -07:00
parent a90d3b8cd0 fe8300bd9d
commit 3fa50a6685
3 changed files with 18 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Octokit.Tests/Clients/AuthorizationsClientTests.cs
+12 -4
View File
@@ -229,14 +229,22 @@ namespace Octokit.Tests.Clients
[Fact]
public async Task GetsOrCreatesAuthenticationWithFingerprintAtCorrectUrl()
{
var data = new NewAuthorization { Fingerprint = "ha-ha-fingerprint"};
var data = new NewAuthorization { Fingerprint = "ha-ha-fingerprint" };
var client = Substitute.For<IApiConnection>();
var authEndpoint = new AuthorizationsClient(client);
authEndpoint.GetOrCreateApplicationAuthentication("clientId", "secret", data);
Uri calledUri = null;
dynamic calledBody = null;
client.Received().Put<ApplicationAuthorization>(Arg.Is<Uri>(u => u.ToString() == "authorizations/clients/clientId/ha-ha-fingerprint"),
Args.Object);
client.Put<ApplicationAuthorization>(Arg.Do<Uri>(u => calledUri = u), Arg.Do<object>(body => calledBody = body));
authEndpoint.GetOrCreateApplicationAuthentication("clientId", "secret", data);
Assert.NotNull(calledUri);
Assert.Equal(calledUri.ToString(), "authorizations/clients/clientId");
Assert.NotNull(calledBody);
Assert.Equal(calledBody.fingerprint, "ha-ha-fingerprint");
}
}
Octokit/Clients/AuthorizationsClient.cs
+6 -9
View File
@@ -178,13 +178,11 @@ namespace Octokit
client_secret = clientSecret,
scopes = newAuthorization.Scopes,
note = newAuthorization.Note,
note_url = newAuthorization.NoteUrl
note_url = newAuthorization.NoteUrl,
fingerprint = newAuthorization.Fingerprint
};
var endpoint = string.IsNullOrWhiteSpace(newAuthorization.Fingerprint)
? ApiUrls.AuthorizationsForClient(clientId)
: ApiUrls.AuthorizationsForClient(clientId, newAuthorization.Fingerprint);
var endpoint = ApiUrls.AuthorizationsForClient(clientId);
return ApiConnection.Put<ApplicationAuthorization>(endpoint, requestData);
}
@@ -224,14 +222,13 @@ namespace Octokit
client_secret = clientSecret,
scopes = newAuthorization.Scopes,
note = newAuthorization.Note,
note_url = newAuthorization.NoteUrl
note_url = newAuthorization.NoteUrl,
fingerprint = newAuthorization.Fingerprint
};
try
{
var endpoint = string.IsNullOrWhiteSpace(newAuthorization.Fingerprint)
? ApiUrls.AuthorizationsForClient(clientId)
: ApiUrls.AuthorizationsForClient(clientId, newAuthorization.Fingerprint);
var endpoint = ApiUrls.AuthorizationsForClient(clientId);
return await ApiConnection.Put<ApplicationAuthorization>(
endpoint,
Octokit/Helpers/ApiUrls.Authorizations.cs
-15
View File
@@ -34,21 +34,6 @@ namespace Octokit
return "authorizations/clients/{0}".FormatUri(clientId);
}
/// <summary>
/// Returns the <see cref="Uri"/> that authorizations for a given client and fingerprint
/// </summary>
/// <param name="clientId">
/// The 20 character OAuth app client key for
/// which to create the token.</param>
/// <param name="fingerprint">
/// A unique string to distinguish an authorization from others created
/// for the same client and user.
/// </param>
public static Uri AuthorizationsForClient(string clientId, string fingerprint)
{
return "authorizations/clients/{0}/{1}".FormatUri(clientId, fingerprint);
}
public static Uri ApplicationAuthorization(string clientId)
{
return "applications/{0}/tokens".FormatUri(clientId);