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

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))]

csharp/App/Backend/DataTypes/Installation.cs

@@ -16,7 +16,8 @@ public class Installation : TreeNode
     public Double Long { get; set; }
 
     public String S3Bucket   { get; set; } = "";
-    public String S3KeySecret    { get; set; } = "";
+    public String S3Region   { get; set; } = "";
-
+    public String S3Provider { get; set; } = "";
-
+    public String S3Key      { get; set; } = "";
+    public String S3Secret   { get; set; } = "";
 }

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

@@ -0,0 +1,48 @@
+using CliWrap;
+using CliWrap.Buffered;
+using InnovEnergy.Lib.Utils;
+
+namespace InnovEnergy.App.Backend.DataTypes.Methods;
+
+public static class ExoCmd
+{
+    private static readonly Command Exo = Cli.Wrap("exo");
+    private const String ConfigFile = "./exoscale.toml";
+
+    public static async Task<(String key, String secret)> CreateKey(this Installation installation)
+    {
+        //if (installation.Id != 1) return "help"; //Todo remove me I am for debugging
+        
+        var preParse = await Exo
+            .WithArguments("iam access-key create " + installation.BucketName() 
+                                                    + " --operation get-sos-object"
+                                                    + " --resource  sos/bucket:" + installation.BucketName()
+                                                    + " -C " + ConfigFile
+                                                    + " -O text")
+            .ExecuteBufferedAsync();
+
+        var key    = preParse.StandardOutput.Split("\t")[2];
+        var secret = preParse.StandardOutput.Split("\t")[3];
+
+        return (key, secret);
+        
+        //return $"{key};{secret}";
+    }
+
+    public static async void RevokeKey(this Installation installation)
+    {
+        try
+        {
+            await Exo
+                 .WithArguments("iam access-key revoke " + installation.S3Key + " -f " + " -C " + ConfigFile)
+                 .ExecuteAsync();
+
+        }
+        catch
+        {
+            // TODO
+            ("Failed to revoke key for installation " + installation.Name).WriteLine();
+        }
+    }
+
+}

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

@@ -1,5 +1,3 @@
-using CliWrap;
-using CliWrap.Buffered;
 using InnovEnergy.App.Backend.Database;
 using InnovEnergy.App.Backend.S3;
 using InnovEnergy.Lib.Utils;
@@ -19,7 +17,11 @@ public static class InstallationMethods
     public static async Task<Boolean> RenewS3BucketUrl(this Installation installation)
     {
         installation.RevokeKey();
-        installation.S3KeySecret = await installation.CreateKey();
+        var (key, secret) = await installation.CreateKey();
+
+        installation.S3Key    = key;
+        installation.S3Secret = secret;
+        
         return Db.Update(installation);
     }
     
@@ -125,40 +127,3 @@ public static class InstallationMethods
     }
     
 }
-
-public static class ExoCmd
-{
-    private static readonly Command Exo = Cli.Wrap("exo");
-    private static String ConfigFile = "./exoscale.toml";
-
-    public static async Task<String> CreateKey(this Installation installation)
-    {
-        if (installation.Id != 1) return "help"; //Todo remove me I am for debugging
-        var preParse = await Exo
-            .WithArguments("iam access-key create " + installation.BucketName() 
-                                                    + " --operation get-sos-object"
-                                                    + " --resource  sos/bucket:" + installation.BucketName()
-                                                    + " -C " + ConfigFile
-                                                    + " -O text")
-            .ExecuteBufferedAsync();
-
-        return   preParse.StandardOutput.Split("\t")[2] + ";" + preParse.StandardOutput.Split("\t")[3];
-    }
-
-    public static async void RevokeKey(this Installation installation)
-    {
-        try
-        {
-            await Exo
-                .WithArguments("iam access-key revoke " + installation.S3KeySecret.Split(";", 2)[0] + " -f " + " -C " + ConfigFile)
-                .ExecuteAsync();
-
-        }
-        catch
-        {
-            // todo Fill me there is no key for this installation
-        }
-    }
-
-}
-

typescript/Frontend/lang/de.json

