Improved configuration

Added signalR auth
2017-12-01 17:18:18 +01:00
parent 46c34f46e8
commit a05c3aeb85
32 changed files with 544 additions and 216 deletions
@@ -9,8 +9,25 @@ namespace Step.Config
            WRITE
        } 

-        public static string ROLE_LEVEL_KEY = "roleLevel";
-        public static string USERNAME_KEY = "username";
-        public static string ID_KEY = "id";
+        // Token fields Keys
+        public const string ROLE_LEVEL_KEY = "roleLevel";
+        public const string USERNAME_KEY = "username";
+        public const string ID_KEY = "id";
+
+        // Names in the xml file
+        public const string SERVER_CONFIG_KEY = "serverConfig";
+        public const string NC_CONFIG_KEY = "ncConfig";
+        public const string AREAS_CONFIG_KEY = "areasConfig";
+
+        public static class AREAS
+        {
+            public const string PRODUCTION_KEY = "production";
+            public const string TOOLING_KEY = "tooling";
+            public const string REPORT_KEY = "report";
+            public const string ALARMS_KEY = "alarms";
+            public const string MAINTENANCE_KEY = "maintenance";
+            public const string UTILITIES_KEY = "utilities";
+            public const string SCADA_KEY = "scada";
+        }
    }
 }
