Skip to content

Commit

Permalink
incorporate changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@lvermeulen
lvermeulen committed Jan 3, 2020
1 parent e062514 commit ff769ab
Show file tree
Hide file tree
Showing 10 changed files with 504 additions and 449 deletions.
112 changes: 58 additions & 54 deletions src/Bitbucket.Net/Audit/BitbucketClient.cs
View file
Original file line number Diff line number Diff line change
@@ -1,54 +1,58 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using Bitbucket.Net.Common.Models;
using Bitbucket.Net.Models.Audit;
using Flurl.Http;

namespace Bitbucket.Net
{
public partial class BitbucketClient
{
private IFlurlRequest GetAuditUrl() => GetBaseUrl("/audit");

private IFlurlRequest GetAuditUrl(string path) => GetAuditUrl()
.AppendPathSegment(path);

public async Task<IEnumerable<AuditEvent>> GetProjectAuditEventsAsync(string projectKey,
int? maxPages = null,
int? limit = null,
int? start = null)
{
var queryParamValues = new Dictionary<string, object>
{
["limit"] = limit,
["start"] = start
};

return await GetPagedResultsAsync(maxPages, queryParamValues, async qpv =>
await GetAuditUrl($"/projects/{projectKey}/events")
.SetQueryParams(qpv)
.GetJsonAsync<PagedResults<AuditEvent>>()
.ConfigureAwait(false))
.ConfigureAwait(false);
}

public async Task<IEnumerable<AuditEvent>> GetProjectRepoAuditEventsAsync(string projectKey, string repositorySlug,
int? maxPages = null,
int? limit = null,
int? start = null)
{
var queryParamValues = new Dictionary<string, object>
{
["limit"] = limit,
["start"] = start
};

return await GetPagedResultsAsync(maxPages, queryParamValues, async qpv =>
await GetAuditUrl($"/projects/{projectKey}/repos/{repositorySlug}/events")
.SetQueryParams(qpv)
.GetJsonAsync<PagedResults<AuditEvent>>()
.ConfigureAwait(false))
.ConfigureAwait(false);
}
}
}
using System.Collections.Generic;
using System.Threading.Tasks;
using Bitbucket.Net.Common.Models;
using Bitbucket.Net.Models.Audit;
using Flurl.Http;