@@ -0,0 +1,136 @@
+{
+  "Information": {
+    "defaultMessage": "Information"
+  },
+  "addNewChild": {
+    "defaultMessage": "Neues Kind hinzufügen"
+  },
+  "addNewDialogButton": {
+    "defaultMessage": "Neue Dialogschaltfläche hinzufügen"
+  },
+  "addUser": {
+    "defaultMessage": "Nutzer erstellen"
+  },
+  "alarms": {
+    "defaultMessage": "Alarme"
+  },
+  "applyChanges": {
+    "defaultMessage": "Änderungen speichern"
+  },
+  "country": {
+    "defaultMessage": "Land"
+  },
+  "createNewFolder": {
+    "defaultMessage": "Neuen Ordner erstellen"
+  },
+  "createNewUser": {
+    "defaultMessage": "Neuen Nutzer erstellen"
+  },
+  "customerName": {
+    "defaultMessage": "Kundenname"
+  },
+  "email": {
+    "defaultMessage": "Email"
+  },
+  "english": {
+    "defaultMessage": "Englisch"
+  },
+  "error": {
+  },
+  "folder": {
+    "defaultMessage": "Ordner"
+  },
+  "german": {
+    "defaultMessage": "Deutsch"
+  },
+  "groupTabs": {
+    "defaultMessage": "Gruppen"
+  },
+  "groupTree": {
+    "defaultMessage": "Gruppenbaum"
+  },
+  "information": {
+    "defaultMessage": "Information"
+  },
+  "inheritedAccess": {
+    "defaultMessage": "Vererbter Zugriff von"
+  },
+  "installation": {
+    "defaultMessage": "Installation"
+  },
+  "installationTabs": {
+    "defaultMessage": "Installationen"
+  },
+  "installations": {
+    "defaultMessage": "Installationen"
+  },
+  "lastWeek": {
+    "defaultMessage": "Letzte Woche"
+  },
+  "location": {
+    "defaultMessage": "Standort"
+  },
+  "log": {
+    "defaultMessage": "Logbuch"
+  },
+  "logout": {
+    "defaultMessage": "Abmelden"
+  },
+  "makeASelection": {
+    "defaultMessage": "Bitte wählen Sie links eine Auswahl"
+  },
+  "manageAccess": {
+    "defaultMessage": "Zugriff verwalten"
+  },
+  "move": {
+    "defaultMessage": "Verschieben"
+  },
+  "moveTo": {
+    "defaultMessage": "Verschieben zu"
+  },
+  "moveTree": {
+    "defaultMessage": "Baum verschieben"
+  },
+  "name": {
+    "defaultMessage": "Name"
+  },
+  "navigationTabs": {
+    "defaultMessage": "Navigation"
+  },
+  "orderNumbers": {
+    "defaultMessage": "Bestellnummer"
+  },
+  "region": {
+    "defaultMessage": "Region"
+  },
+  "requiredLocation": {
+    "defaultMessage": "Standort ist erforderlich"
+  },
+  "requiredName": {
+    "defaultMessage": "Name ist erforderlich"
+  },
+  "requiredRegion": {
+    "defaultMessage": "Region ist erforderlich"
+  },
+  "search": {
+    "defaultMessage": "Suche"
+  },
+  "submit": {
+    "defaultMessage": "Senden"
+  },
+  "updateFolderErrorMessage": {
+    "defaultMessage": "Fehler, Ordner kann nicht aktualisiert werden"
+  },
+  "updatedSuccessfully": {
+    "defaultMessage": "Erfolgreich aktualisiert"
+  },
+  "user": {
+    "defaultMessage": "Nutzer"
+  },
+  "userTabs": {
+    "defaultMessage": "Nutzer"
+  },
+  "users": {
+    "defaultMessage": "Nutzer"
+  }
+}

typescript/Frontend/lang/fr.json

