A lot of work !!!

1 files changed, 55 insertions, 6 deletions

diff --git a/Software/Visual_Studio/Tango.Web/Controllers/JsonController.cs b/Software/Visual_Studio/Tango.Web/Controllers/TangoController.cs
index 1fae9cccc..854d1cf96 100644
--- a/Software/Visual_Studio/Tango.Web/Controllers/JsonController.cs
+++ b/Software/Visual_Studio/Tango.Web/Controllers/TangoController.cs
@@ -10,14 +10,16 @@ using System.Web;
 using System.Web.Http;
 using System.Web.Http.Controllers;
 using Tango.Logging;
+using Tango.Transport.Web;
+using Tango.Web.Authentication;
 
 namespace Tango.Web.Controllers
 {
-    public class JsonController : ApiController
+    public class TangoController : ApiController
     {
         protected LogManager LogManager { get; private set; }
 
-        public JsonController()
+        public TangoController()
         {
             LogManager = LogManager.Default;
         }
@@ -43,10 +45,12 @@ namespace Tango.Web.Controllers
                 {
                     request = context.Request.Content.ReadAsStringAsync().Result;
                 }
-                catch {}
+                catch { }
 
                 LogManager.Log($"Request Received on {controllerName + "/" + actionName}: \n{request}");
 
+                OnRequestArrived(context.Request);
+
                 var result = await base.ExecuteAsync(context, cancellationToken);
                 return result;
             }
@@ -60,16 +64,61 @@ namespace Tango.Web.Controllers
                 {
                     code = HttpStatusCode.BadRequest;
                 }
-                else if (ex is AuthenticationException)
+                else if (ex is AuthenticationException || ex is TokenExpiredException)
                 {
                     code = HttpStatusCode.Unauthorized;
                 }
 
+                var httpException = new HttpResponseException(Request.CreateErrorResponse(code, ex));
+
 #if DEBUG
-                throw new HttpResponseException(Request.CreateErrorResponse(code, ex.ToString()));
+                throw httpException;
 #else
-                throw new HttpResponseException(Request.CreateErrorResponse(code, ex.FlattenMessage()));
+                //Remove Stack trace
+                var expandedException = httpException.Response.Content as System.Net.Http.ObjectContent<System.Web.Http.HttpError>;
+
+                if (expandedException != null)
+                {
+                    var expandedExceptionValues = expandedException.Value as HttpError;
+
+                    if (expandedExceptionValues != null)
+                    {
+                        expandedExceptionValues["StackTrace"] = "StackTrace not provided.";
+                    }
+                }
 #endif
+
+
+                throw httpException;
+            }
+        }
+
+        protected virtual void OnRequestArrived(HttpRequestMessage request)
+        {
+            //Do nothing.
+        }
+    }
+
+    public class TangoController<T> : TangoController where T : class
+    {
+        public WebToken<T> RequestToken { get; set; }
+
+        protected override void OnRequestArrived(HttpRequestMessage request)
+        {
+            base.OnRequestArrived(request);
+
+            var authorizationHeader = request.Headers.Authorization;
+
+            if (authorizationHeader != null && authorizationHeader.Parameter != null)
+            {
+                try
+                {
+                    RequestToken = WebToken<T>.FromToken(authorizationHeader.Parameter);
+                }
+                catch (Exception ex)
+                {
+                    throw new HttpParseException("Could not parse the provided token embedded object.", ex);
+                }
             }
         }
     }