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

fixed some small bugs uncovered by testing

This commit is contained in:
Kim 2023-07-20 13:57:12 +02:00
parent 66da08b407
commit c23149c5cc
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
csharp/App/Backend/Controller.cs
View File

@ -317,7 +317,7 @@ public class Controller : ControllerBase
var session = Db.GetSession(authToken); var session = Db.GetSession(authToken);
// TODO: automatic BadRequest when properties are null during deserialization // TODO: automatic BadRequest when properties are null during deserialization
var installation = Db.GetFolderById(installationAccess.InstallationId); var installation = Db.GetInstallationById(installationAccess.InstallationId);
var user = Db.GetUserById(installationAccess.UserId); var user = Db.GetUserById(installationAccess.UserId);
return session.GrantUserAccessTo(user, installation) return session.GrantUserAccessTo(user, installation)

3
csharp/App/Backend/DataTypes/Methods/ExoCmd.cs
View File

@ -52,14 +52,13 @@ public static class ExoCmd
//return $"{key};{secret}"; //return $"{key};{secret}";
} }
public static async void RevokeReadKey(this Installation installation) public static async Task RevokeReadKey(this Installation installation)
{ {
try try
{ {
await Exo await Exo
.WithArguments("iam access-key revoke " + installation.S3Key + " -f " + " -C " + ConfigFile) .WithArguments("iam access-key revoke " + installation.S3Key + " -f " + " -C " + ConfigFile)
.ExecuteAsync(); .ExecuteAsync();
} }
catch catch
{ {

3
csharp/App/Backend/DataTypes/Methods/Installation.cs
View File

@ -16,7 +16,8 @@ public static class InstallationMethods
public static async Task<Boolean> RenewS3Credentials(this Installation installation) public static async Task<Boolean> RenewS3Credentials(this Installation installation)
{ {
installation.RevokeReadKey(); if(installation.S3Key != "") await installation.RevokeReadKey();
var (key, secret) = await installation.CreateReadKey(); var (key, secret) = await installation.CreateReadKey();
if (installation.S3WriteKey == "" || installation.S3WriteSecret == "") if (installation.S3WriteKey == "" || installation.S3WriteSecret == "")

4
csharp/App/Backend/Database/Db.cs
View File

@ -18,7 +18,7 @@ namespace InnovEnergy.App.Backend.Database;
public static partial class Db public static partial class Db
{ {
internal const String DbPath = "./db.sqlite"; // internal const String DbPath = "./db.sqlite";
private static SQLiteConnection Connection { get; } = ((Func<SQLiteConnection>)(() => private static SQLiteConnection Connection { get; } = ((Func<SQLiteConnection>)(() =>
{ {
@ -169,7 +169,7 @@ public static partial class Db
private static void DeleteStaleSessions() private static void DeleteStaleSessions()
{ {
var deadline = DateTime.Now - Session.MaxAge; var deadline = DateTime.Now.AddDays((-1)*Session.MaxAge.Days);
Sessions.Delete(s => s.LastSeen < deadline); Sessions.Delete(s => s.LastSeen < deadline);
} }

5
typescript/Frontend/src/config/axiosConfig.tsx
View File

@ -1,12 +1,13 @@
import axios from "axios"; import axios from "axios";
export const axiosConfigWithoutToken = axios.create({ export const axiosConfigWithoutToken = axios.create({
baseURL: "https://localhost:7087/api", baseURL: "https://monitor.innov.energy/api",
}); });
const axiosConfig = axios.create({ const axiosConfig = axios.create({
baseURL: "https://localhost:7087/api", baseURL: "https://monitor.innov.energy/api",
}); });
axiosConfig.defaults.params = {}; axiosConfig.defaults.params = {};
axiosConfig.interceptors.request.use( axiosConfig.interceptors.request.use(
(config) => { (config) => {