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

1 files changed, 18 insertions, 26 deletions

diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
index ead64fb38..912d2e5e9 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
@@ -26,30 +26,22 @@ using Tango.MachineService.Filters;
 
 namespace Tango.MachineService.Controllers
 {
-    public class PPCController : JsonController
+    public class PPCController : TangoController<PPCController.TokenObject>
     {
         private static List<PPCPendingUpload> _pendingUploads;
         private ActiveDirectoryManager _ad_manager;
 
-        public class TokenObject : IEquatable<TokenObject>
+        public class 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; }
-
         #region Constructors
 
         static PPCController()
         {
-            TokensManager = new TokensManager<TokenObject>();
             _pendingUploads = new List<PPCPendingUpload>();
         }
 
@@ -62,8 +54,8 @@ namespace Tango.MachineService.Controllers
 
         #region Setup & Update
 
-        [PPCLoginFilter]
         [HttpPost]
+        [JwtTokenFilter]
         public MachineSetupResponse MachineSetup(MachineSetupRequest request)
         {
             MachineSetupResponse response = new MachineSetupResponse();
@@ -73,7 +65,7 @@ namespace Tango.MachineService.Controllers
             using (ObservablesContext db = ObservablesContextHelper.CreateContext())
             {
                 db.Configuration.LazyLoadingEnabled = false;
-                String machine_guid = TokensManager.GetTokenObject(request.AccessToken).MachineGuid;
+                String machine_guid = RequestToken.Object.MachineGuid;
 
                 var machine = db.Machines.SingleOrDefault(x => x.Guid == machine_guid);
 
@@ -136,8 +128,8 @@ namespace Tango.MachineService.Controllers
             return response;
         }
 
-        [PPCLoginFilter]
         [HttpPost]
+        [JwtTokenFilter]
         public DownloadUpdateResponse MachineUpdate(DownloadUpdateRequest request)
         {
             DownloadUpdateResponse response = new DownloadUpdateResponse();
@@ -145,7 +137,7 @@ namespace Tango.MachineService.Controllers
             using (ObservablesContext db = ObservablesContextHelper.CreateContext())
             {
                 db.Configuration.LazyLoadingEnabled = false;
-                String machine_guid = TokensManager.GetTokenObject(request.AccessToken).MachineGuid;
+                String machine_guid = RequestToken.Object.MachineGuid;
 
                 var machine = db.Machines.SingleOrDefault(x => x.Guid == machine_guid);
 
@@ -195,15 +187,15 @@ namespace Tango.MachineService.Controllers
             return response;
         }
 
-        [PPCLoginFilter]
         [HttpPost]
+        [JwtTokenFilter]
         public CheckForUpdateResponse CheckForUpdate(CheckForUpdateRequest request)
         {
             CheckForUpdateResponse response = new CheckForUpdateResponse();
 
             using (ObservablesContext db = ObservablesContextHelper.CreateContext())
             {
-                String machine_guid = TokensManager.GetTokenObject(request.AccessToken).MachineGuid;
+                String machine_guid = RequestToken.Object.MachineGuid;
 
                 var machine = db.Machines.SingleOrDefault(x => x.Guid == machine_guid);
 
@@ -227,8 +219,8 @@ namespace Tango.MachineService.Controllers
             return response;
         }
 
-        [PPCLoginFilter]
         [HttpPost]
+        [JwtTokenFilter]
         public UpdateDBResponse UpdateDB(UpdateDBRequest request)
         {
             UpdateDBResponse response = new UpdateDBResponse();
@@ -236,7 +228,7 @@ namespace Tango.MachineService.Controllers
             using (ObservablesContext db = ObservablesContextHelper.CreateContext())
             {
 
-                String machine_guid = TokensManager.GetTokenObject(request.AccessToken).MachineGuid;
+                String machine_guid = RequestToken.Object.MachineGuid;
 
                 var machine = db.Machines.SingleOrDefault(x => x.Guid == machine_guid);
 
@@ -301,8 +293,8 @@ namespace Tango.MachineService.Controllers
             return response;
         }
 
-        [PPCLoginFilter]
         [HttpPost]
+        [JwtTokenFilter]
         public UploadVersionResponse UploadVersion(UploadVersionRequest request)
         {
             UploadVersionResponse response = new UploadVersionResponse();
@@ -315,7 +307,7 @@ namespace Tango.MachineService.Controllers
                 db.UsersRoles.ToList();
                 db.RolesPermissions.ToList();
 
-                var user_guid = TokensManager.GetTokenObject(request.AccessToken).UserGuid;
+                var user_guid = RequestToken.Object.UserGuid;
 
                 var user = new UserBuilder(db).Set(user_guid).WithRolesAndPermissions().Build();
 
@@ -369,8 +361,8 @@ namespace Tango.MachineService.Controllers
             return response;
         }
 
-        [PPCLoginFilter]
         [HttpPost]
+        [JwtTokenFilter]
         public UploadCompletedResponse NotifyUploadCompleted(UploadCompletedRequest request)
         {
             PPCPendingUpload upload = _pendingUploads.FirstOrDefault(x => x.Token == request.Token);
@@ -439,11 +431,11 @@ namespace Tango.MachineService.Controllers
                         throw new AuthenticationException("Domain user found but the database entry validation failed.");
                     }
 
-                    response.WebToken = TokensManager.GetOrCreate(new TokenObject()
+                    response.AccessToken = WebToken<TokenObject>.CreateNew(MachineServiceConfig.JWT_TOKEN_SECRET, new TokenObject()
                     {
                         Mode = LoginMode.User,
                         UserGuid = user.Guid,
-                    });
+                    }).AccessToken;
                 }
                 else if (request.Mode == LoginMode.Machine)
                 {
@@ -454,11 +446,11 @@ namespace Tango.MachineService.Controllers
                         throw new AuthenticationException("Invalid serial number.");
                     }
 
-                    response.WebToken = TokensManager.GetOrCreate(new TokenObject()
+                    response.AccessToken = WebToken<TokenObject>.CreateNew(MachineServiceConfig.JWT_TOKEN_SECRET, new TokenObject()
                     {
                         Mode = LoginMode.Machine,
-                        UserGuid = machine.Guid,
-                    });
+                        MachineGuid = machine.Guid,
+                    }).AccessToken;
                 }
             }