From 3c197e7b2f2a81f47a1f1e2aba952d307f5ab387 Mon Sep 17 00:00:00 2001 From: Gary Sharp Date: Thu, 19 Apr 2018 17:09:34 +1000 Subject: [PATCH] Bug: Correctly write enrolment log device info --- .../Devices/Enrolment/EnrolmentLog.cs | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/Disco.Services/Devices/Enrolment/EnrolmentLog.cs b/Disco.Services/Devices/Enrolment/EnrolmentLog.cs index bf11ff44..f123615f 100644 --- a/Disco.Services/Devices/Enrolment/EnrolmentLog.cs +++ b/Disco.Services/Devices/Enrolment/EnrolmentLog.cs @@ -2,6 +2,7 @@ using Disco.Services.Logging; using Disco.Services.Logging.Models; using System.Collections.Generic; +using System.Linq; namespace Disco.Services.Devices.Enrolment { @@ -106,7 +107,22 @@ namespace Disco.Services.Devices.Enrolment } public static void LogSessionDeviceInfo(string SessionId, Enrol Request) { - EnrolmentLog.LogSessionDeviceInfo(SessionId, Request.SerialNumber, Request.Hardware.UUID, Request.ComputerName, null, null, Request.Hardware.Manufacturer, Request.Hardware.Model, Request.Hardware.ModelType); + EnrolmentLog.LogSessionDeviceInfo( + SessionId, + Request.SerialNumber, + Request.Hardware.UUID, + Request.ComputerName, + Request.Hardware?.NetworkAdapters? + .Where(a => !a.IsWlanAdapter) + .Select(a => a.MACAddress) + .Aggregate((string)null, (s, m) => $"{s}{m};")?.TrimEnd(';') ?? null, + Request.Hardware?.NetworkAdapters? + .Where(a => a.IsWlanAdapter) + .Select(a => a.MACAddress) + .Aggregate((string)null, (s, m) => $"{s}{m};")?.TrimEnd(';') ?? null, + Request.Hardware.Manufacturer, + Request.Hardware.Model, + Request.Hardware.ModelType); } public static void LogSessionProgress(string SessionId, int Progress, string Status)