refact and login

src/Yavsc.Server/Models/ApplicationDbContext.cs

@@ -1,43 +1,46 @@
-using Microsoft.EntityFrameworkCore;
+using IdentityServer8.EntityFramework.Entities;
+using IdentityServer8.EntityFramework.Interfaces;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
-using Yavsc.Abstract.Models.Messaging;
-using Yavsc.Server.Models.EMailing;
-using Yavsc.Server.Models.IT.SourceCode;
-using Yavsc.Server.Models.IT;
-using Yavsc.Abstract.Identity;
-using Yavsc.Server.Models.Calendar;
 
 namespace Yavsc.Models
 {
+    using Abstract.Identity;
+    using Abstract.Models.Messaging;
+    using Access;
+    using Attributes;
+    using Auth;
+    using Bank;
+    using Billing;
+    using Blog;
+    using Chat;
+    using Drawing;
+    using Forms;
     using Haircut;
+    using Identity;
     using IT.Evolution;
     using IT.Fixing;
-    using Streaming;
-    using Relationship;
-    using Forms;
-    using Auth;
-    using Billing;
-    using Musical;
-    using Workflow;
-    using Identity;
     using Market;
-    using Chat;
     using Messaging;
-    using Access;
+  using Microsoft.AspNetCore.Http;
+  using Musical;
     using Musical.Profiles;
-    using Workflow.Profiles;
-    using Drawing;
-    using Attributes;
-    using Bank;
     using Payment;
-    using Blog;
+    using Relationship;
+    using Server.Models.Calendar;
+    using Server.Models.EMailing;
+    using Server.Models.IT;
+    using Server.Models.IT.SourceCode;
+    using Streaming;
+    using Workflow;
+    using Workflow.Profiles;
 
-    public class ApplicationDbContext : IdentityDbContext<ApplicationUser>
+    public class ApplicationDbContext : IdentityDbContext<ApplicationUser>,
+    IConfigurationDbContext, IPersistedGrantDbContext
     {
         public ApplicationDbContext()
         {
-
         }
         public ApplicationDbContext(DbContextOptions<ApplicationDbContext> options) : base(options)
         {
@@ -46,6 +49,8 @@ namespace Yavsc.Models
         protected override void OnModelCreating(ModelBuilder builder)
         {
             base.OnModelCreating(builder);
+            builder.UseIdentityByDefaultColumns();
+
             // Customize the ASP.NET Identity model and override the defaults if needed.
             // For example, you can rename the ASP.NET Identity table names and more.
             // Add your customizations after calling base.OnModelCreating(builder);
@@ -72,16 +77,48 @@ namespace Yavsc.Models
             builder.Entity<Cratie.Option>().HasKey(o => new { o.Code, o.CodeScrutin });
             builder.Entity<Notification>().Property(n => n.icon).HasDefaultValue("exclam");
             builder.Entity<ChatRoomAccess>().HasKey(p => new { room = p.ChannelName, user = p.UserId });
-            builder.Entity<InstrumentRating>().HasAlternateKey(i => new { Instrument = i.InstrumentId, owner = i.OwnerId });
+            builder.Entity<InstrumentRating>().HasAlternateKey(i => new { Instrument = i.InstrumentId, owner = i.OwnerId })
+            ;
+
+            builder.Entity<Activity>().Property(a => a.ParentCode).IsRequired(false);
             
+            builder.Entity<Client>().Property("Id").UseIdentityAlwaysColumn();
+            builder.Entity<ClientSecret>().Property("Id").UseIdentityAlwaysColumn();
+            builder.Entity<ClientScope>().Property("Id").UseIdentityAlwaysColumn();
+            builder.Entity<ClientIdPRestriction>().Property("Id").UseIdentityAlwaysColumn();
+            builder.Entity<ClientProperty>().Property("Id").UseIdentityAlwaysColumn();
+            builder.Entity<ClientPostLogoutRedirectUri>().Property("Id").UseIdentityAlwaysColumn();
+            builder.Entity<ClientRedirectUri>().Property("Id").UseIdentityAlwaysColumn();
+            builder.Entity<ClientCorsOrigin>().Property("Id").UseIdentityAlwaysColumn();
+            builder.Entity<ClientGrantType>().Property("Id").UseIdentityAlwaysColumn();
+            builder.Entity<ClientClaim>().Property("Id").UseIdentityAlwaysColumn();
+            builder.Entity<ApiResource>().Property("Id").UseIdentityAlwaysColumn();
+            builder.Entity<ApiScope>().Property("Id").UseIdentityAlwaysColumn();
+
+            builder.Entity<DeviceFlowCodes>().HasKey(e => new { e.UserCode, e.DeviceCode });
+            builder.Entity<PersistedGrant>().HasKey(e => e.Key);
+
+            //    builder.Entity<IdentityUserLogin<String>>().HasKey(i=> new { i.LoginProvider, i.UserId, i.ProviderKey });
+            builder.Entity<ClientSecret>().HasOne<Client>().WithMany(e => e.ClientSecrets).HasForeignKey(e => e.ClientId);
+            builder.Entity<ClientScope>().HasOne<Client>().WithMany(e => e.AllowedScopes).HasForeignKey(e => e.ClientId);
+            builder.Entity<ClientIdPRestriction>().HasOne<Client>().WithMany(e => e.IdentityProviderRestrictions).HasForeignKey(e => e.ClientId);
+            builder.Entity<ClientProperty>().HasOne<Client>().WithMany(e => e.Properties).HasForeignKey(e => e.ClientId);
+            builder.Entity<ClientPostLogoutRedirectUri>().HasOne<Client>().WithMany(e => e.PostLogoutRedirectUris).HasForeignKey(e => e.ClientId);
+            builder.Entity<ClientRedirectUri>().HasOne<Client>().WithMany(e => e.RedirectUris).HasForeignKey(e => e.ClientId);
+            builder.Entity<ClientCorsOrigin>().HasOne<Client>().WithMany(e => e.AllowedCorsOrigins).HasForeignKey(e => e.ClientId);
+            builder.Entity<ClientGrantType>().HasOne<Client>().WithMany(e => e.AllowedGrantTypes).HasForeignKey(e => e.ClientId);
+            builder.Entity<ApiResourceSecret>().HasOne<ApiResource>().WithMany(e => e.Secrets).HasForeignKey(e => e.ApiResourceId);
+            builder.Entity<ApiResourceScope>().HasOne<ApiResource>().WithMany(e => e.Scopes).HasForeignKey(e => e.ApiResourceId);
+            builder.Entity<ApiResourceClaim>().HasOne<ApiResource>().WithMany(e => e.UserClaims).HasForeignKey(e => e.ApiResourceId);
+            builder.Entity<ApiResourceProperty>().HasOne<ApiResource>().WithMany(e => e.Properties).HasForeignKey(e => e.ApiResourceId);
+            builder.Entity<ApiScopeClaim>().HasOne<ApiScope>().WithMany(e => e.UserClaims).HasForeignKey(e => e.ScopeId);
+            builder.Entity<ApiScopeProperty>().HasOne<ApiScope>().WithMany(e => e.Properties).HasForeignKey(e => e.ScopeId);
+
             foreach (var et in builder.Model.GetEntityTypes())
             {
                 if (et.ClrType.GetInterface("IBaseTrackedEntity") != null)
                     et.FindProperty("DateCreated").SetAfterSaveBehavior(Microsoft.EntityFrameworkCore.Metadata.PropertySaveBehavior.Ignore);
             }
-
-            builder.Entity<Activity>().Property(a => a.ParentCode).IsRequired(false);
-            //    builder.Entity<IdentityUserLogin<String>>().HasKey(i=> new { i.LoginProvider, i.UserId, i.ProviderKey });
         }
 
         /// <summary>
@@ -91,7 +128,7 @@ namespace Yavsc.Models
         public DbSet<Activity> Activities { get; set; }
 
         public DbSet<UserActivity> UserActivities { get; set; }
-        
+
         /// <summary>
         /// Users posts
         /// </summary>
@@ -203,7 +240,12 @@ namespace Yavsc.Models
             return await base.SaveChangesAsync(ctoken);
         }
 
-        public DbSet<Circle> Circle { get; set; }
+    public Task<int> SaveChangesAsync()
+    {
+        return base.SaveChangesAsync();
+    }
+
+    public DbSet<Circle> Circle { get; set; }
 
         public DbSet<CircleAuthorizationToBlogPost> CircleAuthorizationToBlogPost { get; set; }
 
@@ -265,24 +307,39 @@ namespace Yavsc.Models
 
         public DbSet<InstrumentRating> InstrumentRating { get; set; }
 
-        public DbSet<Scope> Scopes { get; set; }
 
         public DbSet<BlogSpotPublication> blogSpotPublications { get; set; }
 
-        /*
+        public DbSet<Client> Clients { get; set; }
+        public DbSet<ClientIdPRestriction> ClientIdPRestrictions { get; set; }
+        public DbSet<ClientProperty> ClientProperties { get; set; }
+
         public DbSet<ClientCorsOrigin> ClientCorsOrigins { get; set; }
-        public DbSet<IdentityServer8.EntityFramework.Entities.Client> Clients { get; set; }
-        public DbSet<IdentityServer8.EntityFramework.Entities.IdentityResource> IdentityResources { get; set; }
-        public DbSet<IdentityServer8.EntityFramework.Entities.ApiResource> ApiResources { get; set; }
-        public DbSet<IdentityServer8.EntityFramework.Entities.ApiScope> ApiScopes { get; set; }
+        public DbSet<ClientSecret> ClientSecrets { get; set; }
+        public DbSet<ClientScope> ClientScopes { get; set; }
+        public DbSet<ClientGrantType> ClientGrantTypes { get; set; }
+        public DbSet<ClientClaim> ClientClaims { get; set; }
+
+        public DbSet<ClientRedirectUri> ClientRedirectUris { get; set; }
+
+
+        public DbSet<ClientPostLogoutRedirectUri> ClientPostLogoutRedirectUris { get; set; }
+        public DbSet<IdentityResource> IdentityResources { get; set; }
         public DbSet<IdentityResourceClaim> IdentityResourceClaims { get; set; }
         public DbSet<IdentityResourceProperty> IdentityResourceProperties { get; set; }
+        public DbSet<ApiResource> ApiResources { get; set; }
         public DbSet<ApiResourceSecret> ApiResourceSecrets { get; set; }
         public DbSet<ApiResourceScope> ApiResourceScopes { get; set; }
         public DbSet<ApiResourceClaim> ApiResourceClaims { get; set; }
         public DbSet<ApiResourceProperty> ApiResourceProperties { get; set; }
+        public DbSet<ApiScope> ApiScopes { get; set; }
         public DbSet<ApiScopeClaim> ApiScopeClaims { get; set; }
-        public DbSet<ApiScopeProperty> ApiScopeProperties { get; set; } */
-        
+        public DbSet<ApiScopeProperty> ApiScopeProperties { get; set; }
+        public DbSet<PersistedGrant> PersistedGrants { get; set; }
+        public DbSet<DeviceFlowCodes> DeviceFlowCodes { get; set; }
+
+
+
+
     }
 }

