Merge pull request #417 from specklesystems/dev

main -> dev for 3.9.0 release

.github/workflows/integration-test.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Setup .NET
         uses: actions/setup-dotnet@v5

.github/workflows/pr.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Setup .NET
         uses: actions/setup-dotnet@v5
@@ -33,9 +33,6 @@ jobs:
 
       - name: 🔨 Unit Tests
         run: dotnet test ${{ env.Solution }} --configuration Release --filter "Category!=Integration" --no-build --no-restore --verbosity=normal /p:AltCover=true /p:AltCoverAttributeFilter=ExcludeFromCodeCoverage
- 
-      - name: 🎁 Pack
-        run: dotnet pack ${{ env.Solution }} --configuration Release --no-build 
 
       - name: Upload coverage reports to Codecov with GitHub Action
         uses: codecov/codecov-action@v5

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Setup .NET
         uses: actions/setup-dotnet@v5

Speckle.Sdk.sln

@@ -42,7 +42,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{
 	ProjectSection(SolutionItems) = preProject
 		.github\workflows\pr.yml = .github\workflows\pr.yml
 		.github\workflows\release.yml = .github\workflows\release.yml
-		.github\workflows\integration-test.yml = .github\workflows\integration-test.yml
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Sdk.Tests.Performance", "tests\Speckle.Sdk.Tests.Performance\Speckle.Sdk.Tests.Performance.csproj", "{870E3396-E6F7-43AE-B120-E651FA4F46BD}"

src/Speckle.Automate.Sdk/AutomationContext.cs

@@ -63,7 +63,7 @@ internal sealed class AutomationContext(IOperations operations) : IAutomationCon
       );
     }
 
-    Base rootObject = await operations
+    Base? rootObject = await operations
       .Receive2(
         SpeckleClient.ServerUrl,
         AutomationRunData.ProjectId,
@@ -74,10 +74,6 @@ internal sealed class AutomationContext(IOperations operations) : IAutomationCon
       )
       .ConfigureAwait(false);
 
-    await SpeckleClient
-      .Version.Received(new(version.id, AutomationRunData.ProjectId, "automate_function"), cancellationToken)
-      .ConfigureAwait(false);
-
     Console.WriteLine($"It took {Elapsed.TotalSeconds} seconds to receive the speckle version {versionId}");
     return rootObject;
   }

src/Speckle.Objects/Geometry/SolidX.cs

@@ -1,6 +0,0 @@
-using Speckle.Sdk.Models;
-
-namespace Speckle.Objects.Geometry;
-
-[SpeckleType("Objects.Geometry.SolidX")]
-public class SolidX : RawEncodedObject;

src/Speckle.Objects/Other/RawEncoding.cs

@@ -20,5 +20,4 @@ public class RawEncoding : Base // note: at this stage, since we're using this f
 public static class RawEncodingFormats
 {
   public const string RHINO_3DM = "3dm";
-  public const string ACAD_DWG = "dwg";
 }

tests/Speckle.Sdk.Tests.Integration/Api/GraphQL/Resources/SubscriptionResourceTests.cs

@@ -10,12 +10,7 @@ namespace Speckle.Sdk.Tests.Integration.API.GraphQL.Resources;
 
 public class SubscriptionResourceTests : IAsyncLifetime
 {
-#if DEBUG
-  private const int WAIT_PERIOD = 3000; // WSL is slow AF, so for local runs, we're being extra generous
-#else
-  private const int WAIT_PERIOD = 400; // For CI runs, a much smaller wait time is acceptable
-#endif
-  private const int TIMEOUT = WAIT_PERIOD + WAIT_PERIOD + 400;
+  private const int WAIT_PERIOD = 300;
   private IClient _testUser;
   private Project _testProject;
   private Model _testModel;
@@ -37,101 +32,105 @@ public class SubscriptionResourceTests : IAsyncLifetime
     _testVersion = await Fixtures.CreateVersion(_testUser, _testProject.id, _testModel.id);
   }
 
