Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 8 insertions, 28 deletions

diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
index 22feb29c1..2c1c27f52 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
@@ -390,7 +390,11 @@ namespace Tango.MachineService.Controllers
                     if (hasDatabaseUpdates)
                     {
                         response.IsDatabaseUpdateAvailable = true;
-                        response.UpdateDBResponse = UpdateDB(new UpdateDBRequest() { SerialNumber = request.SerialNumber });
+                        response.UpdateDBResponse = UpdateDB(new UpdateDBRequest()
+                        {
+                            ApplicationVersion = request.Version,
+                            FirmwareVersion = request.FirmwareVersion
+                        });
                     }
 
                     //Compare database
@@ -507,8 +511,6 @@ namespace Tango.MachineService.Controllers
                 });
             }
 
-            User machineUser = null;
-
             try
             {
                 using (ObservablesContext db = ObservablesContextHelper.CreateContext())
@@ -519,26 +521,6 @@ namespace Tango.MachineService.Controllers
                     {
                         throw new AuthenticationException("The specified machine could not be found.");
                     }
-
-                    machineUser = db.Users.Include(x => x.Contact).SingleOrDefault(x => x.Contact.FirstName == machine.Name);
-
-                    if (machineUser == null)
-                    {
-                        //No machine user then create one.
-                        machineUser = new User();
-                        machineUser.Email = machine.SerialNumber + "@twine-s.com";
-                        machineUser.Password = machine.SerialNumber;
-                        machineUser.OrganizationGuid = machine.OrganizationGuid;
-                        machineUser.Contact = new Contact();
-                        machineUser.Contact.Email = machineUser.Email;
-                        machineUser.Contact.FirstName = machine.Name;
-                        machineUser.Contact.LastName = machine.Name;
-                        machineUser.Contact.FullName = machine.Name;
-                        machineUser.Address = new Address();
-
-                        db.Users.Add(machineUser);
-                        db.SaveChanges();
-                    }
                 }
 
                 //Insert/Replace Jobs.
@@ -551,7 +533,6 @@ namespace Tango.MachineService.Controllers
                             var job = dto.ToObservable();
 
                             job.ID = 0;
-                            job.UserGuid = machineUser.Guid;
                             job.CustomerGuid = null;
                             job.IsSynchronized = true;
 
@@ -564,6 +545,7 @@ namespace Tango.MachineService.Controllers
                             }
                             else if (job.LastUpdated > existingJob.LastUpdated)
                             {
+                                job.UserGuid = existingJob.UserGuid;
                                 existingJob.Delete(db);
                                 db.Jobs.Add(job);
                                 db.SaveChanges();
@@ -589,7 +571,6 @@ namespace Tango.MachineService.Controllers
                         {
                             var run = dto.ToObservable();
                             run.ID = 0;
-                            run.UserGuid = machineUser.Guid;
                             run.IsSynchronized = true;
 
                             if (db.JobRuns.SingleOrDefault(x => x.Guid == run.Guid) == null)
@@ -618,7 +599,6 @@ namespace Tango.MachineService.Controllers
                         {
                             var ev = dto.ToObservable();
                             ev.ID = 0;
-                            ev.UserGuid = machineUser.Guid;
                             ev.IsSynchronized = true;
 
                             if (db.MachinesEvents.SingleOrDefault(x => x.Guid == ev.Guid) == null)
@@ -959,11 +939,11 @@ namespace Tango.MachineService.Controllers
                 }
                 else if (request.Mode == LoginMode.Machine)
                 {
-                    var machine = db.Machines.SingleOrDefault(x => x.SerialNumber == request.SerialNumber);
+                    var machine = db.Machines.SingleOrDefault(x => x.SerialNumber == request.SerialNumber || x.Guid == request.MachineGuid);
 
                     if (machine == null)
                     {
-                        throw new AuthenticationException("Invalid serial number.");
+                        throw new AuthenticationException("Invalid machine serial number or id.");
                     }
 
                     response.AccessToken = WebToken<TokenObject>.CreateNew(MachineServiceConfig.JWT_TOKEN_SECRET, new TokenObject()