src/Yavsc.Server/Models/IT/Project.cs

@@ -24,7 +24,7 @@ namespace Yavsc.Server.Models.IT
         /// As a side effect, there's no project without valid git reference in db. 
         /// </summary>
         /// <returns></returns>
-        [YaRequired]
+        [Required]
         public string Name { get; set; }
 
         public string Version { get; set; }
@@ -33,7 +33,7 @@ namespace Yavsc.Server.Models.IT
         public virtual List<ProjectBuildConfiguration> Configurations { get; set; }
 
 
-        [YaRequired]
+        [Required]
         public long GitId { get; set; }
 
         [ForeignKey("GitId")]

src/Yavsc.Server/Models/IT/ProjectBuildConfiguration.cs

@@ -13,7 +13,7 @@ namespace Yavsc.Server.Models.IT
         [Key,DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         public long Id { get; set; }
 
-        [YaRequired]
+        [Required]
         public string Name { get; set; }
 
         public long ProjectId { get; set; }

src/Yavsc.Server/Models/IT/SourceCode/GitRepository.cs

@@ -10,7 +10,7 @@ namespace Yavsc.Server.Models.IT.SourceCode
         [Key,DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         public long Id { get; set; }
 
-        [YaRequired]
+        [Required]
         public string Path { get; set; }
 
         [YaStringLength(2048)]
@@ -30,4 +30,4 @@ namespace Yavsc.Server.Models.IT.SourceCode
             return $"[Git ref {Path} {Branch} {Url}]";
         }
     }