-  [Fact(Timeout = TIMEOUT)]
+  [Fact]
   public async Task UserProjectsUpdated_SubscriptionIsCalled()
   {
-    TaskCompletionSource<UserProjectsUpdatedMessage> tcs = new();
+    UserProjectsUpdatedMessage? subscriptionMessage = null;
+
     using var sub = Sut.CreateUserProjectsUpdatedSubscription();
-    sub.Listeners += (_, message) => tcs.SetResult(message);
+    sub.Listeners += (_, message) => subscriptionMessage = message;
 
     await Task.Delay(WAIT_PERIOD); // Give time to subscription to be setup
 
     var created = await _testUser.Project.Create(new(null, null, null));
 
-    var subscriptionMessage = await tcs.Task;
+    await Task.Delay(WAIT_PERIOD); // Give time for subscription to be triggered
 
     subscriptionMessage.Should().NotBeNull();
-    subscriptionMessage.id.Should().Be(created.id);
+    subscriptionMessage!.id.Should().Be(created.id);
     subscriptionMessage.type.Should().Be(UserProjectsUpdatedMessageType.ADDED);
     subscriptionMessage.project.Should().NotBeNull();
   }
 
-  [Fact(Timeout = TIMEOUT)]
+  [Fact]
   public async Task ProjectModelsUpdated_SubscriptionIsCalled()
   {
-    TaskCompletionSource<ProjectModelsUpdatedMessage> tcs = new();
+    ProjectModelsUpdatedMessage? subscriptionMessage = null;
+
     using var sub = Sut.CreateProjectModelsUpdatedSubscription(_testProject.id);
-    sub.Listeners += (_, message) => tcs.SetResult(message);
+    sub.Listeners += (_, message) => subscriptionMessage = message;
 
     await Task.Delay(WAIT_PERIOD); // Give time to subscription to be setup
 
     CreateModelInput input = new("my model", "myDescription", _testProject.id);
     var created = await _testUser.Model.Create(input);
 
-    var subscriptionMessage = await tcs.Task;
+    await Task.Delay(WAIT_PERIOD); // Give time for subscription to be triggered
 
     subscriptionMessage.Should().NotBeNull();
-    subscriptionMessage.id.Should().Be(created.id);
+    subscriptionMessage!.id.Should().Be(created.id);
     subscriptionMessage.type.Should().Be(ProjectModelsUpdatedMessageType.CREATED);
     subscriptionMessage.model.Should().NotBeNull();
   }
 
-  [Fact(Timeout = TIMEOUT)]
+  [Fact]
   public async Task ProjectUpdated_SubscriptionIsCalled()
   {
-    TaskCompletionSource<ProjectUpdatedMessage> tcs = new();
+    ProjectUpdatedMessage? subscriptionMessage = null;
+
     using var sub = Sut.CreateProjectUpdatedSubscription(_testProject.id);
-    sub.Listeners += (_, message) => tcs.SetResult(message);
+    sub.Listeners += (_, message) => subscriptionMessage = message;
 
     await Task.Delay(WAIT_PERIOD); // Give time to subscription to be setup
 
     var input = new ProjectUpdateInput(_testProject.id, "This is my new name");
     var created = await _testUser.Project.Update(input);
 
-    var subscriptionMessage = await tcs.Task;
+    await Task.Delay(WAIT_PERIOD); // Give time for subscription to be triggered
 
     subscriptionMessage.Should().NotBeNull();
-    subscriptionMessage.id.Should().Be(created.id);
+    subscriptionMessage!.id.Should().Be(created.id);
     subscriptionMessage.type.Should().Be(ProjectUpdatedMessageType.UPDATED);
     subscriptionMessage.project.Should().NotBeNull();
   }
 
-  [Fact(Timeout = TIMEOUT)]
+  [Fact]
   public async Task ProjectVersionsUpdated_SubscriptionIsCalled()
   {
-    TaskCompletionSource<ProjectVersionsUpdatedMessage> tcs = new();
+    ProjectVersionsUpdatedMessage? subscriptionMessage = null;
+
     using var sub = Sut.CreateProjectVersionsUpdatedSubscription(_testProject.id);
-    sub.Listeners += (_, message) => tcs.SetResult(message);
+    sub.Listeners += (_, message) => subscriptionMessage = message;
 
     await Task.Delay(WAIT_PERIOD); // Give time to subscription to be setup
 
     var created = await Fixtures.CreateVersion(_testUser, _testProject.id, _testModel.id);
 
-    var subscriptionMessage = await tcs.Task;
+    await Task.Delay(WAIT_PERIOD); // Give time for subscription to be triggered
 
     subscriptionMessage.Should().NotBeNull();
-    subscriptionMessage.id.Should().Be(created.id);
+    subscriptionMessage!.id.Should().Be(created.id);
     subscriptionMessage.type.Should().Be(ProjectVersionsUpdatedMessageType.CREATED);
     subscriptionMessage.version.Should().NotBeNull();
   }
 