@@ -0,0 +1,136 @@
+{
+  "Information": {
+    "defaultMessage": "Informations"
+  },
+  "addNewChild": {
+    "defaultMessage": "Ajouter un nouvel enfant"
+  },
+  "addNewDialogButton": {
+    "defaultMessage": "Ajouter un nouveau bouton de dialogue"
+  },
+  "addUser": {
+    "defaultMessage": "Créer un utilisateur"
+  },
+  "alarms": {
+    "defaultMessage": "Alarmes"
+  },
+  "applyChanges": {
+    "defaultMessage": "Appliquer les modifications"
+  },
+  "country": {
+    "defaultMessage": "Pays"
+  },
+  "createNewFolder": {
+    "defaultMessage": "Créer un nouveau dossier"
+  },
+  "createNewUser": {
+    "defaultMessage": "Créer un nouvel utilisateur"
+  },
+  "customerName": {
+    "defaultMessage": "Nom du client"
+  },
+  "email": {
+    "defaultMessage": "E-mail"
+  },
+  "english": {
+    "defaultMessage": "Anglais"
+  },
+  "error": {
+  },
+  "folder": {
+    "defaultMessage": "Dossier"
+  },
+  "german": {
+    "defaultMessage": "Allemand"
+  },
+  "groupTabs": {
+    "defaultMessage": "Onglets de groupe"
+  },
+  "groupTree": {
+    "defaultMessage": "Arbre de groupe"
+  },
+  "information": {
+    "defaultMessage": "Informations"
+  },
+  "inheritedAccess": {
+    "defaultMessage": "Accès hérité de"
+  },
+  "installation": {
+    "defaultMessage": "Installation"
+  },
+  "installationTabs": {
+    "defaultMessage": "Onglets d'installation"
+  },
+  "installations": {
+    "defaultMessage": "Installations"
+  },
+  "lastWeek": {
+    "defaultMessage": "La semaine dernière"
+  },
+  "location": {
+    "defaultMessage": "Localisation"
+  },
+  "log": {
+    "defaultMessage": "Journal"
+  },
+  "logout": {
+    "defaultMessage": "Déconnexion"
+  },
+  "makeASelection": {
+    "defaultMessage": "Veuillez faire une sélection à gauche"
+  },
+  "manageAccess": {
+    "defaultMessage": "Gérer l'accès"
+  },
+  "move": {
+    "defaultMessage": "Déplacer"
+  },
+  "moveTo": {
+    "defaultMessage": "Déplacer à"
+  },
+  "moveTree": {
+    "defaultMessage": "Déplacer l'arbre"
+  },
+  "name": {
+    "defaultMessage": "Nom"
+  },
+  "navigationTabs": {
+    "defaultMessage": "Onglets de navigation"
+  },
+  "orderNumbers": {
+    "defaultMessage": "Numéro de commande"
+  },
+  "region": {
+    "defaultMessage": "Région"
+  },
+  "requiredLocation": {
+    "defaultMessage": "L'emplacement est requis"
+  },
+  "requiredName": {
+    "defaultMessage": "Le nom est obligatoire"
+  },
+  "requiredRegion": {
+    "defaultMessage": "La région est obligatoire"
+  },
+  "search": {
+    "defaultMessage": "Recherche"
+  },
+  "submit": {
+    "defaultMessage": "Soumettre"
+  },
+  "updateFolderErrorMessage": {
+    "defaultMessage": "Une erreur s'est produite, impossible de mettre à jour le dossier."
+  },
+  "updatedSuccessfully": {
+    "defaultMessage": "Mise à jour réussie"
+  },
+  "user": {
+    "defaultMessage": "Utilisateur"
+  },
+  "userTabs": {
+    "defaultMessage": "Onglets utilisateurs"
+  },
+  "users": {
+    "defaultMessage": "Utilisateurs"
+  }
+}

typescript/Frontend/src/components/Installations/Log/ScalarGraph.tsx

@@ -29,9 +29,8 @@ const s3Access = new S3Access(
   "saliomameiringen",
   "sos-ch-dk-2",
   "exo.io",
-  "EXO464a9ff62fdfa407aa742855",
+  "EXO464a9ff62fdfa407aa742855",                  // key
-  "f2KtCWN4EHFqtvH2kotdyI0w5SjjdHVPAADdcD3ik8g",
+  "f2KtCWN4EHFqtvH2kotdyI0w5SjjdHVPAADdcD3ik8g"  // secret
-  ""
 );
 
 export const fetchData = (

typescript/Frontend/src/dataCache/S3/S3Access.ts

@@ -10,8 +10,7 @@ export class S3Access
         readonly region:      string,
         readonly provider:    string,
         readonly key:         string,
-        readonly secret:      string,
+        readonly secret:      string
-        readonly contentType: string
     )
     {}
 
@@ -46,8 +45,7 @@ export class S3Access
                            s3Path,
                            date,
                            this.key,
-                           this.secret,
+                           this.secret
-                           this.contentType
                        );
     }
 }
@@ -58,7 +56,7 @@ function createAuthorizationHeader(method: string,
                                      date: string,
                                     s3Key: string,
                                  s3Secret: string,
-                              contentType: string,
+                              contentType: string = "",
                                   md5Hash: string = "")
 {
     // StringToSign = HTTP-Verb + "\n" +

typescript/Frontend/src/util/types.tsx

@@ -11,12 +11,16 @@ export interface I_Installation {
   orderNumbers: string;
   lat: number;
   long: number;
-  s3Bucket: string;
   id: number;
   name: string;
   information: string;
   parentId: number;
-  s3Url: string;
+
+  s3Bucket: string;
+  s3Region: string;
+  s3Provider: string;
+  s3Key: string;
+  s3Secret: string;
 }
 
 export interface I_Folder {