Change S3 keys format; add correct S3 key for SalimaxPrototype
This commit is contained in:
parent
ba9b134f07
commit
395d5a89b2
|
@ -5,7 +5,7 @@ using InnovEnergy.App.Backend.Relations;
|
||||||
using InnovEnergy.Lib.Utils;
|
using InnovEnergy.Lib.Utils;
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
|
||||||
namespace InnovEnergy.App.Backend.Controllers;
|
namespace InnovEnergy.App.Backend;
|
||||||
|
|
||||||
using Token = String;
|
using Token = String;
|
||||||
|
|
||||||
|
@ -81,7 +81,9 @@ public class Controller : ControllerBase
|
||||||
if (installation is null || !user.HasAccessTo(installation))
|
if (installation is null || !user.HasAccessTo(installation))
|
||||||
return Unauthorized();
|
return Unauthorized();
|
||||||
|
|
||||||
return installation.FillOrderNumbers().HideParentIfUserHasNoAccessToParent(user);
|
return installation
|
||||||
|
.FillOrderNumbers()
|
||||||
|
.HideParentIfUserHasNoAccessToParent(user);
|
||||||
}
|
}
|
||||||
|
|
||||||
[HttpGet(nameof(GetUsersWithDirectAccessToInstallation))]
|
[HttpGet(nameof(GetUsersWithDirectAccessToInstallation))]
|
||||||
|
|
|
@ -15,8 +15,6 @@ 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 S3Bucket { get; set; } = "";
|
public String S3Url { get; set; } = "";
|
||||||
public String S3KeySecret { get; set; } = "";
|
public String S3KeySecret { get; set; } = "";
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
|
@ -142,7 +142,7 @@ public static class ExoCmd
|
||||||
+ " -O text")
|
+ " -O text")
|
||||||
.ExecuteBufferedAsync();
|
.ExecuteBufferedAsync();
|
||||||
|
|
||||||
return preParse.StandardOutput.Split("\t")[2] + ";" + preParse.StandardOutput.Split("\t")[3];
|
return $"{preParse.StandardOutput.Split("\t")[2]};{preParse.StandardOutput.Split("\t")[3]}";
|
||||||
}
|
}
|
||||||
|
|
||||||
public static async void RevokeKey(this Installation installation)
|
public static async void RevokeKey(this Installation installation)
|
||||||
|
|
Binary file not shown.
Loading…
Reference in New Issue