namespace Bitbucket.Net
{
public partial class BitbucketClient
{
private IFlurlRequest GetAuditUrl() => GetBaseUrl("/audit");

private IFlurlRequest GetAuditUrl(string path) => GetAuditUrl()
.AppendPathSegment(path);

public async Task<IEnumerable<AuditEvent>> GetProjectAuditEventsAsync(string projectKey,
int? maxPages = null,
int? limit = null,
int? start = null,
int? avatarSize = null)
{
var queryParamValues = new Dictionary<string, object>
{
["limit"] = limit,
["start"] = start,
["avatarSize"] = avatarSize
};

return await GetPagedResultsAsync(maxPages, queryParamValues, async qpv =>
await GetAuditUrl($"/projects/{projectKey}/events")
.SetQueryParams(qpv)
.GetJsonAsync<PagedResults<AuditEvent>>()
.ConfigureAwait(false))
.ConfigureAwait(false);
}

public async Task<IEnumerable<AuditEvent>> GetProjectRepoAuditEventsAsync(string projectKey, string repositorySlug,
int? maxPages = null,
int? limit = null,
int? start = null,
int? avatarSize = null)
{
var queryParamValues = new Dictionary<string, object>
{
["limit"] = limit,
["start"] = start,
["avatarSize"] = avatarSize
};

return await GetPagedResultsAsync(maxPages, queryParamValues, async qpv =>
await GetAuditUrl($"/projects/{projectKey}/repos/{repositorySlug}/events")
.SetQueryParams(qpv)
.GetJsonAsync<PagedResults<AuditEvent>>()
.ConfigureAwait(false))
.ConfigureAwait(false);
}
}
}
6 changes: 4 additions & 2 deletions src/Bitbucket.Net/CommentLikes/BitbucketClient.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,14 @@ private IFlurlRequest GetCommentLikesUrl(string path) => GetCommentLikesUrl()
public async Task<IEnumerable<User>> GetCommitCommentLikesAsync(string projectKey, string repositorySlug, string commitId, string commentId,
int? maxPages = null,
int? limit = null,
int? start = null)
int? start = null,
int? avatarSize = null)
{
var queryParamValues = new Dictionary<string, object>
{
["limit"] = limit,
["start"] = start
["start"] = start,
["avatarSize"] = avatarSize
};

return await GetPagedResultsAsync(maxPages, queryParamValues, async qpv =>
Expand Down
33 changes: 22 additions & 11 deletions src/Bitbucket.Net/Core/Admin/BitbucketClient.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,16 @@ public async Task<bool> AddAdminGroupUsersAsync(GroupUsers groupUsers)
public async Task<IEnumerable<UserInfo>> GetAdminGroupMoreMembersAsync(string context, string filter = null,
int? maxPages = null,
int? limit = null,
int? start = null)
int? start = null,
int? avatarSize = null)
{
var queryParamValues = new Dictionary<string, object>
{
["limit"] = limit,
["start"] = start,
["context"] = context,
["filter"] = filter
["filter"] = filter,
["avatarSize"] = avatarSize
};

return await GetPagedResultsAsync(maxPages, queryParamValues, async qpv =>
Expand All @@ -91,14 +93,16 @@ await GetAdminUrl("/groups/more-members")
public async Task<IEnumerable<UserInfo>> GetAdminGroupMoreNonMembersAsync(string context, string filter = null,
int? maxPages = null,
int? limit = null,
int? start = null)
int? start = null,
int? avatarSize = null)
{
var queryParamValues = new Dictionary<string, object>
{
["limit"] = limit,
["start"] = start,
["context"] = context,
["filter"] = filter
["filter"] = filter,
["avatarSize"] = avatarSize
};

return await GetPagedResultsAsync(maxPages, queryParamValues, async qpv =>
Expand All @@ -112,13 +116,15 @@ await GetAdminUrl("/groups/more-non-members")
public async Task<IEnumerable<UserInfo>> GetAdminUsersAsync(string filter = null,
int? maxPages = null,
int? limit = null,
int? start = null)
int? start = null,
int? avatarSize = null)
{
var queryParamValues = new Dictionary<string, object>
{
["limit"] = limit,
["start"] = start,
["filter"] = filter
["filter"] = filter,
["avatarSize"] = avatarSize
};

return await GetPagedResultsAsync(maxPages, queryParamValues, async qpv =>
Expand Down Expand Up @@ -261,9 +267,10 @@ public async Task<bool> RemoveAdminUserFromGroupAsync(string userName, string gr
return await HandleResponseAsync(response).ConfigureAwait(false);
}

public async Task<UserInfo> RenameAdminUserAsync(UserRename userRename)
public async Task<UserInfo> RenameAdminUserAsync(UserRename userRename, int? avatarSize = null)
{
var response = await GetAdminUrl("users/rename")
.SetQueryParam("avatarSize", avatarSize)
.PostJsonAsync(userRename)
.ConfigureAwait(false);

Expand Down Expand Up @@ -414,13 +421,15 @@ await GetAdminUrl("/permissions/groups/none")
public async Task<IEnumerable<UserPermission>> GetAdminUserPermissionsAsync(string filter = null,
int? maxPages = null,
int? limit = null,
int? start = null)
int? start = null,
int? avatarSize = null)
{
var queryParamValues = new Dictionary<string, object>
{
["limit"] = limit,
["start"] = start,
["filter"] = filter
["filter"] = filter,
["avatarSize"] = avatarSize
};

return await GetPagedResultsAsync(maxPages, queryParamValues, async qpv =>
Expand Down Expand Up @@ -460,13 +469,15 @@ public async Task<bool> DeleteAdminUserPermissionsAsync(string name)
public async Task<IEnumerable<User>> GetAdminUserPermissionsNoneAsync(string filter = null,
int? maxPages = null,
int? limit = null,
int? start = null)
int? start = null,
int? avatarSize = null)
{
var queryParamValues = new Dictionary<string, object>
{
["limit"] = limit,
["start"] = start,
["filter"] = filter
["filter"] = filter,
["avatarSize"] = avatarSize
};

return await GetPagedResultsAsync(maxPages, queryParamValues, async qpv =>
Expand Down
48 changes: 33 additions & 15 deletions src/Bitbucket.Net/Core/Projects/BitbucketClient.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,15 @@ public async Task<Project> GetProjectAsync(string projectKey)
public async Task<IEnumerable<UserPermission>> GetProjectUserPermissionsAsync(string projectKey, string filter = null,
int? maxPages = null,
int? limit = null,
int? start = null)
int? start = null,
int? avatarSize = null)
{
var queryParamValues = new Dictionary<string, object>
{
["limit"] = limit,
["start"] = start,
["filter"] = filter
["filter"] = filter,
["avatarSize"] = avatarSize
};

return await GetPagedResultsAsync(maxPages, queryParamValues, async qpv =>
Expand Down Expand Up @@ -495,13 +497,15 @@ public async Task<IEnumerable<UserPermission>> GetProjectRepositoryUserPermissio
string filter = null,
int? maxPages = null,
int? limit = null,
int? start = null)
int? start = null,
int? avatarSize = null)
{
var queryParamValues = new Dictionary<string, object>
{
["filter"] = filter,
["limit"] = limit,
["start"] = start
["start"] = start,
["avatarSize"] = avatarSize
};

return await GetPagedResultsAsync(maxPages, queryParamValues, async qpv =>
Expand All @@ -528,10 +532,12 @@ public async Task<bool> UpdateProjectRepositoryUserPermissionsAsync(string proje
return await HandleResponseAsync(response).ConfigureAwait(false);
}

public async Task<bool> DeleteProjectRepositoryUserPermissionsAsync(string projectKey, string repositorySlug, string name)
public async Task<bool> DeleteProjectRepositoryUserPermissionsAsync(string projectKey, string repositorySlug, string name,
int? avatarSize = null)
{
var response = await GetProjectsReposUrl(projectKey, repositorySlug, "/permissions/users")
.SetQueryParam("name", name)
.SetQueryParam("avatarSize", avatarSize)
.DeleteAsync()
.ConfigureAwait(false);

Expand Down Expand Up @@ -824,10 +830,12 @@ public async Task<CommentRef> CreateCommitCommentAsync(string projectKey, string
return await HandleResponseAsync<CommentRef>(response).ConfigureAwait(false);
}

public async Task<CommentRef> GetCommitCommentAsync(string projectKey, string repositorySlug, string commitId, long commentId)
public async Task<CommentRef> GetCommitCommentAsync(string projectKey, string repositorySlug, string commitId, long commentId,
int? avatarSize = null)
{
return await GetProjectsReposUrl(projectKey, repositorySlug, $"/commits/{commitId}/comments/{commentId}")
.GetJsonAsync<CommentRef>()
.SetQueryParam("avatarSize", avatarSize)
.GetJsonAsync<CommentRef>()
.ConfigureAwait(false);
}

Expand Down Expand Up @@ -1111,14 +1119,16 @@ public async Task<IEnumerable<PullRequestActivity>> GetPullRequestActivitiesAsyn
PullRequestFromTypes? fromType = null,
int? maxPages = null,
int? limit = null,
int? start = null)
int? start = null,
int? avatarSize = null)
{
var queryParamValues = new Dictionary<string, object>
{
["limit"] = limit,
["start"] = start,
["fromId"] = fromId,
["fromType"] = BitbucketHelpers.PullRequestFromTypeToString(fromType)
["fromType"] = BitbucketHelpers.PullRequestFromTypeToString(fromType),
["avatarSize"] = avatarSize
};

return await GetPagedResultsAsync(maxPages, queryParamValues, async qpv =>
Expand Down Expand Up @@ -1274,12 +1284,14 @@ public async Task<IEnumerable<CommentRef>> GetPullRequestCommentsAsync(string pr
string toHash = null,
int? maxPages = null,
int? limit = null,
int? start = null)
int? start = null,
int? avatarSize = null)
{
var queryParamValues = new Dictionary<string, object>
{
["limit"] = limit,
["start"] = start,
["avatarSize"] = avatarSize,
["path"] = path,
["anchorState"] = BitbucketHelpers.AnchorStateToString(anchorState),
["diffType"] = BitbucketHelpers.DiffTypeToString(diffType),
Expand All @@ -1295,10 +1307,12 @@ await GetProjectsReposUrl(projectKey, repositorySlug, $"/pull-requests/{pullRequ
.ConfigureAwait(false);
}

public async Task<CommentRef> GetPullRequestCommentAsync(string projectKey, string repositorySlug, long pullRequestId, long commentId)
public async Task<CommentRef> GetPullRequestCommentAsync(string projectKey, string repositorySlug, long pullRequestId, long commentId,
int? avatarSize = null)
{
return await GetProjectsReposUrl(projectKey, repositorySlug)
.AppendPathSegment($"/pull-requests/{pullRequestId}/comments/{commentId}")
.SetQueryParam("avatarSize", avatarSize)
.GetJsonAsync<CommentRef>()
.ConfigureAwait(false);
}
Expand Down Expand Up @@ -1412,12 +1426,14 @@ public async Task<Differences> GetPullRequestDiffPathAsync(string projectKey, st
public async Task<IEnumerable<Participant>> GetPullRequestParticipantsAsync(string projectKey, string repositorySlug, long pullRequestId,
int? maxPages = null,
int? limit = null,
int? start = null)
int? start = null,
int? avatarSize = null)
{
var queryParamValues = new Dictionary<string, object>
{
["limit"] = limit,
["start"] = start
["start"] = start,
["avatarSize"] = avatarSize
};

return await GetPagedResultsAsync(maxPages, queryParamValues, async qpv =>
Expand Down Expand Up @@ -1492,12 +1508,14 @@ public async Task<bool> UnassignUserFromPullRequestAsync(string projectKey, stri
public async Task<IEnumerable<BitbucketTask>> GetPullRequestTasksAsync(string projectKey, string repositorySlug, long pullRequestId,
int? maxPages = null,
int? limit = null,
int? start = null)
int? start = null,
int? avatarSize = null)
{
var queryParamValues = new Dictionary<string, object>
{
["limit"] = limit,
["start"] = start
["start"] = start,
["avatarSize"] = avatarSize
};

return await GetPagedResultsAsync(maxPages, queryParamValues, async qpv =>
Expand Down
Loading

0 comments on commit ff769ab

Please sign in to comment.