Refactor script results and move entities.

Agent/Services/ScriptExecutor.cs

@@ -4,8 +4,8 @@ using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Remotely.Shared;
 using Remotely.Shared.Dtos;
+using Remotely.Shared.Entities;
 using Remotely.Shared.Enums;
-using Remotely.Shared.Models;
 using Remotely.Shared.Utilities;
 using System;
 using System.Net.Http;

Desktop.Shared/Services/BrandingProvider.cs

@@ -4,8 +4,8 @@ using Immense.RemoteControl.Shared;
 using Immense.RemoteControl.Shared.Models;
 using Microsoft.Extensions.Logging;
 using Remotely.Shared;
+using Remotely.Shared.Entities;
 using Remotely.Shared.Enums;
-using Remotely.Shared.Models;
 using Remotely.Shared.Services;
 using Remotely.Shared.Utilities;
 using System;

Server/API/BrandingController.cs

@@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Build.Framework;
 using Microsoft.Extensions.Logging;
 using Remotely.Server.Services;
-using Remotely.Shared.Models;
+using Remotely.Shared.Entities;
 using System;
 using System.Collections.Generic;
 using System.Linq;

Server/API/DevicesController.cs

@@ -5,6 +5,7 @@ using Microsoft.Extensions.Logging;
 using Remotely.Server.Auth;
 using Remotely.Server.Extensions;
 using Remotely.Server.Services;
+using Remotely.Shared.Entities;
 using Remotely.Shared.Models;
 using System;
 using System.Collections.Generic;

Server/API/LoginController.cs

@@ -8,7 +8,7 @@ using Microsoft.Extensions.Logging;
 using Remotely.Server.Hubs;
 using Remotely.Server.Models;
 using Remotely.Server.Services;
-using Remotely.Shared.Models;
+using Remotely.Shared.Entities;
 using System;
 using System.Linq;
 using System.Threading.Tasks;

Server/API/OrganizationManagementController.cs

@@ -11,6 +11,7 @@ using Org.BouncyCastle.Crypto.Agreement;
 using Remotely.Server.Auth;
 using Remotely.Server.Extensions;
 using Remotely.Server.Services;
+using Remotely.Shared.Entities;
 using Remotely.Shared.Models;
 using Remotely.Shared.ViewModels;
 using System;

Server/API/RemoteControlController.cs

@@ -4,7 +4,6 @@ using Microsoft.AspNetCore.SignalR;
 using Remotely.Server.Hubs;
 using Remotely.Server.Models;
 using Remotely.Server.Services;
-using Remotely.Shared.Models;
 using System;
 using System.Linq;
 using System.Threading.Tasks;
@@ -14,6 +13,7 @@ using Immense.RemoteControl.Server.Abstractions;
 using Immense.RemoteControl.Shared.Helpers;
 using Microsoft.Extensions.Logging;
 using Remotely.Server.Extensions;
+using Remotely.Shared.Entities;
 
 // For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
 

Server/API/SavedScriptsController.cs

@@ -2,7 +2,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Remotely.Server.Auth;
 using Remotely.Server.Services;
-using Remotely.Shared.Models;
+using Remotely.Shared.Entities;
 using System;
 using System.Collections.Generic;
 using System.Linq;

Server/API/ScriptingController.cs

@@ -4,7 +4,6 @@ using Microsoft.AspNetCore.SignalR;
 using Remotely.Server.Hubs;
 using Remotely.Server.Services;
 using Remotely.Shared.Utilities;
-using Remotely.Shared.Models;
 using System;
 using System.IO;
 using System.Threading.Tasks;
@@ -13,6 +12,7 @@ using Remotely.Server.Auth;
 using Immense.RemoteControl.Shared.Helpers;
 using Remotely.Shared;
 using Remotely.Server.Extensions;
+using Remotely.Shared.Entities;
 
 namespace Remotely.Server.API;
 

Server/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs

@@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.AspNetCore.WebUtilities;
-using Remotely.Shared.Models;
+using Remotely.Shared.Entities;
 
 namespace Remotely.Server.Areas.Identity.Pages.Account;
 

