From 8c6037b0100858d61bcae33464bde2d4d67bcc5a Mon Sep 17 00:00:00 2001 From: Reimar Date: Tue, 25 Mar 2025 12:21:49 +0100 Subject: [PATCH 01/24] Implement AMQP in IoT --- iot/Makefile | 4 ++-- iot/brokers/amqp.c | 35 +++++++++++++++++++++++++++++++++++ iot/brokers/amqp.h | 4 ++++ iot/{ => brokers}/mqtt.c | 6 +++--- iot/{ => brokers}/mqtt.h | 0 iot/config.example.h | 4 ++++ iot/main.c | 8 ++++---- 7 files changed, 52 insertions(+), 9 deletions(-) create mode 100644 iot/brokers/amqp.c create mode 100644 iot/brokers/amqp.h rename iot/{ => brokers}/mqtt.c (94%) rename iot/{ => brokers}/mqtt.h (100%) diff --git a/iot/Makefile b/iot/Makefile index d9c12c7..0f0e886 100644 --- a/iot/Makefile +++ b/iot/Makefile @@ -1,3 +1,3 @@ -all: main.c mqtt.c temperature.c device_id.c - $(CC) -lmosquitto -lpthread -li2c main.c mqtt.c temperature.c device_id.c +all: main.c brokers/mqtt.c brokers/amqp.c temperature.c device_id.c + $(CC) -lmosquitto -lrabbitmq -lpthread -li2c main.c brokers/mqtt.c brokers/amqp.c temperature.c device_id.c diff --git a/iot/brokers/amqp.c b/iot/brokers/amqp.c new file mode 100644 index 0000000..20d7c39 --- /dev/null +++ b/iot/brokers/amqp.c @@ -0,0 +1,35 @@ +#include +#include + +#include "../config.h" + +amqp_connection_state_t conn; +amqp_socket_t *socket; + +void broker_on_connect(void); + +void amqp_send_message(char *queue, char *message) +{ + amqp_basic_properties_t props; + props._flags = AMQP_BASIC_CONTENT_TYPE_FLAG | AMQP_BASIC_DELIVERY_MODE_FLAG; + props.content_type = amqp_literal_bytes("text/plain"); + props.delivery_mode = 2; + + amqp_basic_publish(conn, 1, amqp_cstring_bytes(queue), amqp_cstring_bytes(queue), 0, 0, &props, amqp_cstring_bytes(message)); +} + +void init_amqp(void) +{ + conn = amqp_new_connection(); + + socket = amqp_tcp_socket_new(conn); + amqp_socket_open(socket, AMQP_IP, AMQP_PORT); + + amqp_login(conn, "/", 0, 131072, 0, AMQP_SASL_METHOD_PLAIN, AMQP_USER, AMQP_PASSWORD); + + amqp_channel_open(conn, 1); + + broker_on_connect(); + + for (;;); +} diff --git a/iot/brokers/amqp.h b/iot/brokers/amqp.h new file mode 100644 index 0000000..be45cbb --- /dev/null +++ b/iot/brokers/amqp.h @@ -0,0 +1,4 @@ +void init_amqp(void); + +void amqp_send_message(char *topic, char *message); + diff --git a/iot/mqtt.c b/iot/brokers/mqtt.c similarity index 94% rename from iot/mqtt.c rename to iot/brokers/mqtt.c index ae9de13..d89d7a7 100644 --- a/iot/mqtt.c +++ b/iot/brokers/mqtt.c @@ -3,11 +3,11 @@ #include #include -#include "config.h" +#include "../config.h" struct mosquitto *mosq; -void mqtt_on_connect(void); +void broker_on_connect(void); void on_connect(struct mosquitto *client, void *obj, int rc) { @@ -18,7 +18,7 @@ void on_connect(struct mosquitto *client, void *obj, int rc) puts("Connected to " MQTT_IP); - mqtt_on_connect(); + broker_on_connect(); } void on_message(struct mosquitto *mosq, void *obj, const struct mosquitto_message *message) diff --git a/iot/mqtt.h b/iot/brokers/mqtt.h similarity index 100% rename from iot/mqtt.h rename to iot/brokers/mqtt.h diff --git a/iot/config.example.h b/iot/config.example.h index 20d78c9..dbd308f 100644 --- a/iot/config.example.h +++ b/iot/config.example.h @@ -3,3 +3,7 @@ #define MQTT_USER "user" #define MQTT_PASSWORD "password" +#define AMQP_IP "127.0.0.1" +#define AMQP_PORT 5672 +#define AMQP_USER "user" +#define AMQP_PASSWORD "password" diff --git a/iot/main.c b/iot/main.c index fb1571c..ad6014c 100644 --- a/iot/main.c +++ b/iot/main.c @@ -6,7 +6,7 @@ #include #include -#include "mqtt.h" +#include "brokers/amqp.h" #include "temperature.h" #include "device_id.h" @@ -33,7 +33,7 @@ void *watch_temperature(void *arg) char *str = malloc(snprintf(NULL, 0, format, temperature, device_id, timestamp) + 1); sprintf(str, format, temperature, device_id, timestamp); - mqtt_send_message("temperature", str); + amqp_send_message("temperature-logs", str); free(str); @@ -47,7 +47,7 @@ void *watch_temperature(void *arg) return NULL; } -void mqtt_on_connect(void) +void broker_on_connect(void) { pthread_t temperature_thread; pthread_create(&temperature_thread, NULL, watch_temperature, NULL); @@ -57,7 +57,7 @@ int main(void) { srand(time(NULL)); - init_mqtt(); + init_amqp(); return EXIT_SUCCESS; } From 90cbf7ae810140ec5d4df518784df14e7dd94e7d Mon Sep 17 00:00:00 2001 From: Reimar Date: Tue, 25 Mar 2025 12:54:52 +0100 Subject: [PATCH 02/24] Fix listening for AMQP messages, remove test console app --- backend/Api/AMQPReciever/AMQPReciever.cs | 3 +- backend/ConsoleApp1/ConsoleApp1.csproj | 14 ------- backend/ConsoleApp1/ConsoleApp1.sln | 25 ------------ backend/ConsoleApp1/Program.cs | 52 ------------------------ 4 files changed, 1 insertion(+), 93 deletions(-) delete mode 100644 backend/ConsoleApp1/ConsoleApp1.csproj delete mode 100644 backend/ConsoleApp1/ConsoleApp1.sln delete mode 100644 backend/ConsoleApp1/Program.cs diff --git a/backend/Api/AMQPReciever/AMQPReciever.cs b/backend/Api/AMQPReciever/AMQPReciever.cs index 0b6cf56..36b3a44 100644 --- a/backend/Api/AMQPReciever/AMQPReciever.cs +++ b/backend/Api/AMQPReciever/AMQPReciever.cs @@ -67,8 +67,7 @@ namespace Api.AMQPReciever await channel.BasicConsumeAsync(queue, true, consumer); - Console.WriteLine("Press enter to exit."); - Console.ReadLine(); + while (true); } } } diff --git a/backend/ConsoleApp1/ConsoleApp1.csproj b/backend/ConsoleApp1/ConsoleApp1.csproj deleted file mode 100644 index 7dfb515..0000000 --- a/backend/ConsoleApp1/ConsoleApp1.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - Exe - net8.0 - enable - enable - - - - - - - diff --git a/backend/ConsoleApp1/ConsoleApp1.sln b/backend/ConsoleApp1/ConsoleApp1.sln deleted file mode 100644 index b1ff789..0000000 --- a/backend/ConsoleApp1/ConsoleApp1.sln +++ /dev/null @@ -1,25 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.9.34607.119 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApp1", "ConsoleApp1.csproj", "{0BC93CF2-F92D-4DD6-83BE-A985CBB74960}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0BC93CF2-F92D-4DD6-83BE-A985CBB74960}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0BC93CF2-F92D-4DD6-83BE-A985CBB74960}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0BC93CF2-F92D-4DD6-83BE-A985CBB74960}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0BC93CF2-F92D-4DD6-83BE-A985CBB74960}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {55EE0E94-4585-4E79-AC67-4B0E809E99AB} - EndGlobalSection -EndGlobal diff --git a/backend/ConsoleApp1/Program.cs b/backend/ConsoleApp1/Program.cs deleted file mode 100644 index a5e0e23..0000000 --- a/backend/ConsoleApp1/Program.cs +++ /dev/null @@ -1,52 +0,0 @@ -using RabbitMQ.Client; -using RabbitMQ.Client.Events; -using System.Text; - - -var factory = new ConnectionFactory(); -var queue = "test"; - - -factory.UserName = "h5"; -factory.Password = "Merc1234"; -factory.HostName = "10.135.51.116"; -factory.Port = 5672; - -using var conn = await factory.CreateConnectionAsync(); -Console.WriteLine("AMQPClien connected"); -using var channel = await conn.CreateChannelAsync(); - -await channel.QueueDeclareAsync(queue: queue, durable: false, exclusive: false, autoDelete: false); -Console.WriteLine($"{queue} connected"); - -var consumer = new AsyncEventingBasicConsumer(channel); -consumer.ReceivedAsync += (model, ea) => -{ - Console.WriteLine("Received application message."); - var body = ea.Body.ToArray(); - var message = Encoding.UTF8.GetString(body); - Console.WriteLine(message); - - return Task.CompletedTask; -}; - -await channel.BasicConsumeAsync(queue, true, consumer); - - -const string message = "Hello World!"; -var body = Encoding.UTF8.GetBytes(message); -await channel.BasicPublishAsync(exchange: string.Empty, routingKey: queue, body: body); -Console.WriteLine(" Press enter to continue."); -Console.ReadLine(); -await channel.BasicPublishAsync(exchange: string.Empty, routingKey: queue, body: body); -Console.WriteLine(" Press enter to continue."); -Console.ReadLine(); -await channel.BasicPublishAsync(exchange: string.Empty, routingKey: queue, body: body); -Console.WriteLine(" Press enter to continue."); -Console.ReadLine(); -await channel.BasicPublishAsync(exchange: string.Empty, routingKey: queue, body: body); -Console.WriteLine(" Press enter to continue."); -Console.ReadLine(); -await channel.BasicPublishAsync(exchange: string.Empty, routingKey: queue, body: body); -Console.WriteLine(" Press enter to exit."); -Console.ReadLine(); \ No newline at end of file From 507e156f17ec4ebfd6db53aeee38ea731937e7cf Mon Sep 17 00:00:00 2001 From: Jeas0001 Date: Tue, 25 Mar 2025 13:15:42 +0100 Subject: [PATCH 03/24] Some comment in AMQPReciever, AMQPReciever and DBAccess --- backend/Api/AMQPReciever/AMQPReciever.cs | 10 ++++- backend/Api/DBAccess/DBAccess.cs | 50 ++++++++++++++++++++++- backend/Api/MQTTReciever/MQTTReciever.cs | 21 ++++++---- backend/Api/Program.cs | 18 +++++--- backend/ConsoleApp1/ConsoleApp1.csproj | 14 ------- backend/ConsoleApp1/ConsoleApp1.sln | 25 ------------ backend/ConsoleApp1/Program.cs | 52 ------------------------ 7 files changed, 83 insertions(+), 107 deletions(-) delete mode 100644 backend/ConsoleApp1/ConsoleApp1.csproj delete mode 100644 backend/ConsoleApp1/ConsoleApp1.sln delete mode 100644 backend/ConsoleApp1/Program.cs diff --git a/backend/Api/AMQPReciever/AMQPReciever.cs b/backend/Api/AMQPReciever/AMQPReciever.cs index 0b6cf56..0d76072 100644 --- a/backend/Api/AMQPReciever/AMQPReciever.cs +++ b/backend/Api/AMQPReciever/AMQPReciever.cs @@ -28,13 +28,16 @@ namespace Api.AMQPReciever factory.HostName = _configuration["AMQP:host"]; factory.Port = Convert.ToInt32(_configuration["AMQP:port"]); + // Connecting to our rabbitmq and after that it create's a channel where you can connect to a queue using var conn = await factory.CreateConnectionAsync(); Console.WriteLine("AMQPClien connected"); using var channel = await conn.CreateChannelAsync(); + // Here we connect to the queue through the channel that got created earlier await channel.QueueDeclareAsync(queue: queue, durable: false, exclusive: false, autoDelete: false); Console.WriteLine($"{queue} connected"); + // Everytime a message is recieved from the queue it goes into this consumer.ReceivedAsync var consumer = new AsyncEventingBasicConsumer(channel); consumer.ReceivedAsync += (model, ea) => { @@ -44,15 +47,18 @@ namespace Api.AMQPReciever var messageReceive = JsonSerializer.Deserialize(message); - if (messageReceive == null || messageReceive.temperature == 0 || messageReceive.device_id == null || messageReceive.timestamp == 0) + // Checks if the message has the data we need + if (messageReceive == null || messageReceive.device_id == null || messageReceive.timestamp == 0) { return Task.CompletedTask; } + // Convert to the model we use in the database and gets the device from the database that is used for getting the current set temphigh and templow TemperatureLogs newLog = new TemperatureLogs(); string refernceId = messageReceive.device_id; var device = _dbAccess.ReadDevice(refernceId); + // Checks if the device exist if it doesn't it throws the data away if (device == null) { return Task.CompletedTask; } newLog.Temperature = messageReceive.temperature; @@ -60,11 +66,13 @@ namespace Api.AMQPReciever newLog.TempHigh = device.TempHigh; newLog.TempLow = device.TempLow; + // Send the data to dbaccess to be saved _dbAccess.CreateLog(newLog, refernceId); return Task.CompletedTask; }; + // Consumes the data in the queue await channel.BasicConsumeAsync(queue, true, consumer); Console.WriteLine("Press enter to exit."); diff --git a/backend/Api/DBAccess/DBAccess.cs b/backend/Api/DBAccess/DBAccess.cs index ad83328..8ced21d 100644 --- a/backend/Api/DBAccess/DBAccess.cs +++ b/backend/Api/DBAccess/DBAccess.cs @@ -18,6 +18,11 @@ namespace Api.DBAccess _context = context; } + /// + /// Creates a user using entityframework core + /// + /// Need the entire user obj + /// returns the true in a OkObjectResult and if there is some error it returns a ConflictObjectResult and a message that explain the reason public async Task CreateUser(User user) { var users = await _context.Users.ToListAsync(); @@ -43,6 +48,11 @@ namespace Api.DBAccess return new ConflictObjectResult(new { message = "Could not save to databse" }); } + /// + /// Returns a user that matches either the email or username + /// + /// Has a username or email and a password here the password is not used + /// (user) that matches the login public async Task Login(Login login) { User user = new User(); @@ -59,11 +69,18 @@ namespace Api.DBAccess return user; } + // Returns a user according to userID public async Task ReadUser(int userId) { return await _context.Users.FirstOrDefaultAsync(u => u.Id == userId); } + /// + /// Updates the user in the database + /// + /// Contains the updated user info + /// Has the id for the user that is to be updated + /// returns the updated user in a OkObjectResult and if there is some error it returns a ConflictObjectResult and a message that explain the reason public async Task UpdateUser(User user, int userId) { var profile = await _context.Users.FirstOrDefaultAsync(u => u.Id == userId); @@ -97,6 +114,11 @@ namespace Api.DBAccess return new ConflictObjectResult(new { message = "Could not save to database" }); } + /// + /// Deletes a user from the database + /// + /// The Id of the user that is to be deleted + /// returns the true in a OkObjectResult and if there is some error it returns a ConflictObjectResult and a message that explain the reason public async Task DeleteUser(int userId) { var user = await _context.Users.Include(u => u.Devices).FirstOrDefaultAsync(u => u.Id == userId); @@ -120,6 +142,7 @@ namespace Api.DBAccess return new ConflictObjectResult(new { message = "Invalid user" }); } + // Returns devices according to userID public async Task> ReadDevices(int userId) { var user = await _context.Users.Include(u => u.Devices).FirstOrDefaultAsync(u => u.Id == userId); @@ -131,6 +154,12 @@ namespace Api.DBAccess return devices; } + /// + /// Creates a user using entityframework core + /// + /// The device that is going to be created + /// The user that owns the device + /// returns the true in a OkObjectResult and if there is some error it returns a ConflictObjectResult and a message that explain the reason public async Task CreateDevice(Device device, int userId) { var user = await _context.Users.Include(u => u.Devices).FirstOrDefaultAsync(u => u.Id == userId); @@ -147,17 +176,25 @@ namespace Api.DBAccess return new ConflictObjectResult(new { message = "Could not save to database" }); } - + + // Returns a device according to userID public async Task ReadDevice(int deviceId) { return await _context.Devices.FirstOrDefaultAsync(d => d.Id == deviceId); } + // Returns a device according to userID public Device ReadDevice(string refenreId) { return _context.Devices.FirstOrDefault(d => d.ReferenceId == refenreId); } + /// + /// Updates a device in the database + /// + /// Contains the updated device info + /// Has the id for the device that is to be updated + /// returns the updated device in a OkObjectResult and if there is some error it returns a ConflictObjectResult and a message that explain the reason public async Task UpdateDevice(Device device, int deviceId) { var device1 = await _context.Devices.FirstOrDefaultAsync(u => u.Id == deviceId); @@ -179,6 +216,11 @@ namespace Api.DBAccess return new ConflictObjectResult(new { message = "Could not save to database" }); } + /// + /// Returns the logs from the device + /// + /// Has the id for the device that the los belong too + /// public async Task> ReadLogs(int deviceId) { var device = await _context.Devices.Include(d => d.Logs).FirstOrDefaultAsync(d => d.Id == deviceId); @@ -190,6 +232,11 @@ namespace Api.DBAccess return logs; } + /// + /// Creates a new log + /// + /// the new log + /// the referenceId that belongs too the device that recoded the log public async void CreateLog(TemperatureLogs temperatureLogs, string referenceId) { var device = await _context.Devices.Include(d => d.Logs).FirstOrDefaultAsync(d => d.ReferenceId == referenceId); @@ -202,6 +249,7 @@ namespace Api.DBAccess await _context.SaveChangesAsync(); } + // Does a health check on the database access public async Task Test() { return _context.Database.CanConnect(); diff --git a/backend/Api/MQTTReciever/MQTTReciever.cs b/backend/Api/MQTTReciever/MQTTReciever.cs index aa0931d..8c72341 100644 --- a/backend/Api/MQTTReciever/MQTTReciever.cs +++ b/backend/Api/MQTTReciever/MQTTReciever.cs @@ -26,12 +26,14 @@ namespace Api.MQTTReciever using (mqttClient = mqttFactory.CreateMqttClient()) { + // Entering our values for conecting to MQTT var mqttClientOptions = new MqttClientOptionsBuilder() .WithTcpServer($"{_configuration["MQTT:host"]}", Convert.ToInt32(_configuration["MQTT:port"])) .WithCredentials($"{_configuration["MQTT:username"]}", $"{_configuration["MQTT:password"]}") .WithCleanSession() .Build(); + // Everytime a message is recieved from the queue it goes into this mqttClient.ApplicationMessageReceivedAsync // Setup message handling before connecting so that queued messages // are also handled properly. When there is no event handler attached all // received messages get lost. @@ -41,35 +43,38 @@ namespace Api.MQTTReciever string sensorData = Encoding.UTF8.GetString(e.ApplicationMessage.Payload); - var mqttMessageReceive = JsonSerializer.Deserialize(sensorData); + var messageReceive = JsonSerializer.Deserialize(sensorData); - if (mqttMessageReceive == null || mqttMessageReceive.temperature == 0 || mqttMessageReceive.device_id == null || mqttMessageReceive.timestamp == 0) + // Checks if the message has the data we need + if (messageReceive == null || messageReceive.device_id == null || messageReceive.timestamp == 0) { return Task.CompletedTask; } + // Convert to the model we use in the database and gets the device from the database that is used for getting the current set temphigh and templow TemperatureLogs newLog = new TemperatureLogs(); - string refernceId = mqttMessageReceive.device_id; + string refernceId = messageReceive.device_id; var device = _dbAccess.ReadDevice(refernceId); + // Checks if the device exist if it doesn't it throws the data away if (device == null) { return Task.CompletedTask; } - newLog.Temperature = mqttMessageReceive.temperature; - newLog.Date = DateTimeOffset.FromUnixTimeSeconds(mqttMessageReceive.timestamp).DateTime; + newLog.Temperature = messageReceive.temperature; + newLog.Date = DateTimeOffset.FromUnixTimeSeconds(messageReceive.timestamp).DateTime; newLog.TempHigh = device.TempHigh; newLog.TempLow = device.TempLow; + // Send the data to dbaccess to be saved _dbAccess.CreateLog(newLog, refernceId); return Task.CompletedTask; }; - + // Starts the connection to rabbitmq await mqttClient.ConnectAsync(mqttClientOptions, CancellationToken.None); Console.WriteLine("mqttClient"); - //var mqttSubscribeOptions = mqttFactory.CreateSubscribeOptionsBuilder().WithTopicTemplate(topic).Build(); - + // Subscribes to our topic await mqttClient.SubscribeAsync("temperature"); Console.WriteLine("MQTT client subscribed to topic."); diff --git a/backend/Api/Program.cs b/backend/Api/Program.cs index 2cd40db..8ab6897 100644 --- a/backend/Api/Program.cs +++ b/backend/Api/Program.cs @@ -12,7 +12,7 @@ class Program public static void Main(string[] args) { var app = CreateWebHostBuilder(args).Build(); - + string rabbitMQ = "AMQP"; // This value has to be either "AMQP" or "MQTT" RunMigrations(app); @@ -24,11 +24,17 @@ class Program var configuration = services.GetRequiredService(); var dbAccess = services.GetRequiredService(); - //AMQPReciever amqp = new AMQPReciever(configuration, dbAccess); - //amqp.Handle_Received_Application_Message().Wait(); - - MQTTReciever mqtt = new MQTTReciever(configuration, dbAccess); - mqtt.Handle_Received_Application_Message().Wait(); + // Choose to either connect AMQP or MQTT + if (rabbitMQ == "AMQP") + { + AMQPReciever amqp = new AMQPReciever(configuration, dbAccess); + amqp.Handle_Received_Application_Message().Wait(); + } + else if (rabbitMQ == "MQTT") + { + MQTTReciever mqtt = new MQTTReciever(configuration, dbAccess); + mqtt.Handle_Received_Application_Message().Wait(); + } } }); diff --git a/backend/ConsoleApp1/ConsoleApp1.csproj b/backend/ConsoleApp1/ConsoleApp1.csproj deleted file mode 100644 index 7dfb515..0000000 --- a/backend/ConsoleApp1/ConsoleApp1.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - Exe - net8.0 - enable - enable - - - - - - - diff --git a/backend/ConsoleApp1/ConsoleApp1.sln b/backend/ConsoleApp1/ConsoleApp1.sln deleted file mode 100644 index b1ff789..0000000 --- a/backend/ConsoleApp1/ConsoleApp1.sln +++ /dev/null @@ -1,25 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.9.34607.119 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApp1", "ConsoleApp1.csproj", "{0BC93CF2-F92D-4DD6-83BE-A985CBB74960}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0BC93CF2-F92D-4DD6-83BE-A985CBB74960}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0BC93CF2-F92D-4DD6-83BE-A985CBB74960}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0BC93CF2-F92D-4DD6-83BE-A985CBB74960}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0BC93CF2-F92D-4DD6-83BE-A985CBB74960}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {55EE0E94-4585-4E79-AC67-4B0E809E99AB} - EndGlobalSection -EndGlobal diff --git a/backend/ConsoleApp1/Program.cs b/backend/ConsoleApp1/Program.cs deleted file mode 100644 index a5e0e23..0000000 --- a/backend/ConsoleApp1/Program.cs +++ /dev/null @@ -1,52 +0,0 @@ -using RabbitMQ.Client; -using RabbitMQ.Client.Events; -using System.Text; - - -var factory = new ConnectionFactory(); -var queue = "test"; - - -factory.UserName = "h5"; -factory.Password = "Merc1234"; -factory.HostName = "10.135.51.116"; -factory.Port = 5672; - -using var conn = await factory.CreateConnectionAsync(); -Console.WriteLine("AMQPClien connected"); -using var channel = await conn.CreateChannelAsync(); - -await channel.QueueDeclareAsync(queue: queue, durable: false, exclusive: false, autoDelete: false); -Console.WriteLine($"{queue} connected"); - -var consumer = new AsyncEventingBasicConsumer(channel); -consumer.ReceivedAsync += (model, ea) => -{ - Console.WriteLine("Received application message."); - var body = ea.Body.ToArray(); - var message = Encoding.UTF8.GetString(body); - Console.WriteLine(message); - - return Task.CompletedTask; -}; - -await channel.BasicConsumeAsync(queue, true, consumer); - - -const string message = "Hello World!"; -var body = Encoding.UTF8.GetBytes(message); -await channel.BasicPublishAsync(exchange: string.Empty, routingKey: queue, body: body); -Console.WriteLine(" Press enter to continue."); -Console.ReadLine(); -await channel.BasicPublishAsync(exchange: string.Empty, routingKey: queue, body: body); -Console.WriteLine(" Press enter to continue."); -Console.ReadLine(); -await channel.BasicPublishAsync(exchange: string.Empty, routingKey: queue, body: body); -Console.WriteLine(" Press enter to continue."); -Console.ReadLine(); -await channel.BasicPublishAsync(exchange: string.Empty, routingKey: queue, body: body); -Console.WriteLine(" Press enter to continue."); -Console.ReadLine(); -await channel.BasicPublishAsync(exchange: string.Empty, routingKey: queue, body: body); -Console.WriteLine(" Press enter to exit."); -Console.ReadLine(); \ No newline at end of file From 2f5f753ab6466823ce7ca25d07b7633f9c255eb4 Mon Sep 17 00:00:00 2001 From: Reimar Date: Wed, 26 Mar 2025 09:58:43 +0100 Subject: [PATCH 04/24] Implement printing temperature on display --- iot/Makefile | 6 ++-- iot/devices/display.c | 60 +++++++++++++++++++++++++++++++++ iot/devices/display.h | 10 ++++++ iot/{ => devices}/temperature.c | 38 +++++++++++---------- iot/{ => devices}/temperature.h | 0 iot/main.c | 21 ++++++++++-- 6 files changed, 113 insertions(+), 22 deletions(-) create mode 100644 iot/devices/display.c create mode 100644 iot/devices/display.h rename iot/{ => devices}/temperature.c (62%) rename iot/{ => devices}/temperature.h (100%) diff --git a/iot/Makefile b/iot/Makefile index 0f0e886..62e1390 100644 --- a/iot/Makefile +++ b/iot/Makefile @@ -1,3 +1,5 @@ -all: main.c brokers/mqtt.c brokers/amqp.c temperature.c device_id.c - $(CC) -lmosquitto -lrabbitmq -lpthread -li2c main.c brokers/mqtt.c brokers/amqp.c temperature.c device_id.c +FILES=main.c brokers/mqtt.c brokers/amqp.c devices/temperature.c devices/display.c device_id.c + +all: $(FILES) + $(CC) -lmosquitto -lrabbitmq -lpthread -li2c $(FILES) diff --git a/iot/devices/display.c b/iot/devices/display.c new file mode 100644 index 0000000..6c90e08 --- /dev/null +++ b/iot/devices/display.c @@ -0,0 +1,60 @@ +#include +#include +#include +#include +#include +#include +#include +#include + +#include "display.h" + +#define JHD1313_BUS "/dev/i2c-2" +#define JHD1313_ADR 0x3e + +void display_set_cursor_pos(display_handle_t display, int x, int y) +{ + i2c_smbus_write_byte_data(display, 0x00, (y ? 0xC0 : 0x80) + x); +} + +void display_write_str(display_handle_t display, char *str) +{ + while (*str) { + display_write_char(display, *str); + str++; + } +} + +void display_write_char(display_handle_t display, char ch) +{ + i2c_smbus_write_byte_data(display, 0x40, ch); +} + +display_handle_t init_display() +{ + int file = open(JHD1313_BUS, O_RDWR); + + if (file < 0) { + perror("Error opening display device"); + exit(EXIT_FAILURE); + } + + if (ioctl(file, I2C_SLAVE, JHD1313_ADR) == -1) { + fprintf(stderr, "ERROR: setting address %d on i2c bus %s with ioctl() - %s", JHD1313_ADR, JHD1313_BUS, strerror(errno)); + exit(EXIT_FAILURE); + } + + // 2 line mode, 5x8 + i2c_smbus_write_byte_data(file, 0x00, 0x28); + // Display on, cursor on, blink off + i2c_smbus_write_byte_data(file, 0x00, 0x0C); + // Display clear + i2c_smbus_write_byte_data(file, 0x00, 0x01); + // Entry mode set + i2c_smbus_write_byte_data(file, 0x00, 0x06); + + i2c_smbus_write_byte_data(file, 0x00, 0x02); + + return file; +} + diff --git a/iot/devices/display.h b/iot/devices/display.h new file mode 100644 index 0000000..bc217c1 --- /dev/null +++ b/iot/devices/display.h @@ -0,0 +1,10 @@ +typedef int display_handle_t; + +display_handle_t init_display(); + +void display_set_cursor_pos(display_handle_t display, int x, int y); + +void display_write_str(display_handle_t display, char *str); + +void display_write_char(display_handle_t display, char ch); + diff --git a/iot/temperature.c b/iot/devices/temperature.c similarity index 62% rename from iot/temperature.c rename to iot/devices/temperature.c index 1719733..055dbbe 100644 --- a/iot/temperature.c +++ b/iot/devices/temperature.c @@ -11,8 +11,10 @@ #include "temperature.h" -#define MPC9808_BUS "/dev/i2c-2" -#define MPC9808_ADR 0x18 +#define MCP9808_BUS "/dev/i2c-2" +#define MCP9808_ADR 0x18 +#define MCP9808_MANID 0x0054 +#define MCP9808_DEVID 0x04 #define CONFIG_REG 0x01 #define TUPPER_REG 0x02 @@ -53,16 +55,16 @@ double get_temperature(temperature_handle_t file) temperature_handle_t init_temperature(void) { - int file = open(MPC9808_BUS, O_RDWR); + int file = open(MCP9808_BUS, O_RDWR); if (file < 0) { - fprintf(stderr, "Error opening temperature sensor device (%s): %s\n", MPC9808_BUS, strerror(errno)); - exit(1); + perror("Error opening temperature sensor device"); + exit(EXIT_FAILURE); } - if (ioctl(file, I2C_SLAVE, MPC9808_ADR) == -1) { - fprintf(stderr, "ERROR: setting address %d on i2c bus %s with ioctl() - %s", MPC9808_ADR, MPC9808_BUS, strerror(errno)); - exit(1); + if (ioctl(file, I2C_SLAVE, MCP9808_ADR) == -1) { + fprintf(stderr, "ERROR: setting address %d on i2c bus %s with ioctl() - %s", MCP9808_ADR, MCP9808_BUS, strerror(errno)); + exit(EXIT_FAILURE); } int32_t reg32; @@ -73,23 +75,23 @@ temperature_handle_t init_temperature(void) reg32 = i2c_smbus_read_word_data(file, MANID_REG); if (reg32 < 0) { - fprintf(stderr, "ERROR: Read failed on i2c bus register %d - %s\n", MANID_REG,strerror(errno)); - exit(1); + fprintf(stderr, "Read failed on i2c bus register %d: %s\n", MANID_REG, strerror(errno)); + exit(EXIT_FAILURE); } - if (bswap_16(reg16poi[0]) != 0x0054) { - fprintf(stderr, "Manufactorer ID wrong is 0x%x should be 0x54\n",__bswap_16(reg16poi[0])); - exit(1); + if (bswap_16(reg16poi[0]) != MCP9808_MANID) { + fprintf(stderr, "Invalid manufacturer ID: Expected 0x%x, got 0x%x\n", MCP9808_MANID, __bswap_16(reg16poi[0])); + exit(EXIT_FAILURE); } // Read device ID and revision reg32 = i2c_smbus_read_word_data(file, DEVID_REG); if (reg32 < 0) { - fprintf(stderr, "ERROR: Read failed on i2c bus register %d - %s\n", DEVID_REG,strerror(errno) ); - exit(1); + fprintf(stderr, "Read failed on i2c bus register %d - %s\n", DEVID_REG, strerror(errno)); + exit(EXIT_FAILURE); } - if (reg8poi[0] != 0x04) { - fprintf(stderr, "Manufactorer ID OK but device ID wrong is 0x%x should be 0x4\n",reg8poi[0]); - exit(1); + if (reg8poi[0] != MCP9808_DEVID) { + fprintf(stderr, "Invalid device ID - expected 0x%x, got 0x%x\n", MCP9808_DEVID, reg8poi[0]); + exit(EXIT_FAILURE); } return file; diff --git a/iot/temperature.h b/iot/devices/temperature.h similarity index 100% rename from iot/temperature.h rename to iot/devices/temperature.h diff --git a/iot/main.c b/iot/main.c index ad6014c..9c0184d 100644 --- a/iot/main.c +++ b/iot/main.c @@ -7,7 +7,8 @@ #include #include "brokers/amqp.h" -#include "temperature.h" +#include "devices/temperature.h" +#include "devices/display.h" #include "device_id.h" void *watch_temperature(void *arg) @@ -16,14 +17,21 @@ void *watch_temperature(void *arg) printf("Device ID: %s\n", device_id); - temperature_handle_t temp_handle = init_temperature(); + display_handle_t display = init_display(); + display_write_str(display, " "); + display_set_cursor_pos(display, 0, 1); + display_write_str(display, "Device....."); + display_write_str(display, device_id); + temperature_handle_t temp_handle = init_temperature(); get_temperature(temp_handle); while (true) { + // Retrieve data double temperature = get_temperature(temp_handle); size_t timestamp = time(NULL); + // Send JSON char *format = "{" "\"temperature\": %lf," "\"device_id\": \"%s\"," @@ -37,6 +45,15 @@ void *watch_temperature(void *arg) free(str); + // Print on display + str = malloc(17); + sprintf(str, "===[ %.1lf\xDF" "C ]===", temperature); + + display_set_cursor_pos(display, 0, 0); + display_write_str(display, str); + + free(str); + printf("Temperature: %lf\n", temperature); sleep(60); From 6f311fabd48f539e191f8e78e942c1a809482a93 Mon Sep 17 00:00:00 2001 From: Jeas0001 Date: Wed, 26 Mar 2025 12:14:42 +0100 Subject: [PATCH 05/24] Comments --- backend/Api/BusinessLogic/DeviceLogic.cs | 25 +++++++++++ backend/Api/BusinessLogic/UserLogic.cs | 48 ++++++++++++++++++++- backend/Api/Controllers/DeviceController.cs | 6 ++- backend/Api/Controllers/UserController.cs | 4 ++ backend/Api/DBAccess/DBAccess.cs | 4 +- 5 files changed, 82 insertions(+), 5 deletions(-) diff --git a/backend/Api/BusinessLogic/DeviceLogic.cs b/backend/Api/BusinessLogic/DeviceLogic.cs index 506316c..27ab67a 100644 --- a/backend/Api/BusinessLogic/DeviceLogic.cs +++ b/backend/Api/BusinessLogic/DeviceLogic.cs @@ -16,6 +16,12 @@ namespace Api.BusinessLogic _configuration = configuration; } + /// + /// Gets the user from dbaccess using the userId and checks if the user exists + /// Gets all devices that match the userId and checks if there are any devices connected to the user + /// + /// UserId that matches a user that owns the devices + /// returns the devices in a OkObjectResult and if there is some error it returns a ConflictObjectResult and a message that explain the reason public async Task GetDevices(int userId) { var profile = await _dbAccess.ReadUser(userId); @@ -29,6 +35,13 @@ namespace Api.BusinessLogic return new OkObjectResult(devices); } + /// + /// Checks if the user that the device is trying to be added to exists + /// Then it is send to dbaccess + /// + /// The new device + /// The user that owns the device + /// returns true in a OkObjectResult and if there is some error it returns a ConflictObjectResult and a message that explain the reason public async Task AddDevice(Device device, int userId) { var profile = await _dbAccess.ReadUser(userId); @@ -38,6 +51,12 @@ namespace Api.BusinessLogic return await _dbAccess.CreateDevice(device, userId); } + /// + /// Checks if the device exist that is trying to be read from + /// Gets the logs and checks if there are any in the list + /// + /// The deviceId that you want from the logs + /// returns the logs in a OkObjectResult and if there is some error it returns a ConflictObjectResult and a message that explain the reason public async Task GetLogs(int deviceId) { var device = await _dbAccess.ReadDevice(deviceId); @@ -51,6 +70,12 @@ namespace Api.BusinessLogic return new OkObjectResult(logs); } + /// + /// Checks if the deviceId matches a device + /// + /// The updated info + /// The device to be edited + /// returns the updated device in a OkObjectResult and if there is some error it returns a ConflictObjectResult and a message that explain the reason public async Task EditDevice(Device device, int deviceId) { var device1 = _dbAccess.ReadDevice(deviceId); diff --git a/backend/Api/BusinessLogic/UserLogic.cs b/backend/Api/BusinessLogic/UserLogic.cs index 43d21f6..ed0a11f 100644 --- a/backend/Api/BusinessLogic/UserLogic.cs +++ b/backend/Api/BusinessLogic/UserLogic.cs @@ -22,6 +22,14 @@ namespace Api.BusinessLogic _configuration = configuration; } + /// + /// First checks if the mail is a valid one with regex so if there is something before the @ and after and it has a domain + /// Then it checks if the password is to our security standard + /// Then it makes sure the user has a device list + /// The last thing before it saves the user is creating a salt and then hashing of the password + /// + /// The new user + /// returns true in a OkObjectResult and if there is some error it returns a ConflictObjectResult and a message that explain the reason public async Task RegisterUser(User user) { if (!new Regex(@".+@.+\..+").IsMatch(user.Email)) @@ -48,6 +56,13 @@ namespace Api.BusinessLogic return await _dbAccess.CreateUser(user); } + /// + /// Gets the user that matches the login + /// Hashes the login password with the users salt + /// checks if the hashed password that the login has is the same as the one saved in the database + /// + /// Has a username or email and a password + /// Returns a jwt token, username and userid public async Task Login(Login login) { User user = await _dbAccess.Login(login); @@ -65,6 +80,15 @@ namespace Api.BusinessLogic return new ConflictObjectResult(new { message = "Invalid password" }); } + /// + /// First checks if the mail is a valid one with regex so if there is something before the @ and after and it has a domain + /// Then it checks if the password is to our security standard + /// Finds the user that matches the userId and hashes a new hash with the old salt + /// Then the updated user and the userId is being send to dbaccess + /// + /// Contains the updated user info + /// Has the id for the user that is to be updated + /// returns the updated user in a OkObjectResult and if there is some error it returns a ConflictObjectResult and a message that explain the reason public async Task EditProfile(User user, int userId) { if (!new Regex(@".+@.+\..+").IsMatch(user.Email)) @@ -85,11 +109,23 @@ namespace Api.BusinessLogic return await _dbAccess.UpdateUser(user, userId); } + /// + /// Just sends the userid of the user that is to be deleted + /// + /// The Id of the user that is to be deleted + /// returns the true in a OkObjectResult and if there is some error it returns a ConflictObjectResult and a message that explain the reason public async Task DeleteUser(int userId) { return await _dbAccess.DeleteUser(userId); } + /// + /// Generates a hash from a salt and input using the algorithm that is provided + /// + /// This is the input that is supposed to be hashed + /// This is the alogorithm that is used to encrypt the input + /// This is something extra added to make the hashed input more unpredictable + /// The hashed input private static string ComputeHash(string input, HashAlgorithm algorithm, string salt) { Byte[] inputBytes = Encoding.UTF8.GetBytes(input); @@ -105,6 +141,11 @@ namespace Api.BusinessLogic return BitConverter.ToString(hashedBytes); } + /// + /// Checks if password is up to our security standard + /// + /// The password that is to be checked + /// true or false dependeing on if the password is up to standard public bool PasswordSecurity(string password) { var hasMinimum8Chars = new Regex(@".{8,}"); @@ -112,6 +153,11 @@ namespace Api.BusinessLogic return hasMinimum8Chars.IsMatch(password); } + /// + /// Generates a JWT token that last 2 hours + /// + /// Used for sending the userid and username with the token + /// Returns a valid JWTToken private string GenerateJwtToken(User user) { var claims = new[] @@ -129,7 +175,7 @@ namespace Api.BusinessLogic _configuration["JwtSettings:Issuer"], _configuration["JwtSettings:Audience"], claims, - expires: DateTime.Now.AddMinutes(30), + expires: DateTime.Now.AddHours(2), signingCredentials: creds); return new JwtSecurityTokenHandler().WriteToken(token); diff --git a/backend/Api/Controllers/DeviceController.cs b/backend/Api/Controllers/DeviceController.cs index d936fdb..8244f8c 100644 --- a/backend/Api/Controllers/DeviceController.cs +++ b/backend/Api/Controllers/DeviceController.cs @@ -19,15 +19,15 @@ namespace Api.Controllers _deviceLogic = deviceLogic; } + // Sends the userId to deviceLogic [Authorize] [HttpGet("{userId}")] public async Task GetDevices(int userId) { - List devices = await _dbAccess.ReadDevices(userId); - if (devices.Count == 0) { return BadRequest(new { error = "There is no devices that belong to this userID" }); } return await _deviceLogic.GetDevices(userId); } + // Sends the device and userId to deviceLogic [Authorize] [HttpPost("adddevice/{userId}")] public async Task AddDevice([FromBody] Device device, int userId) @@ -35,6 +35,7 @@ namespace Api.Controllers return await _deviceLogic.AddDevice(device, userId); } + // Sends the deviceId to deviceLogic [Authorize] [HttpGet("logs/{deviceId}")] public async Task GetLogs(int deviceId) @@ -42,6 +43,7 @@ namespace Api.Controllers return await _deviceLogic.GetLogs(deviceId); } + // Sends the deviceId to deviceLogic [Authorize] [HttpPut("Edit/{deviceId}")] public async Task EditDevice([FromBody] Device device, int deviceId) diff --git a/backend/Api/Controllers/UserController.cs b/backend/Api/Controllers/UserController.cs index 186e1d4..74cbb1b 100644 --- a/backend/Api/Controllers/UserController.cs +++ b/backend/Api/Controllers/UserController.cs @@ -21,18 +21,21 @@ namespace Api.Controllers _userLogic = userLogic; } + // Sends the login to userLogic [HttpPost("Login")] public async Task Login([FromBody] Login login) { return await _userLogic.Login(login); } + // Sends the user to userLogic [HttpPost("Create")] public async Task CreateUser([FromBody] User user) { return await _userLogic.RegisterUser(user); } + // Sends the user and userId to userLogic [Authorize] [HttpPut("Edit/{userId}")] public async Task EditUser([FromBody] User user, int userId) @@ -40,6 +43,7 @@ namespace Api.Controllers return await _userLogic.EditProfile(user, userId); } + // Sends the userId to userLogic [Authorize] [HttpDelete("Delete/{userId}")] public async Task DeleteUser(int userId) diff --git a/backend/Api/DBAccess/DBAccess.cs b/backend/Api/DBAccess/DBAccess.cs index 8ced21d..a239f8c 100644 --- a/backend/Api/DBAccess/DBAccess.cs +++ b/backend/Api/DBAccess/DBAccess.cs @@ -22,7 +22,7 @@ namespace Api.DBAccess /// Creates a user using entityframework core /// /// Need the entire user obj - /// returns the true in a OkObjectResult and if there is some error it returns a ConflictObjectResult and a message that explain the reason + /// returns true in a OkObjectResult and if there is some error it returns a ConflictObjectResult and a message that explain the reason public async Task CreateUser(User user) { var users = await _context.Users.ToListAsync(); @@ -118,7 +118,7 @@ namespace Api.DBAccess /// Deletes a user from the database /// /// The Id of the user that is to be deleted - /// returns the true in a OkObjectResult and if there is some error it returns a ConflictObjectResult and a message that explain the reason + /// returns true in a OkObjectResult and if there is some error it returns a ConflictObjectResult and a message that explain the reason public async Task DeleteUser(int userId) { var user = await _context.Users.Include(u => u.Devices).FirstOrDefaultAsync(u => u.Id == userId); From 47797d18a0e6c20eacb932c9b84dcca154041558 Mon Sep 17 00:00:00 2001 From: Jeas0001 Date: Wed, 26 Mar 2025 13:14:12 +0100 Subject: [PATCH 06/24] Made AMQPPush for pushing the device limits to RabbitMQ and consume after 1 hour --- backend/Api/AMQP/AMQPPush.cs | 88 +++++++++++++++++++ .../{AMQPReciever => AMQP}/AMQPReciever.cs | 4 +- backend/Api/DBAccess/DBAccess.cs | 6 ++ backend/Api/MQTTReciever/MQTTReciever.cs | 2 +- backend/Api/Models/DeviceLimit.cs | 11 +++ ...QTTMessageReceive.cs => MessageReceive.cs} | 2 +- backend/Api/Program.cs | 7 +- 7 files changed, 114 insertions(+), 6 deletions(-) create mode 100644 backend/Api/AMQP/AMQPPush.cs rename backend/Api/{AMQPReciever => AMQP}/AMQPReciever.cs (97%) create mode 100644 backend/Api/Models/DeviceLimit.cs rename backend/Api/Models/{MQTTMessageReceive.cs => MessageReceive.cs} (83%) diff --git a/backend/Api/AMQP/AMQPPush.cs b/backend/Api/AMQP/AMQPPush.cs new file mode 100644 index 0000000..fe3065f --- /dev/null +++ b/backend/Api/AMQP/AMQPPush.cs @@ -0,0 +1,88 @@ +using Api.DBAccess; +using Api.Models; +using RabbitMQ.Client; +using RabbitMQ.Client.Events; +using System.Text; +using System.Text.Json; + +namespace Api.AMQP +{ + public class AMQPPush + { + private readonly IConfiguration _configuration; + private readonly DbAccess _dbAccess; + + public AMQPPush(IConfiguration configuration, DbAccess dbAccess) + { + _dbAccess = dbAccess; + _configuration = configuration; + } + + public async Task Handle_Push_Device_Limits() + { + var factory = new ConnectionFactory(); + var queue = "temperature-limits"; + + factory.UserName = _configuration["AMQP:username"]; + factory.Password = _configuration["AMQP:password"]; + factory.HostName = _configuration["AMQP:host"]; + factory.Port = Convert.ToInt32(_configuration["AMQP:port"]); + + // Connecting to our rabbitmq and after that it create's a channel where you can connect to a queue + var conn = await factory.CreateConnectionAsync(); + Console.WriteLine("AMQPClient connected"); + var channel = await conn.CreateChannelAsync(); + + // Here we connect to the queue through the channel that got created earlier + await channel.QueueDeclareAsync(queue: queue, durable: false, exclusive: false, autoDelete: false); + Console.WriteLine($"{queue} connected"); + + while (true) + { + + var devices = _dbAccess.ReadDevices(); + foreach (var device in devices) + { + var deviceLimit = new DeviceLimit(); + deviceLimit.ReferenceId = device.ReferenceId; + deviceLimit.TempHigh = device.TempHigh; + deviceLimit.TempLow = device.TempLow; + string message = JsonSerializer.Serialize(deviceLimit); + var body = Encoding.UTF8.GetBytes(message); + await channel.BasicPublishAsync(exchange: string.Empty, routingKey: queue, body: body); + } + + await Task.Delay(10000); + + await channel.CloseAsync(); + Console.WriteLine($"{queue} disconnected"); + await conn.CloseAsync(); + Console.WriteLine("AMQPClient disconnected"); + await channel.DisposeAsync(); + await conn.DisposeAsync(); + await Task.Delay(3600000); + + conn = await factory.CreateConnectionAsync(); + Console.WriteLine("AMQPClient connected"); + channel = await conn.CreateChannelAsync(); + + // Here we connect to the queue through the channel that got created earlier + await channel.QueueDeclareAsync(queue: queue, durable: false, exclusive: false, autoDelete: false); + Console.WriteLine($"{queue} connected"); + + // Everytime a message is recieved from the queue it goes into this consumer.ReceivedAsync + var consumer = new AsyncEventingBasicConsumer(channel); + consumer.ReceivedAsync += (model, ea) => + { + Console.WriteLine("Emptying queue"); + + return Task.CompletedTask; + }; + + // Consumes the data in the queue + await channel.BasicConsumeAsync(queue, true, consumer); + + } + } + } +} diff --git a/backend/Api/AMQPReciever/AMQPReciever.cs b/backend/Api/AMQP/AMQPReciever.cs similarity index 97% rename from backend/Api/AMQPReciever/AMQPReciever.cs rename to backend/Api/AMQP/AMQPReciever.cs index 149d205..558d1ca 100644 --- a/backend/Api/AMQPReciever/AMQPReciever.cs +++ b/backend/Api/AMQP/AMQPReciever.cs @@ -30,7 +30,7 @@ namespace Api.AMQPReciever // Connecting to our rabbitmq and after that it create's a channel where you can connect to a queue using var conn = await factory.CreateConnectionAsync(); - Console.WriteLine("AMQPClien connected"); + Console.WriteLine("AMQPClient connected"); using var channel = await conn.CreateChannelAsync(); // Here we connect to the queue through the channel that got created earlier @@ -45,7 +45,7 @@ namespace Api.AMQPReciever var body = ea.Body.ToArray(); var message = Encoding.UTF8.GetString(body); - var messageReceive = JsonSerializer.Deserialize(message); + var messageReceive = JsonSerializer.Deserialize(message); // Checks if the message has the data we need if (messageReceive == null || messageReceive.device_id == null || messageReceive.timestamp == 0) diff --git a/backend/Api/DBAccess/DBAccess.cs b/backend/Api/DBAccess/DBAccess.cs index a239f8c..3500641 100644 --- a/backend/Api/DBAccess/DBAccess.cs +++ b/backend/Api/DBAccess/DBAccess.cs @@ -189,6 +189,12 @@ namespace Api.DBAccess return _context.Devices.FirstOrDefault(d => d.ReferenceId == refenreId); } + // Returns all devices + public List ReadDevices() + { + return _context.Devices.ToList(); + } + /// /// Updates a device in the database /// diff --git a/backend/Api/MQTTReciever/MQTTReciever.cs b/backend/Api/MQTTReciever/MQTTReciever.cs index 8c72341..f68cbe0 100644 --- a/backend/Api/MQTTReciever/MQTTReciever.cs +++ b/backend/Api/MQTTReciever/MQTTReciever.cs @@ -43,7 +43,7 @@ namespace Api.MQTTReciever string sensorData = Encoding.UTF8.GetString(e.ApplicationMessage.Payload); - var messageReceive = JsonSerializer.Deserialize(sensorData); + var messageReceive = JsonSerializer.Deserialize(sensorData); // Checks if the message has the data we need if (messageReceive == null || messageReceive.device_id == null || messageReceive.timestamp == 0) diff --git a/backend/Api/Models/DeviceLimit.cs b/backend/Api/Models/DeviceLimit.cs new file mode 100644 index 0000000..ee2e3d7 --- /dev/null +++ b/backend/Api/Models/DeviceLimit.cs @@ -0,0 +1,11 @@ +namespace Api.Models +{ + public class DeviceLimit + { + public double TempHigh { get; set; } + + public double TempLow { get; set; } + + public string? ReferenceId { get; set; } + } +} diff --git a/backend/Api/Models/MQTTMessageReceive.cs b/backend/Api/Models/MessageReceive.cs similarity index 83% rename from backend/Api/Models/MQTTMessageReceive.cs rename to backend/Api/Models/MessageReceive.cs index 16d264a..cb27d59 100644 --- a/backend/Api/Models/MQTTMessageReceive.cs +++ b/backend/Api/Models/MessageReceive.cs @@ -1,6 +1,6 @@ namespace Api.Models { - public class MQTTMessageReceive + public class MessageReceive { public double temperature { get; set; } diff --git a/backend/Api/Program.cs b/backend/Api/Program.cs index 8ab6897..c9a0c33 100644 --- a/backend/Api/Program.cs +++ b/backend/Api/Program.cs @@ -1,4 +1,5 @@ using Api; +using Api.AMQP; using Api.AMQPReciever; using Api.DBAccess; using Api.MQTTReciever; @@ -27,8 +28,10 @@ class Program // Choose to either connect AMQP or MQTT if (rabbitMQ == "AMQP") { - AMQPReciever amqp = new AMQPReciever(configuration, dbAccess); - amqp.Handle_Received_Application_Message().Wait(); + AMQPReciever amqpReciever = new AMQPReciever(configuration, dbAccess); + amqpReciever.Handle_Received_Application_Message().Wait(); + AMQPPush aMQPPush = new AMQPPush(configuration, dbAccess); + aMQPPush.Handle_Push_Device_Limits().Wait(); } else if (rabbitMQ == "MQTT") { From 998cb90acc082ebfc6958c7bdca4116f61f0590b Mon Sep 17 00:00:00 2001 From: Jeas0001 Date: Wed, 26 Mar 2025 14:28:20 +0100 Subject: [PATCH 07/24] Changed the name of the publisher --- backend/Api/AMQP/{AMQPPush.cs => AMQPPublisher.cs} | 12 ++++++++---- backend/Api/Program.cs | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) rename backend/Api/AMQP/{AMQPPush.cs => AMQPPublisher.cs} (87%) diff --git a/backend/Api/AMQP/AMQPPush.cs b/backend/Api/AMQP/AMQPPublisher.cs similarity index 87% rename from backend/Api/AMQP/AMQPPush.cs rename to backend/Api/AMQP/AMQPPublisher.cs index fe3065f..c7e08db 100644 --- a/backend/Api/AMQP/AMQPPush.cs +++ b/backend/Api/AMQP/AMQPPublisher.cs @@ -7,12 +7,12 @@ using System.Text.Json; namespace Api.AMQP { - public class AMQPPush + public class AMQPPublisher { private readonly IConfiguration _configuration; private readonly DbAccess _dbAccess; - public AMQPPush(IConfiguration configuration, DbAccess dbAccess) + public AMQPPublisher(IConfiguration configuration, DbAccess dbAccess) { _dbAccess = dbAccess; _configuration = configuration; @@ -39,7 +39,7 @@ namespace Api.AMQP while (true) { - + // Publishes all devices limits var devices = _dbAccess.ReadDevices(); foreach (var device in devices) { @@ -52,16 +52,20 @@ namespace Api.AMQP await channel.BasicPublishAsync(exchange: string.Empty, routingKey: queue, body: body); } + // Short delay before disconnecting from rabbitMQ await Task.Delay(10000); + // Disconnecting from rabbitMQ to save resources await channel.CloseAsync(); Console.WriteLine($"{queue} disconnected"); await conn.CloseAsync(); Console.WriteLine("AMQPClient disconnected"); await channel.DisposeAsync(); await conn.DisposeAsync(); + // 1 hour delay await Task.Delay(3600000); + // Creating a new connection to rabbitMQ conn = await factory.CreateConnectionAsync(); Console.WriteLine("AMQPClient connected"); channel = await conn.CreateChannelAsync(); @@ -70,7 +74,7 @@ namespace Api.AMQP await channel.QueueDeclareAsync(queue: queue, durable: false, exclusive: false, autoDelete: false); Console.WriteLine($"{queue} connected"); - // Everytime a message is recieved from the queue it goes into this consumer.ReceivedAsync + // Here all messages is consumed so the queue is empty var consumer = new AsyncEventingBasicConsumer(channel); consumer.ReceivedAsync += (model, ea) => { diff --git a/backend/Api/Program.cs b/backend/Api/Program.cs index c9a0c33..e2bce37 100644 --- a/backend/Api/Program.cs +++ b/backend/Api/Program.cs @@ -30,7 +30,7 @@ class Program { AMQPReciever amqpReciever = new AMQPReciever(configuration, dbAccess); amqpReciever.Handle_Received_Application_Message().Wait(); - AMQPPush aMQPPush = new AMQPPush(configuration, dbAccess); + AMQPPublisher aMQPPush = new AMQPPublisher(configuration, dbAccess); aMQPPush.Handle_Push_Device_Limits().Wait(); } else if (rabbitMQ == "MQTT") From edc195b234c0191b5041e28bdfac7cc7d0016a27 Mon Sep 17 00:00:00 2001 From: Jeas0001 Date: Thu, 27 Mar 2025 09:48:08 +0100 Subject: [PATCH 08/24] Fixed AMQPPublish and split the code into more functions and added Refresh token to Usermodel --- backend/Api/AMQP/AMQPPublisher.cs | 89 ++++++----- backend/Api/AMQP/AMQPReciever.cs | 65 ++++++--- ...084557_AddedRefreshTokenToUser.Designer.cs | 138 ++++++++++++++++++ .../20250327084557_AddedRefreshTokenToUser.cs | 40 +++++ .../Api/Migrations/DBContextModelSnapshot.cs | 6 + backend/Api/Models/User.cs | 4 + 6 files changed, 289 insertions(+), 53 deletions(-) create mode 100644 backend/Api/Migrations/20250327084557_AddedRefreshTokenToUser.Designer.cs create mode 100644 backend/Api/Migrations/20250327084557_AddedRefreshTokenToUser.cs diff --git a/backend/Api/AMQP/AMQPPublisher.cs b/backend/Api/AMQP/AMQPPublisher.cs index c7e08db..60bb0a4 100644 --- a/backend/Api/AMQP/AMQPPublisher.cs +++ b/backend/Api/AMQP/AMQPPublisher.cs @@ -1,7 +1,9 @@ using Api.DBAccess; using Api.Models; +using Microsoft.IdentityModel.Tokens; using RabbitMQ.Client; using RabbitMQ.Client.Events; +using System.Security.Cryptography; using System.Text; using System.Text.Json; @@ -11,34 +13,27 @@ namespace Api.AMQP { private readonly IConfiguration _configuration; private readonly DbAccess _dbAccess; + private IConnection _conn; + private IChannel _channel; + private ConnectionFactory _factory; + private string _queue; public AMQPPublisher(IConfiguration configuration, DbAccess dbAccess) { _dbAccess = dbAccess; _configuration = configuration; + _factory = new ConnectionFactory(); + _queue = "temperature-limits"; + + InitFactory(); } public async Task Handle_Push_Device_Limits() { - var factory = new ConnectionFactory(); - var queue = "temperature-limits"; - - factory.UserName = _configuration["AMQP:username"]; - factory.Password = _configuration["AMQP:password"]; - factory.HostName = _configuration["AMQP:host"]; - factory.Port = Convert.ToInt32(_configuration["AMQP:port"]); - - // Connecting to our rabbitmq and after that it create's a channel where you can connect to a queue - var conn = await factory.CreateConnectionAsync(); - Console.WriteLine("AMQPClient connected"); - var channel = await conn.CreateChannelAsync(); - - // Here we connect to the queue through the channel that got created earlier - await channel.QueueDeclareAsync(queue: queue, durable: false, exclusive: false, autoDelete: false); - Console.WriteLine($"{queue} connected"); - while (true) { + await Connect(); + // Publishes all devices limits var devices = _dbAccess.ReadDevices(); foreach (var device in devices) @@ -49,33 +44,21 @@ namespace Api.AMQP deviceLimit.TempLow = device.TempLow; string message = JsonSerializer.Serialize(deviceLimit); var body = Encoding.UTF8.GetBytes(message); - await channel.BasicPublishAsync(exchange: string.Empty, routingKey: queue, body: body); + await _channel.BasicPublishAsync(exchange: string.Empty, routingKey: _queue, body: body); } // Short delay before disconnecting from rabbitMQ - await Task.Delay(10000); + await Task.Delay(1000); // Disconnecting from rabbitMQ to save resources - await channel.CloseAsync(); - Console.WriteLine($"{queue} disconnected"); - await conn.CloseAsync(); - Console.WriteLine("AMQPClient disconnected"); - await channel.DisposeAsync(); - await conn.DisposeAsync(); + await Dispose(); // 1 hour delay await Task.Delay(3600000); - // Creating a new connection to rabbitMQ - conn = await factory.CreateConnectionAsync(); - Console.WriteLine("AMQPClient connected"); - channel = await conn.CreateChannelAsync(); - - // Here we connect to the queue through the channel that got created earlier - await channel.QueueDeclareAsync(queue: queue, durable: false, exclusive: false, autoDelete: false); - Console.WriteLine($"{queue} connected"); + await Connect(); // Here all messages is consumed so the queue is empty - var consumer = new AsyncEventingBasicConsumer(channel); + var consumer = new AsyncEventingBasicConsumer(_channel); consumer.ReceivedAsync += (model, ea) => { Console.WriteLine("Emptying queue"); @@ -84,9 +67,45 @@ namespace Api.AMQP }; // Consumes the data in the queue - await channel.BasicConsumeAsync(queue, true, consumer); + await _channel.BasicConsumeAsync(_queue, true, consumer); + // Short delay before disconnecting from rabbitMQ + await Task.Delay(1000); + await Dispose(); } } + + // Disconnects from rabbitMQ + private async Task Dispose() + { + await _channel.CloseAsync(); + await _conn.CloseAsync(); + await _channel.DisposeAsync(); + await _conn.DisposeAsync(); + return true; + } + + // Connects to rabbitMQ + private async Task Connect() + { + // Creating a new connection to rabbitMQ + _conn = await _factory.CreateConnectionAsync(); + Console.WriteLine("AMQPClient connected"); + _channel = await _conn.CreateChannelAsync(); + + // Here we connect to the queue through the channel that got created earlier + await _channel.QueueDeclareAsync(queue: _queue, durable: false, exclusive: false, autoDelete: false); + Console.WriteLine($"{_queue} connected"); + return true; + } + + // The info for the factory + private void InitFactory() + { + _factory.UserName = _configuration["AMQP:username"]; + _factory.Password = _configuration["AMQP:password"]; + _factory.HostName = _configuration["AMQP:host"]; + _factory.Port = Convert.ToInt32(_configuration["AMQP:port"]); + } } } diff --git a/backend/Api/AMQP/AMQPReciever.cs b/backend/Api/AMQP/AMQPReciever.cs index 558d1ca..892341e 100644 --- a/backend/Api/AMQP/AMQPReciever.cs +++ b/backend/Api/AMQP/AMQPReciever.cs @@ -4,6 +4,7 @@ using RabbitMQ.Client; using RabbitMQ.Client.Events; using System.Text; using System.Text.Json; +using System.Threading.Channels; namespace Api.AMQPReciever { @@ -11,34 +12,27 @@ namespace Api.AMQPReciever { private readonly IConfiguration _configuration; private readonly DbAccess _dbAccess; + private IConnection _conn; + private IChannel _channel; + private ConnectionFactory _factory; + private string _queue; public AMQPReciever(IConfiguration configuration, DbAccess dbAccess) { _dbAccess = dbAccess; _configuration = configuration; + _factory = new ConnectionFactory(); + _queue = "temperature-logs"; + + InitFactory(); } public async Task Handle_Received_Application_Message() { - var factory = new ConnectionFactory(); - var queue = "temperature-logs"; - - factory.UserName = _configuration["AMQP:username"]; - factory.Password = _configuration["AMQP:password"]; - factory.HostName = _configuration["AMQP:host"]; - factory.Port = Convert.ToInt32(_configuration["AMQP:port"]); - - // Connecting to our rabbitmq and after that it create's a channel where you can connect to a queue - using var conn = await factory.CreateConnectionAsync(); - Console.WriteLine("AMQPClient connected"); - using var channel = await conn.CreateChannelAsync(); - - // Here we connect to the queue through the channel that got created earlier - await channel.QueueDeclareAsync(queue: queue, durable: false, exclusive: false, autoDelete: false); - Console.WriteLine($"{queue} connected"); + await Connect(); // Everytime a message is recieved from the queue it goes into this consumer.ReceivedAsync - var consumer = new AsyncEventingBasicConsumer(channel); + var consumer = new AsyncEventingBasicConsumer(_channel); consumer.ReceivedAsync += (model, ea) => { Console.WriteLine("Received application message."); @@ -73,9 +67,44 @@ namespace Api.AMQPReciever }; // Consumes the data in the queue - await channel.BasicConsumeAsync(queue, true, consumer); + await _channel.BasicConsumeAsync(_queue, true, consumer); while (true); + + await Dispose(); + } + + // Disconnects from rabbitMQ + private async Task Dispose() + { + await _channel.CloseAsync(); + await _conn.CloseAsync(); + await _channel.DisposeAsync(); + await _conn.DisposeAsync(); + return true; + } + + // Connects to rabbitMQ + private async Task Connect() + { + // Creating a new connection to rabbitMQ + _conn = await _factory.CreateConnectionAsync(); + Console.WriteLine("AMQPClient connected"); + _channel = await _conn.CreateChannelAsync(); + + // Here we connect to the queue through the channel that got created earlier + await _channel.QueueDeclareAsync(queue: _queue, durable: false, exclusive: false, autoDelete: false); + Console.WriteLine($"{_queue} connected"); + return true; + } + + // The info for the factory + private void InitFactory() + { + _factory.UserName = _configuration["AMQP:username"]; + _factory.Password = _configuration["AMQP:password"]; + _factory.HostName = _configuration["AMQP:host"]; + _factory.Port = Convert.ToInt32(_configuration["AMQP:port"]); } } } diff --git a/backend/Api/Migrations/20250327084557_AddedRefreshTokenToUser.Designer.cs b/backend/Api/Migrations/20250327084557_AddedRefreshTokenToUser.Designer.cs new file mode 100644 index 0000000..ec38fc2 --- /dev/null +++ b/backend/Api/Migrations/20250327084557_AddedRefreshTokenToUser.Designer.cs @@ -0,0 +1,138 @@ +// +using System; +using Api; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace Api.Migrations +{ + [DbContext(typeof(DBContext))] + [Migration("20250327084557_AddedRefreshTokenToUser")] + partial class AddedRefreshTokenToUser + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "9.0.3"); + + modelBuilder.Entity("Api.Models.Device", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Name") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("ReferenceId") + .HasColumnType("TEXT"); + + b.Property("TempHigh") + .HasColumnType("REAL"); + + b.Property("TempLow") + .HasColumnType("REAL"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("Devices"); + }); + + modelBuilder.Entity("Api.Models.TemperatureLogs", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Date") + .HasColumnType("TEXT"); + + b.Property("DeviceId") + .HasColumnType("INTEGER"); + + b.Property("TempHigh") + .HasColumnType("REAL"); + + b.Property("TempLow") + .HasColumnType("REAL"); + + b.Property("Temperature") + .HasColumnType("REAL"); + + b.HasKey("Id"); + + b.HasIndex("DeviceId"); + + b.ToTable("TemperatureLogs"); + }); + + modelBuilder.Entity("Api.Models.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Email") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Password") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("RefreshToken") + .HasColumnType("TEXT"); + + b.Property("RefreshTokenExpiresAt") + .HasColumnType("TEXT"); + + b.Property("Salt") + .HasColumnType("TEXT"); + + b.Property("UserName") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("Users"); + }); + + modelBuilder.Entity("Api.Models.Device", b => + { + b.HasOne("Api.Models.User", null) + .WithMany("Devices") + .HasForeignKey("UserId"); + }); + + modelBuilder.Entity("Api.Models.TemperatureLogs", b => + { + b.HasOne("Api.Models.Device", null) + .WithMany("Logs") + .HasForeignKey("DeviceId"); + }); + + modelBuilder.Entity("Api.Models.Device", b => + { + b.Navigation("Logs"); + }); + + modelBuilder.Entity("Api.Models.User", b => + { + b.Navigation("Devices"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/backend/Api/Migrations/20250327084557_AddedRefreshTokenToUser.cs b/backend/Api/Migrations/20250327084557_AddedRefreshTokenToUser.cs new file mode 100644 index 0000000..63ab30f --- /dev/null +++ b/backend/Api/Migrations/20250327084557_AddedRefreshTokenToUser.cs @@ -0,0 +1,40 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Api.Migrations +{ + /// + public partial class AddedRefreshTokenToUser : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "RefreshToken", + table: "Users", + type: "TEXT", + nullable: true); + + migrationBuilder.AddColumn( + name: "RefreshTokenExpiresAt", + table: "Users", + type: "TEXT", + nullable: false, + defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "RefreshToken", + table: "Users"); + + migrationBuilder.DropColumn( + name: "RefreshTokenExpiresAt", + table: "Users"); + } + } +} diff --git a/backend/Api/Migrations/DBContextModelSnapshot.cs b/backend/Api/Migrations/DBContextModelSnapshot.cs index 69184bb..6d96bdd 100644 --- a/backend/Api/Migrations/DBContextModelSnapshot.cs +++ b/backend/Api/Migrations/DBContextModelSnapshot.cs @@ -88,6 +88,12 @@ namespace Api.Migrations .IsRequired() .HasColumnType("TEXT"); + b.Property("RefreshToken") + .HasColumnType("TEXT"); + + b.Property("RefreshTokenExpiresAt") + .HasColumnType("TEXT"); + b.Property("Salt") .HasColumnType("TEXT"); diff --git a/backend/Api/Models/User.cs b/backend/Api/Models/User.cs index 4583fab..542547e 100644 --- a/backend/Api/Models/User.cs +++ b/backend/Api/Models/User.cs @@ -12,6 +12,10 @@ public string? Salt { get; set; } + public string? RefreshToken { get; set; } + + public DateTime RefreshTokenExpiresAt { get; set; } + public List? Devices { get; set; } } } From 46de83dc4277f089dcaf65ea21d52aab5f5cd9ac Mon Sep 17 00:00:00 2001 From: Jeas0001 Date: Thu, 27 Mar 2025 10:17:25 +0100 Subject: [PATCH 09/24] RefreshToken is made --- backend/Api/BusinessLogic/UserLogic.cs | 13 +++++++++++-- backend/Api/Controllers/UserController.cs | 6 ++++++ backend/Api/DBAccess/DBAccess.cs | 14 ++++++++++++++ 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/backend/Api/BusinessLogic/UserLogic.cs b/backend/Api/BusinessLogic/UserLogic.cs index ed0a11f..d8dcf13 100644 --- a/backend/Api/BusinessLogic/UserLogic.cs +++ b/backend/Api/BusinessLogic/UserLogic.cs @@ -49,7 +49,7 @@ namespace Api.BusinessLogic string salt = Guid.NewGuid().ToString(); string hashedPassword = ComputeHash(user.Password, SHA256.Create(), salt); - + user.Salt = salt; user.Password = hashedPassword; @@ -74,7 +74,9 @@ namespace Api.BusinessLogic if (user.Password == hashedPassword) { var token = GenerateJwtToken(user); - return new OkObjectResult(new { token, user.UserName, user.Id }); + user.RefreshToken = Guid.NewGuid().ToString(); + _dbAccess.UpdatesRefreshToken(user.RefreshToken, user.Id); + return new OkObjectResult(new { token, user.UserName, user.Id, refreshToken = user.RefreshToken }); } return new ConflictObjectResult(new { message = "Invalid password" }); @@ -119,6 +121,13 @@ namespace Api.BusinessLogic return await _dbAccess.DeleteUser(userId); } + public async Task RefreshToken(string refreshToken) + { + User user = await _dbAccess.ReadUser(refreshToken); + if (user == null) { return new ConflictObjectResult(new { message = "Could not match refreshtoken" }); } + return new OkObjectResult(GenerateJwtToken(user)); + } + /// /// Generates a hash from a salt and input using the algorithm that is provided /// diff --git a/backend/Api/Controllers/UserController.cs b/backend/Api/Controllers/UserController.cs index 74cbb1b..19c90d9 100644 --- a/backend/Api/Controllers/UserController.cs +++ b/backend/Api/Controllers/UserController.cs @@ -51,5 +51,11 @@ namespace Api.Controllers return await _userLogic.DeleteUser(userId); } + [HttpGet("RefreshToken")] + public async Task RefreshToken(string refreshToken) + { + return await _userLogic.RefreshToken(refreshToken); + } + } } diff --git a/backend/Api/DBAccess/DBAccess.cs b/backend/Api/DBAccess/DBAccess.cs index 3500641..012f86d 100644 --- a/backend/Api/DBAccess/DBAccess.cs +++ b/backend/Api/DBAccess/DBAccess.cs @@ -75,6 +75,20 @@ namespace Api.DBAccess return await _context.Users.FirstOrDefaultAsync(u => u.Id == userId); } + // Returns a user according to refreshToken + public async Task ReadUser(string refreshToken) + { + return await _context.Users.FirstOrDefaultAsync(u => u.RefreshToken == refreshToken); + } + + public async void UpdatesRefreshToken(string refreshToken, int userId) + { + var user = await _context.Users.FirstOrDefaultAsync(u => u.Id == userId); + + user.RefreshToken = refreshToken; + user.RefreshTokenExpiresAt = DateTime.Now.AddDays(7); + } + /// /// Updates the user in the database /// From 8ad863b7816e747042e1c744eb8bfa49d7bb3785 Mon Sep 17 00:00:00 2001 From: Jeas0001 Date: Thu, 27 Mar 2025 10:22:46 +0100 Subject: [PATCH 10/24] Added securityDefinition and requirements --- backend/Api/Startup.cs | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/backend/Api/Startup.cs b/backend/Api/Startup.cs index 8be7f08..08a2658 100644 --- a/backend/Api/Startup.cs +++ b/backend/Api/Startup.cs @@ -66,6 +66,29 @@ namespace Api services.AddSwaggerGen(c => { c.SwaggerDoc("v1", new OpenApiInfo { Title = "My API", Version = "v1" }); + + // Configure Swagger to use Bearer token authentication + c.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme + { + Description = "JWT Authorization header using the Bearer scheme", + Type = SecuritySchemeType.Http, + Scheme = "bearer" + }); + + c.AddSecurityRequirement(new OpenApiSecurityRequirement + { + { + new OpenApiSecurityScheme + { + Reference = new OpenApiReference + { + Type = ReferenceType.SecurityScheme, + Id = "Bearer" + } + }, + new string[] { } + } + }); }); } From 0f1b10d2d703ca070fbdd0f064754dab32360a63 Mon Sep 17 00:00:00 2001 From: Reimar Date: Thu, 27 Mar 2025 09:03:34 +0100 Subject: [PATCH 11/24] Change how requests are sent in order to send auth token --- frontend/home/index.html | 63 ++++----- frontend/scripts/home.js | 127 +++++++++---------- frontend/scripts/login.js | 13 +- frontend/scripts/register.js | 11 +- frontend/scripts/services/devices.service.js | 9 +- frontend/scripts/services/users.service.js | 60 +++------ frontend/shared/utils.js | 33 ++++- 7 files changed, 148 insertions(+), 168 deletions(-) diff --git a/frontend/home/index.html b/frontend/home/index.html index 403e197..6fe912f 100644 --- a/frontend/home/index.html +++ b/frontend/home/index.html @@ -1,36 +1,37 @@ - - - - Temperature-Alarm-Web - - - - + + + + Temperature-Alarm-Web + + + + - -
-
- Home -
- Devices - Profile + +
+
+ Home + +
+
+ +
+ + + + + + + + + +
NameTemperatureDateTempHighTempLow
-
-
- -
- - - - - - - - - -
NameTemperatureDateTempHighTempLow
-
- + + diff --git a/frontend/scripts/home.js b/frontend/scripts/home.js index 8538bbb..01c4bf1 100644 --- a/frontend/scripts/home.js +++ b/frontend/scripts/home.js @@ -1,84 +1,71 @@ import { mockTemperatureLogs } from "../mockdata/temperature-logs.mockdata.js"; // Import data +import { getLogsOnDeviceId } from "./services/devices.service.js"; -const xValues = mockTemperatureLogs.map((log) => - new Date(log.date).toLocaleString() -); // Full Date labels -const yValues = mockTemperatureLogs.map((log) => log.temperature); // Temperature values -buildTable(mockTemperatureLogs); -new Chart("myChart", { - type: "line", - data: { - labels: xValues, - datasets: [ - { - fill: false, - lineTension: 0.4, - backgroundColor: "rgba(0,0,255,1.0)", - borderColor: "rgba(0,0,255,0.1)", - data: yValues, - }, - ], - }, - options: { - tooltips: { - callbacks: { - title: function (tooltipItem) { - return `Date: ${tooltipItem[0].label}`; +async function buildChart() { + const data = await getLogsOnDeviceId(1); + + const xValues = mockTemperatureLogs.map((log) => + new Date(log.date).toLocaleString() + ); // Full Date labels + const yValues = mockTemperatureLogs.map((log) => log.temperature); // Temperature values + buildTable(mockTemperatureLogs); + new Chart("myChart", { + type: "line", + data: { + labels: xValues, + datasets: [ + { + fill: false, + lineTension: 0.4, + backgroundColor: "rgba(0,0,255,1.0)", + borderColor: "rgba(0,0,255,0.1)", + data: yValues, + }, + ], }, - label: function (tooltipItem) { - return `Temperature: ${tooltipItem.value}°C`; + options: { + tooltips: { + callbacks: { + title: function (tooltipItem) { + return `Date: ${tooltipItem[0].label}`; + }, + label: function (tooltipItem) { + return `Temperature: ${tooltipItem.value}°C`; + }, + }, + }, }, - }, - }, - }, -}); + }); +} function buildTable(data) { - var table = document.getElementById(`TemperatureTable`); - data.forEach((log) => { - var averageTemp = (log.tempHigh + log.tempLow) / 2.0; - var color; - if (log.temperature > log.tempHigh) { - color = "tempHigh"; - } else if ( - log.temperature < log.tempHigh && - log.temperature > averageTemp - ) { - color = "tempMidHigh"; - } else if (log.temperature < log.tempLow) { - color = "tempLow"; - } else if (log.temperature > log.tempLow && log.temperature < averageTemp) { - color = "tempMidLow"; - } else { - color = "tempNormal"; - } - var row = ` + var table = document.getElementById(`TemperatureTable`); + data.forEach((log) => { + var averageTemp = (log.tempHigh + log.tempLow) / 2.0; + var color; + if (log.temperature > log.tempHigh) { + color = "tempHigh"; + } else if ( + log.temperature < log.tempHigh && + log.temperature > averageTemp + ) { + color = "tempMidHigh"; + } else if (log.temperature < log.tempLow) { + color = "tempLow"; + } else if (log.temperature > log.tempLow && log.temperature < averageTemp) { + color = "tempMidLow"; + } else { + color = "tempNormal"; + } + var row = ` Name ${log.temperature} ${log.date} ${log.tempHigh} ${log.tempLow} `; - table.innerHTML += row; - }); + table.innerHTML += row; + }); } -// Get the modal -var modal = document.getElementById("chartModal"); -var btn = document.getElementById("myBtn"); -var span = document.getElementsByClassName("close")[0]; -btn.onclick = function () { - modal.style.display = "block"; -}; - -// When the user clicks on (x), close the modal -span.onclick = function () { - modal.style.display = "none"; -}; - -// When the user clicks anywhere outside of the modal, close it -window.onclick = function (event) { - if (event.target == modal) { - modal.style.display = "none"; - } -}; +buildChart(); diff --git a/frontend/scripts/login.js b/frontend/scripts/login.js index e264a10..162a418 100644 --- a/frontend/scripts/login.js +++ b/frontend/scripts/login.js @@ -10,13 +10,12 @@ document.getElementById("loginForm").addEventListener("submit", function(event) login(emailOrUsername, password) .then(response => { - if (response.error) { - document.getElementById("form-error").innerText = response.error; - document.getElementById("form-error").style.display = "block"; - - return; - } - location.href = "/home"; + }) + .catch(error => { + console.log(error); + document.getElementById("form-error").innerText = error; + document.getElementById("form-error").style.display = "block"; }); }); + diff --git a/frontend/scripts/register.js b/frontend/scripts/register.js index 56bc5ee..3284ed3 100644 --- a/frontend/scripts/register.js +++ b/frontend/scripts/register.js @@ -14,13 +14,10 @@ document.getElementById("registerForm").addEventListener("submit", function(even // Call function with form values create(email, username, password, repeatPassword) .then(response => { - if (response?.error) { - document.getElementById("form-error").innerText = response.error; - document.getElementById("form-error").style.display = "block"; - - return; - } - location.href = "/login"; + }) + .catch(error => { + document.getElementById("form-error").innerText = error; + document.getElementById("form-error").style.display = "block"; }); }); diff --git a/frontend/scripts/services/devices.service.js b/frontend/scripts/services/devices.service.js index b2b18d8..5b8830f 100644 --- a/frontend/scripts/services/devices.service.js +++ b/frontend/scripts/services/devices.service.js @@ -1,4 +1,4 @@ -import { address } from "../../shared/constants"; +import { address } from "../../shared/constants.js"; export function getDevicesOnUserId(id) { fetch(`${address}/get-on-user-id`, { @@ -26,15 +26,14 @@ export function update(ids) { .catch(error => console.error("Error:", error)); } -export function getLogsOnDeviceIds(id) { - fetch(`${address}/get-on-device-ids`, { +export function getLogsOnDeviceId(id) { + fetch(`${address}/device/logs/${id}`, { method: "GET", headers: { "Content-Type": "application/json" }, - body: JSON.stringify({ ids: id }) }) .then(response => response.json()) .then(data => console.log("Success:", data)) .catch(error => console.error("Error:", error)); -} \ No newline at end of file +} diff --git a/frontend/scripts/services/users.service.js b/frontend/scripts/services/users.service.js index 4b5fa02..c12d085 100644 --- a/frontend/scripts/services/users.service.js +++ b/frontend/scripts/services/users.service.js @@ -1,54 +1,32 @@ -import { address } from "../../shared/constants.js"; -import { handleResponse } from "../../shared/utils.js"; +import { request } from "../../shared/utils.js"; export function login(usernameOrEmail, password) { - return fetch(`${address}/user/login`, { - method: "POST", - headers: { - "Content-Type": "application/json" - }, - body: JSON.stringify({ - EmailOrUsrn: usernameOrEmail, - Password: password, - }), - }) - .then(handleResponse) - .catch(err => { error: err.message }); + return request("POST", "/user/login", { + EmailOrUsrn: usernameOrEmail, + Password: password, + }); } export function create(email, username, password, repeatPassword){ - return fetch(`${address}/user/create`, { - method: "POST", - headers: { - "Content-Type": "application/json" - }, - body: JSON.stringify({email: email, username: username, password: password, repeatPassword: repeatPassword}) - }) - .then(handleResponse) - .catch(err => { error: err.message }); + return request("POST", "/user/create", { + email, + username, + password, + repeatPassword, + }); } export function update(email, username){ - return fetch(`${address}/user/update`, { - method: "PATCH", - headers: { - "Content-Type": "application/json" - }, - body: JSON.stringify({email: email, username: username}) - }) - .then(handleResponse) - .catch(err => { error: err.message }); + return request("PATCH", "/user/update", { + email, + username, + }); } export function updatePassword(oldPassword, newPassword){ - return fetch(`${address}/user/update-password`, { - method: "PATCH", - headers: { - "Content-Type": "application/json" - }, - body: JSON.stringify({oldPassword: oldPassword, newPassword: newPassword}) - }) - .then(handleResponse) - .catch(err => { error: err.message }); + return request("PATCH", "/user/update-password", { + oldPassword, + newPassword, + }); } diff --git a/frontend/shared/utils.js b/frontend/shared/utils.js index 419b3c0..d3c1964 100644 --- a/frontend/shared/utils.js +++ b/frontend/shared/utils.js @@ -1,12 +1,31 @@ -export async function handleResponse(response) { - const json = await response.json(); +import { address } from "./constants.js"; - if (response.ok || json.error) return json; +export async function request(method, path, body = null) { + const token = document.cookie.match(/\bauth-token=(\S+)/); - if (json.errors) { - return { error: Object.values(response.errors)[0][0] }; - } + return new Promise((resolve, reject) => { + fetch(address + path, { + method, + headers: { + "Content-Type": body ? "application/json" : undefined, + "Authorization": token?.length > 1 ? `Bearer ${token[1]}` : undefined, + }, + body: body ? JSON.stringify(body) : undefined, + }) + .then(async response => { + const json = await response.json(); - return { error: "Request failed with HTTP code " + response.status }; + if (response.ok) return resolve(json); + + if (json.error) return reject(json.error); + + if (json.message) return reject(json.message); + + if (json.errors) return reject(Object.values(response.errors)[0][0]); + + reject("Request failed with HTTP code " + response.status); + }) + .catch(err => reject(err.message)); + }); } From 02bfbabcfc030593de271e91cc216f321b86a3f3 Mon Sep 17 00:00:00 2001 From: Reimar Date: Thu, 27 Mar 2025 09:08:34 +0100 Subject: [PATCH 12/24] Set auth token when logging in --- frontend/scripts/login.js | 8 +++++++- frontend/shared/utils.js | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/frontend/scripts/login.js b/frontend/scripts/login.js index 162a418..74a8f33 100644 --- a/frontend/scripts/login.js +++ b/frontend/scripts/login.js @@ -10,10 +10,16 @@ document.getElementById("loginForm").addEventListener("submit", function(event) login(emailOrUsername, password) .then(response => { + document.cookie = `auth-token=${response.token}`; + + localStorage.setItem("user", { + id: response.id, + username: response.userName, + }); + location.href = "/home"; }) .catch(error => { - console.log(error); document.getElementById("form-error").innerText = error; document.getElementById("form-error").style.display = "block"; }); diff --git a/frontend/shared/utils.js b/frontend/shared/utils.js index d3c1964..30badae 100644 --- a/frontend/shared/utils.js +++ b/frontend/shared/utils.js @@ -1,7 +1,7 @@ import { address } from "./constants.js"; export async function request(method, path, body = null) { - const token = document.cookie.match(/\bauth-token=(\S+)/); + const token = document.cookie.match(/\bauth-token=([^;\s]+)/); return new Promise((resolve, reject) => { fetch(address + path, { From b8bb86edca2e641b4ab351bdb61a3c7a4781a896 Mon Sep 17 00:00:00 2001 From: Reimar Date: Thu, 27 Mar 2025 10:47:31 +0100 Subject: [PATCH 13/24] Fix JWT bearer authentication --- backend/Api/Startup.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backend/Api/Startup.cs b/backend/Api/Startup.cs index 08a2658..e2f5857 100644 --- a/backend/Api/Startup.cs +++ b/backend/Api/Startup.cs @@ -110,6 +110,8 @@ namespace Api app.UseRouting(); + app.UseAuthentication(); + app.UseAuthorization(); app.UseEndpoints(endpoints => From f6e2c8f450d0f0cb7d252bd7f5188eedec156b42 Mon Sep 17 00:00:00 2001 From: Jeas0001 Date: Mon, 31 Mar 2025 09:19:50 +0200 Subject: [PATCH 14/24] Gets userId from the jwttoken --- backend/Api/AMQP/AMQPReciever.cs | 12 ------------ backend/Api/Controllers/DeviceController.cs | 15 +++++++++++---- backend/Api/Controllers/UserController.cs | 14 ++++++++++---- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/backend/Api/AMQP/AMQPReciever.cs b/backend/Api/AMQP/AMQPReciever.cs index 892341e..0280791 100644 --- a/backend/Api/AMQP/AMQPReciever.cs +++ b/backend/Api/AMQP/AMQPReciever.cs @@ -70,18 +70,6 @@ namespace Api.AMQPReciever await _channel.BasicConsumeAsync(_queue, true, consumer); while (true); - - await Dispose(); - } - - // Disconnects from rabbitMQ - private async Task Dispose() - { - await _channel.CloseAsync(); - await _conn.CloseAsync(); - await _channel.DisposeAsync(); - await _conn.DisposeAsync(); - return true; } // Connects to rabbitMQ diff --git a/backend/Api/Controllers/DeviceController.cs b/backend/Api/Controllers/DeviceController.cs index 8244f8c..b8442ff 100644 --- a/backend/Api/Controllers/DeviceController.cs +++ b/backend/Api/Controllers/DeviceController.cs @@ -3,6 +3,7 @@ using Api.Models; using Api.DBAccess; using Microsoft.AspNetCore.Authorization; using Api.BusinessLogic; +using System.Security.Claims; namespace Api.Controllers { @@ -21,17 +22,23 @@ namespace Api.Controllers // Sends the userId to deviceLogic [Authorize] - [HttpGet("{userId}")] - public async Task GetDevices(int userId) + [HttpGet] + public async Task GetDevices() { + var claims = HttpContext.User.Claims; + string userIdString = claims.FirstOrDefault(c => c.Type == ClaimTypes.NameIdentifier).Value; + int userId = Convert.ToInt32(userIdString); return await _deviceLogic.GetDevices(userId); } // Sends the device and userId to deviceLogic [Authorize] - [HttpPost("adddevice/{userId}")] - public async Task AddDevice([FromBody] Device device, int userId) + [HttpPost("adddevice")] + public async Task AddDevice([FromBody] Device device) { + var claims = HttpContext.User.Claims; + string userIdString = claims.FirstOrDefault(c => c.Type == ClaimTypes.NameIdentifier).Value; + int userId = Convert.ToInt32(userIdString); return await _deviceLogic.AddDevice(device, userId); } diff --git a/backend/Api/Controllers/UserController.cs b/backend/Api/Controllers/UserController.cs index 19c90d9..ec462dc 100644 --- a/backend/Api/Controllers/UserController.cs +++ b/backend/Api/Controllers/UserController.cs @@ -37,17 +37,23 @@ namespace Api.Controllers // Sends the user and userId to userLogic [Authorize] - [HttpPut("Edit/{userId}")] - public async Task EditUser([FromBody] User user, int userId) + [HttpPut("Edit")] + public async Task EditUser([FromBody] User user) { + var claims = HttpContext.User.Claims; + string userIdString = claims.FirstOrDefault(c => c.Type == ClaimTypes.NameIdentifier).Value; + int userId = Convert.ToInt32(userIdString); return await _userLogic.EditProfile(user, userId); } // Sends the userId to userLogic [Authorize] - [HttpDelete("Delete/{userId}")] - public async Task DeleteUser(int userId) + [HttpDelete("Delete")] + public async Task DeleteUser() { + var claims = HttpContext.User.Claims; + string userIdString = claims.FirstOrDefault(c => c.Type == ClaimTypes.NameIdentifier).Value; + int userId = Convert.ToInt32(userIdString); return await _userLogic.DeleteUser(userId); } From dd2a3cf1508c53ce320f340d762f5a584ae4f047 Mon Sep 17 00:00:00 2001 From: Reimar Date: Mon, 31 Mar 2025 09:29:55 +0200 Subject: [PATCH 15/24] Show real temperature data in frontend --- .../mockdata/temperature-logs.mockdata.js | 28 ------------------- frontend/scripts/home.js | 8 +++--- frontend/scripts/services/devices.service.js | 11 ++------ frontend/shared/utils.js | 16 ++++++----- 4 files changed, 15 insertions(+), 48 deletions(-) delete mode 100644 frontend/mockdata/temperature-logs.mockdata.js diff --git a/frontend/mockdata/temperature-logs.mockdata.js b/frontend/mockdata/temperature-logs.mockdata.js deleted file mode 100644 index e6056ae..0000000 --- a/frontend/mockdata/temperature-logs.mockdata.js +++ /dev/null @@ -1,28 +0,0 @@ -export const mockTemperatureLogs = [ - { id: 1, temperature: 18.9, date: "2025-03-19T17:00:00Z", tempHigh: 22.0, tempLow: 18.0 }, - { id: 1, temperature: 19.1, date: "2025-03-19T17:10:00Z", tempHigh: 22.0, tempLow: 18.0 }, - { id: 1, temperature: 19.5, date: "2025-03-19T17:20:00Z", tempHigh: 22.0, tempLow: 18.0 }, - { id: 1, temperature: 19.8, date: "2025-03-19T17:30:00Z", tempHigh: 22.0, tempLow: 18.0 }, - { id: 1, temperature: 20.1, date: "2025-03-19T17:40:00Z", tempHigh: 22.0, tempLow: 18.0 }, - { id: 1, temperature: 20.3, date: "2025-03-19T17:50:00Z", tempHigh: 22.0, tempLow: 18.0 }, - { id: 1, temperature: 20.6, date: "2025-03-19T18:00:00Z", tempHigh: 22.0, tempLow: 18.0 }, - { id: 1, temperature: 20.9, date: "2025-03-19T18:10:00Z", tempHigh: 22.0, tempLow: 18.0 }, - { id: 1, temperature: 20.8, date: "2025-03-19T18:20:00Z", tempHigh: 22.0, tempLow: 18.0 }, - { id: 1, temperature: 20.7, date: "2025-03-19T18:30:00Z", tempHigh: 22.0, tempLow: 18.0 }, - { id: 1, temperature: 20.5, date: "2025-03-19T18:40:00Z", tempHigh: 22.0, tempLow: 18.0 }, - { id: 1, temperature: 20.3, date: "2025-03-19T18:50:00Z", tempHigh: 22.0, tempLow: 18.0 }, - { id: 1, temperature: 20.1, date: "2025-03-19T19:00:00Z", tempHigh: 22.0, tempLow: 18.0 }, - { id: 1, temperature: 18.9, date: "2025-03-19T20:00:00Z", tempHigh: 22.0, tempLow: 18.0 }, - { id: 1, temperature: 19.1, date: "2025-03-19T20:10:00Z", tempHigh: 22.0, tempLow: 18.0 }, - { id: 1, temperature: 19.5, date: "2025-03-19T20:20:00Z", tempHigh: 22.0, tempLow: 18.0 }, - { id: 1, temperature: 19.8, date: "2025-03-19T20:30:00Z", tempHigh: 22.0, tempLow: 18.0 }, - { id: 1, temperature: 20.1, date: "2025-03-19T20:40:00Z", tempHigh: 22.0, tempLow: 18.0 }, - { id: 1, temperature: 20.3, date: "2025-03-19T20:50:00Z", tempHigh: 22.0, tempLow: 18.0 }, - { id: 1, temperature: 22.6, date: "2025-03-19T21:00:00Z", tempHigh: 22.0, tempLow: 18.0 }, - { id: 1, temperature: 22.9, date: "2025-03-19T21:10:00Z", tempHigh: 22.0, tempLow: 18.0 }, - { id: 1, temperature: 22.8, date: "2025-03-19T21:20:00Z", tempHigh: 22.0, tempLow: 18.0 }, - { id: 1, temperature: 22.7, date: "2025-03-19T21:30:00Z", tempHigh: 22.0, tempLow: 18.0 }, - { id: 1, temperature: 22.5, date: "2025-03-19T21:40:00Z", tempHigh: 22.0, tempLow: 18.0 }, - { id: 1, temperature: 23.3, date: "2025-03-19T21:50:00Z", tempHigh: 22.0, tempLow: 18.0 }, - { id: 1, temperature: 24.1, date: "2025-03-19T22:00:00Z", tempHigh: 22.0, tempLow: 18.0 }, -] diff --git a/frontend/scripts/home.js b/frontend/scripts/home.js index 01c4bf1..6e19caa 100644 --- a/frontend/scripts/home.js +++ b/frontend/scripts/home.js @@ -1,14 +1,14 @@ -import { mockTemperatureLogs } from "../mockdata/temperature-logs.mockdata.js"; // Import data import { getLogsOnDeviceId } from "./services/devices.service.js"; async function buildChart() { + // TODO change device id const data = await getLogsOnDeviceId(1); - const xValues = mockTemperatureLogs.map((log) => + const xValues = data.map((log) => new Date(log.date).toLocaleString() ); // Full Date labels - const yValues = mockTemperatureLogs.map((log) => log.temperature); // Temperature values - buildTable(mockTemperatureLogs); + const yValues = data.map((log) => log.temperature); // Temperature values + buildTable(data); new Chart("myChart", { type: "line", data: { diff --git a/frontend/scripts/services/devices.service.js b/frontend/scripts/services/devices.service.js index 5b8830f..2d6eb82 100644 --- a/frontend/scripts/services/devices.service.js +++ b/frontend/scripts/services/devices.service.js @@ -1,4 +1,5 @@ import { address } from "../../shared/constants.js"; +import { request } from "../../shared/utils.js"; export function getDevicesOnUserId(id) { fetch(`${address}/get-on-user-id`, { @@ -27,13 +28,5 @@ export function update(ids) { } export function getLogsOnDeviceId(id) { - fetch(`${address}/device/logs/${id}`, { - method: "GET", - headers: { - "Content-Type": "application/json" - }, - }) - .then(response => response.json()) - .then(data => console.log("Success:", data)) - .catch(error => console.error("Error:", error)); + return request("GET", `/device/logs/${id}`); } diff --git a/frontend/shared/utils.js b/frontend/shared/utils.js index 30badae..08c045c 100644 --- a/frontend/shared/utils.js +++ b/frontend/shared/utils.js @@ -13,17 +13,19 @@ export async function request(method, path, body = null) { body: body ? JSON.stringify(body) : undefined, }) .then(async response => { - const json = await response.json(); + try { + const json = await response.json(); - if (response.ok) return resolve(json); + if (response.ok) return resolve(json); - if (json.error) return reject(json.error); + if (json.error) return reject(json.error); - if (json.message) return reject(json.message); + if (json.message) return reject(json.message); - if (json.errors) return reject(Object.values(response.errors)[0][0]); - - reject("Request failed with HTTP code " + response.status); + if (json.errors) return reject(Object.values(json.errors)[0][0]); + } finally { + reject("Request failed with HTTP code " + response.status); + } }) .catch(err => reject(err.message)); }); From df130b312cb0648788ba78d1a91a9d7ce31787c3 Mon Sep 17 00:00:00 2001 From: Reimar Date: Mon, 31 Mar 2025 10:20:26 +0200 Subject: [PATCH 16/24] Style dashboard --- frontend/home/index.html | 37 +++++++------- frontend/scripts/home.js | 28 +++++++---- frontend/styles/home.css | 105 ++++++++++++++++++++++++--------------- 3 files changed, 102 insertions(+), 68 deletions(-) diff --git a/frontend/home/index.html b/frontend/home/index.html index 6fe912f..36b1193 100644 --- a/frontend/home/index.html +++ b/frontend/home/index.html @@ -10,27 +10,28 @@ -
-
- Home - +
+ Home + -
+
+
+
- - - - - - - - - -
NameTemperatureDateTempHighTempLow
+
+ + + + + + + + +
TemperatureDateTimeLimits
+
diff --git a/frontend/scripts/home.js b/frontend/scripts/home.js index 6e19caa..44aca18 100644 --- a/frontend/scripts/home.js +++ b/frontend/scripts/home.js @@ -1,8 +1,9 @@ import { getLogsOnDeviceId } from "./services/devices.service.js"; async function buildChart() { - // TODO change device id + // TODO change device id const data = await getLogsOnDeviceId(1); + data.sort((a, b) => new Date(b.date).getTime() - new Date(a.date).getTime()); const xValues = data.map((log) => new Date(log.date).toLocaleString() @@ -15,6 +16,7 @@ async function buildChart() { labels: xValues, datasets: [ { + label: "Temperature", fill: false, lineTension: 0.4, backgroundColor: "rgba(0,0,255,1.0)", @@ -43,28 +45,32 @@ function buildTable(data) { data.forEach((log) => { var averageTemp = (log.tempHigh + log.tempLow) / 2.0; var color; - if (log.temperature > log.tempHigh) { + if (log.temperature >= log.tempHigh) { color = "tempHigh"; } else if ( log.temperature < log.tempHigh && log.temperature > averageTemp ) { color = "tempMidHigh"; - } else if (log.temperature < log.tempLow) { + } else if (log.temperature <= log.tempLow) { color = "tempLow"; } else if (log.temperature > log.tempLow && log.temperature < averageTemp) { color = "tempMidLow"; } else { color = "tempNormal"; } - var row = ` - Name - ${log.temperature} - ${log.date} - ${log.tempHigh} - ${log.tempLow} - `; - table.innerHTML += row; + + const date = new Date(log.date).toLocaleDateString(); + const time = new Date(log.date).toLocaleTimeString(); + + table.innerHTML += ` + + ${log.temperature}°C + ${date} + ${time} + Min: ${log.tempLow}°C, Max: ${log.tempHigh}°C + + `; }); } diff --git a/frontend/styles/home.css b/frontend/styles/home.css index 9eb7fac..a90bd7a 100644 --- a/frontend/styles/home.css +++ b/frontend/styles/home.css @@ -1,79 +1,106 @@ body { - margin: 0; - font-family: Arial, Helvetica, sans-serif; + margin: 0; + font-family: Arial, Helvetica, sans-serif; + background-color: #F9F9F9; } #container { - background-color: white; - opacity: 100%; + margin: 0 2rem; } .topnav { - overflow: hidden; - background-color: #333; + overflow: hidden; + background-color: #333; } .topnav a { - float: left; - color: #f2f2f2; - text-align: center; - padding: 14px 16px; - text-decoration: none; - font-size: 17px; + float: left; + color: #f2f2f2; + text-align: center; + padding: 14px 16px; + text-decoration: none; + font-size: 17px; } .topnav a:hover { - background-color: #ddd; - color: black; + background-color: #ddd; + color: black; } .topnav a.active { - background-color: #04aa6d; - color: white; + background-color: #04aa6d; + color: white; +} + +#table-wrapper { + overflow: hidden; + border-radius: 8px; + box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.1); + border: 1px solid #DDD; } table { - font-family: arial, sans-serif; - border-collapse: collapse; - width: 100%; + font-family: arial, sans-serif; + border-collapse: collapse; + width: 100%; + background-color: white; + color: #616161; } td, th { - border: 1px solid #dddddd; - text-align: left; - padding: 8px; + border-right: 1px solid #DDD; + border-bottom: 1px solid #DDD; + text-align: left; + padding: 8px; +} + +th { + border-bottom: 2px solid #DDD; } tr:nth-child(even) { - background-color: #dddddd; + background-color: #F5F5F5; +} + +table .temperature { + text-align: center; + color: white; + font-weight: bold; + width: 20px; +} +table tr:not(:last-child) .temperature { + border-bottom-color: white; } .tempHigh { - color: #ff0000; - width: 20px; + background-color: #ff0000; } - .tempMidHigh { - color: #fffb00; - width: 20px; + background-color: #FFA000; } - .tempNormal { - color: #02ed26; - width: 20px; + background-color: #AAA; } - .tempMidLow { - color: #16fae7; - width: 20px; + background-color: #64B5F6; } - .tempLow { - color: #0004ff; - width: 20px; + background-color: #3F51B5; } -.chartContainer{ - margin: 20px; +.low-limit { + color: #3F51B5; } +.high-limit { + color: #F00; +} + +.chart-container { + margin: 2rem 0; + background-color: white; + border-radius: 8px; + border: 1px solid #DDD; + box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.1); +} + From 6fe0841cbc2aecd03dd040eff529a7c1bd206eeb Mon Sep 17 00:00:00 2001 From: Reimar Date: Mon, 31 Mar 2025 10:31:57 +0200 Subject: [PATCH 17/24] Add error handling on dashboard --- frontend/home/index.html | 6 ++++-- frontend/login/index.html | 3 ++- frontend/register/index.html | 3 ++- frontend/scripts/home.js | 14 ++++++++++---- frontend/styles/auth.css | 10 ---------- frontend/styles/common.css | 9 ++++++++- frontend/styles/home.css | 4 ++++ 7 files changed, 30 insertions(+), 19 deletions(-) diff --git a/frontend/home/index.html b/frontend/home/index.html index 36b1193..ae98704 100644 --- a/frontend/home/index.html +++ b/frontend/home/index.html @@ -4,9 +4,10 @@ Temperature-Alarm-Web - - + + + @@ -33,6 +34,7 @@
+
diff --git a/frontend/login/index.html b/frontend/login/index.html index 4b22dea..fef2c91 100644 --- a/frontend/login/index.html +++ b/frontend/login/index.html @@ -4,6 +4,7 @@ Login - Temperature alarm + @@ -28,7 +29,7 @@
-
+
diff --git a/frontend/register/index.html b/frontend/register/index.html index 666fe02..921cea8 100644 --- a/frontend/register/index.html +++ b/frontend/register/index.html @@ -4,6 +4,7 @@ Register - Temperature Alarm + @@ -33,7 +34,7 @@ -
+
diff --git a/frontend/scripts/home.js b/frontend/scripts/home.js index 44aca18..e51e563 100644 --- a/frontend/scripts/home.js +++ b/frontend/scripts/home.js @@ -1,8 +1,6 @@ import { getLogsOnDeviceId } from "./services/devices.service.js"; -async function buildChart() { - // TODO change device id - const data = await getLogsOnDeviceId(1); +async function buildChart(data) { data.sort((a, b) => new Date(b.date).getTime() - new Date(a.date).getTime()); const xValues = data.map((log) => @@ -74,4 +72,12 @@ function buildTable(data) { }); } -buildChart(); +// TODO change device id +getLogsOnDeviceId(1) + .then(buildChart) + .catch(err => { + document.getElementById("error").innerText = err; + document.getElementById("error").style.display = "block"; + document.getElementById("container").style.display = "none"; + }); + diff --git a/frontend/styles/auth.css b/frontend/styles/auth.css index bb7a66a..7ddf7ce 100644 --- a/frontend/styles/auth.css +++ b/frontend/styles/auth.css @@ -39,16 +39,6 @@ button:hover { margin-top: 0.5rem; } -#form-error { - display: none; - background-color: #FFCDD2; - color: #C62828; - border: 1px solid #C62828; - border-radius: 4px; - padding: 1rem 2rem; - margin-top: 1rem; -} - button{ border-radius: 20px; } diff --git a/frontend/styles/common.css b/frontend/styles/common.css index a4742c3..4de8cbb 100644 --- a/frontend/styles/common.css +++ b/frontend/styles/common.css @@ -1,3 +1,10 @@ .error { - background-color: #EF9A9A; + display: none; + background-color: #FFCDD2; + color: #C62828; + border: 1px solid #C62828; + border-radius: 4px; + padding: 1rem 2rem; + margin-top: 1rem; } + diff --git a/frontend/styles/home.css b/frontend/styles/home.css index a90bd7a..0f1fd03 100644 --- a/frontend/styles/home.css +++ b/frontend/styles/home.css @@ -104,3 +104,7 @@ table tr:not(:last-child) .temperature { box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.1); } +#error { + margin: 2rem; +} + From 9dc19efd8378e74071392d4d454edeac000c4172 Mon Sep 17 00:00:00 2001 From: Jeas0001 Date: Mon, 31 Mar 2025 10:39:07 +0200 Subject: [PATCH 18/24] Removed unnessesary usings and added a datetimerange for getting logs --- backend/Api/AMQP/AMQPPublisher.cs | 2 -- backend/Api/AMQP/AMQPReciever.cs | 1 - backend/Api/BusinessLogic/DeviceLogic.cs | 15 ++++++++++++--- backend/Api/BusinessLogic/UserLogic.cs | 1 - backend/Api/Controllers/DeviceController.cs | 4 ++-- backend/Api/Controllers/UserController.cs | 4 ---- backend/Api/DBAccess/DBAccess.cs | 11 ++++------- backend/Api/Models/DateTimeRange.cs | 9 +++++++++ backend/Api/Program.cs | 1 - 9 files changed, 27 insertions(+), 21 deletions(-) create mode 100644 backend/Api/Models/DateTimeRange.cs diff --git a/backend/Api/AMQP/AMQPPublisher.cs b/backend/Api/AMQP/AMQPPublisher.cs index 60bb0a4..be883f1 100644 --- a/backend/Api/AMQP/AMQPPublisher.cs +++ b/backend/Api/AMQP/AMQPPublisher.cs @@ -1,9 +1,7 @@ using Api.DBAccess; using Api.Models; -using Microsoft.IdentityModel.Tokens; using RabbitMQ.Client; using RabbitMQ.Client.Events; -using System.Security.Cryptography; using System.Text; using System.Text.Json; diff --git a/backend/Api/AMQP/AMQPReciever.cs b/backend/Api/AMQP/AMQPReciever.cs index 0280791..215f956 100644 --- a/backend/Api/AMQP/AMQPReciever.cs +++ b/backend/Api/AMQP/AMQPReciever.cs @@ -4,7 +4,6 @@ using RabbitMQ.Client; using RabbitMQ.Client.Events; using System.Text; using System.Text.Json; -using System.Threading.Channels; namespace Api.AMQPReciever { diff --git a/backend/Api/BusinessLogic/DeviceLogic.cs b/backend/Api/BusinessLogic/DeviceLogic.cs index 27ab67a..ae4be2c 100644 --- a/backend/Api/BusinessLogic/DeviceLogic.cs +++ b/backend/Api/BusinessLogic/DeviceLogic.cs @@ -1,7 +1,6 @@ using Api.DBAccess; using Api.Models; using Microsoft.AspNetCore.Mvc; -using static System.Runtime.InteropServices.JavaScript.JSType; namespace Api.BusinessLogic { @@ -54,10 +53,12 @@ namespace Api.BusinessLogic /// /// Checks if the device exist that is trying to be read from /// Gets the logs and checks if there are any in the list + /// Checks if the datetimeRange have 2 values that are the same bc that means they want all logs + /// Then it makes a new list with all data that are in the range of the 2 datetimes /// /// The deviceId that you want from the logs /// returns the logs in a OkObjectResult and if there is some error it returns a ConflictObjectResult and a message that explain the reason - public async Task GetLogs(int deviceId) + public async Task GetLogs(DateTimeRange dateTimeRange, int deviceId) { var device = await _dbAccess.ReadDevice(deviceId); @@ -67,7 +68,15 @@ namespace Api.BusinessLogic if (logs.Count == 0) { return new ConflictObjectResult(new { message = "Could not find any logs connected to the device" }); } - return new OkObjectResult(logs); + if (dateTimeRange.DateTimeStart == dateTimeRange.DateTimeEnd) { return new OkObjectResult(logs); } + + List rangedLogs = new List(); + foreach (var log in logs) + { + if (log.Date <= dateTimeRange.DateTimeStart && log.Date >= dateTimeRange.DateTimeEnd) { rangedLogs.Add(log); } + } + + return new OkObjectResult(rangedLogs); } /// diff --git a/backend/Api/BusinessLogic/UserLogic.cs b/backend/Api/BusinessLogic/UserLogic.cs index d8dcf13..a39a83c 100644 --- a/backend/Api/BusinessLogic/UserLogic.cs +++ b/backend/Api/BusinessLogic/UserLogic.cs @@ -1,6 +1,5 @@ using Api.DBAccess; using Api.Models; -using Microsoft.AspNetCore.Http.HttpResults; using Microsoft.AspNetCore.Mvc; using Microsoft.IdentityModel.Tokens; using System.IdentityModel.Tokens.Jwt; diff --git a/backend/Api/Controllers/DeviceController.cs b/backend/Api/Controllers/DeviceController.cs index b8442ff..7cee3ad 100644 --- a/backend/Api/Controllers/DeviceController.cs +++ b/backend/Api/Controllers/DeviceController.cs @@ -45,9 +45,9 @@ namespace Api.Controllers // Sends the deviceId to deviceLogic [Authorize] [HttpGet("logs/{deviceId}")] - public async Task GetLogs(int deviceId) + public async Task GetLogs([FromBody] DateTimeRange dateTimeRange, int deviceId) { - return await _deviceLogic.GetLogs(deviceId); + return await _deviceLogic.GetLogs(dateTimeRange, deviceId); } // Sends the deviceId to deviceLogic diff --git a/backend/Api/Controllers/UserController.cs b/backend/Api/Controllers/UserController.cs index ec462dc..510cd79 100644 --- a/backend/Api/Controllers/UserController.cs +++ b/backend/Api/Controllers/UserController.cs @@ -1,10 +1,6 @@ using Microsoft.AspNetCore.Mvc; using Api.Models; -using Api.DBAccess; -using Microsoft.IdentityModel.Tokens; -using System.IdentityModel.Tokens.Jwt; using System.Security.Claims; -using System.Text; using Microsoft.AspNetCore.Authorization; using Api.BusinessLogic; diff --git a/backend/Api/DBAccess/DBAccess.cs b/backend/Api/DBAccess/DBAccess.cs index 012f86d..a3882ae 100644 --- a/backend/Api/DBAccess/DBAccess.cs +++ b/backend/Api/DBAccess/DBAccess.cs @@ -1,10 +1,6 @@ using Microsoft.EntityFrameworkCore; using Api.Models; -using System.Text; -using System.Runtime.Intrinsics.Arm; -using System.Security.Cryptography; using Microsoft.AspNetCore.Mvc; -using static System.Runtime.InteropServices.JavaScript.JSType; namespace Api.DBAccess @@ -81,6 +77,7 @@ namespace Api.DBAccess return await _context.Users.FirstOrDefaultAsync(u => u.RefreshToken == refreshToken); } + // Updates the refreshtoken saved in DB public async void UpdatesRefreshToken(string refreshToken, int userId) { var user = await _context.Users.FirstOrDefaultAsync(u => u.Id == userId); @@ -190,14 +187,14 @@ namespace Api.DBAccess return new ConflictObjectResult(new { message = "Could not save to database" }); } - - // Returns a device according to userID + + // Returns a device according to deviceId public async Task ReadDevice(int deviceId) { return await _context.Devices.FirstOrDefaultAsync(d => d.Id == deviceId); } - // Returns a device according to userID + // Returns a device according to refenreId public Device ReadDevice(string refenreId) { return _context.Devices.FirstOrDefault(d => d.ReferenceId == refenreId); diff --git a/backend/Api/Models/DateTimeRange.cs b/backend/Api/Models/DateTimeRange.cs new file mode 100644 index 0000000..018df76 --- /dev/null +++ b/backend/Api/Models/DateTimeRange.cs @@ -0,0 +1,9 @@ +namespace Api.Models +{ + public class DateTimeRange + { + public DateTime DateTimeStart { get; set; } + + public DateTime DateTimeEnd { get; set; } + } +} diff --git a/backend/Api/Program.cs b/backend/Api/Program.cs index e2bce37..fc7a5e3 100644 --- a/backend/Api/Program.cs +++ b/backend/Api/Program.cs @@ -5,7 +5,6 @@ using Api.DBAccess; using Api.MQTTReciever; using Microsoft.AspNetCore; using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.Configuration; class Program { From fe85e1ff2350354c9d7641d7a101cbe5f58f65e1 Mon Sep 17 00:00:00 2001 From: Reimar Date: Mon, 31 Mar 2025 10:38:07 +0200 Subject: [PATCH 19/24] Add JS constants to gitignore --- frontend/.gitignore | 2 ++ frontend/shared/constants.example.js | 3 +++ frontend/shared/constants.js | 1 - 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 frontend/.gitignore create mode 100644 frontend/shared/constants.example.js delete mode 100644 frontend/shared/constants.js diff --git a/frontend/.gitignore b/frontend/.gitignore new file mode 100644 index 0000000..1ebdc24 --- /dev/null +++ b/frontend/.gitignore @@ -0,0 +1,2 @@ +shared/constants.js + diff --git a/frontend/shared/constants.example.js b/frontend/shared/constants.example.js new file mode 100644 index 0000000..440c1b3 --- /dev/null +++ b/frontend/shared/constants.example.js @@ -0,0 +1,3 @@ +//export const address = "https://temperature.mercantec.tech/api" +export const address = "http://localhost:5000/api"; + diff --git a/frontend/shared/constants.js b/frontend/shared/constants.js deleted file mode 100644 index a21da0c..0000000 --- a/frontend/shared/constants.js +++ /dev/null @@ -1 +0,0 @@ -export const address = "hhttps://temperature.mercantec.tech/api" From d9205d425c5aa30e0e0e56ed7fc0d5617cdd3e87 Mon Sep 17 00:00:00 2001 From: Jeas0001 Date: Mon, 31 Mar 2025 10:48:20 +0200 Subject: [PATCH 20/24] Datetime ranged have any logs --- backend/Api/BusinessLogic/DeviceLogic.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backend/Api/BusinessLogic/DeviceLogic.cs b/backend/Api/BusinessLogic/DeviceLogic.cs index ae4be2c..4f0eb50 100644 --- a/backend/Api/BusinessLogic/DeviceLogic.cs +++ b/backend/Api/BusinessLogic/DeviceLogic.cs @@ -76,6 +76,8 @@ namespace Api.BusinessLogic if (log.Date <= dateTimeRange.DateTimeStart && log.Date >= dateTimeRange.DateTimeEnd) { rangedLogs.Add(log); } } + if (rangedLogs.Count == 0) { return new ConflictObjectResult(new { message = "There is no logs for that periode" }); } + return new OkObjectResult(rangedLogs); } From 668b29c0683e5e2b65a3f507678fac010639b005 Mon Sep 17 00:00:00 2001 From: Jeas0001 Date: Mon, 31 Mar 2025 10:50:21 +0200 Subject: [PATCH 21/24] Undid last commit from me --- backend/Api/BusinessLogic/DeviceLogic.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/backend/Api/BusinessLogic/DeviceLogic.cs b/backend/Api/BusinessLogic/DeviceLogic.cs index 4f0eb50..ae4be2c 100644 --- a/backend/Api/BusinessLogic/DeviceLogic.cs +++ b/backend/Api/BusinessLogic/DeviceLogic.cs @@ -76,8 +76,6 @@ namespace Api.BusinessLogic if (log.Date <= dateTimeRange.DateTimeStart && log.Date >= dateTimeRange.DateTimeEnd) { rangedLogs.Add(log); } } - if (rangedLogs.Count == 0) { return new ConflictObjectResult(new { message = "There is no logs for that periode" }); } - return new OkObjectResult(rangedLogs); } From e2dd9d9e6eb89611adff543f1ae6c5fb9dc46683 Mon Sep 17 00:00:00 2001 From: Reimar Date: Mon, 31 Mar 2025 11:00:11 +0200 Subject: [PATCH 22/24] Fix cookie path --- frontend/scripts/login.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/scripts/login.js b/frontend/scripts/login.js index 74a8f33..68e7048 100644 --- a/frontend/scripts/login.js +++ b/frontend/scripts/login.js @@ -10,7 +10,7 @@ document.getElementById("loginForm").addEventListener("submit", function(event) login(emailOrUsername, password) .then(response => { - document.cookie = `auth-token=${response.token}`; + document.cookie = `auth-token=${response.token}; Path=/`; localStorage.setItem("user", { id: response.id, From fb3705690d0d7075386517a80d66cbd92d2ec53e Mon Sep 17 00:00:00 2001 From: Reimar Date: Mon, 31 Mar 2025 11:03:38 +0200 Subject: [PATCH 23/24] Don't send undefined content type in frontend --- frontend/shared/utils.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/frontend/shared/utils.js b/frontend/shared/utils.js index 08c045c..f6a17c7 100644 --- a/frontend/shared/utils.js +++ b/frontend/shared/utils.js @@ -3,13 +3,16 @@ import { address } from "./constants.js"; export async function request(method, path, body = null) { const token = document.cookie.match(/\bauth-token=([^;\s]+)/); + const headers = {}; + if (body) + headers["Content-Type"] = "application/json"; + if (token?.length > 1) + headers["Authorization"] = `Bearer ${token[1]}`; + return new Promise((resolve, reject) => { fetch(address + path, { method, - headers: { - "Content-Type": body ? "application/json" : undefined, - "Authorization": token?.length > 1 ? `Bearer ${token[1]}` : undefined, - }, + headers, body: body ? JSON.stringify(body) : undefined, }) .then(async response => { From 6cb36947cbaeb04aeb6c56548e5f3d8d834253f9 Mon Sep 17 00:00:00 2001 From: Jeas0001 Date: Mon, 31 Mar 2025 11:16:16 +0200 Subject: [PATCH 24/24] Made the datetime optional --- backend/Api/Controllers/DeviceController.cs | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/backend/Api/Controllers/DeviceController.cs b/backend/Api/Controllers/DeviceController.cs index 7cee3ad..67727b3 100644 --- a/backend/Api/Controllers/DeviceController.cs +++ b/backend/Api/Controllers/DeviceController.cs @@ -45,8 +45,19 @@ namespace Api.Controllers // Sends the deviceId to deviceLogic [Authorize] [HttpGet("logs/{deviceId}")] - public async Task GetLogs([FromBody] DateTimeRange dateTimeRange, int deviceId) + public async Task GetLogs(int deviceId, DateTime? dateTimeStart = null, DateTime? dateTimeEnd = null) { + DateTimeRange dateTimeRange = new DateTimeRange(); + if (dateTimeStart != null && dateTimeEnd != null) + { + dateTimeRange.DateTimeStart = (DateTime)dateTimeStart; + dateTimeRange.DateTimeEnd= (DateTime)dateTimeEnd; + } + else + { + dateTimeRange.DateTimeStart = DateTime.Now; + dateTimeRange.DateTimeEnd = dateTimeRange.DateTimeStart; + } return await _deviceLogic.GetLogs(dateTimeRange, deviceId); }