-}
+}

src/Yavsc.Server/Models/Messaging/CircleEvent.cs

@@ -36,7 +36,7 @@ namespace Yavsc.Models.Messaging
 		/// Gets or sets the circles.
 		/// </summary>
 		/// <value>The circles.</value>
-		[YaRequired, Display(Name="Circles")]
+		[Required, Display(Name="Circles")]
 		public virtual List<Circle> Circles{ get; set; }
 
         public override string CreateBody()

src/Yavsc.Server/Models/Messaging/DimissClicked.cs

@@ -7,13 +7,13 @@ namespace Yavsc.Models.Messaging
 {
     public class DismissClicked
     {
-        [YaRequired]
+        [Required]
         public string UserId { get; set; }
         
         [ForeignKey("UserId")]
         public virtual ApplicationUser User { get; set; }
 
-        [YaRequired]
+        [Required]
         public long NotificationId { get; set; }
 
         [ForeignKey("NotificationId")]

src/Yavsc.Server/Models/Messaging/LiveFlow.cs

@@ -41,7 +41,7 @@ namespace Yavsc.Models.Streaming
       [Display(Name="SequenceNumberLabel", ResourceType=typeof(LiveFlow))]
       public int SequenceNumber { get; set; }
 
-      [YaRequired]
+      [Required]
       [Display(Name="OwnerIdLabel", ResourceType=typeof(LiveFlow))]
       public string OwnerId {get; set; }
 

src/Yavsc.Server/Models/Musical/Instrument.cs

@@ -10,7 +10,7 @@ namespace Yavsc.Models.Musical
     [Key(), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
     public long Id {get; set; }
     
-    [MaxLength(255), YaRequired]
+    [MaxLength(255), Required]
     public string Name { get ; set; }
     }
-}
+}

