Innovenergy
/
Innovenergy_trunk
2
1
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Use separate S3 data fields as in S3Config (cs & ts)

This commit is contained in:
ig 2023-07-05 15:13:44 +02:00
parent 3a10e4cb20
commit 9068f183d6
5 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
csharp/App/Backend/DataTypes/Installation.cs
View File

@ -15,6 +15,9 @@ public class Installation : TreeNode
public Double Lat { get; set; } public Double Lat { get; set; }
public Double Long { get; set; } public Double Long { get; set; }
public String S3Url { 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; } = "";
} }

BIN
csharp/App/Backend/db.sqlite
View File

Binary file not shown.

5
typescript/Frontend/src/components/Installations/Log/ScalarGraph.tsx
View File

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

8
typescript/Frontend/src/dataCache/S3/S3Access.ts
View File

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

8
typescript/Frontend/src/util/types.tsx
View File

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