Merge branch 'main' of github.com:panoramicdata/LogicMonitor.Api

panoramicdata · Mar 6, 2024 · 9bda683 · 9bda683
2 parents c7d75c6 + f50e01c
commit 9bda683
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 8 deletions.
diff --git a/LogicMonitor.Api.Test/LogicMonitor.Api.Test.csproj b/LogicMonitor.Api.Test/LogicMonitor.Api.Test.csproj
@@ -13,7 +13,7 @@
 	<ItemGroup>
 		<PackageReference Include="Divergic.Logging.Xunit" Version="4.3.0" />
 		<PackageReference Include="FluentAssertions" Version="6.12.0" />
-		<PackageReference Include="FluentAssertions.Analyzers" Version="0.29.0">
+		<PackageReference Include="FluentAssertions.Analyzers" Version="0.30.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
@@ -24,10 +24,10 @@
 		<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
 		<PackageReference Include="SixLabors.ImageSharp" Version="3.1.2" />
-		<PackageReference Include="xunit" Version="2.6.5" />
-		<PackageReference Include="xunit.analyzers" Version="1.9.0" />
+		<PackageReference Include="xunit" Version="2.6.6" />
+		<PackageReference Include="xunit.analyzers" Version="1.10.0" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

diff --git a/LogicMonitor.Api.Test/Users/UserTests.cs b/LogicMonitor.Api.Test/Users/UserTests.cs
@@ -0,0 +1,13 @@
+namespace LogicMonitor.Api.Test.Users;
+
+public class UserTests(ITestOutputHelper iTestOutputHelper) : TestWithOutput(iTestOutputHelper)
+{
+	[Fact]
+	public async Task GetAll()
+	{
+		var users = await LogicMonitorClient.GetAllAsync<User>(default).ConfigureAwait(true);
+
+		users.Should().NotBeNull();
+		users.Should().NotBeNullOrEmpty();
+	}
+}
diff --git a/LogicMonitor.Api/LogicMonitor.Api.csproj b/LogicMonitor.Api/LogicMonitor.Api.csproj
@@ -28,7 +28,7 @@
 
 		<!-- Update the following before releasing to nuget -->
 		<PackageReleaseNotes>
-			Added logicMonitorClient.GetAllAsync() support for ApiTokens.
+			Added missing properties on various user-related objects.
 		</PackageReleaseNotes>
 		<UserSecretsId>57aaa0e7-815d-4065-9339-f3f070bed01e</UserSecretsId>
 

diff --git a/LogicMonitor.Api/Users/PrivilegeObjectType.cs b/LogicMonitor.Api/Users/PrivilegeObjectType.cs
@@ -101,5 +101,11 @@ public enum PrivilegeObjectType
 	/// Dexda
 	/// </summary>
 	[DataMember(Name = "dexda")]
-	Dexda
+	Dexda,
+
+	/// <summary>
+	/// Module
+	/// </summary>
+	[DataMember(Name = "module")]
+	Module
 }
diff --git a/LogicMonitor.Api/Users/RolePrivilegeOperation.cs b/LogicMonitor.Api/Users/RolePrivilegeOperation.cs
@@ -53,5 +53,11 @@ public enum RolePrivilegeOperation
 	/// NoPrivilege
 	/// </summary>
 	[EnumMember(Value = "noprivilege")]
-	NoPrivilege
+	NoPrivilege,
+
+	/// <summary>
+	/// Install
+	/// </summary>
+	[EnumMember(Value = "install")]
+	Install
 }
diff --git a/LogicMonitor.Api/Users/User.cs b/LogicMonitor.Api/Users/User.cs
@@ -210,6 +210,12 @@ public class User : IdentifiedItem, IHasEndpoint
 	[IgnoreDataMember]
 	public DateTime? LastActionOnUtc => LastActionOnSeconds.ToNullableDateTimeUtc();
 
+	/// <summary>
+	///    Whether they should be forced to logout immediately
+	/// </summary>
+	[DataMember(Name = "immediateForceLogout")]
+	public bool ImmediateForceLogout { get; set; }
+
 	/// <summary>
 	///    The endpoint
 	/// </summary>

diff --git a/LogicMonitor.Api/Users/ViewPermission.cs b/LogicMonitor.Api/Users/ViewPermission.cs
@@ -84,6 +84,12 @@ public class ViewPermission
 	[DataMember(Name = "Traces")]
 	public bool Traces { get; set; }
 
+	/// <summary>
+	/// Modules
+	/// </summary>
+	[DataMember(Name = "Modules")]
+	public bool Modules { get; set; }
+
 	/// <inheritdoc />
 	public override string ToString() =>
 		$"{nameof(Dashboards)}={Dashboards};" +
@@ -95,5 +101,6 @@ public override string ToString() =>
 		$"{nameof(Alerts)}={Alerts};" +
 		$"{nameof(Maps)}={Maps};" +
 		$"{nameof(Logs)}={Logs};" +
-		$"{nameof(Traces)}={Traces};";
+		$"{nameof(Traces)}={Traces};" +
+		$"{nameof(Modules)}={Modules};";
 }