Server/Areas/Identity/Pages/Account/ConfirmEmailChange.cshtml.cs

@@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.AspNetCore.WebUtilities;
-using Remotely.Shared.Models;
+using Remotely.Shared.Entities;
 
 namespace Remotely.Server.Areas.Identity.Pages.Account;
 

Server/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs

@@ -10,9 +10,9 @@ using Microsoft.AspNetCore.Identity.UI.Services;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.AspNetCore.WebUtilities;
-using Remotely.Shared.Models;
 using Remotely.Server.Services;
 using Microsoft.Extensions.Logging;
+using Remotely.Shared.Entities;
 
 namespace Remotely.Server.Areas.Identity.Pages.Account;
 

Server/Areas/Identity/Pages/Account/Login.cshtml.cs

@@ -11,10 +11,10 @@ using Microsoft.AspNetCore.Identity.UI.Services;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Logging;
-using Remotely.Shared.Models;
 using Remotely.Server.Services;
 using Microsoft.AspNetCore.WebUtilities;
 using System.Text;
+using Remotely.Shared.Entities;
 
 namespace Remotely.Server.Areas.Identity.Pages.Account;
 

Server/Areas/Identity/Pages/Account/Logout.cshtml

@@ -4,6 +4,7 @@
 @using Microsoft.AspNetCore.SignalR
 @using Remotely.Server.Hubs
 @using Immense.RemoteControl.Server.Hubs
+@using Remotely.Shared.Entities
 
 @attribute [IgnoreAntiforgeryToken]
 @inject SignInManager<RemotelyUser> SignInManager

Server/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs

@@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Logging;
-using Remotely.Shared.Models;
+using Remotely.Shared.Entities;
 
 namespace Remotely.Server.Areas.Identity.Pages.Account.Manage;
 

Server/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
-using Remotely.Shared.Models;
+using Remotely.Shared.Entities;
 
 namespace Remotely.Server.Areas.Identity.Pages.Account.Manage;
 

Server/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml

@@ -1,2 +1,3 @@
 @using Remotely.Server.Areas.Identity.Pages.Account.Manage
-@using Remotely.Shared.Models
+@using Remotely.Shared.Models
+@using Remotely.Shared.Entities

Server/Areas/Identity/Pages/Account/Register.cshtml.cs

@@ -17,6 +17,7 @@ using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Remotely.Server.Services;
 using Remotely.Shared;
+using Remotely.Shared.Entities;
 using Remotely.Shared.Models;
 
 namespace Remotely.Server.Areas.Identity.Pages.Account;

Server/Areas/Identity/Pages/Shared/_LoginPartial.cshtml

@@ -1,4 +1,5 @@
 @using Microsoft.AspNetCore.Identity
+@using Remotely.Shared.Entities
 @inject SignInManager<RemotelyUser> SignInManager
 @inject UserManager<RemotelyUser> UserManager
 @inject Remotely.Server.Services.IApplicationConfig AppConfig

Server/Auth/OrganizationAdminRequirementHandler.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
-using Remotely.Shared.Models;
+using Remotely.Shared.Entities;
 using System.Threading.Tasks;
 
 namespace Remotely.Server.Auth;

Server/Auth/ServerAdminRequirementHandler.cs

@@ -2,7 +2,7 @@
 
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
-using Remotely.Shared.Models;
+using Remotely.Shared.Entities;
 using System.Threading.Tasks;
 
 namespace Remotely.Server.Auth;

Server/Auth/TwoFactorRequiredHandler.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Remotely.Server.Services;
-using Remotely.Shared.Models;
+using Remotely.Shared.Entities;
 using System;
 using System.Collections.Generic;
 using System.Linq;

Server/Components/AuthComponentBase.cs

@@ -2,7 +2,7 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Identity;
 using Remotely.Server.Services;
-using Remotely.Shared.Models;
+using Remotely.Shared.Entities;
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;

Server/Components/Devices/DeviceCard.razor.cs