src/Yavsc.Server/Models/Musical/InstrumentRating.cs

@@ -10,7 +10,7 @@ namespace Yavsc.Models.Musical
         [Key(), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         public long Id {get; set; }
 
-        [YaRequired]
+        [Required]
         public long InstrumentId { get; set; }
        
         [ForeignKey("InstrumentId")]
@@ -25,4 +25,4 @@ namespace Yavsc.Models.Musical
         public virtual PerformerProfile Profile { get; set; } 
 
     }
-}
+}

src/Yavsc.Server/Models/Musical/MusicalPreference.cs

@@ -17,7 +17,7 @@ namespace Yavsc.Models.Musical
 
     public int Rate { get; set; }
     
-    [YaRequired]
+    [Required]
     public long TendencyId { get; set; }
     
     [ForeignKey("TendencyId")]

src/Yavsc.Server/Models/Musical/MusicalTendency.cs

@@ -9,7 +9,7 @@ namespace Yavsc.Models.Musical {
     [Key(), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
     public long Id {get; set; }
     
-    [MaxLength(255),YaRequired]
+    [MaxLength(255),Required]
     public string Name { get ; set; }
       
   }

src/Yavsc.Server/Models/Payment/PaypalPayment.cs

@@ -10,10 +10,10 @@ namespace Yavsc.Models.Payment {
 
     public class PayPalPayment : ITrackedEntity
     {
-        [YaRequired,Key]
+        [Required,Key]
         public string CreationToken { get; set; }
 
-        [YaRequired]
+        [Required]
         public string ExecutorId { get; set; }
         
         [ForeignKey("ExecutorId")]

src/Yavsc.Server/Models/Relationship/Circle.cs

@@ -14,10 +14,10 @@ namespace Yavsc.Models.Relationship
 
         public bool Public { get; set; }
 
-        [YaRequired]
+        [Required]
         public string Name { get; set; }
         
-        [YaRequired]
+        [Required]
         public string OwnerId { get; set; }
 
         [ForeignKey("OwnerId"),JsonIgnore,NotMapped]

src/Yavsc.Server/Models/Relationship/CircleMember.cs

@@ -9,13 +9,13 @@ namespace Yavsc.Models.Relationship
     public partial class CircleMember
     {
 
-        [YaRequired]
+        [Required]
         public long CircleId { get; set; }
 
         [ForeignKey("CircleId")]
         public virtual Circle Circle { get; set; }
         
-        [YaRequired]
+        [Required]
         public string MemberId { get; set; }
 
         [ForeignKey("MemberId")]

src/Yavsc.Server/Models/Relationship/Tag.cs

@@ -9,7 +9,7 @@ namespace Yavsc.Models.Relationship
     {
         [Key(), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         public long Id { get; set; }
-        [YaRequired()]
+        [Required()]
         public string Name { get; set; }
     }
 }

src/Yavsc.Server/Models/Workflow/Activity.cs

@@ -14,14 +14,14 @@ namespace Yavsc.Models.Workflow
     public class Activity : ITrackedEntity, IActivity
     {
 
-        [YaStringLength(512), YaRequired, Key]
+        [YaStringLength(512), Required, Key]
         [Display(Name = "Code")]
         public string Code { get; set; }
         /// <summary>
         ///
         /// </summary>
         /// <returns></returns>
-        [YaStringLength(512), YaRequired()]
+        [YaStringLength(512), Required()]
         [Display(Name = "Nom")]
         public string Name { get; set; }
 

src/Yavsc.Server/Models/Workflow/CommandForm.cs

@@ -16,7 +16,7 @@ namespace Yavsc.Models.Workflow
 
         public string Title { get; set; }
 
-        [YaRequired]
+        [Required]
         public string ActivityCode { get; set; }
 
         [ForeignKey("ActivityCode"),JsonIgnore]

src/Yavsc.Server/Models/Workflow/PerformerProfile.cs

@@ -21,13 +21,13 @@ namespace Yavsc.Models.Workflow
         [Display(Name="Activity"), JsonIgnore]
         public virtual List<UserActivity> Activity { get; set; }
 
-        [YaRequired,YaStringLength(14),Display(Name="SIREN"),
+        [Required,YaStringLength(14),Display(Name="SIREN"),
         RegularExpression(@"^[0-9]{9,14}$", ErrorMessage = "Only numbers are allowed here")]
         public string SIREN { get; set; }
 
         public long OrganizationAddressId { get; set; }
 
-        [YaRequired,Display(Name="Organization address"),ForeignKey("OrganizationAddressId")]
+        [Required,Display(Name="Organization address"),ForeignKey("OrganizationAddressId")]
         public virtual Location OrganizationAddress { get; set; }
 
         [Display(Name="Accept notifications on client query")]

src/Yavsc.Server/Models/Workflow/RendezVous.cs

@@ -18,21 +18,21 @@ namespace Yavsc.Models.Workflow
         /// Event date
         /// </summary>
         /// <returns></returns>
-        [YaRequired(),Display(Name="EventDate")]
+        [Required(),Display(Name="EventDate")]
         public DateTime EventDate { get; set; }
 
         /// <summary>
         /// Location identifier
         /// </summary>
         /// <returns></returns>
-        [YaRequired]
+        [Required]
         public long LocationId { get; set; }
 
         /// <summary>
         /// A Location for this event
         /// </summary>
         /// <returns></returns>
-        [YaRequired(ErrorMessage="SpecifyPlace"),Display(Name="Location"),ForeignKey("LocationId")]
+        [Required(ErrorMessage="SpecifyPlace"),Display(Name="Location"),ForeignKey("LocationId")]
         public Location Location { get; set; }
 
     }

src/Yavsc.Server/Models/Workflow/UserActivity.cs

@@ -7,13 +7,13 @@ namespace Yavsc.Models.Workflow
 {
     public class UserActivity
     {
-        [YaRequired]
+        [Required]
         public string UserId { get; set; }
 
         [ForeignKey("UserId")]
         public virtual PerformerProfile User { get; set; }
         
-        [YaRequired]
+        [Required]
         public string DoesCode { get; set; }
 
         [ForeignKey("DoesCode")]
@@ -25,4 +25,4 @@ namespace Yavsc.Models.Workflow
         [NotMapped,JsonIgnore]
         public object Settings { get; internal set; }
     }
-}
+}