From 45829a9fb6f4b0d4443e22c972cf8543be533d4e Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Mon, 18 Feb 2019 18:16:24 +0200
Subject: Working on Tokens Manager.

---
 .../Controllers/MachineStudioController.cs                    |  2 +-
 .../Web/Tango.MachineService/Controllers/PPCController.cs     | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'Software/Visual_Studio/Web/Tango.MachineService/Controllers')

diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs
index 142980fdd..98ea8d827 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs
@@ -347,7 +347,7 @@ namespace Tango.MachineService.Controllers
                     Password = request.Password,
                 },
 
-                AccessToken = TokensManager.CreateNew(user.Guid),
+                AccessToken = TokensManager.GetOrCreate(user.Guid),
                 VersionChangeRequired = versionChangeRequired,
                 RequiredVersion = requiredVersion,
             };
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
index af861923c..064a44fdb 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
@@ -31,11 +31,16 @@ namespace Tango.MachineService.Controllers
         private static List<PPCPendingUpload> _pendingUploads;
         private ActiveDirectoryManager _ad_manager;
 
-        public class TokenObject
+        public class TokenObject : IEquatable<TokenObject>
         {
             public LoginMode Mode { get; set; }
             public String UserGuid { get; set; }
             public String MachineGuid { get; set; }
+
+            public bool Equals(TokenObject other)
+            {
+                return UserGuid == other.UserGuid || MachineGuid == MachineGuid;
+            }
         }
 
         public static TokensManager<TokenObject> TokensManager { get; set; }
@@ -434,7 +439,7 @@ namespace Tango.MachineService.Controllers
                         throw new AuthenticationException("Domain user found but the database entry validation failed.");
                     }
 
-                    response.AccessToken = TokensManager.CreateNew(new TokenObject()
+                    response.AccessToken = TokensManager.GetOrCreate(new TokenObject()
                     {
                         Mode = LoginMode.User,
                         UserGuid = user.Guid,
@@ -449,7 +454,7 @@ namespace Tango.MachineService.Controllers
                         throw new AuthenticationException("Invalid serial number.");
                     }
 
-                    response.AccessToken = TokensManager.CreateNew(new TokenObject()
+                    response.AccessToken = TokensManager.GetOrCreate(new TokenObject()
                     {
                         Mode = LoginMode.Machine,
                         UserGuid = machine.Guid,
-- 
cgit v1.3.1