@@ -9,6 +9,7 @@ using Remotely.Server.Enums;
 using Remotely.Server.Hubs;
 using Remotely.Server.Models;
 using Remotely.Server.Services;
+using Remotely.Shared.Entities;
 using Remotely.Shared.Enums;
 using Remotely.Shared.Models;
 using Remotely.Shared.Utilities;

Server/Components/Devices/DevicesFrame.razor.cs

@@ -7,6 +7,7 @@ using Remotely.Server.Hubs;
 using Remotely.Server.Models;
 using Remotely.Server.Services;
 using Remotely.Shared.Attributes;
+using Remotely.Shared.Entities;
 using Remotely.Shared.Models;
 using Remotely.Shared.Utilities;
 using System;

Server/Components/Devices/Terminal.razor.cs

@@ -6,6 +6,7 @@ using Microsoft.Extensions.Logging;
 using Remotely.Server.Components.ModalContents;
 using Remotely.Server.Hubs;
 using Remotely.Server.Services;
+using Remotely.Shared.Entities;
 using Remotely.Shared.Enums;
 using Remotely.Shared.Models;
 using Remotely.Shared.Utilities;

Server/Components/Scripts/RunScript.razor.cs

@@ -8,6 +8,7 @@ using Remotely.Server.Migrations.Sqlite;
 using Remotely.Server.Migrations.SqlServer;
 using Remotely.Server.Pages;
 using Remotely.Server.Services;
+using Remotely.Shared.Entities;
 using Remotely.Shared.Enums;
 using Remotely.Shared.Models;
 using Remotely.Shared.Utilities;

Server/Components/Scripts/SavedScripts.razor.cs

@@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.CodeAnalysis.Scripting;
 using Remotely.Server.Pages;
 using Remotely.Server.Services;
-using Remotely.Shared.Models;
+using Remotely.Shared.Entities;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;

Server/Components/Scripts/ScriptSchedules.razor.cs

@@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Forms;
 using Remotely.Server.Pages;
 using Remotely.Server.Services;
+using Remotely.Shared.Entities;
 using Remotely.Shared.Models;
 using Remotely.Shared.Utilities;
 using System;

Server/Components/Scripts/ScriptTreeNode.cs

@@ -1,5 +1,5 @@
 using Remotely.Server.Components.TreeView;
-using Remotely.Shared.Models;
+using Remotely.Shared.Entities;
 using System;
 using System.Collections.Generic;
 using System.Linq;

Server/Data/AppDb.cs

@@ -6,6 +6,7 @@ using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Logging;
+using Remotely.Shared.Entities;
 using Remotely.Shared.Models;
 using Remotely.Shared.Utilities;
 using System;

Server/Hubs/AgentHub.cs

@@ -6,6 +6,7 @@ using Remotely.Server.Models;
 using Remotely.Server.Services;
 using Remotely.Shared;
 using Remotely.Shared.Dtos;
+using Remotely.Shared.Entities;
 using Remotely.Shared.Enums;
 using Remotely.Shared.Models;
 using Remotely.Shared.Utilities;
@@ -278,7 +279,7 @@ public class AgentHub : Hub
 
         _ = await _circuitManager.InvokeOnConnection($"{result.Value.SenderConnectionID}",
             CircuitEventName.ScriptResult,
-            result);
+            result.Value);
     }
 
     public void ScriptResultViaApi(string commandID, string requestID)

Server/Hubs/CircuitConnection.cs

@@ -12,8 +12,8 @@ using Remotely.Server.Auth;
 using Remotely.Server.Models;
 using Remotely.Server.Services;
 using Remotely.Shared;
+using Remotely.Shared.Entities;
 using Remotely.Shared.Enums;
-using Remotely.Shared.Models;
 using Remotely.Shared.Utilities;
 using System;
 using System.Collections.Concurrent;

Server/Pages/ApiKeys.razor

@@ -1,5 +1,6 @@
 @page "/api-keys"
 @using Immense.RemoteControl.Shared.Helpers;