@@ -9,7 +9,8 @@ namespace Step.Config
 {
    public static class StartupConfig
    {
-        public static GenericConfigModel genericConfig;
+        public static ServerConfigModel serverConfig;
+        public static NcConfigModel ncConfig;

        public static AreasConfigModel productionConfig;
        public static AreasConfigModel toolingConfig;
@@ -6,13 +6,14 @@ using System.Xml.Linq;
 using System.Linq;
 using static Step.Config.StartupConfig;
 using Step.Model.ConfigModels;
+using static Step.Config.Constants;

 namespace Step.Config
 {
-    public class StartupConfigController
+    public static class StartupConfigController
+    {
+        public static void ReadStartupConfig()
    {
-        public static void ReadStartUpConfig()
-        {
            // Read validation file
            XmlSchemaSet readerSettings = new XmlSchemaSet();
            // Add Schema
@@ -22,60 +23,71 @@ namespace Step.Config
            // Validate file
            xmlConfigFile.Validate(readerSettings, ValidationHandler);

-            // Read generic config with LINQ
-            genericConfig = xmlConfigFile
-                .Descendants("generalConfig")
-                .Select(x => new GenericConfigModel()
+            // Read nc Config with LINQ
+            ncConfig = xmlConfigFile
+                .Descendants(NC_CONFIG_KEY)
+                .Select(x => new NcConfigModel()
                {
-                    Language = x.Element("language").Value,
-                    ServerPort = Convert.ToInt32(x.Element("serverPort").Value),
-                    NcVendor = Convert.ToInt32(x.Element("NcVendor").Value),
-                    NcIpAddress = x.Element("NcIpAddress").Value,
-                    NcPort = Convert.ToInt32(x.Element("NcPort").Value)
+                    NcVendor = Convert.ToInt32(x.Element("ncVendor").Value),
+                    NcIpAddress = x.Element("ncIpAddress").Value,
+                    NcPort = Convert.ToInt32(x.Element("ncPort").Value)
                }).FirstOrDefault();

+            // Read server config with LINQ and save into static config
+            serverConfig = xmlConfigFile
+                .Descendants(SERVER_CONFIG_KEY)
+                .Select(x => new ServerConfigModel()
+                {   // Set server config model data
+                Language = x.Element("language").Value,
+                    ServerPort = Convert.ToInt32(x.Element("serverPort").Value),
+                    EnableDirectoryBrowsing = Convert.ToBoolean(x.Element("enableDirectoryBrowsing").Value)
+                }).FirstOrDefault();
+
+            // Read areas config with LINQ
            xmlConfigFile
-                .Descendants("areasConfig")
+                .Descendants(AREAS_CONFIG_KEY) // Get areas config node
                .Elements()
                .ToList()
-                .ForEach(x => addKeyValue(x));
+                .ForEach(x => SetAreaValueByName(x)); // Loop through elements
        }

-        private static void addKeyValue(XElement element)
+        private static void SetAreaValueByName(XElement element)
        {
+            // Choose which area to be set
            switch (element.Name.ToString())
            {
-                case "production":
-                        SetAreasConfigValue(ref productionConfig, element);
+                case AREAS.PRODUCTION_KEY:
+                        SetAreaValue(ref productionConfig, element);
                    break;
-                case "tooling":
-                        SetAreasConfigValue(ref toolingConfig, element);
+                case AREAS.TOOLING_KEY:
+                        SetAreaValue(ref toolingConfig, element);
                    break;
-                case "report":
-                        SetAreasConfigValue(ref reportConfig, element);
+                case AREAS.REPORT_KEY:
+                        SetAreaValue(ref reportConfig, element);
                    break;
-                case "alarms":
-                        SetAreasConfigValue(ref alarmsConfig, element);
+                case AREAS.ALARMS_KEY:
+                        SetAreaValue(ref alarmsConfig, element);
                    break;
-                case "maintenance":
-                        SetAreasConfigValue(ref maintenanceConfig, element);
+                case AREAS.MAINTENANCE_KEY:
+                        SetAreaValue(ref maintenanceConfig, element);
                    break;
-                case "utilities":
-                        SetAreasConfigValue(ref utilitiesConfig, element);
+                case AREAS.UTILITIES_KEY:
+                        SetAreaValue(ref utilitiesConfig, element);
                    break;
-                case "scada":
-                        SetAreasConfigValue(ref scadaConfig, element);
+                case AREAS.SCADA_KEY:
+                        SetAreaValue(ref scadaConfig, element);
                    break;
            }
        }

-        private static void SetAreasConfigValue (ref AreasConfigModel areasConfig, XElement element)
+        private static void SetAreaValue (ref AreasConfigModel areasConfig, XElement element)
        {
+            // Set area model with xml data
            areasConfig = new AreasConfigModel()
            {
-                name = element.Name.ToString(),
-                enabled = Convert.ToBoolean(element.Element("enabled").Value),
-                allowExternalBrowser = Convert.ToBoolean(element.Element("allowExternalBrowser").Value)
+                Name = element.Name.ToString(),
+                Enabled = Convert.ToBoolean(element.Element("enabled").Value),
+                AllowExternalBrowser = Convert.ToBoolean(element.Element("allowExternalBrowser").Value)
            };
        }

@@ -92,5 +104,28 @@ namespace Step.Config
                Console.WriteLine(e.Message);
            }
        }
+
+        public static bool CheckAreaStatus(string areaName)
+        {   // Get Area status ( enabled field) by name
+            switch (areaName)
+            {
+                case AREAS.PRODUCTION_KEY:
+                    return productionConfig.Enabled;
+                case AREAS.TOOLING_KEY:
+                    return toolingConfig.Enabled;
+                case AREAS.REPORT_KEY:
+                    return productionConfig.Enabled;
+                case AREAS.ALARMS_KEY:
+                    return alarmsConfig.Enabled;
+                case AREAS.MAINTENANCE_KEY:
+                    return maintenanceConfig.Enabled;
+                case AREAS.UTILITIES_KEY:
+                    return utilitiesConfig.Enabled;
+                case AREAS.SCADA_KEY:
+                    return scadaConfig.Enabled;
+                default:
+                    return false;
+            }
+        }
    }
 }
@@ -58,5 +58,10 @@
      <Name>Step.Model</Name>
    </ProjectReference>
  </ItemGroup>
+  <ItemGroup>
+    <Content Include="startupConfig.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+	<ncConfig>
+		    <ncPort>8080</ncPort>
+		    <ncVendor>1</ncVendor>
+		    <ncIpAddress>127.0.0.1</ncIpAddress>
+	</ncConfig>
+  <serverConfig>
+    <serverPort>9000</serverPort>
+    <language>ita</language>
+    <enableDirectoryBrowsing>true</enableDirectoryBrowsing>
+  </serverConfig>
+  <areasConfig>
+    <production>
+      <enabled>true</enabled>
+      <allowExternalBrowser>false</allowExternalBrowser>
+    </production>
+    <tooling>
+      <enabled>false</enabled>
+	  <allowExternalBrowser>false</allowExternalBrowser>
+    </tooling>
+    <report>
+      <enabled>true</enabled>
+      <allowExternalBrowser>true</allowExternalBrowser>
+    </report>
+    <alarms>
+      <enabled>false</enabled>
+      <allowExternalBrowser>true</allowExternalBrowser>
+    </alarms>
+    <maintenance>
+      <enabled>true</enabled>
+      <allowExternalBrowser>false</allowExternalBrowser>
+    </maintenance>
+    <utilities>
+      <enabled>true</enabled>
+      <allowExternalBrowser>false</allowExternalBrowser>
+    </utilities>
+    <scada>
+      <enabled>false</enabled>
+      <allowExternalBrowser>true</allowExternalBrowser>
+    </scada>
+  </areasConfig>
+</root>
@@ -3,14 +3,21 @@
  <xs:element name="root">
    <xs:complexType>
      <xs:sequence>
-        <xs:element name="generalConfig">
+        <xs:element name="ncConfig">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="ncVendor" type="NcType" minOccurs='1' maxOccurs='1'/>
+              <xs:element name="ncIpAddress" minOccurs='1' maxOccurs='1'/>
+              <xs:element name="ncPort" type="xs:int"  minOccurs='1' maxOccurs='1'/>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="serverConfig">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="serverPort" type="xs:int" minOccurs='1' maxOccurs='1'/>
-              <xs:element name="language" type="xs:language" minOccurs='1' maxOccurs='1'/>
-              <xs:element name="NcVendor" type="NcType" minOccurs='1' maxOccurs='1'/>
-              <xs:element name="NcIpAddress" minOccurs='1' maxOccurs='1'/>
-              <xs:element name="NcPort" type="xs:int"  minOccurs='1' maxOccurs='1'/>
+              <xs:element name="language" type="xs:language" minOccurs='1' maxOccurs='1' default="en"/>
+              <xs:element name="enableDirectoryBrowsing" type="xs:boolean" default="false"/>
            </xs:sequence>
          </xs:complexType>
        </xs:element>
@@ -1,38 +0,0 @@
-using System;
-using System.Linq;
-using Step.Model;
-using static Step.Config.Constants;
-
-namespace Step.Database.Controllers
-{
-    public class AccessCategoriesController : IDisposable
-    {
-        private DatabaseContext dbCtx;
-
-        public AccessCategoriesController()
-        {
-            // Initialize database context
-            dbCtx = new DatabaseContext();
-        }
-
-        public void Dispose()
-        {
-            // Clear database context
-            dbCtx.Dispose();
-        }
-
-        public int FindCategoryLevelByAction(string categoryName, ACTIONS action)
-        {
-            AccessCategoryModel accessCategories = dbCtx.AccessCategories.Where(ac => ac.Name == categoryName).FirstOrDefault();
-            if (accessCategories != null)
-            {
-                if (ACTIONS.READ == action)
-                    return accessCategories.ReadLevelMin;
-                else
-                    return accessCategories.WriteLevelMin;
-            }
-
-            return 0;
-        }
-    }
-}
@@ -0,0 +1,32 @@
+using System;
+using System.Linq;
+using System.Web.Helpers;
+using Step.Model;
+
+namespace Step.Database.Controllers
+{
+    public class FunctionAccessController : IDisposable
+    {
+        private DatabaseContext dbCtx;
+
+        public FunctionAccessController()
+        {
+            // Initialize database context
+            dbCtx = new DatabaseContext();
+        }
+
+        public void Dispose()
+        {
+            // Clear database context
+            dbCtx.Dispose();
+        }
+
+        public FunctionAccessModel FindEnabledFunctionByName(string functionName)
+        {
+            return dbCtx
+                .FunctionsAccess
+                .Where(x => x.Name == functionName && x.Enabled == true)
+                .FirstOrDefault();
+        }
+    }
+}
@@ -14,7 +14,7 @@ namespace Step.Database
    {
        public DbSet<UserModel> Users { get; set; }
        public DbSet<RoleModel> Roles { get; set; }
-        public DbSet<AccessCategoryModel> AccessCategories { get; set; }
+        public DbSet<FunctionAccessModel> FunctionsAccess { get; set; }

        public DatabaseContext()
            : base("mySQLDatabaseConnection")
@@ -66,14 +66,13 @@
    <Reference Include="System.Xml" />
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="Controllers\AccessCategoriesController.cs" />
+    <Compile Include="Controllers\FunctionAccessController.cs" />
    <Compile Include="Controllers\UsersController.cs" />
    <Compile Include="DatabaseContext.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
  </ItemGroup>
  <ItemGroup>
    <None Include="App.config" />
-    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Step.Config\Step.Config.csproj">
@@ -8,8 +8,8 @@ namespace Step.Model.ConfigModels
 {
    public class AreasConfigModel
    {
-        public string name { get; set; }
-        public bool enabled { get; set; }
-        public bool allowExternalBrowser { get; set; }
+        public string Name { get; set; }
+        public bool Enabled { get; set; }
+        public bool AllowExternalBrowser { get; set; }
    }
 }
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Step.Model.ConfigModels
+{
+    public class ServerConfigModel
+    {
+        public string Language { get; set; }
+        public int ServerPort { get; set; }
+        public bool EnableDirectoryBrowsing { get; set; }
+    }
+}
@@ -6,12 +6,10 @@ using System.Threading.Tasks;

 namespace Step.Model.ConfigModels
 {
-    public class GenericConfigModel
+    public class NcConfigModel
    {
-        public string Language { get; set; }
-        public int ServerPort { get; set; }
        public int NcVendor { get; set; }
-        public int NcPort { get; set; }
        public string NcIpAddress { get; set; }
+        public int NcPort { get; set; }
    }
 }
@@ -8,20 +8,22 @@ using System.Threading.Tasks;

 namespace Step.Model
 {
-    [Table("access_category")]
-    public class AccessCategoryModel
+    [Table("functions_access")]
+
+    public class FunctionAccessModel
    {
        [Key]
        [Column("id")]
-        public int RoleId { get; set; }
-
+        public int FunctionAccessId { get; set; }
        [Column("name")]
        public string Name { get; set; }
-
        [Column("write_level_min")]
        public int WriteLevelMin { get; set; }
-
        [Column("read_level_min")]
        public int ReadLevelMin { get; set; }
+        [Column("area")]
+        public string Area { get; set; }
+        [Column("enabled")]
+        public bool Enabled { get; set; }
    }
 }
@@ -53,9 +53,10 @@
    <Reference Include="System.Xml" />
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="AccessCategoryModel.cs" />
+    <Compile Include="ConfigModels\NcConfigModel.cs" />
    <Compile Include="ConfigModels\AreasConfigModel.cs" />
-    <Compile Include="ConfigModels\GenericConfigModel.cs" />
+    <Compile Include="ConfigModels\ServerConfigModel.cs" />
+    <Compile Include="FunctionAccessModel.cs" />
    <Compile Include="RoleModel.cs">
      <Generator>DtsGenerator</Generator>
      <LastGenOutput>RoleModel.cs.d.ts</LastGenOutput>
@@ -8,7 +8,7 @@ using System.Threading.Tasks;

 namespace Step.Model
 {
-    [Table("user")]
+    [Table("users")]
    public class UserModel
    {
        [Key]
@@ -8,7 +8,6 @@
    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
  </configSections>
  <appSettings>
-    <add key="localHostServiceURI" value="http://localhost:9000" />
    <add key="enableDirectoryBrowsing" value="true" />
  </appSettings>
  <system.web>
@@ -8,8 +8,11 @@ using System.Reflection;
 using Microsoft.Owin.FileSystems;
 using System.Configuration;
 using Microsoft.Owin.Security.OAuth;
+using Microsoft.Owin.Cors;
 using Step.Provider;
-using Step.Config;
+using Microsoft.AspNet.SignalR;
+using Microsoft.AspNet.SignalR.Hubs;
+using Step.Attributes;

 [assembly: OwinStartup(typeof(Step.App_Start.Startup))]

@@ -17,10 +20,9 @@ namespace Step.App_Start
 {
    public class Startup
    {
+        public static OAuthAuthorizationServerOptions OAuthOptions;
        public void Configuration(IAppBuilder app)
        {
-            StartupConfigController.ReadStartUpConfig();
-
            // Configure HTTP
            HttpConfiguration config = new HttpConfiguration();

@@ -30,13 +32,13 @@ namespace Step.App_Start
            // Register Swagger config
            SwaggerConfig.Register(config);

-            // Configure authentication
-            ConfigureOAuth(app);
-
            app.UseWebApi(config);
+            // Configure api authentication
+            ConfigureWebApiOAuth(app);
+
+            // SignalR config & startup
+            SignalRConfig(app);

-            // Register SignalR
-            app.MapSignalR();
            var directoryBrowsing = ConfigurationManager.AppSettings["enableDirectoryBrowsing"] == "true";

            string rootDir = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "..", "wwwroot");
@@ -51,9 +53,10 @@ namespace Step.App_Start
            app.UseFileServer(options);
        }

-        private void ConfigureOAuth(IAppBuilder app)
-        {
-            OAuthAuthorizationServerOptions OAuthOptions = new OAuthAuthorizationServerOptions
+        private void ConfigureWebApiOAuth(IAppBuilder app)
+        {  
+            // Create new authorization options
+            OAuthOptions = new OAuthAuthorizationServerOptions
            {
                // Login and Token generation end point 
                TokenEndpointPath = new PathString("/Token"),
@@ -68,5 +71,25 @@ namespace Step.App_Start
            // Set bearer oAuth as authentication method
            app.UseOAuthBearerAuthentication(new OAuthBearerAuthenticationOptions());
        }
+
+        public void SignalRConfig(IAppBuilder app)
+        {
+            //// Set up signalR config
+            //app.Map("/signalr", map =>
+            //{
+            //    map.UseCors(CorsOptions.AllowAll);
+            //    // Debug 
+            //    HubConfiguration hubConfiguration = new HubConfiguration
+            //    {
+            //        EnableDetailedErrors = true
+            //    };
+            //    // Create an istance of custom authorize attribute
+            //    SignalRAuthorizeAttribute authorizer = new SignalRAuthorizeAttribute();
+            //    AuthorizeModule module = new AuthorizeModule(authorizer, authorizer);
+            //    GlobalHost.HubPipeline.AddModule(module);
+            //    map.RunSignalR();
+            //});
+            app.MapSignalR();
+        }
    }
 }
@@ -26,7 +26,7 @@ namespace Step
      config.Formatters.JsonFormatter.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver();

      config.EnableCors();
-
+      
      // Web API routes
      config.MapHttpAttributeRoutes();

@@ -0,0 +1,67 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using System.Security.Principal;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNet.SignalR;
+using Microsoft.AspNet.SignalR.Hubs;
+using Step.Config;
+using Step.Database.Controllers;
+using Step.Model;
+using static Step.Config.Constants;
+
+namespace Step.Attributes
+{
+    class SignalRAuthorizeAttribute : AuthorizeAttribute
+    {
+        public string Category;
+        public ACTIONS Action;
+        protected override bool UserAuthorized(IPrincipal user)
+        {
+            if (!base.UserAuthorized(user))
+                return false;
+
+            ClaimsIdentity identity = user.Identity as ClaimsIdentity;
+            var userRoleLevel = identity.Claims.Where(c => c.Type == ROLE_LEVEL_KEY).SingleOrDefault();
+            // User data not found -> not authorized
+            if (userRoleLevel == null)
+                return false;
+
+            // check authorization
+            if (!CheckAuthorization(Convert.ToInt32(userRoleLevel.Value), Category))
+                return false;
+
+            return true; 
+        }
+
+        private bool CheckAuthorization(int userLevel, string areaName)
+        {
+            using (FunctionAccessController acController = new FunctionAccessController())
+            {
+                // Read from db category levels
+                FunctionAccessModel functionAccess = acController.FindEnabledFunctionByName(areaName);
+                if (functionAccess != null && StartupConfigController.CheckAreaStatus(functionAccess.Area))
+                {
+                    if (Action == ACTIONS.READ)
+                    {   // Check read permissions 
+                        if (functionAccess.ReadLevelMin > userLevel)
+                            return false; // Not authorized
+                    }
+                    else
+                    {   // Check write permissions
+                        if (functionAccess.WriteLevelMin > userLevel)
+                            return false; // Not authorized
+                    }
+                }
+                else
+                {
+                    return false;
+                }
+                // Authorized
+                return true;
+            }
+        }
+    }
+}
@@ -0,0 +1,64 @@
+using System;
+using System.Linq;
+using System.Security.Claims;
+using System.Web.Http;
+using System.Web.Http.Controllers;
+using Step.Database.Controllers;
+using Step.Config;
+using static Step.Config.Constants;
+using Step.Model;
+
+namespace Step
+{
+    class WebApiAuthorizeAttribute : AuthorizeAttribute
+    {
+        public string Category;
+        public ACTIONS Action;
+        protected override bool IsAuthorized(HttpActionContext actionContext)
+        {
+            if (!base.IsAuthorized(actionContext))
+                return false;
+
+            // Get user level stored in the bearer token   
+            ClaimsPrincipal principal = actionContext.RequestContext.Principal as ClaimsPrincipal;
+            var userRoleLevel = principal.Claims.Where(c => c.Type == ROLE_LEVEL_KEY).SingleOrDefault();
+            // User data not found -> not authorized
+            if (userRoleLevel == null)
+                return false;
+
+            // check authorization
+            if (!CheckAuthorization(Convert.ToInt32(userRoleLevel.Value), Category))
+                return false;
+
+            return true;
+        }
+
+        private bool CheckAuthorization(int userLevel, string areaName)
+        {
+            using (FunctionAccessController acController = new FunctionAccessController())
+            {
+                // Read from db category levels
+                FunctionAccessModel functionAccess = acController.FindEnabledFunctionByName(areaName);
+                if (functionAccess != null && StartupConfigController.CheckAreaStatus(functionAccess.Area))
+                {
+                    if (Action == ACTIONS.READ)
+                    {   // Check read permissions 
+                        if (functionAccess.ReadLevelMin > userLevel)
+                            return false; // Not authorized
+                    }
+                    else
+                    {   // Check write permissions
+                        if (functionAccess.WriteLevelMin > userLevel)
+                            return false; // Not authorized
+                    }
+                }
+                else
+                {
+                    return false;
+                }
+                // Authorized
+                return true;
+            }
+        }
+    }
+}
@@ -0,0 +1,77 @@
+using System;
+using System.Linq;
+using System.Security.Claims;
+using Microsoft.AspNet.SignalR;
+using Step.Database.Controllers;
+using Step.Config;
+using static Step.Config.Constants;
+using Step.Model;
+using Microsoft.AspNet.SignalR.Hubs;
+
+namespace Step
+{
+    class SignalRAuthorizationAttribute : AuthorizeAttribute
+    {
+        public string Category;
+        public ACTIONS Action;
+
+        public override bool AuthorizeHubConnection(HubDescriptor hubDescriptor, IRequest request)
+        {
+            return base.AuthorizeHubConnection(hubDescriptor, request);
+        }
+
+        public override bool AuthorizeHubMethodInvocation(IHubIncomingInvokerContext hubIncomingInvokerContext, bool appliesToMethod)
+        {
+            return base.AuthorizeHubMethodInvocation(hubIncomingInvokerContext, appliesToMethod);
+        }
+
+        //protected override bool IsAuthorized(HttpActionContext actionContext)
+        //{
+        //    if (!base.IsAuthorized(actionContext))
+        //        return false;
+
+        //    // Get user level stored in the bearer token   
+        //    ClaimsPrincipal principal = actionContext.RequestContext.Principal as ClaimsPrincipal;
+        //    var userRoleLevel = principal.Claims.Where(c => c.Type == ROLE_LEVEL_KEY).SingleOrDefault();
+        //    // User data not found -> not authorized
+        //    if (userRoleLevel == null)
+        //        return false;
+
+        //    // check authorization
+        //    if (!CheckAuthorization(Convert.ToInt32(userRoleLevel.Value)))
+        //        return false;
+
+        //    return base.IsAuthorized(actionContext);
+        //}
+
+        //private bool CheckAuthorization(int userLevel)
+        //{
+        //    using (FunctionAccessController acController = new FunctionAccessController())
+        //    {
+
+        //        // Read from db category levels
+        //        FunctionAccessModel functionAccess = acController.FindEnabledFunctionByName(Category, Action);
+        //        if (functionAccess != null && StartupConfigController.CheckAreaStatus(functionAccess.Area))
+        //        {
+        //            if (Action == ACTIONS.READ)
+        //            {   // Check read permissions 
+        //                if (functionAccess.ReadLevelMin > userLevel)
+        //                    return false; // Not authorized
+        //            }
+        //            else
+        //            {   // Check write permissions
+        //                if (functionAccess.WriteLevelMin > userLevel)
+        //                    return false; // Not authorized
+        //            }
+        //        }
+        //        else
+        //        {
+        //            return false;
+        //        }
+        //        // Authorized
+        //        return true;
+        //    }
+        //}
+
+    }
+}
@@ -1,50 +0,0 @@
-using System;
-using System.Linq;
-using System.Security.Claims;
-using System.Security.Principal;
-using System.Web.Http;
-using System.Web.Http.Controllers;
-using Step.Database.Controllers;
-using static Step.Config.Constants;
-
-namespace Step
-{
-    class CmsAuthorizationAttribute : AuthorizeAttribute
-    {
-        public string Category;
-        public ACTIONS Action;
-        protected override bool IsAuthorized(HttpActionContext actionContext)
-        {
-            if (!base.IsAuthorized(actionContext))
-                return false;
-
-            // Get user level stored in the bearer token   
-            ClaimsPrincipal principal = actionContext.RequestContext.Principal as ClaimsPrincipal;
-            int userLevel = Convert.ToInt32(principal.Claims.Where(c => c.Type == ROLE_LEVEL_KEY).Single().Value);
-
-            if (!CheckAuthorization(userLevel))
-            {
-                return false;
-            }
-
-            return base.IsAuthorized(actionContext);
-        }
-
-        private bool CheckAuthorization(int userLevel)
-        {
-            using (AccessCategoriesController acController = new AccessCategoriesController())
-            {
-                // Read from db category levels
-                int categoryLevel = acController.FindCategoryLevelByAction(Category, Action);
-
-                if (categoryLevel > userLevel)
-                {
-                    // Not authorized
-                    return false;
-                }
-                // Authorized
-                return true;
-            }
-        }
-    }
-}
@@ -3,11 +3,15 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Web;
 using Microsoft.AspNet.SignalR;
+using Microsoft.AspNet.SignalR.Hubs;
+using Step.Attributes;
+using static Step.Config.Constants;

 namespace Step.Controllers
 {
  public class DataHub : Hub
  {
+     [SignalRAuthorize(Category = "test", Action = ACTIONS.WRITE)]
    public void Hello()
    {
      Clients.All.hello("Ciao");
@@ -16,7 +16,7 @@ namespace Step.Controllers
            return Unauthorized();
        }

-        [CmsAuthorization(Category = "test", Action = ACTIONS.WRITE)]
+        [WebApiAuthorize(Category = "test", Action = ACTIONS.WRITE)]
        [Route("test"), HttpGet]
        public IHttpActionResult Test()
        {
@@ -6,26 +6,34 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Web;

-namespace Groupadoo.Web.Providers
+namespace Step.Provider
 {
-  public class SignalROAuthBearerProvider : OAuthBearerAuthenticationProvider
-  {
-
-    public override Task RequestToken(OAuthRequestTokenContext context)
+    public class SignalROAuthBearerProvider : OAuthBearerAuthenticationProvider
    {
-      var token = context.OwinContext.Request.Query["connectionToken"];
-      if (!string.IsNullOrWhiteSpace(token))
-      {
-        var result = JsonConvert.DeserializeObject<TokenValue>(token);
-        if (context != null && result != null)
-          context.Token = result.token;
-      }
-      return Task.FromResult<object>(null);
-    }
-  }

-  class TokenValue
-  {
-    public string token { get; set; }
-  }
+        public override Task RequestToken(OAuthRequestTokenContext context)
+        {
+            
+           var token = context.OwinContext.Request.Query["connectionToken"];
+
+            if (!string.IsNullOrWhiteSpace(token))
+            {
+                if (context != null)
+                {
+                    context.Token = token;
+                    base.RequestToken(context);
+                }
+            }
+            return Task.FromResult<object>(null);
+        }
+        public override Task ValidateIdentity(OAuthValidateIdentityContext context)
+        {
+            return base.ValidateIdentity(context);
+        }
+    }
+
+    class TokenValue
+    {
+        public string token { get; set; }
+    }
 }
@@ -59,6 +59,9 @@
    <Reference Include="Microsoft.Owin, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.Owin.3.1.0\lib\net45\Microsoft.Owin.dll</HintPath>
    </Reference>
+    <Reference Include="Microsoft.Owin.Cors, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Cors.3.1.0\lib\net45\Microsoft.Owin.Cors.dll</HintPath>
+    </Reference>
    <Reference Include="Microsoft.Owin.FileSystems, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.Owin.FileSystems.3.1.0\lib\net45\Microsoft.Owin.FileSystems.dll</HintPath>
    </Reference>
@@ -145,7 +148,8 @@
    <Compile Include="App_Start\Startup.cs" />
    <Compile Include="App_Start\SwaggerConfig.cs" />
    <Compile Include="App_Start\WebApiConfig.cs" />
-    <Compile Include="CmsAuthorizationAttribute.cs" />
+    <Compile Include="Attributes\WebApiAuthorizeAttribute.cs" />
+    <Compile Include="Attributes\SignalRAuthorizeAttribute.cs" />
    <Compile Include="Controllers\DataHub.cs" />
    <Compile Include="Controllers\LoginController.cs" />
    <Compile Include="program.cs" />
@@ -8,6 +8,8 @@ using System.Threading;
 using System.Web;
 using TeamDev.SDK;
 using TeamDev.SDK.MVVM;
+using static Step.Config.StartupConfig;
+using Step.Config;

 namespace Step
 {
@@ -20,25 +22,34 @@ namespace Step

        public static void Main()
        {
-            // Start self host application 
-            var configuredUri = ConfigurationManager.AppSettings["localHostServiceURI"];
-
-            // Start WinForm
-            ServerControlWindow.Start();
-
-            // Register listener to "close application" messages
-            MessageServices.Current.Subscribe("StopServer", (a, b) =>
+            try
            {
-                StopRequest.Set();
-            });
+                StartupConfigController.ReadStartupConfig();

-            // Start server services
-            using (WebApp.Start<Step.App_Start.Startup>(url: configuredUri))
-            {
-                StopRequest.WaitOne();
+                // Start self host application 
+                string configuredUri = "http://localhost:" + serverConfig.ServerPort.ToString();
+
+                // Start WinForm
+                ServerControlWindow.Start();
+
+                // Register listener to "close application" messages
+                MessageServices.Current.Subscribe("StopServer", (a, b) =>
+                {
+                    StopRequest.Set();
+                });
+
+                // Start server services
+                using (WebApp.Start<Step.App_Start.Startup>(url: configuredUri))
+                {
+                    StopRequest.WaitOne();
+                }
+                // Close WinForm
+                ServerControlWindow.Stop();
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine(ex);
            }
-            // Close WinForm
-            ServerControlWindow.Stop();
        }
    }
 }
@@ -46,7 +46,7 @@ eval("// style-loader: Adds some css to the DOM by adding a <style> tag\n\n// lo
 /***/ 387:
 /***/ (function(module, exports, __webpack_require__) {

-eval("exports = module.exports = __webpack_require__(369)(true);\n// imports\n\n\n// module\nexports.push([module.i, \"\\n#app {\\n\\n  -webkit-font-smoothing: antialiased;\\n  -moz-osx-font-smoothing: grayscale;\\n  text-align: center;\\n  color: #2c3e50;\\n  margin-top: 60px;\\n}\\n\", \"\", {\"version\":3,\"sources\":[\"C:/Work/SCM/CMS/Step/Step/wwwroot/src/src/App.vue?7e719196\"],\"names\":[],\"mappings\":\";AAuBA;;EAEA,oCAAA;EACA,mCAAA;EACA,mBAAA;EACA,eAAA;EACA,iBAAA;CACA\",\"file\":\"App.vue\",\"sourcesContent\":[\"<template>\\n  <div id=\\\"app\\\">\\n    <button @click=\\\"callHub()\\\">Say Hello to server</button>\\n    <router-view/>\\n  </div>\\n</template>\\n\\n<script>\\nimport { Hub } from \\\"./services/hub\\\";\\n\\nexport default {\\n  name: \\\"app\\\",\\n  mounted: function(){\\n    this.hub = new Hub();\\n\\n  },\\n  methods:{\\n    callHub: function(){ this.hub.Hello();}\\n  }\\n};\\n</script>\\n\\n<style>\\n#app {\\n\\n  -webkit-font-smoothing: antialiased;\\n  -moz-osx-font-smoothing: grayscale;\\n  text-align: center;\\n  color: #2c3e50;\\n  margin-top: 60px;\\n}\\n</style>\\n\"],\"sourceRoot\":\"\"}]);\n\n// exports\n//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMzg3LmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vLy4vc3JjL0FwcC52dWU/Yzc3MCJdLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnRzID0gbW9kdWxlLmV4cG9ydHMgPSByZXF1aXJlKFwiLi4vbm9kZV9tb2R1bGVzL2Nzcy1sb2FkZXIvbGliL2Nzcy1iYXNlLmpzXCIpKHRydWUpO1xuLy8gaW1wb3J0c1xuXG5cbi8vIG1vZHVsZVxuZXhwb3J0cy5wdXNoKFttb2R1bGUuaWQsIFwiXFxuI2FwcCB7XFxuXFxuICAtd2Via2l0LWZvbnQtc21vb3RoaW5nOiBhbnRpYWxpYXNlZDtcXG4gIC1tb3otb3N4LWZvbnQtc21vb3RoaW5nOiBncmF5c2NhbGU7XFxuICB0ZXh0LWFsaWduOiBjZW50ZXI7XFxuICBjb2xvcjogIzJjM2U1MDtcXG4gIG1hcmdpbi10b3A6IDYwcHg7XFxufVxcblwiLCBcIlwiLCB7XCJ2ZXJzaW9uXCI6MyxcInNvdXJjZXNcIjpbXCJDOi9Xb3JrL1NDTS9DTVMvU3RlcC9TdGVwL3d3d3Jvb3Qvc3JjL3NyYy9BcHAudnVlPzdlNzE5MTk2XCJdLFwibmFtZXNcIjpbXSxcIm1hcHBpbmdzXCI6XCI7QUF1QkE7O0VBRUEsb0NBQUE7RUFDQSxtQ0FBQTtFQUNBLG1CQUFBO0VBQ0EsZUFBQTtFQUNBLGlCQUFBO0NBQ0FcIixcImZpbGVcIjpcIkFwcC52dWVcIixcInNvdXJjZXNDb250ZW50XCI6W1wiPHRlbXBsYXRlPlxcbiAgPGRpdiBpZD1cXFwiYXBwXFxcIj5cXG4gICAgPGJ1dHRvbiBAY2xpY2s9XFxcImNhbGxIdWIoKVxcXCI+U2F5IEhlbGxvIHRvIHNlcnZlcjwvYnV0dG9uPlxcbiAgICA8cm91dGVyLXZpZXcvPlxcbiAgPC9kaXY+XFxuPC90ZW1wbGF0ZT5cXG5cXG48c2NyaXB0PlxcbmltcG9ydCB7IEh1YiB9IGZyb20gXFxcIi4vc2VydmljZXMvaHViXFxcIjtcXG5cXG5leHBvcnQgZGVmYXVsdCB7XFxuICBuYW1lOiBcXFwiYXBwXFxcIixcXG4gIG1vdW50ZWQ6IGZ1bmN0aW9uKCl7XFxuICAgIHRoaXMuaHViID0gbmV3IEh1YigpO1xcblxcbiAgfSxcXG4gIG1ldGhvZHM6e1xcbiAgICBjYWxsSHViOiBmdW5jdGlvbigpeyB0aGlzLmh1Yi5IZWxsbygpO31cXG4gIH1cXG59O1xcbjwvc2NyaXB0PlxcblxcbjxzdHlsZT5cXG4jYXBwIHtcXG5cXG4gIC13ZWJraXQtZm9udC1zbW9vdGhpbmc6IGFudGlhbGlhc2VkO1xcbiAgLW1vei1vc3gtZm9udC1zbW9vdGhpbmc6IGdyYXlzY2FsZTtcXG4gIHRleHQtYWxpZ246IGNlbnRlcjtcXG4gIGNvbG9yOiAjMmMzZTUwO1xcbiAgbWFyZ2luLXRvcDogNjBweDtcXG59XFxuPC9zdHlsZT5cXG5cIl0sXCJzb3VyY2VSb290XCI6XCJcIn1dKTtcblxuLy8gZXhwb3J0c1xuXG5cblxuLy8vLy8vLy8vLy8vLy8vLy8vXG4vLyBXRUJQQUNLIEZPT1RFUlxuLy8gLi9ub2RlX21vZHVsZXMvY3NzLWxvYWRlcj9zb3VyY2VNYXAhLi9ub2RlX21vZHVsZXMvdnVlLWxvYWRlci9saWIvc3R5bGUtY29tcGlsZXI/e1widnVlXCI6dHJ1ZSxcImlkXCI6XCJkYXRhLXYtMDRjMjA0NmJcIixcInNjb3BlZFwiOmZhbHNlLFwiaGFzSW5saW5lQ29uZmlnXCI6ZmFsc2V9IS4vbm9kZV9tb2R1bGVzL3Z1ZS1sb2FkZXIvbGliL3NlbGVjdG9yLmpzP3R5cGU9c3R5bGVzJmluZGV4PTAmYnVzdENhY2hlIS4vc3JjL0FwcC52dWVcbi8vIG1vZHVsZSBpZCA9IDM4N1xuLy8gbW9kdWxlIGNodW5rcyA9IDEiXSwibWFwcGluZ3MiOiJBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7Iiwic291cmNlUm9vdCI6IiJ9\n//# sourceURL=webpack-internal:///387\n");
+eval("exports = module.exports = __webpack_require__(369)(true);\n// imports\n\n\n// module\nexports.push([module.i, \"\\n#app {\\r\\n\\r\\n  -webkit-font-smoothing: antialiased;\\r\\n  -moz-osx-font-smoothing: grayscale;\\r\\n  text-align: center;\\r\\n  color: #2c3e50;\\r\\n  margin-top: 60px;\\n}\\r\\n\", \"\", {\"version\":3,\"sources\":[\"C:/Workspace/CMS_STEP/Step/wwwroot/src/src/App.vue?7aad2534\"],\"names\":[],\"mappings\":\";AAuBA;;EAEA,oCAAA;EACA,mCAAA;EACA,mBAAA;EACA,eAAA;EACA,iBAAA;CACA\",\"file\":\"App.vue\",\"sourcesContent\":[\"<template>\\r\\n  <div id=\\\"app\\\">\\r\\n    <button @click=\\\"callHub()\\\">Say Hello to server</button>\\r\\n    <router-view/>\\r\\n  </div>\\r\\n</template>\\r\\n\\r\\n<script>\\r\\nimport { Hub } from \\\"./services/hub\\\";\\r\\n\\r\\nexport default {\\r\\n  name: \\\"app\\\",\\r\\n  mounted: function(){\\r\\n    this.hub = new Hub();\\r\\n\\r\\n  },\\r\\n  methods:{\\r\\n    callHub: function(){ this.hub.Hello();}\\r\\n  }\\r\\n};\\r\\n</script>\\r\\n\\r\\n<style>\\r\\n#app {\\r\\n\\r\\n  -webkit-font-smoothing: antialiased;\\r\\n  -moz-osx-font-smoothing: grayscale;\\r\\n  text-align: center;\\r\\n  color: #2c3e50;\\r\\n  margin-top: 60px;\\r\\n}\\r\\n</style>\\r\\n\"],\"sourceRoot\":\"\"}]);\n\n// exports\n//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMzg3LmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vLy4vc3JjL0FwcC52dWU/Yzc3MCJdLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnRzID0gbW9kdWxlLmV4cG9ydHMgPSByZXF1aXJlKFwiLi4vbm9kZV9tb2R1bGVzL2Nzcy1sb2FkZXIvbGliL2Nzcy1iYXNlLmpzXCIpKHRydWUpO1xuLy8gaW1wb3J0c1xuXG5cbi8vIG1vZHVsZVxuZXhwb3J0cy5wdXNoKFttb2R1bGUuaWQsIFwiXFxuI2FwcCB7XFxyXFxuXFxyXFxuICAtd2Via2l0LWZvbnQtc21vb3RoaW5nOiBhbnRpYWxpYXNlZDtcXHJcXG4gIC1tb3otb3N4LWZvbnQtc21vb3RoaW5nOiBncmF5c2NhbGU7XFxyXFxuICB0ZXh0LWFsaWduOiBjZW50ZXI7XFxyXFxuICBjb2xvcjogIzJjM2U1MDtcXHJcXG4gIG1hcmdpbi10b3A6IDYwcHg7XFxufVxcclxcblwiLCBcIlwiLCB7XCJ2ZXJzaW9uXCI6MyxcInNvdXJjZXNcIjpbXCJDOi9Xb3Jrc3BhY2UvQ01TX1NURVAvU3RlcC93d3dyb290L3NyYy9zcmMvQXBwLnZ1ZT83YWFkMjUzNFwiXSxcIm5hbWVzXCI6W10sXCJtYXBwaW5nc1wiOlwiO0FBdUJBOztFQUVBLG9DQUFBO0VBQ0EsbUNBQUE7RUFDQSxtQkFBQTtFQUNBLGVBQUE7RUFDQSxpQkFBQTtDQUNBXCIsXCJmaWxlXCI6XCJBcHAudnVlXCIsXCJzb3VyY2VzQ29udGVudFwiOltcIjx0ZW1wbGF0ZT5cXHJcXG4gIDxkaXYgaWQ9XFxcImFwcFxcXCI+XFxyXFxuICAgIDxidXR0b24gQGNsaWNrPVxcXCJjYWxsSHViKClcXFwiPlNheSBIZWxsbyB0byBzZXJ2ZXI8L2J1dHRvbj5cXHJcXG4gICAgPHJvdXRlci12aWV3Lz5cXHJcXG4gIDwvZGl2PlxcclxcbjwvdGVtcGxhdGU+XFxyXFxuXFxyXFxuPHNjcmlwdD5cXHJcXG5pbXBvcnQgeyBIdWIgfSBmcm9tIFxcXCIuL3NlcnZpY2VzL2h1YlxcXCI7XFxyXFxuXFxyXFxuZXhwb3J0IGRlZmF1bHQge1xcclxcbiAgbmFtZTogXFxcImFwcFxcXCIsXFxyXFxuICBtb3VudGVkOiBmdW5jdGlvbigpe1xcclxcbiAgICB0aGlzLmh1YiA9IG5ldyBIdWIoKTtcXHJcXG5cXHJcXG4gIH0sXFxyXFxuICBtZXRob2RzOntcXHJcXG4gICAgY2FsbEh1YjogZnVuY3Rpb24oKXsgdGhpcy5odWIuSGVsbG8oKTt9XFxyXFxuICB9XFxyXFxufTtcXHJcXG48L3NjcmlwdD5cXHJcXG5cXHJcXG48c3R5bGU+XFxyXFxuI2FwcCB7XFxyXFxuXFxyXFxuICAtd2Via2l0LWZvbnQtc21vb3RoaW5nOiBhbnRpYWxpYXNlZDtcXHJcXG4gIC1tb3otb3N4LWZvbnQtc21vb3RoaW5nOiBncmF5c2NhbGU7XFxyXFxuICB0ZXh0LWFsaWduOiBjZW50ZXI7XFxyXFxuICBjb2xvcjogIzJjM2U1MDtcXHJcXG4gIG1hcmdpbi10b3A6IDYwcHg7XFxyXFxufVxcclxcbjwvc3R5bGU+XFxyXFxuXCJdLFwic291cmNlUm9vdFwiOlwiXCJ9XSk7XG5cbi8vIGV4cG9ydHNcblxuXG5cbi8vLy8vLy8vLy8vLy8vLy8vL1xuLy8gV0VCUEFDSyBGT09URVJcbi8vIC4vbm9kZV9tb2R1bGVzL2Nzcy1sb2FkZXI/c291cmNlTWFwIS4vbm9kZV9tb2R1bGVzL3Z1ZS1sb2FkZXIvbGliL3N0eWxlLWNvbXBpbGVyP3tcInZ1ZVwiOnRydWUsXCJpZFwiOlwiZGF0YS12LTA0YzIwNDZiXCIsXCJzY29wZWRcIjpmYWxzZSxcImhhc0lubGluZUNvbmZpZ1wiOmZhbHNlfSEuL25vZGVfbW9kdWxlcy92dWUtbG9hZGVyL2xpYi9zZWxlY3Rvci5qcz90eXBlPXN0eWxlcyZpbmRleD0wJmJ1c3RDYWNoZSEuL3NyYy9BcHAudnVlXG4vLyBtb2R1bGUgaWQgPSAzODdcbi8vIG1vZHVsZSBjaHVua3MgPSAxIl0sIm1hcHBpbmdzIjoiQUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBOyIsInNvdXJjZVJvb3QiOiIifQ==\n//# sourceURL=webpack-internal:///387\n");

 /***/ }),

@@ -54,7 +54,7 @@ eval("exports = module.exports = __webpack_require__(369)(true);\n// imports\n\n
 /***/ (function(module, exports, __webpack_require__) {

 "use strict";
-eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n  value: true\n});\n\nvar _hub = __webpack_require__(389);\n\nexports.default = {\n  name: \"app\",\n  mounted: function mounted() {\n    this.hub = new _hub.Hub();\n  },\n  methods: {\n    callHub: function callHub() {\n      this.hub.Hello();\n    }\n  }\n}; //\n//\n//\n//\n//\n//\n////# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMzg4LmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vL0FwcC52dWU/M2MzYyJdLCJzb3VyY2VzQ29udGVudCI6WyI8dGVtcGxhdGU+XG4gIDxkaXYgaWQ9XCJhcHBcIj5cbiAgICA8YnV0dG9uIEBjbGljaz1cImNhbGxIdWIoKVwiPlNheSBIZWxsbyB0byBzZXJ2ZXI8L2J1dHRvbj5cbiAgICA8cm91dGVyLXZpZXcvPlxuICA8L2Rpdj5cbjwvdGVtcGxhdGU+XG5cbjxzY3JpcHQ+XG5pbXBvcnQgeyBIdWIgfSBmcm9tIFwiLi9zZXJ2aWNlcy9odWJcIjtcblxuZXhwb3J0IGRlZmF1bHQge1xuICBuYW1lOiBcImFwcFwiLFxuICBtb3VudGVkOiBmdW5jdGlvbigpe1xuICAgIHRoaXMuaHViID0gbmV3IEh1YigpO1xuXG4gIH0sXG4gIG1ldGhvZHM6e1xuICAgIGNhbGxIdWI6IGZ1bmN0aW9uKCl7IHRoaXMuaHViLkhlbGxvKCk7fVxuICB9XG59O1xuPC9zY3JpcHQ+XG5cbjxzdHlsZT5cbiNhcHAge1xuXG4gIC13ZWJraXQtZm9udC1zbW9vdGhpbmc6IGFudGlhbGlhc2VkO1xuICAtbW96LW9zeC1mb250LXNtb290aGluZzogZ3JheXNjYWxlO1xuICB0ZXh0LWFsaWduOiBjZW50ZXI7XG4gIGNvbG9yOiAjMmMzZTUwO1xuICBtYXJnaW4tdG9wOiA2MHB4O1xufVxuPC9zdHlsZT5cblxuXG5cbi8vIFdFQlBBQ0sgRk9PVEVSIC8vXG4vLyBBcHAudnVlPzdlNzE5MTk2Il0sIm1hcHBpbmdzIjoiOzs7Ozs7QUFRQTtBQUNBOztBQUdBO0FBQ0E7QUFFQTtBQUNBOzs7O0FBRUE7QUFEQTtBQU5BOzs7Ozs7QSIsInNvdXJjZVJvb3QiOiIifQ==\n//# sourceURL=webpack-internal:///388\n");
+eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n  value: true\n});\n\nvar _hub = __webpack_require__(389);\n\nexports.default = {\n  name: \"app\",\n  mounted: function mounted() {\n    this.hub = new _hub.Hub();\n  },\n  methods: {\n    callHub: function callHub() {\n      this.hub.Hello();\n    }\n  }\n}; //\n//\n//\n//\n//\n//\n////# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMzg4LmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vL0FwcC52dWU/YTliNSJdLCJzb3VyY2VzQ29udGVudCI6WyI8dGVtcGxhdGU+XHJcbiAgPGRpdiBpZD1cImFwcFwiPlxyXG4gICAgPGJ1dHRvbiBAY2xpY2s9XCJjYWxsSHViKClcIj5TYXkgSGVsbG8gdG8gc2VydmVyPC9idXR0b24+XHJcbiAgICA8cm91dGVyLXZpZXcvPlxyXG4gIDwvZGl2PlxyXG48L3RlbXBsYXRlPlxyXG5cclxuPHNjcmlwdD5cclxuaW1wb3J0IHsgSHViIH0gZnJvbSBcIi4vc2VydmljZXMvaHViXCI7XHJcblxyXG5leHBvcnQgZGVmYXVsdCB7XHJcbiAgbmFtZTogXCJhcHBcIixcclxuICBtb3VudGVkOiBmdW5jdGlvbigpe1xyXG4gICAgdGhpcy5odWIgPSBuZXcgSHViKCk7XHJcblxyXG4gIH0sXHJcbiAgbWV0aG9kczp7XHJcbiAgICBjYWxsSHViOiBmdW5jdGlvbigpeyB0aGlzLmh1Yi5IZWxsbygpO31cclxuICB9XHJcbn07XHJcbjwvc2NyaXB0PlxyXG5cclxuPHN0eWxlPlxyXG4jYXBwIHtcclxuXHJcbiAgLXdlYmtpdC1mb250LXNtb290aGluZzogYW50aWFsaWFzZWQ7XHJcbiAgLW1vei1vc3gtZm9udC1zbW9vdGhpbmc6IGdyYXlzY2FsZTtcclxuICB0ZXh0LWFsaWduOiBjZW50ZXI7XHJcbiAgY29sb3I6ICMyYzNlNTA7XHJcbiAgbWFyZ2luLXRvcDogNjBweDtcclxufVxyXG48L3N0eWxlPlxyXG5cblxuXG4vLyBXRUJQQUNLIEZPT1RFUiAvL1xuLy8gQXBwLnZ1ZT83YWFkMjUzNCJdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBUUE7QUFDQTs7QUFHQTtBQUNBO0FBRUE7QUFDQTs7OztBQUVBO0FBREE7QUFOQTs7Ozs7O0EiLCJzb3VyY2VSb290IjoiIn0=\n//# sourceURL=webpack-internal:///388\n");

 /***/ }),

@@ -62,7 +62,7 @@ eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n  value: true\n});\n
 /***/ (function(module, exports, __webpack_require__) {

 "use strict";
-eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n    value: true\n});\nvar Hub = /** @class */function () {\n    function Hub() {\n        this._hub = $.connection.dataHub;\n        // Registro le callback;\n        this._hub.client.hello = function (r) {\n            console.log(r);\n        };\n        $.connection.hub.start();\n    }\n    Hub.prototype.Hello = function () {\n        this._hub.server.hello();\n    };\n    return Hub;\n}();\nexports.Hub = Hub;//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMzg5LmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vLy4vc3JjL3NlcnZpY2VzL2h1Yi50cz9jOGIwIl0sInNvdXJjZXNDb250ZW50IjpbIlxuXG5kZWNsYXJlIGxldCAkOiBhbnk7XG5cbmV4cG9ydCBjbGFzcyBIdWIge1xuXG4gIHByaXZhdGUgX2h1YjogYW55O1xuXG4gIGNvbnN0cnVjdG9yKCkge1xuXG4gICAgdGhpcy5faHViID0gJC5jb25uZWN0aW9uLmRhdGFIdWI7XG5cbiAgICAvLyBSZWdpc3RybyBsZSBjYWxsYmFjaztcblxuICAgIHRoaXMuX2h1Yi5jbGllbnQuaGVsbG8gPSAocikgPT4geyBjb25zb2xlLmxvZyhyKTsgfTtcbiAgICAkLmNvbm5lY3Rpb24uaHViLnN0YXJ0KCk7XG4gIH1cblxuICBwdWJsaWMgSGVsbG8gKCl7XG4gICAgdGhpcy5faHViLnNlcnZlci5oZWxsbygpO1xuICB9XG59XG5cblxuXG4vLyBXRUJQQUNLIEZPT1RFUiAvL1xuLy8gLi9zcmMvc2VydmljZXMvaHViLnRzIl0sIm1hcHBpbmdzIjoiOzs7OztBQUlBO0FBSUE7QUFFQTtBQUVBO0FBRUE7QUFBQTtBQUFBO0FBQ0E7QUFDQTtBQUVBO0FBQ0E7QUFDQTtBQUNBO0FBakJBO0EiLCJzb3VyY2VSb290IjoiIn0=\n//# sourceURL=webpack-internal:///389\n");
+eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n    value: true\n});\nvar Hub = /** @class */function () {\n    function Hub() {\n        this._hub = $.connection.dataHub;\n        var token = \"AQAAANCMnd8BFdERjHoAwE_Cl-sBAAAAyk_XnVU0X0OPCrt0XQvPLgAAAAACAAAAAAAQZgAAAAEAACAAAAA05Bpr89kWeWIFrSQIIlJg9ZUQ5Rq5VICulqc8jbzdxAAAAAAOgAAAAAIAACAAAADZIPmUW0SBY2z8AL7_CgNfVniob3kG1L8dn5whj2yGK5AAAAB35OElQ8vCrNNgQsymJDbhIVXpf6yZSq1fR649j-5CfNgJLzMK4SbrD75kHWxlVV8RantR6nrALoB-3ZuNA5951HgClbYTrp3IH3_9pUEZmjTg46fZWRo-ppAVXTbHzF7VCnvF6zexN4rkXIQZ868ukSNHsPcHnTirHYBQCQ2gCsLxLUaIFqnb5KuvnDYamhhAAAAADP74YPSylEat5lJa26PGzbfmq3rtyYya_ZINIyaz_j3b9J_ZxubtAiGLbXL-O2kx0wgBBEnnAOJyjlC98NPv1w\";\n        //this._hub.useBearerToken( \"bearer QAAANCMnd8BFdERjHoAwE_Cl-sBAAAAyk_XnVU0X0OPCrt0XQvPLgAAAAACAAAAAAAQZgAAAAEAACAAAAAik0Igt-zyICvVvWQ2hu1Nf_Bx_v0AuVgwC7Ie4RepWwAAAAAOgAAAAAIAACAAAAAKuBCgTtbX7OqeawJ4IRnki6grdWSzk5jx-EXPtI4tSZAAAAA0D7JprXTRInt-Bzxi67aXYdUwh0yA4uXrhjwW1t7862LJXHQzTOJfvp-NYS1LY8SlxkckYuYJ3BPSjKK9m7MvPKY5l1XiQ_q0ZRz0vI9LR2-xzkOJ_IzvTnY8vq6kjNbsnTUVnnkWBGovwbjRH5hjh7vjKxh6PTWk46kdRd9saJdRQkiYeHlmSbgZtwjblPxAAAAAd3IqDFN6hhAw4CdPlshYXS5SULuYMMmCsxDHIszjxZrNe61bC5WLcm75xfKMoU_lVCMfE1n_SdmjOA5c5rq6cA\");\n        // Registro le callback;\n        //$.connection.hub.qs = {\n        //  \"Authorization\": \"bearer \"\n        //};\n        $.signalR.ajaxDefaults.headers = { Authorization: \"Bearer \" + token };\n        this._hub.client.hello = function (r) {\n            console.log(r);\n        };\n        $.connection.hub.start();\n    }\n    Hub.prototype.Hello = function () {\n        this._hub.server.hello();\n    };\n    return Hub;\n}();\nexports.Hub = Hub;//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMzg5LmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vLy4vc3JjL3NlcnZpY2VzL2h1Yi50cz9jOGIwIl0sInNvdXJjZXNDb250ZW50IjpbIlxyXG5cclxuZGVjbGFyZSBsZXQgJDogYW55O1xyXG5cclxuZXhwb3J0IGNsYXNzIEh1YiB7XHJcblxyXG4gIHByaXZhdGUgX2h1YjogYW55O1xyXG5cclxuICBjb25zdHJ1Y3RvcigpIHtcclxuXHJcbiAgICB0aGlzLl9odWIgPSAkLmNvbm5lY3Rpb24uZGF0YUh1YjtcbiAgICB2YXIgdG9rZW4gPSBcIkFRQUFBTkNNbmQ4QkZkRVJqSG9Bd0VfQ2wtc0JBQUFBeWtfWG5WVTBYME9QQ3J0MFhRdlBMZ0FBQUFBQ0FBQUFBQUFRWmdBQUFBRUFBQ0FBQUFBMDVCcHI4OWtXZVdJRnJTUUlJbEpnOVpVUTVScTVWSUN1bHFjOGpiemR4QUFBQUFBT2dBQUFBQUlBQUNBQUFBRFpJUG1VVzBTQlkyejhBTDdfQ2dOZlZuaW9iM2tHMUw4ZG41d2hqMnlHSzVBQUFBQjM1T0VsUTh2Q3JOTmdRc3ltSkRiaElWWHBmNnlaU3ExZlI2NDlqLTVDZk5nSkx6TUs0U2JyRDc1a0hXeGxWVjhSYW50UjZuckFMb0ItM1p1TkE1OTUxSGdDbGJZVHJwM0lIM185cFVFWm1qVGc0NmZaV1JvLXBwQVZYVGJIekY3VkNudkY2emV4TjRya1hJUVo4Njh1a1NOSHNQY0huVGlySFlCUUNRMmdDc0x4TFVhSUZxbmI1S3V2bkRZYW1oaEFBQUFBRFA3NFlQU3lsRWF0NWxKYTI2UEd6YmZtcTNydHlZeWFfWklOSXlhel9qM2I5Sl9aeHVidEFpR0xiWEwtTzJreDB3Z0JCRW5uQU9KeWpsQzk4TlB2MXdcIlxyXG4gICAgLy90aGlzLl9odWIudXNlQmVhcmVyVG9rZW4oIFwiYmVhcmVyIFFBQUFOQ01uZDhCRmRFUmpIb0F3RV9DbC1zQkFBQUF5a19YblZVMFgwT1BDcnQwWFF2UExnQUFBQUFDQUFBQUFBQVFaZ0FBQUFFQUFDQUFBQUFpazBJZ3QtenlJQ3ZWdldRMmh1MU5mX0J4X3YwQXVWZ3dDN0llNFJlcFd3QUFBQUFPZ0FBQUFBSUFBQ0FBQUFBS3VCQ2dUdGJYN09xZWF3SjRJUm5raTZncmRXU3prNWp4LUVYUHRJNHRTWkFBQUFBMEQ3SnByWFRSSW50LUJ6eGk2N2FYWWRVd2gweUE0dVhyaGp3VzF0Nzg2MkxKWEhRelRPSmZ2cC1OWVMxTFk4U2x4a2NrWXVZSjNCUFNqS0s5bTdNdlBLWTVsMVhpUV9xMFpSejB2STlMUjIteHprT0pfSXp2VG5ZOHZxNmtqTmJzblRVVm5ua1dCR292d2JqUkg1aGpoN3ZqS3hoNlBUV2s0NmtkUmQ5c2FKZFJRa2lZZUhsbVNiZ1p0d2pibFB4QUFBQUFkM0lxREZONmhoQXc0Q2RQbHNoWVhTNVNVTHVZTU1tQ3N4REhJc3pqeFpyTmU2MWJDNVdMY203NXhmS01vVV9sVkNNZkUxbl9TZG1qT0E1YzVycTZjQVwiKTtcclxuICAgIC8vIFJlZ2lzdHJvIGxlIGNhbGxiYWNrO1xyXG4gICAgLy8kLmNvbm5lY3Rpb24uaHViLnFzID0ge1xyXG4gICAgLy8gIFwiQXV0aG9yaXphdGlvblwiOiBcImJlYXJlciBcIlxyXG4gICAgLy99O1xuICAgICQuc2lnbmFsUi5hamF4RGVmYXVsdHMuaGVhZGVycyA9IHsgQXV0aG9yaXphdGlvbjogXCJCZWFyZXIgXCIgKyB0b2tlbiB9O1xyXG4gICAgdGhpcy5faHViLmNsaWVudC5oZWxsbyA9IChyKSA9PiB7IGNvbnNvbGUubG9nKHIpOyB9O1xyXG4gICAgJC5jb25uZWN0aW9uLmh1Yi5zdGFydCgpO1xyXG4gIH1cclxuXHJcbiAgcHVibGljIEhlbGxvICgpe1xyXG4gICAgdGhpcy5faHViLnNlcnZlci5oZWxsbygpO1xyXG4gIH1cclxufVxyXG5cblxuXG4vLyBXRUJQQUNLIEZPT1RFUiAvL1xuLy8gLi9zcmMvc2VydmljZXMvaHViLnRzIl0sIm1hcHBpbmdzIjoiOzs7OztBQUlBO0FBSUE7QUFFQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFBQTtBQUFBO0FBQ0E7QUFDQTtBQUVBO0FBQ0E7QUFDQTtBQUNBO0FBckJBO0EiLCJzb3VyY2VSb290IjoiIn0=\n//# sourceURL=webpack-internal:///389\n");

 /***/ }),

@@ -9,9 +9,13 @@ export class Hub {
  constructor() {

    this._hub = $.connection.dataHub;
-
+    var token = "AQAAANCMnd8BFdERjHoAwE_Cl-sBAAAAyk_XnVU0X0OPCrt0XQvPLgAAAAACAAAAAAAQZgAAAAEAACAAAAA05Bpr89kWeWIFrSQIIlJg9ZUQ5Rq5VICulqc8jbzdxAAAAAAOgAAAAAIAACAAAADZIPmUW0SBY2z8AL7_CgNfVniob3kG1L8dn5whj2yGK5AAAAB35OElQ8vCrNNgQsymJDbhIVXpf6yZSq1fR649j-5CfNgJLzMK4SbrD75kHWxlVV8RantR6nrALoB-3ZuNA5951HgClbYTrp3IH3_9pUEZmjTg46fZWRo-ppAVXTbHzF7VCnvF6zexN4rkXIQZ868ukSNHsPcHnTirHYBQCQ2gCsLxLUaIFqnb5KuvnDYamhhAAAAADP74YPSylEat5lJa26PGzbfmq3rtyYya_ZINIyaz_j3b9J_ZxubtAiGLbXL-O2kx0wgBBEnnAOJyjlC98NPv1w"
+    //this._hub.useBearerToken( "bearer QAAANCMnd8BFdERjHoAwE_Cl-sBAAAAyk_XnVU0X0OPCrt0XQvPLgAAAAACAAAAAAAQZgAAAAEAACAAAAAik0Igt-zyICvVvWQ2hu1Nf_Bx_v0AuVgwC7Ie4RepWwAAAAAOgAAAAAIAACAAAAAKuBCgTtbX7OqeawJ4IRnki6grdWSzk5jx-EXPtI4tSZAAAAA0D7JprXTRInt-Bzxi67aXYdUwh0yA4uXrhjwW1t7862LJXHQzTOJfvp-NYS1LY8SlxkckYuYJ3BPSjKK9m7MvPKY5l1XiQ_q0ZRz0vI9LR2-xzkOJ_IzvTnY8vq6kjNbsnTUVnnkWBGovwbjRH5hjh7vjKxh6PTWk46kdRd9saJdRQkiYeHlmSbgZtwjblPxAAAAAd3IqDFN6hhAw4CdPlshYXS5SULuYMMmCsxDHIszjxZrNe61bC5WLcm75xfKMoU_lVCMfE1n_SdmjOA5c5rq6cA");
    // Registro le callback;
-
+    //$.connection.hub.qs = {
+    //  "Authorization": "bearer "
+    //};
+    $.signalR.ajaxDefaults.headers = { Authorization: "Bearer " + token };
    this._hub.client.hello = (r) => { console.log(r); };
    $.connection.hub.start();
  }