Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk

csharp/App/Backend/Controller.cs

@@ -317,7 +317,7 @@ public class Controller : ControllerBase
         var session = Db.GetSession(authToken);
        
         // TODO: automatic BadRequest when properties are null during deserialization
-        var installation = Db.GetFolderById(installationAccess.InstallationId);
+        var installation = Db.GetInstallationById(installationAccess.InstallationId);
         var user         = Db.GetUserById(installationAccess.UserId);
         
         return session.GrantUserAccessTo(user, installation) 

csharp/App/Backend/DataTypes/Methods/ExoCmd.cs

@@ -52,14 +52,13 @@ public static class ExoCmd
         //return $"{key};{secret}";
     }
 
-    public static async void RevokeReadKey(this Installation installation)
+    public static async Task RevokeReadKey(this Installation installation)
     {
         try
         {
             await Exo
                  .WithArguments("iam access-key revoke " + installation.S3Key + " -f " + " -C " + ConfigFile)
                  .ExecuteAsync();
-
         }
         catch
         {

csharp/App/Backend/DataTypes/Methods/Installation.cs

@@ -16,7 +16,8 @@ public static class InstallationMethods
 
     public static async Task<Boolean> RenewS3Credentials(this Installation installation)
     {
-        installation.RevokeReadKey();
+        if(installation.S3Key != "") await installation.RevokeReadKey();
+        
         var (key, secret) = await installation.CreateReadKey();
 
         if (installation.S3WriteKey == "" || installation.S3WriteSecret == "")

csharp/App/Backend/Database/Db.cs

@@ -18,7 +18,7 @@ namespace InnovEnergy.App.Backend.Database;
 
 public static partial class Db 
 {
-    internal const String DbPath = "./db.sqlite";
+    // internal const String DbPath = "./db.sqlite";
 
     private static SQLiteConnection Connection { get; } = ((Func<SQLiteConnection>)(() =>
     {
@@ -169,7 +169,7 @@ public static partial class Db
 
     private static void DeleteStaleSessions()
     {
-        var deadline = DateTime.Now - Session.MaxAge;
+        var deadline = DateTime.Now.AddDays((-1)*Session.MaxAge.Days);
         Sessions.Delete(s => s.LastSeen < deadline);
     }
 

csharp/App/S3Explorer/SnakeGameSS.cs

@@ -4,7 +4,7 @@ public static class SnakeGameSs
 {
     public static async Task PlaySnake()
     {
-        var tickRate = TimeSpan.FromMilliseconds(100);
+        var tickRate = TimeSpan.FromMilliseconds(90);
         var snakeGame = new SnakeGame();
 
         using (var cts = new CancellationTokenSource())
@@ -86,7 +86,7 @@ public static class SnakeGameSs
         public void Render()
         {
             Console.SetCursorPosition(Position.Left, Position.Top);
-            Console.Write("🍏");
+            Console.Write("🐜");
         }
     }
 
@@ -272,8 +272,8 @@ public static class SnakeGameSs
             const int numberOfColumns = 20;
 
             var random = new Random();
-            var top = random.Next(0, numberOfRows + 1);
+            var top = random.Next(1, numberOfRows);
-            var left = random.Next(0, numberOfColumns + 1);
+            var left = random.Next(1, numberOfColumns);
             var position = new Position(top, left);
             var apple = new Apple(position);
 

typescript/Frontend/src/config/axiosConfig.tsx

@@ -1,12 +1,13 @@
 import axios from "axios";
 
 export const axiosConfigWithoutToken = axios.create({
-  baseURL: "https://localhost:7087/api",
+  baseURL: "https://monitor.innov.energy/api",
 });
 
 const axiosConfig = axios.create({
-  baseURL: "https://localhost:7087/api",
+  baseURL: "https://monitor.innov.energy/api",
 });
+
 axiosConfig.defaults.params = {};
 axiosConfig.interceptors.request.use(
   (config) => {