From d4055c6ff1857676672ac39627b3578b9c95473a Mon Sep 17 00:00:00 2001 From: Jedd Morgan <45512892+JR-Morgan@users.noreply.github.com> Date: Mon, 23 Mar 2026 16:03:20 +0000 Subject: [PATCH 1/4] Avoid deprecated fields --- .../Api/GraphQL/Models/Workspace.cs | 12 ++++++- .../GraphQL/Resources/ActiveUserResource.cs | 8 ++--- .../GraphQL/Resources/OtherUserResource.cs | 36 +++++++++---------- .../GraphQL/Resources/WorkspaceResource.cs | 6 +--- 4 files changed, 32 insertions(+), 30 deletions(-) diff --git a/src/Speckle.Sdk/Api/GraphQL/Models/Workspace.cs b/src/Speckle.Sdk/Api/GraphQL/Models/Workspace.cs index 745f54ad7..807212bd6 100644 --- a/src/Speckle.Sdk/Api/GraphQL/Models/Workspace.cs +++ b/src/Speckle.Sdk/Api/GraphQL/Models/Workspace.cs @@ -1,3 +1,5 @@ +using Speckle.Newtonsoft.Json; + namespace Speckle.Sdk.Api.GraphQL.Models; public class LimitedWorkspace @@ -6,8 +8,12 @@ public class LimitedWorkspace public string name { get; init; } public string? role { get; init; } public string slug { get; init; } - public string? logo { 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 @@ -16,9 +22,13 @@ public class Workspace : LimitedWorkspace public DateTime updatedAt { get; init; } public bool readOnly { get; init; } public 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; } diff --git a/src/Speckle.Sdk/Api/GraphQL/Resources/ActiveUserResource.cs b/src/Speckle.Sdk/Api/GraphQL/Resources/ActiveUserResource.cs index cb5451816..732b3fa56 100644 --- a/src/Speckle.Sdk/Api/GraphQL/Resources/ActiveUserResource.cs +++ b/src/Speckle.Sdk/Api/GraphQL/Resources/ActiveUserResource.cs @@ -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 } } diff --git a/src/Speckle.Sdk/Api/GraphQL/Resources/OtherUserResource.cs b/src/Speckle.Sdk/Api/GraphQL/Resources/OtherUserResource.cs index 309d12557..a6c65dbda 100644 --- a/src/Speckle.Sdk/Api/GraphQL/Resources/OtherUserResource.cs +++ b/src/Speckle.Sdk/Api/GraphQL/Resources/OtherUserResource.cs @@ -52,7 +52,6 @@ query LimitedUser($id: String!) { /// String to search for. Must be at least 3 characters /// Max number of users to fetch /// Optional cursor for pagination - /// /// /// /// @@ -61,26 +60,25 @@ 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!) { + users(input: $input) { cursor items { - id - name - bio - company - avatar - verified - role - } - } + id + name + bio + company + avatar + verified + role + } + } } """; @@ -89,11 +87,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/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 From 4b319499c33609b81e831dc976e9834fadaaa9a3 Mon Sep 17 00:00:00 2001 From: Jedd Morgan <45512892+JR-Morgan@users.noreply.github.com> Date: Mon, 23 Mar 2026 16:10:44 +0000 Subject: [PATCH 2/4] Fix mistake --- src/Speckle.Sdk/Api/GraphQL/Resources/OtherUserResource.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Speckle.Sdk/Api/GraphQL/Resources/OtherUserResource.cs b/src/Speckle.Sdk/Api/GraphQL/Resources/OtherUserResource.cs index a6c65dbda..26d462564 100644 --- a/src/Speckle.Sdk/Api/GraphQL/Resources/OtherUserResource.cs +++ b/src/Speckle.Sdk/Api/GraphQL/Resources/OtherUserResource.cs @@ -67,7 +67,7 @@ public async Task UserSearch( //language=graphql const string QUERY = """ query Users($input: UsersRetrievalInput!) { - users(input: $input) { + data:users(input: $input) { cursor items { id From 2b61ab7d2e0088a97f5bdfb41b70eda701ec1411 Mon Sep 17 00:00:00 2001 From: Jedd Morgan <45512892+JR-Morgan@users.noreply.github.com> Date: Tue, 24 Mar 2026 10:04:44 +0000 Subject: [PATCH 3/4] fallback mechanism --- .../GraphQL/Resources/ActiveUserResource.cs | 44 ++++++++++++++++++- .../GraphQL/Resources/SubscriptionResource.cs | 1 + 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/src/Speckle.Sdk/Api/GraphQL/Resources/ActiveUserResource.cs b/src/Speckle.Sdk/Api/GraphQL/Resources/ActiveUserResource.cs index 732b3fa56..4e8289187 100644 --- a/src/Speckle.Sdk/Api/GraphQL/Resources/ActiveUserResource.cs +++ b/src/Speckle.Sdk/Api/GraphQL/Resources/ActiveUserResource.cs @@ -313,7 +313,7 @@ query ActiveUser($limit: Int!, $cursor: String, $filter: UserWorkspacesFilter) { /// note this returns a , because it may be a workspace the user is not a member of /// /// The ActiveUser could not be found (e.g. the client is not authenticated) - public async Task GetActiveWorkspace(CancellationToken cancellationToken = default) + private async Task GetActiveWorkspace_Legacy(CancellationToken cancellationToken = default) { //language=graphql const string QUERY = """ @@ -324,7 +324,6 @@ query ActiveUser { name role slug - logoUrl description } } @@ -345,6 +344,47 @@ query ActiveUser { return response.data.data; } + public async Task GetActiveWorkspace(CancellationToken cancellationToken = default) + { + //language=graphql + const string QUERY = """ + query ActiveUser { + data:activeUser { + data:activeWorkspace { + id + name + role + slug + logoUrl + description + } + } + } + """; + + var request = new GraphQLRequest { Query = QUERY }; + + NullableResponse?> response; + try + { + response = await _client + .ExecuteGraphQLRequest?>>(request, cancellationToken) + .ConfigureAwait(false); + } + catch (SpeckleGraphQLInvalidQueryException) + { + //v2.x.x servers do not have a logoUrl property + return await GetActiveWorkspace_Legacy(cancellationToken).ConfigureAwait(false); + } + + if (response.data is null) + { + throw new SpeckleException("GraphQL response indicated that the ActiveUser could not be found"); + } + + return response.data.data; + } + /// Max number of projects to fetch /// Optional cursor for pagination /// Optional filter 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 ) From c517dead036529ea658e162ff2cf24a9d5b41102 Mon Sep 17 00:00:00 2001 From: Jedd Morgan <45512892+JR-Morgan@users.noreply.github.com> Date: Tue, 24 Mar 2026 10:24:43 +0000 Subject: [PATCH 4/4] Internal --- .../Api/GraphQL/Resources/WorkspaceResourceTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d597472d4..838156e2c 100644 --- a/tests/Speckle.Sdk.Tests.Integration/Api/GraphQL/Resources/WorkspaceResourceTests.cs +++ b/tests/Speckle.Sdk.Tests.Integration/Api/GraphQL/Resources/WorkspaceResourceTests.cs @@ -21,7 +21,7 @@ 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"));