diff --git a/IoTSharp.Hub/Data/ApplicationDBInitializer.cs b/IoTSharp.Hub/Data/ApplicationDBInitializer.cs index 12392a0254df3778b09ed84ff41c03ac54b9d226..c11c2d6ec016c4108ace325a89ae8d5a617ebc55 100644 --- a/IoTSharp.Hub/Data/ApplicationDBInitializer.cs +++ b/IoTSharp.Hub/Data/ApplicationDBInitializer.cs @@ -83,10 +83,10 @@ namespace IoTSharp.Hub.Data await _signInManager.UserManager.AddClaimAsync(user, new Claim(IoTSharpClaimTypes.Customer, customer.Id.ToString())); await _signInManager.UserManager.AddClaimAsync(user, new Claim(IoTSharpClaimTypes.Tenant, tenant.Id.ToString())); await _signInManager.UserManager.AddToRoleAsync(user, nameof(UserRole.Anonymous)); + await _signInManager.UserManager.AddToRoleAsync(user, nameof(UserRole.NormalUser)); await _signInManager.UserManager.AddToRoleAsync(user, nameof(UserRole.CustomerAdmin)); await _signInManager.UserManager.AddToRoleAsync(user, nameof(UserRole.TenantAdmin)); await _signInManager.UserManager.AddToRoleAsync(user, nameof(UserRole.SystemAdmin)); - await _signInManager.UserManager.AddToRoleAsync(user, nameof(UserRole.Anonymous)); } } var rship = new Relationship diff --git a/IoTSharp.Hub/Data/Device.cs b/IoTSharp.Hub/Data/Device.cs index c3dd96d1f69b473b42c52a0ddc9dff129fc78093..1d8209b01cdac545bf176d03af1cc3fc7ca681c1 100644 --- a/IoTSharp.Hub/Data/Device.cs +++ b/IoTSharp.Hub/Data/Device.cs @@ -16,10 +16,14 @@ namespace IoTSharp.Hub.Data public Customer Customer { get; set; } + [Newtonsoft.Json.JsonIgnore] public virtual List AttributeData { get; set; } - public virtual List AttributeLatest { get; set; } + + [Newtonsoft.Json.JsonIgnore] public virtual List TelemetryData { get; set; } + public virtual List AttributeLatest { get; set; } + public virtual List TelemetryLatest { get; set; } } } \ No newline at end of file diff --git a/IoTSharp.Hub/Extensions/TokenExtension.cs b/IoTSharp.Hub/Extensions/TokenExtension.cs index 4ab7690ca8015b45d79683ace93948c853e2ede0..7c87fe1d0316a513d9061b2812614b5172bd61f2 100644 --- a/IoTSharp.Hub/Extensions/TokenExtension.cs +++ b/IoTSharp.Hub/Extensions/TokenExtension.cs @@ -57,6 +57,7 @@ namespace IoTSharp.Hub { options.DefaultScheme = JwtBearerDefaults.AuthenticationScheme; options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme; + options.DefaultForbidScheme = JwtBearerDefaults.AuthenticationScheme; }) .AddJwtBearer(options => {