+@using Remotely.Shared.Entities;
 @attribute [Authorize(Policy = PolicyNames.OrganizationAdminRequired)]
 @inherits AuthComponentBase
 

Server/Pages/DeviceDetails.razor.cs

@@ -4,8 +4,8 @@ using Microsoft.AspNetCore.Components.Web;
 using Remotely.Server.Components;
 using Remotely.Server.Hubs;
 using Remotely.Server.Services;
+using Remotely.Shared.Entities;
 using Remotely.Shared.Enums;
-using Remotely.Shared.Models;
 using Remotely.Shared.Utilities;
 using System;
 using System.Collections.Concurrent;

Server/Pages/ManageOrganization.razor.cs

@@ -7,6 +7,7 @@ using Microsoft.AspNetCore.WebUtilities;
 using Remotely.Server.Components;
 using Remotely.Server.Components.ModalContents;
 using Remotely.Server.Services;
+using Remotely.Shared.Entities;
 using Remotely.Shared.Models;
 using Remotely.Shared.ViewModels;
 using System;

Server/Pages/ServerConfig.razor.cs

@@ -9,8 +9,8 @@ using Microsoft.Extensions.Logging;
 using Remotely.Server.Components;
 using Remotely.Server.Hubs;
 using Remotely.Server.Services;
+using Remotely.Shared.Entities;
 using Remotely.Shared.Enums;
-using Remotely.Shared.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;

Server/Pages/Shared/_Layout.cshtml

@@ -3,6 +3,7 @@
 @using Microsoft.EntityFrameworkCore;
 @using Remotely.Server.Services
 @using Remotely.Shared.Models
+@using Remotely.Shared.Entities
 @inject IApplicationConfig AppConfig
 @inject IWebHostEnvironment Environment
 @inject ICompositeViewEngine Engine

Server/Pages/Shared/_LoginPartial.cshtml

@@ -1,6 +1,6 @@
 @using Microsoft.AspNetCore.Identity
 @using Remotely.Shared.Models
-
+@using Remotely.Shared.Entities
 @inject SignInManager<RemotelyUser> SignInManager
 @inject UserManager<RemotelyUser> UserManager
 @inject Remotely.Server.Services.IApplicationConfig AppConfig

Server/Pages/_Host.cshtml

@@ -1,6 +1,7 @@
 @page "/"
 @using Remotely.Server.Services
 @using Remotely.Shared.Models
+@using Remotely.Shared.Entities
 @namespace Remotely.Server.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 @inject IDataService DataService

Server/Program.cs

@@ -23,7 +23,6 @@ using Remotely.Server.Auth;
 using Remotely.Server.Data;
 using Remotely.Server.Hubs;
 using Remotely.Server.Services;
-using Remotely.Shared.Models;
 using System.IO;
 using System.Linq;
 using System.Net;
@@ -39,6 +38,7 @@ using Serilog;
 using Nihs.SimpleMessenger;
 using Microsoft.AspNetCore.RateLimiting;
 using RatePolicyNames = Remotely.Server.RateLimiting.PolicyNames;
+using Remotely.Shared.Entities;
 
 var builder = WebApplication.CreateBuilder(args);
 var configuration = builder.Configuration;

Server/Services/AgentHubSessionCache.cs

@@ -1,5 +1,5 @@
 using Immense.RemoteControl.Server.Models;
-using Remotely.Shared.Models;
+using Remotely.Shared.Entities;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;

Server/Services/AuthService.cs

@@ -1,7 +1,7 @@
 using Immense.RemoteControl.Shared;
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.AspNetCore.Identity;
-using Remotely.Shared.Models;
+using Remotely.Shared.Entities;
 using System;
 using System.Collections.Generic;
 using System.Linq;

Server/Services/DataService.cs

@@ -12,6 +12,7 @@ using Remotely.Server.Data;
 using Remotely.Server.Models;
 using Remotely.Shared;
 using Remotely.Shared.Dtos;
+using Remotely.Shared.Entities;
 using Remotely.Shared.Enums;
 using Remotely.Shared.Models;
 using Remotely.Shared.Utilities;

