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 48f4df21f..629857e5c 100644 Binary files a/csharp/App/Backend/db.sqlite and b/csharp/App/Backend/db.sqlite differ 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 {