diff --git a/csharp/App/Backend/Controller.cs b/csharp/App/Backend/Controller.cs index 2c54fd319..ca7deabb2 100644 --- a/csharp/App/Backend/Controller.cs +++ b/csharp/App/Backend/Controller.cs @@ -5,7 +5,7 @@ using InnovEnergy.App.Backend.Relations; using InnovEnergy.Lib.Utils; using Microsoft.AspNetCore.Mvc; -namespace InnovEnergy.App.Backend.Controllers; +namespace InnovEnergy.App.Backend; using Token = String; @@ -81,7 +81,9 @@ public class Controller : ControllerBase if (installation is null || !user.HasAccessTo(installation)) return Unauthorized(); - return installation.FillOrderNumbers().HideParentIfUserHasNoAccessToParent(user); + return installation + .FillOrderNumbers() + .HideParentIfUserHasNoAccessToParent(user); } [HttpGet(nameof(GetUsersWithDirectAccessToInstallation))] diff --git a/csharp/App/Backend/DataTypes/Installation.cs b/csharp/App/Backend/DataTypes/Installation.cs index 4a01de8dc..66fa98341 100644 --- a/csharp/App/Backend/DataTypes/Installation.cs +++ b/csharp/App/Backend/DataTypes/Installation.cs @@ -15,8 +15,6 @@ public class Installation : TreeNode public Double Lat { get; set; } public Double Long { get; set; } - public String S3Bucket { get; set; } = ""; - public String S3KeySecret { get; set; } = ""; - - + public String S3Url { get; set; } = ""; + public String S3KeySecret { get; set; } = ""; } \ No newline at end of file diff --git a/csharp/App/Backend/DataTypes/Methods/Installation.cs b/csharp/App/Backend/DataTypes/Methods/Installation.cs index f3c89995d..efbbf221a 100644 --- a/csharp/App/Backend/DataTypes/Methods/Installation.cs +++ b/csharp/App/Backend/DataTypes/Methods/Installation.cs @@ -142,7 +142,7 @@ public static class ExoCmd + " -O text") .ExecuteBufferedAsync(); - return preParse.StandardOutput.Split("\t")[2] + ";" + preParse.StandardOutput.Split("\t")[3]; + return $"{preParse.StandardOutput.Split("\t")[2]};{preParse.StandardOutput.Split("\t")[3]}"; } public static async void RevokeKey(this Installation installation) diff --git a/csharp/App/Backend/db.sqlite b/csharp/App/Backend/db.sqlite index b553a5903..48f4df21f 100644 Binary files a/csharp/App/Backend/db.sqlite and b/csharp/App/Backend/db.sqlite differ