Server/Services/ScriptScheduleDispatcher.cs

@@ -1,8 +1,8 @@
 using Immense.RemoteControl.Server.Abstractions;
 using Microsoft.Extensions.Logging;
 using Remotely.Server.Hubs;
+using Remotely.Shared.Entities;
 using Remotely.Shared.Enums;
-using Remotely.Shared.Models;
 using Remotely.Shared.Utilities;
 using System;
 using System.Collections.Generic;

Server/_Imports.razor

@@ -23,4 +23,5 @@
 @using System.Collections.Concurrent
 @using Remotely.Server.Components.Scripts
 @using Remotely.Server.Components.TreeView
-@using Remotely.Server.Auth
+@using Remotely.Server.Auth
+@using Remotely.Shared.Entities

Shared/Entities/Alert.cs

@@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.Json.Serialization;
 
-namespace Remotely.Shared.Models;
+namespace Remotely.Shared.Entities;
 
 public class Alert
 {

Shared/Entities/ApiToken.cs

@@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.Json.Serialization;
 
-namespace Remotely.Shared.Models;
+namespace Remotely.Shared.Entities;
 
 public class ApiToken
 {

Shared/Entities/BrandingInfo.cs

@@ -9,15 +9,15 @@ using System.Text;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
-namespace Remotely.Shared.Models;
+namespace Remotely.Shared.Entities;
 
 public class BrandingInfo : BrandingInfoBase
 {
     [Key]
     [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-    public string Id { get; set; } = string.Empty;
+    public string Id { get; set; } = null!;
 
-    public string? OrganizationId { get; set; }
+    public string OrganizationId { get; set; } = null!;
 
     [JsonIgnore]
     public Organization? Organization { get; set; }

Shared/Entities/Device.cs

@@ -1,5 +1,6 @@
 using Remotely.Shared.Attributes;
 using Remotely.Shared.Enums;
+using Remotely.Shared.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -7,7 +8,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 using System.Runtime.InteropServices;
 using System.Text.Json.Serialization;
 
-namespace Remotely.Shared.Models;
+namespace Remotely.Shared.Entities;
 
 public class Device
 {
@@ -40,7 +41,7 @@ public class Device
     public List<Drive>? Drives { get; set; }
 
     [Key]
-    public string ID { get; set; } = null!;
+    public string ID { get; set; } = Guid.NewGuid().ToString();
 
     public bool Is64Bit { get; set; }
     public bool IsOnline { get; set; }
@@ -54,7 +55,7 @@ public class Device
     public string[] MacAddresses { get; set; } = Array.Empty<string>();
 
     [StringLength(5000)]
-    public string? Notes { get; set; }       
+    public string? Notes { get; set; }
 
     [JsonIgnore]
     public Organization? Organization { get; set; }

Shared/Entities/InviteLink.cs

@@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.Json.Serialization;
 
-namespace Remotely.Shared.Models;
+namespace Remotely.Shared.Entities;
 
 public class InviteLink
 {
@@ -15,6 +15,6 @@ public class InviteLink
     public DateTimeOffset DateSent { get; set; }
     [JsonIgnore]
     public Organization? Organization { get; set; }
-    public string? OrganizationID { get; set; }
+    public string OrganizationID { get; set; } = null!;
     public string? ResetUrl { get; set; }
 }

Shared/Entities/Organization.cs

@@ -1,11 +1,12 @@
 using Immense.RemoteControl.Shared.Models;
 using Remotely.Shared.Enums;
+using Remotely.Shared.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Remotely.Shared.Models;
+namespace Remotely.Shared.Entities;
 
 public class Organization
 {

Shared/Entities/RemotelyUser.cs

@@ -1,9 +1,10 @@
 using Microsoft.AspNetCore.Identity;
+using Remotely.Shared.Models;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 
-namespace Remotely.Shared.Models;
+namespace Remotely.Shared.Entities;
 
 public class RemotelyUser : IdentityUser
 {

Shared/Entities/SavedScript.cs

@@ -8,7 +8,7 @@ using System.Text;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
-namespace Remotely.Shared.Models;
+namespace Remotely.Shared.Entities;
 
 public class SavedScript
 {

Shared/Entities/ScriptResult.cs

@@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 
-namespace Remotely.Shared.Models;
+namespace Remotely.Shared.Entities;
 
 public class ScriptResult : ScriptResultBase
 {
@@ -17,12 +17,12 @@ public class ScriptResult : ScriptResultBase
 
     [Key]
     [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-    public string ID { get; set; } = string.Empty;
+    public string ID { get; set; } = null!;
 
     [JsonIgnore]
     [IgnoreDataMember]
     public Organization? Organization { get; set; }
-    public string OrganizationID { get; set; } = string.Empty;
+    public required string OrganizationID { get; set; }
 
     [JsonIgnore]
     public SavedScript? SavedScript { get; set; }

Shared/Entities/ScriptRun.cs

@@ -8,7 +8,7 @@ using System.Text;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
-namespace Remotely.Shared.Models;
+namespace Remotely.Shared.Entities;
 
 public class ScriptRun
 {

Shared/Entities/ScriptSchedule.cs

@@ -1,4 +1,5 @@
 using Remotely.Shared.Enums;
+using Remotely.Shared.Models;
 using Remotely.Shared.Utilities;
 using System;
 using System.Collections.Generic;
@@ -9,7 +10,7 @@ using System.Text;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
-namespace Remotely.Shared.Models;
+namespace Remotely.Shared.Entities;
 
 public class ScriptSchedule
 {

Shared/Entities/SharedFile.cs

@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Remotely.Shared.Models;
+namespace Remotely.Shared.Entities;
 
 public class SharedFile
 {

Shared/Extensions/DeviceExtensions.cs

@@ -1,5 +1,5 @@
 using Remotely.Shared.Dtos;
-using Remotely.Shared.Models;
+using Remotely.Shared.Entities;
 using System;
 using System.Collections.Generic;
 using System.Linq;

Shared/Models/DeviceGroup.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.Json.Serialization;
+using Remotely.Shared.Entities;
 
 namespace Remotely.Shared.Models;
 

Shared/Shared.csproj

@@ -22,11 +22,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Update="Models\ScriptResult.cs">
+    <Compile Update="Entities\ScriptResult.cs">
       <LastGenOutput>ScriptResult.cs.d.ts</LastGenOutput>
       <Generator>DtsGenerator</Generator>
     </Compile>
-    <Compile Update="Models\Device.cs">
+    <Compile Update="Entities\Device.cs">
       <Generator></Generator>
     </Compile>
     <Compile Update="Models\RemotelyUserOptions.cs">

Tests/Server.Tests/DataServiceTests.cs

@@ -3,6 +3,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using Remotely.Server.Services;
 using Remotely.Shared.Dtos;
+using Remotely.Shared.Entities;
 using Remotely.Shared.Models;
 using Remotely.Shared.Utilities;
 using System;

Tests/Server.Tests/IoCActivator.cs

@@ -10,7 +10,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Remotely.Server.API;
 using Remotely.Server.Data;
 using Remotely.Server.Services;
-using Remotely.Shared.Models;
+using Remotely.Shared.Entities;
 using Remotely.Shared.Utilities;
 using System;
 using System.Collections.Generic;

Tests/Server.Tests/ScriptScheduleDispatcherTests.cs

@@ -5,6 +5,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using Remotely.Server.Hubs;
 using Remotely.Server.Services;
+using Remotely.Shared.Entities;
 using Remotely.Shared.Enums;
 using Remotely.Shared.Models;
 using Remotely.Shared.Utilities;

Tests/Server.Tests/TestData.cs

@@ -6,6 +6,7 @@ using Remotely.Server.Areas.Identity.Pages.Account.Manage;
 using Remotely.Server.Data;
 using Remotely.Server.Services;
 using Remotely.Shared.Dtos;
+using Remotely.Shared.Entities;
 using Remotely.Shared.Models;
 using System;
 using System.Linq;