-  [Fact(Skip = CommentResourceTests.SERVER_SKIP_MESSAGE, Timeout = TIMEOUT)]
+  [Fact(Skip = CommentResourceTests.SERVER_SKIP_MESSAGE)]
   public async Task ProjectCommentsUpdated_SubscriptionIsCalled()
   {
     string resourceIdString = $"{_testProject.id},{_testModel.id},{_testVersion}";
+    ProjectCommentsUpdatedMessage? subscriptionMessage = null;
 
-    TaskCompletionSource<ProjectCommentsUpdatedMessage> tcs = new();
     using var sub = Sut.CreateProjectCommentsUpdatedSubscription(new(_testProject.id, resourceIdString));
-    sub.Listeners += (_, message) => tcs.SetResult(message);
+    sub.Listeners += (_, message) => subscriptionMessage = message;
 
     await Task.Delay(WAIT_PERIOD); // Give time to subscription to be setup
 
     var created = await Fixtures.CreateComment(_testUser, _testProject.id, _testModel.id, _testVersion.id);
 
-    var subscriptionMessage = await tcs.Task;
+    await Task.Delay(WAIT_PERIOD); // Give time for subscription to be triggered
 
     subscriptionMessage.Should().NotBeNull();
-    subscriptionMessage.id.Should().Be(created.id);
+    subscriptionMessage!.id.Should().Be(created.id);
     subscriptionMessage.type.Should().Be(ProjectCommentsUpdatedMessageType.CREATED);
     subscriptionMessage.comment.Should().NotBeNull();
   }

tests/Speckle.Sdk.Tests.Integration/Credentials/UserServerInfoTests.cs

@@ -0,0 +1,85 @@
+using FluentAssertions;
+using GraphQL.Client.Http;
+using Microsoft.Extensions.DependencyInjection;
+using Speckle.Sdk.Api.GraphQL.Models;
+using Speckle.Sdk.Credentials;
+
+namespace Speckle.Sdk.Tests.Integration.Credentials;
+
+public class UserServerInfoTests : IAsyncLifetime
+{
+  private Account _acc;
+
+  public Task DisposeAsync() => Task.CompletedTask;
+
+  public async Task InitializeAsync()
+  {
+    _acc = await Fixtures.SeedUser();
+  }
+
+  [Fact]
+  public async Task IsFrontEnd2True()
+  {
+    ServerInfo result = await Fixtures
+      .ServiceProvider.GetRequiredService<IAccountManager>()
+      .GetServerInfo(new("https://app.speckle.systems/"));
+
+    result.Should().NotBeNull();
+    result.frontend2.Should().BeTrue();
+  }
+
+  [Fact]
+  public async Task GetServerInfo_ExpectFail_NoServer()
+  {
+    Uri serverUrl = new("http://invalidserver.local");
+
+    await FluentActions
+      .Invoking(async () =>
+        await Fixtures.ServiceProvider.GetRequiredService<IAccountManager>().GetServerInfo(serverUrl)
+      )
+      .Should()
+      .ThrowAsync<HttpRequestException>();
+  }
+
+  [Fact]
+  public async Task GetUserInfo()
+  {
+    Uri serverUrl = new(_acc.serverInfo.url);
+    UserInfo result = await Fixtures
+      .ServiceProvider.GetRequiredService<IAccountManager>()
+      .GetUserInfo(_acc.token, serverUrl);
+
+    result.id.Should().Be(_acc.userInfo.id);
+    result.name.Should().Be(_acc.userInfo.name);
+    result.email.Should().Be(_acc.userInfo.email);
+    result.company.Should().Be(_acc.userInfo.company);
+    result.avatar.Should().Be(_acc.userInfo.avatar);
+  }
+
+  [Fact]
+  public async Task GetUserInfo_ExpectFail_NoServer()
+  {
+    Uri serverUrl = new("http://invalidserver.local");
+
+    await FluentActions
+      .Invoking(async () =>
+        await Fixtures.ServiceProvider.GetRequiredService<IAccountManager>().GetUserInfo("", serverUrl)
+      )
+      .Should()
+      .ThrowAsync<HttpRequestException>();
+  }
+
+  [Fact]
+  public async Task GetUserInfo_ExpectFail_NoUser()
+  {
+    Uri serverUrl = new(_acc.serverInfo.url);
+    await FluentActions
+      .Invoking(async () =>
+        await Fixtures
+          .ServiceProvider.GetRequiredService<IAccountManager>()
+          .GetUserInfo("Bearer 08913c3c1e7ac65d779d1e1f11b942a44ad9672ca9", serverUrl)
+      )
+      .Should()
+      .ThrowAsync<GraphQLHttpRequestException>();
+  }
+}