From 51ebc673e7b617c539281b83579fc69e78b08239 Mon Sep 17 00:00:00 2001
From: Gary Sharp <discoict@outlook.com>
Date: Thu, 17 Oct 2013 11:03:54 +1100
Subject: [PATCH] Fix: Update details device during enrolment #14

---
 Disco.BI/BI/DeviceBI/Enrol.cs | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/Disco.BI/BI/DeviceBI/Enrol.cs b/Disco.BI/BI/DeviceBI/Enrol.cs
index 9ecc0906..28c1a5cd 100644
--- a/Disco.BI/BI/DeviceBI/Enrol.cs
+++ b/Disco.BI/BI/DeviceBI/Enrol.cs
@@ -1,18 +1,16 @@
-using System;
-using System.Linq;
-using System.Text.RegularExpressions;
-using Disco.BI.Interop.ActiveDirectory;
 using Disco.BI.Extensions;
-using Disco.Data.Configuration.Modules;
+using Disco.BI.Interop.ActiveDirectory;
 using Disco.Data.Repository;
 using Disco.Models.ClientServices;
 using Disco.Models.Interop.ActiveDirectory;
 using Disco.Models.Repository;
-using Tamir.SharpSsh;
-using Disco.Services.Plugins;
-using Disco.Services.Plugins.Features.CertificateProvider;
-using Disco.Services.Users;
 using Disco.Services.Authorization;
+using Disco.Services.Users;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using Tamir.SharpSsh;
 
 namespace Disco.BI.DeviceBI
 {
@@ -396,9 +394,15 @@ namespace Disco.BI.DeviceBI
                         AllowUnauthenticatedEnrol = false,
                         CreatedDate = DateTime.Now,
                         EnrolledDate = DateTime.Now,
-                        LastEnrolDate = DateTime.Now
+                        LastEnrolDate = DateTime.Now,
+                        DeviceDetails = new List<DeviceDetail>()
                     };
                     Database.Devices.Add(RepoDevice);
+
+                    if (!string.IsNullOrEmpty(Request.DeviceLanMacAddress))
+                        RepoDevice.DeviceDetails.LanMacAddress(RepoDevice, Request.DeviceLanMacAddress);
+                    if (!string.IsNullOrEmpty(Request.DeviceWlanMacAddress))
+                        RepoDevice.DeviceDetails.WLanMacAddress(RepoDevice, Request.DeviceWlanMacAddress);
                 }
                 else
                 {
@@ -414,6 +418,11 @@ namespace Disco.BI.DeviceBI
 
                     RepoDevice.DeviceModel = deviceModel;
 
+                    if (!string.IsNullOrEmpty(Request.DeviceLanMacAddress))
+                        RepoDevice.DeviceDetails.LanMacAddress(RepoDevice, Request.DeviceLanMacAddress);
+                    if (!string.IsNullOrEmpty(Request.DeviceWlanMacAddress))
+                        RepoDevice.DeviceDetails.WLanMacAddress(RepoDevice, Request.DeviceWlanMacAddress);
+
                     if (!RepoDevice.EnrolledDate.HasValue)
                         RepoDevice.EnrolledDate = DateTime.Now;
                     RepoDevice.LastEnrolDate = DateTime.Now;