diff --git a/src/Speckle.Sdk/Api/GraphQL/Models/Workspace.cs b/src/Speckle.Sdk/Api/GraphQL/Models/Workspace.cs index 745f54ad7..9faa104a0 100644 --- a/src/Speckle.Sdk/Api/GraphQL/Models/Workspace.cs +++ b/src/Speckle.Sdk/Api/GraphQL/Models/Workspace.cs @@ -1,30 +1,40 @@ +using Speckle.Newtonsoft.Json; + namespace Speckle.Sdk.Api.GraphQL.Models; public class LimitedWorkspace { - public string id { get; init; } - public string name { get; init; } + public required string id { get; init; } + public required string name { get; init; } public string? role { get; init; } - public string slug { get; init; } - public string? logo { get; init; } + public required string slug { get; init; } + public string? logoUri { get; init; } public string? description { get; init; } + + [JsonIgnore] + [Obsolete($"Deprecated, use {nameof(logoUri)} instead", true)] + public string? logo { get; init; } } public class Workspace : LimitedWorkspace { - public DateTime createdAt { get; init; } - public DateTime updatedAt { get; init; } - public bool readOnly { get; init; } - public WorkspacePermissionChecks permissions { get; init; } + public required DateTime createdAt { get; init; } + public required DateTime updatedAt { get; init; } + public required bool readOnly { get; init; } + public required WorkspacePermissionChecks permissions { get; init; } + + [JsonIgnore] + [Obsolete("Workspaces no longer have creation state, is always created true", true)] public WorkspaceCreationState? creationState { get; init; } } +[Obsolete("Workspaces no longer have creation state, is always created true")] public sealed class WorkspaceCreationState { - public bool completed { get; init; } + public required bool completed { get; init; } } public sealed class WorkspacePermissionChecks { - public PermissionCheckResult canCreateProject { get; init; } + public required PermissionCheckResult canCreateProject { get; init; } } diff --git a/src/Speckle.Sdk/Api/GraphQL/Resources/ActiveUserResource.cs b/src/Speckle.Sdk/Api/GraphQL/Resources/ActiveUserResource.cs index cb5451816..b9f8f0b4b 100644 --- a/src/Speckle.Sdk/Api/GraphQL/Resources/ActiveUserResource.cs +++ b/src/Speckle.Sdk/Api/GraphQL/Resources/ActiveUserResource.cs @@ -1,4 +1,4 @@ -using GraphQL; +using GraphQL; using Speckle.Sdk.Api.GraphQL.Inputs; using Speckle.Sdk.Api.GraphQL.Models; using Speckle.Sdk.Api.GraphQL.Models.Responses; @@ -264,15 +264,11 @@ query ActiveUser($limit: Int!, $cursor: String, $filter: UserWorkspacesFilter) { name role slug - logo + logoUrl createdAt updatedAt readOnly description - creationState - { - completed - } permissions { canCreateProject { authorized @@ -328,7 +324,7 @@ query ActiveUser { name role slug - logo + logoUrl description } } @@ -337,9 +333,20 @@ query ActiveUser { var request = new GraphQLRequest { Query = QUERY }; - var response = await _client - .ExecuteGraphQLRequest?>>(request, cancellationToken) - .ConfigureAwait(false); + NullableResponse?> response; + try + { + response = await _client + .ExecuteGraphQLRequest?>>(request, cancellationToken) + .ConfigureAwait(false); + } + catch (AggregateException a) + { + //v2.x.x servers do not have a logoUrl property + a.Handle(x => x is SpeckleGraphQLInvalidQueryException); + + return null; + } if (response.data is null) { diff --git a/src/Speckle.Sdk/Api/GraphQL/Resources/CommentResource.cs b/src/Speckle.Sdk/Api/GraphQL/Resources/CommentResource.cs index 30aed5e97..ed9397c7d 100644 --- a/src/Speckle.Sdk/Api/GraphQL/Resources/CommentResource.cs +++ b/src/Speckle.Sdk/Api/GraphQL/Resources/CommentResource.cs @@ -21,6 +21,7 @@ internal CommentResource(ISpeckleGraphQLClient client) /// /// /// + [Obsolete("Comments are deprecated in favour of Issues which we don't provide a .NET Resource for at this time")] public async Task Get( string commentId, string projectId, @@ -99,6 +100,7 @@ query CommentThreads($projectId: String!, $commentId: String!, $repliesLimit: In /// /// /// + [Obsolete("Comments are deprecated in favour of Issues which we don't provide a .NET Resource for at this time")] public async Task GetProjectComments( string projectId, int limit = ServerLimits.DEFAULT_PAGINATION_REQUEST, @@ -186,6 +188,7 @@ query CommentThreads($projectId: String!, $cursor: String, $limit: Int!, $filter /// /// /// + [Obsolete("Comments are deprecated in favour of Issues which we don't provide a .NET Resource for at this time")] internal async Task Create(CreateCommentInput input, CancellationToken cancellationToken = default) { //language=graphql @@ -227,6 +230,7 @@ mutation Mutation($input: CreateCommentInput!) { /// /// /// + [Obsolete("Comments are deprecated in favour of Issues which we don't provide a .NET Resource for at this time")] internal async Task Edit(EditCommentInput input, CancellationToken cancellationToken = default) { //language=graphql @@ -267,6 +271,7 @@ mutation Mutation($input: EditCommentInput!) { /// /// /// + [Obsolete("Comments are deprecated in favour of Issues which we don't provide a .NET Resource for at this time")] public async Task Archive(ArchiveCommentInput input, CancellationToken cancellationToken = default) { //language=graphql @@ -293,6 +298,7 @@ mutation Mutation($input: ArchiveCommentInput!) { /// /// /// + [Obsolete("Comments are deprecated in favour of Issues which we don't provide a .NET Resource for at this time")] public async Task MarkViewed(MarkCommentViewedInput input, CancellationToken cancellationToken = default) { //language=graphql @@ -320,6 +326,7 @@ mutation Mutation($input: MarkCommentViewedInput!) { /// /// /// + [Obsolete("Comments are deprecated in favour of Issues which we don't provide a .NET Resource for at this time")] internal async Task Reply(CreateCommentReplyInput input, CancellationToken cancellationToken = default) { //language=graphql diff --git a/src/Speckle.Sdk/Api/GraphQL/Resources/OtherUserResource.cs b/src/Speckle.Sdk/Api/GraphQL/Resources/OtherUserResource.cs index 309d12557..a0a92cf60 100644 --- a/src/Speckle.Sdk/Api/GraphQL/Resources/OtherUserResource.cs +++ b/src/Speckle.Sdk/Api/GraphQL/Resources/OtherUserResource.cs @@ -52,35 +52,34 @@ query LimitedUser($id: String!) { /// String to search for. Must be at least 3 characters /// Max number of users to fetch /// Optional cursor for pagination - /// /// /// /// /// + [Obsolete("User search is deprecated")] public async Task UserSearch( string query, int limit = ServerLimits.DEFAULT_PAGINATION_REQUEST, string? cursor = null, - bool archived = false, bool emailOnly = false, CancellationToken cancellationToken = default ) { //language=graphql const string QUERY = """ - query UserSearch($query: String!, $limit: Int!, $cursor: String, $archived: Boolean, $emailOnly: Boolean) { - data:userSearch(query: $query, limit: $limit, cursor: $cursor, archived: $archived, emailOnly: $emailOnly) { + query Users($input: UsersRetrievalInput!) { + data:users(input: $input) { cursor items { - id - name - bio - company - avatar - verified - role - } - } + id + name + bio + company + avatar + verified + role + } + } } """; @@ -89,11 +88,13 @@ query UserSearch($query: String!, $limit: Int!, $cursor: String, $archived: Bool Query = QUERY, Variables = new { - query, - limit, - cursor, - archived, - emailOnly, + input = new + { + query, + limit, + emailOnly, + cursor, + }, }, }; diff --git a/src/Speckle.Sdk/Api/GraphQL/Resources/SubscriptionResource.cs b/src/Speckle.Sdk/Api/GraphQL/Resources/SubscriptionResource.cs index 8ba201d18..391402305 100644 --- a/src/Speckle.Sdk/Api/GraphQL/Resources/SubscriptionResource.cs +++ b/src/Speckle.Sdk/Api/GraphQL/Resources/SubscriptionResource.cs @@ -76,6 +76,7 @@ subscription UserProjectsUpdated { /// Subscribe to updates to resource comments/threads. Optionally specify resource ID string to only receive updates regarding comments for those resources /// /// + [Obsolete("Comments are now issues, and we've not update SDKs with the new subs")] public Subscription CreateProjectCommentsUpdatedSubscription( ViewerUpdateTrackingTarget target ) diff --git a/src/Speckle.Sdk/Api/GraphQL/Resources/WorkspaceResource.cs b/src/Speckle.Sdk/Api/GraphQL/Resources/WorkspaceResource.cs index 285c008b6..805a4ad67 100644 --- a/src/Speckle.Sdk/Api/GraphQL/Resources/WorkspaceResource.cs +++ b/src/Speckle.Sdk/Api/GraphQL/Resources/WorkspaceResource.cs @@ -28,15 +28,11 @@ query WorkspaceGet($workspaceId: String!) { name role slug - logo + logoUrl createdAt updatedAt readOnly description - creationState - { - completed - } permissions { canCreateProject { authorized diff --git a/tests/Speckle.Sdk.Tests.Integration/Api/GraphQL/Resources/ActiveUserResourceTests.cs b/tests/Speckle.Sdk.Tests.Integration/Api/GraphQL/Resources/ActiveUserResourceTests.cs index 803a42b6e..e80671cca 100644 --- a/tests/Speckle.Sdk.Tests.Integration/Api/GraphQL/Resources/ActiveUserResourceTests.cs +++ b/tests/Speckle.Sdk.Tests.Integration/Api/GraphQL/Resources/ActiveUserResourceTests.cs @@ -107,14 +107,14 @@ await FluentActions .ThrowAsync(); } - [Fact] + [Fact, Trait("Server", "Internal")] public async Task ActiveUserGetWorkspaces() { var ex = await Assert.ThrowsAsync(async () => _ = await Sut.GetWorkspaces()); await Verify(ex); } - [Fact] + [Fact, Trait("Server", "Internal")] public async Task ActiveUserGetWorkspaces_NoAuth() { await FluentActions @@ -130,7 +130,7 @@ public async Task ActiveUserGetActiveWorkspace() res.Should().Be(null); } - [Fact] + [Fact, Trait("Server", "Internal")] public async Task ActiveUserGetActiveWorkspace_NoAuth() { await FluentActions diff --git a/tests/Speckle.Sdk.Tests.Integration/Api/GraphQL/Resources/WorkspaceResourceTests.cs b/tests/Speckle.Sdk.Tests.Integration/Api/GraphQL/Resources/WorkspaceResourceTests.cs index f497407eb..c895b4709 100644 --- a/tests/Speckle.Sdk.Tests.Integration/Api/GraphQL/Resources/WorkspaceResourceTests.cs +++ b/tests/Speckle.Sdk.Tests.Integration/Api/GraphQL/Resources/WorkspaceResourceTests.cs @@ -22,15 +22,23 @@ private static async Task Setup() return testUser; } - [Fact] + [Fact, Trait("Server", "Internal")] public async Task TestGetWorkspace() { var ex = await Assert.ThrowsAsync(async () => _ = await Sut.Get("non-existent-id")); ex.InnerExceptions.Should().HaveCount(1); - ex.InnerExceptions.Should().AllBeOfType(); + ex.InnerExceptions.Should().AllBeOfType(); + } + + [Fact, Trait("Server", "Internal")] + public async Task TestGetProjectsInternal() + { + var ex = await Assert.ThrowsAsync(async () => _ = await Sut.GetProjects("non-existent-id")); + ex.InnerExceptions.Should().HaveCount(1); + ex.InnerExceptions.Should().AllBeOfType(); } - [Fact] + [Fact, Trait("Server", "Public")] public async Task TestGetProjects() { var ex = await Assert.ThrowsAsync(async () => _ = await Sut.GetProjects("non-existent-id"));