Working on Tokens Manager.

1 files changed, 8 insertions, 3 deletions

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,