From 9068f183d637c45d8aa07823c54c15c1ddb9afe1 Mon Sep 17 00:00:00 2001
From: ig <ig ig@devnullmail.com>
Date: Wed, 5 Jul 2023 15:13:44 +0200
Subject: [PATCH] Use separate S3 data fields as in S3Config (cs & ts)

---
 csharp/App/Backend/DataTypes/Installation.cs  |   7 +++++--
 csharp/App/Backend/db.sqlite                  | Bin 540672 -> 540672 bytes
 .../Installations/Log/ScalarGraph.tsx         |   5 ++---
 .../Frontend/src/dataCache/S3/S3Access.ts     |   8 +++-----
 typescript/Frontend/src/util/types.tsx        |   8 ++++++--
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/csharp/App/Backend/DataTypes/Installation.cs b/csharp/App/Backend/DataTypes/Installation.cs
index 66fa98341..428ce3dbe 100644
--- a/csharp/App/Backend/DataTypes/Installation.cs
+++ b/csharp/App/Backend/DataTypes/Installation.cs
@@ -15,6 +15,9 @@ public class Installation : TreeNode
     public Double Lat  { get; set; }
     public Double Long { get; set; }
 
-    public String S3Url       { get; set; } = "";
-    public String S3KeySecret { get; set; } = "";
+    public String S3Bucket   { get; set; } = "";
+    public String S3Region   { get; set; } = "";
+    public String S3Provider { get; set; } = "";
+    public String S3Key      { get; set; } = "";
+    public String S3Secret   { get; set; } = "";
 }
\ No newline at end of file
diff --git a/csharp/App/Backend/db.sqlite b/csharp/App/Backend/db.sqlite
index 48f4df21f777348630c05fc75e94b0c88f85bb4d..629857e5cc02d2317f4c301f6dc6fb53bf6bcf52 100644
GIT binary patch
delta 387
zcmZo@P;6*WoFFY2#K6GN0>m(2IZ?-$F=%7L%K41eo4FR`b21*CT($C`Xk!JVkUX!T
zzdk#=E`u(Uv#zePWb)*Wl|_?3t&%YG^AAx74R&==aP*7x^$&7I=NIP}>n3ODrey0H
zrB>wYW#%_?uWsjF%?QLyK+FupEI`Z(#BAHSSF`_O;br~Az;}VKj?awuDeI?+Wm?;9
zHn4AF<!UxyWfxafWo%R4Jdr1uaeD7|c5!_j1*Kr)pw#rt{5&Ovvc#g~jKm_aSU^#J
zS!POV5vu6+soU8LB}4)l`1|;-^9Av4<;~=A;=ak9%@Vj>>H@nt3xBhlJiEBDF=Lx?
mNn%n?>g11%!kf=CIxtRWy2dW<K%#Ztsg-E<b6sQqmI(lw+;(sP

delta 274
zcmZo@P;6*WoFFY2z`(%J0>m(2G*QQxF<@iD%K3~=o4FR`b26TpT($C`RAy0TUV3U?
zV<Dq}Jg=a?K0CWEgDw+8a-;O*fK~Yt86_nJ#a8<I#fdqY`MHU?sZjNk6R!wQ-oHwk
z(Yl#?bvyTJMj&PaVrC#_0b*7lX4}ran*A3GFPi}a-vz!pJ~Q5@Yz7m{w6@!9VBf|%
z-S-~59amEkE4#R=Dr2kq=7~JPjMM$Mvx{$EvYkCiLSz90e;?m<z98PMyqP>s+&8(i
zSr%-Uy1;JEGI@c4KYvrXJiEBDF=MM}Nn%n?>g11%!kf=CIxtSx-OkQ2efL#%{_T?2
I*q>(t0H8ru<NyEw

diff --git a/typescript/Frontend/src/components/Installations/Log/ScalarGraph.tsx b/typescript/Frontend/src/components/Installations/Log/ScalarGraph.tsx
index cebe80296..29cac776e 100644
--- a/typescript/Frontend/src/components/Installations/Log/ScalarGraph.tsx
+++ b/typescript/Frontend/src/components/Installations/Log/ScalarGraph.tsx
@@ -29,9 +29,8 @@ const s3Access = new S3Access(
   "saliomameiringen",
   "sos-ch-dk-2",
   "exo.io",
-  "EXO464a9ff62fdfa407aa742855",
-  "f2KtCWN4EHFqtvH2kotdyI0w5SjjdHVPAADdcD3ik8g",
-  ""
+  "EXO464a9ff62fdfa407aa742855",                  // key
+  "f2KtCWN4EHFqtvH2kotdyI0w5SjjdHVPAADdcD3ik8g"  // secret
 );
 
 export const fetchData = (
diff --git a/typescript/Frontend/src/dataCache/S3/S3Access.ts b/typescript/Frontend/src/dataCache/S3/S3Access.ts
index 6780f0ced..eeb90b795 100644
--- a/typescript/Frontend/src/dataCache/S3/S3Access.ts
+++ b/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 contentType: string
+        readonly secret:      string
     )
     {}
 
@@ -46,8 +45,7 @@ export class S3Access
                            s3Path,
                            date,
                            this.key,
-                           this.secret,
-                           this.contentType
+                           this.secret
                        );
     }
 }
@@ -58,7 +56,7 @@ function createAuthorizationHeader(method: string,
                                      date: string,
                                     s3Key: string,
                                  s3Secret: string,
-                              contentType: string,
+                              contentType: string = "",
                                   md5Hash: string = "")
 {
     // StringToSign = HTTP-Verb + "\n" +
diff --git a/typescript/Frontend/src/util/types.tsx b/typescript/Frontend/src/util/types.tsx
index 139941d49..5b6bfcc25 100644
--- a/typescript/Frontend/src/util/types.tsx
+++ b/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 {