Circles, pub & auth

* Adds a boolean to each Circle, saying that
  it is public, and its existence may be known by any interested in
* Adds claims of type "YavscClaimTypes.CircleMembership" at
  login, in order to implement some faster authorisation processes and file restricted accesses.

src/Yavsc.Server/Models/ApplicationUser.cs

@@ -109,6 +109,9 @@ namespace Yavsc.Models
         [JsonIgnore][InverseProperty("User")]
         public virtual List<ChatRoomAccess> RoomAccess { get; set; }
 
+        [JsonIgnore][InverseProperty("Member")]
+        public virtual List<CircleMember> Membership { get; set; }
+
         public DateTime DateCreated
         {
             get; set;

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

@@ -7,9 +7,12 @@ using Newtonsoft.Json;
 namespace Yavsc.Models.Relationship
 {
     public class Circle {
+        
         [Key, DatabaseGeneratedAttribute(DatabaseGeneratedOption.Identity)]
         public long Id { get; set; }
 
+        public bool Public { get; set; }
+
         public string Name { get; set; }
         public string OwnerId { get; set; }
 

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

@@ -13,6 +13,7 @@ namespace Yavsc.Models.Relationship
 
         [ForeignKey("CircleId")]
         public virtual Circle Circle { get; set; }
+        
         [Required]
         public string MemberId { get; set; }
 

src/Yavsc.Server/ViewModels/Auth/ClaimTypes.cs

@@ -4,6 +4,8 @@
 namespace Yavsc {
     public static class  YavscClaimTypes {
 
+        public const string CircleMembership = "CircleMembership";
+
         public const string GoogleUserId = "GoogleUserId";
     }
 

src/Yavsc/Controllers/Accounting/AccountController.cs

@@ -20,13 +20,17 @@ using Newtonsoft.Json;
 
 namespace Yavsc.Controllers
 {
+    using System.Collections.Generic;
     using Yavsc.Abstract.Manage;
+    using Yavsc.Auth;
     using Yavsc.Helpers;
 
     public class AccountController : Controller
     {
         private readonly UserManager<ApplicationUser> _userManager;
         private readonly SignInManager<ApplicationUser> _signInManager;
+        const string  nextPageTokenKey = "nextPageTokenKey";
+        const int defaultLen = 10;
         private readonly IEmailSender _emailSender;
         // private readonly ISmsSender _smsSender;
         private readonly ILogger _logger;
@@ -39,6 +43,7 @@ namespace Yavsc.Controllers
 
         ApplicationDbContext _dbContext;
         
+
         public AccountController(
             UserManager<ApplicationUser> userManager,
             SignInManager<ApplicationUser> signInManager,
@@ -49,7 +54,13 @@ namespace Yavsc.Controllers
             ApplicationDbContext dbContext)
         {
             _userManager = userManager;
+            
             _signInManager = signInManager;
+            var emailUserTokenProvider = new UserTokenProvider();
+            _userManager.RegisterTokenProvider("EmailConfirmation", emailUserTokenProvider);
+            
+            _userManager.RegisterTokenProvider("ResetPassword", emailUserTokenProvider);
+            
             // _userManager.RegisterTokenProvider("SMS",new UserTokenProvider());
             // _userManager.RegisterTokenProvider("Phone", new UserTokenProvider());
             _emailSender = emailSender;
@@ -60,8 +71,13 @@ namespace Yavsc.Controllers
             _dbContext = dbContext;
         }
 
-        const string  nextPageTokenKey = "nextPageTokenKey";
-        const int defaultLen = 10;
+
+        [Authorize(Roles = Constants.AdminGroupName)]
+        public IActionResult Index(string page, string len)
+        {
+            
+            return View();
+        }
 
         [Authorize(Roles = Constants.AdminGroupName)]
         [Route("Account/UserList/{page?}/{len?}")]
@@ -128,7 +144,9 @@ namespace Yavsc.Controllers
                 {
                     if (ModelState.IsValid)
                     {
-                        var user = await _userManager.FindByNameAsync(model.UserName);
+                        var user = _dbContext.Users.Include(u=>u.Membership).FirstOrDefault(
+                            u=>u.UserName == model.UserName);
+                       
                         if (user != null)
                         {
                             if (!await _userManager.IsEmailConfirmedAsync(user))
@@ -145,8 +163,12 @@ namespace Yavsc.Controllers
 
                         if (result.Succeeded)
                         {
+                            await _userManager.AddClaimsAsync(user, user.Membership.Select(
+                                m => new Claim(YavscClaimTypes.CircleMembership, m.CircleId.ToString())
+                             ));
                             return Redirect(model.ReturnUrl ?? "/");
                         }
+
                         if (result.RequiresTwoFactor)
                         {
                             return RedirectToAction(nameof(SendCode), new { ReturnUrl = model.ReturnUrl, RememberMe = model.RememberMe });

src/Yavsc/Controllers/Accounting/OAuthController.cs

@@ -69,7 +69,8 @@ namespace Yavsc.Controllers
                     var accepted = Request.Headers["Accept"];
                     if (accepted.Contains("application/json"))
                     {
-                        return new BadRequestObjectResult(new { error = this.HttpContext.Items } );
+                        _logger.LogError("Invalid http status at authorisation");
+                        return new BadRequestObjectResult(new { error = Response.StatusCode} );
                     }
                 }
 
@@ -145,6 +146,7 @@ namespace Yavsc.Controllers
                 var accepted = Request.Headers["Accept"];
                 if (accepted.Contains("application/json"))
                 {
+                    _logger.LogInformation("serving available scopes");
                     return Ok(model);
                 }
             }

src/Yavsc/Migrations/20190730164137_publicCircle.cs

@@ -0,0 +1,935 @@
+using System;
+using System.Collections.Generic;
+using Microsoft.Data.Entity.Migrations;
+
+namespace Yavsc.Migrations
+{
+    public partial class publicCircle : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(name: "FK_IdentityRoleClaim<string>_IdentityRole_RoleId", table: "AspNetRoleClaims");
+            migrationBuilder.DropForeignKey(name: "FK_IdentityUserClaim<string>_ApplicationUser_UserId", table: "AspNetUserClaims");
+            migrationBuilder.DropForeignKey(name: "FK_IdentityUserLogin<string>_ApplicationUser_UserId", table: "AspNetUserLogins");
+            migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole<string>_IdentityRole_RoleId", table: "AspNetUserRoles");
+            migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole<string>_ApplicationUser_UserId", table: "AspNetUserRoles");
+            migrationBuilder.DropForeignKey(name: "FK_Ban_ApplicationUser_TargetId", table: "Ban");
+            migrationBuilder.DropForeignKey(name: "FK_BlackListed_ApplicationUser_OwnerId", table: "BlackListed");
+            migrationBuilder.DropForeignKey(name: "FK_BlackListed_ApplicationUser_UserId", table: "BlackListed");
+            migrationBuilder.DropForeignKey(name: "FK_CircleAuthorizationToBlogPost_BlogPost_BlogPostId", table: "CircleAuthorizationToBlogPost");
+            migrationBuilder.DropForeignKey(name: "FK_CircleAuthorizationToBlogPost_Circle_CircleId", table: "CircleAuthorizationToBlogPost");
+            migrationBuilder.DropForeignKey(name: "FK_AccountBalance_ApplicationUser_UserId", table: "AccountBalance");
+            migrationBuilder.DropForeignKey(name: "FK_BalanceImpact_AccountBalance_BalanceId", table: "BalanceImpact");
+            migrationBuilder.DropForeignKey(name: "FK_CommandLine_Estimate_EstimateId", table: "CommandLine");
+            migrationBuilder.DropForeignKey(name: "FK_Estimate_ApplicationUser_ClientId", table: "Estimate");
+            migrationBuilder.DropForeignKey(name: "FK_BlogTag_BlogPost_PostId", table: "BlogTag");
+            migrationBuilder.DropForeignKey(name: "FK_BlogTag_Tag_TagId", table: "BlogTag");
+            migrationBuilder.DropForeignKey(name: "FK_Comment_ApplicationUser_AuthorId", table: "Comment");
+            migrationBuilder.DropForeignKey(name: "FK_Comment_BlogPost_PostId", table: "Comment");
+            migrationBuilder.DropForeignKey(name: "FK_Schedule_ApplicationUser_OwnerId", table: "Schedule");
+            migrationBuilder.DropForeignKey(name: "FK_ChatConnection_ApplicationUser_ApplicationUserId", table: "ChatConnection");
+            migrationBuilder.DropForeignKey(name: "FK_ChatRoomAccess_ApplicationUser_UserId", table: "ChatRoomAccess");
+            migrationBuilder.DropForeignKey(name: "FK_BrusherProfile_PerformerProfile_UserId", table: "BrusherProfile");
+            migrationBuilder.DropForeignKey(name: "FK_HairCutQuery_Activity_ActivityCode", table: "HairCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairCutQuery_ApplicationUser_ClientId", table: "HairCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairCutQuery_PerformerProfile_PerformerId", table: "HairCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairCutQuery_HairPrestation_PrestationId", table: "HairCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairMultiCutQuery_Activity_ActivityCode", table: "HairMultiCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairMultiCutQuery_ApplicationUser_ClientId", table: "HairMultiCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairMultiCutQuery_PerformerProfile_PerformerId", table: "HairMultiCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairPrestationCollectionItem_HairPrestation_PrestationId", table: "HairPrestationCollectionItem");
+            migrationBuilder.DropForeignKey(name: "FK_HairPrestationCollectionItem_HairMultiCutQuery_QueryId", table: "HairPrestationCollectionItem");
+            migrationBuilder.DropForeignKey(name: "FK_HairTaint_Color_ColorId", table: "HairTaint");
+            migrationBuilder.DropForeignKey(name: "FK_HairTaintInstance_HairPrestation_PrestationId", table: "HairTaintInstance");
+            migrationBuilder.DropForeignKey(name: "FK_HairTaintInstance_HairTaint_TaintId", table: "HairTaintInstance");
+            migrationBuilder.DropForeignKey(name: "FK_DimissClicked_Notification_NotificationId", table: "DimissClicked");
+            migrationBuilder.DropForeignKey(name: "FK_DimissClicked_ApplicationUser_UserId", table: "DimissClicked");
+            migrationBuilder.DropForeignKey(name: "FK_Instrumentation_Instrument_InstrumentId", table: "Instrumentation");
+            migrationBuilder.DropForeignKey(name: "FK_PayPalPayment_ApplicationUser_ExecutorId", table: "PayPalPayment");
+            migrationBuilder.DropForeignKey(name: "FK_CircleMember_Circle_CircleId", table: "CircleMember");
+            migrationBuilder.DropForeignKey(name: "FK_CircleMember_ApplicationUser_MemberId", table: "CircleMember");
+            migrationBuilder.DropForeignKey(name: "FK_Contact_PostalAddress_AddressId", table: "Contact");
+            migrationBuilder.DropForeignKey(name: "FK_LiveFlow_ApplicationUser_OwnerId", table: "LiveFlow");
+            migrationBuilder.DropForeignKey(name: "FK_CommandForm_Activity_ActivityCode", table: "CommandForm");
+            migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_Location_OrganizationAddressId", table: "PerformerProfile");
+            migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_ApplicationUser_PerformerId", table: "PerformerProfile");
+            migrationBuilder.DropForeignKey(name: "FK_RdvQuery_Activity_ActivityCode", table: "RdvQuery");
+            migrationBuilder.DropForeignKey(name: "FK_RdvQuery_ApplicationUser_ClientId", table: "RdvQuery");
+            migrationBuilder.DropForeignKey(name: "FK_RdvQuery_PerformerProfile_PerformerId", table: "RdvQuery");
+            migrationBuilder.DropForeignKey(name: "FK_UserActivity_Activity_DoesCode", table: "UserActivity");
+            migrationBuilder.DropForeignKey(name: "FK_UserActivity_PerformerProfile_UserId", table: "UserActivity");
+            migrationBuilder.DropForeignKey(name: "FK_MailingTemplate_ApplicationUser_ManagerId", table: "MailingTemplate");
+            migrationBuilder.DropForeignKey(name: "FK_MailingTemplate_ApplicationUser_SuccessorId", table: "MailingTemplate");
+            migrationBuilder.DropForeignKey(name: "FK_Project_Activity_ActivityCode", table: "Project");
+            migrationBuilder.DropForeignKey(name: "FK_Project_ApplicationUser_ClientId", table: "Project");
+            migrationBuilder.DropForeignKey(name: "FK_Project_GitRepositoryReference_GitId", table: "Project");
+            migrationBuilder.DropForeignKey(name: "FK_Project_PerformerProfile_PerformerId", table: "Project");
+            migrationBuilder.DropForeignKey(name: "FK_ProjectBuildConfiguration_Project_ProjectId", table: "ProjectBuildConfiguration");
+            migrationBuilder.AddColumn<bool>(
+                name: "Public",
+                table: "Circle",
+                nullable: false,
+                defaultValue: false);
+            migrationBuilder.AddForeignKey(
+                name: "FK_IdentityRoleClaim<string>_IdentityRole_RoleId",
+                table: "AspNetRoleClaims",
+                column: "RoleId",
+                principalTable: "AspNetRoles",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_IdentityUserClaim<string>_ApplicationUser_UserId",
+                table: "AspNetUserClaims",
+                column: "UserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_IdentityUserLogin<string>_ApplicationUser_UserId",
+                table: "AspNetUserLogins",
+                column: "UserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_IdentityUserRole<string>_IdentityRole_RoleId",
+                table: "AspNetUserRoles",
+                column: "RoleId",
+                principalTable: "AspNetRoles",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_IdentityUserRole<string>_ApplicationUser_UserId",
+                table: "AspNetUserRoles",
+                column: "UserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Ban_ApplicationUser_TargetId",
+                table: "Ban",
+                column: "TargetId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_BlackListed_ApplicationUser_OwnerId",
+                table: "BlackListed",
+                column: "OwnerId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_BlackListed_ApplicationUser_UserId",
+                table: "BlackListed",
+                column: "UserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_CircleAuthorizationToBlogPost_BlogPost_BlogPostId",
+                table: "CircleAuthorizationToBlogPost",
+                column: "BlogPostId",
+                principalTable: "BlogPost",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_CircleAuthorizationToBlogPost_Circle_CircleId",
+                table: "CircleAuthorizationToBlogPost",
+                column: "CircleId",
+                principalTable: "Circle",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_AccountBalance_ApplicationUser_UserId",
+                table: "AccountBalance",
+                column: "UserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_BalanceImpact_AccountBalance_BalanceId",
+                table: "BalanceImpact",
+                column: "BalanceId",
+                principalTable: "AccountBalance",
+                principalColumn: "UserId",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_CommandLine_Estimate_EstimateId",
+                table: "CommandLine",
+                column: "EstimateId",
+                principalTable: "Estimate",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Estimate_ApplicationUser_ClientId",
+                table: "Estimate",
+                column: "ClientId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_BlogTag_BlogPost_PostId",
+                table: "BlogTag",
+                column: "PostId",
+                principalTable: "BlogPost",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_BlogTag_Tag_TagId",
+                table: "BlogTag",
+                column: "TagId",
+                principalTable: "Tag",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Comment_ApplicationUser_AuthorId",
+                table: "Comment",
+                column: "AuthorId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Comment_BlogPost_PostId",
+                table: "Comment",
+                column: "PostId",
+                principalTable: "BlogPost",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Schedule_ApplicationUser_OwnerId",
+                table: "Schedule",
+                column: "OwnerId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_ChatConnection_ApplicationUser_ApplicationUserId",
+                table: "ChatConnection",
+                column: "ApplicationUserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_ChatRoomAccess_ApplicationUser_UserId",
+                table: "ChatRoomAccess",
+                column: "UserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_BrusherProfile_PerformerProfile_UserId",
+                table: "BrusherProfile",
+                column: "UserId",
+                principalTable: "PerformerProfile",
+                principalColumn: "PerformerId",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairCutQuery_Activity_ActivityCode",
+                table: "HairCutQuery",
+                column: "ActivityCode",
+                principalTable: "Activity",
+                principalColumn: "Code",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairCutQuery_ApplicationUser_ClientId",
+                table: "HairCutQuery",
+                column: "ClientId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairCutQuery_PerformerProfile_PerformerId",
+                table: "HairCutQuery",
+                column: "PerformerId",
+                principalTable: "PerformerProfile",
+                principalColumn: "PerformerId",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairCutQuery_HairPrestation_PrestationId",
+                table: "HairCutQuery",
+                column: "PrestationId",
+                principalTable: "HairPrestation",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairMultiCutQuery_Activity_ActivityCode",
+                table: "HairMultiCutQuery",
+                column: "ActivityCode",
+                principalTable: "Activity",
+                principalColumn: "Code",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairMultiCutQuery_ApplicationUser_ClientId",
+                table: "HairMultiCutQuery",
+                column: "ClientId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairMultiCutQuery_PerformerProfile_PerformerId",
+                table: "HairMultiCutQuery",
+                column: "PerformerId",
+                principalTable: "PerformerProfile",
+                principalColumn: "PerformerId",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairPrestationCollectionItem_HairPrestation_PrestationId",
+                table: "HairPrestationCollectionItem",
+                column: "PrestationId",
+                principalTable: "HairPrestation",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairPrestationCollectionItem_HairMultiCutQuery_QueryId",
+                table: "HairPrestationCollectionItem",
+                column: "QueryId",
+                principalTable: "HairMultiCutQuery",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairTaint_Color_ColorId",
+                table: "HairTaint",
+                column: "ColorId",
+                principalTable: "Color",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairTaintInstance_HairPrestation_PrestationId",
+                table: "HairTaintInstance",
+                column: "PrestationId",
+                principalTable: "HairPrestation",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairTaintInstance_HairTaint_TaintId",
+                table: "HairTaintInstance",
+                column: "TaintId",
+                principalTable: "HairTaint",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_DimissClicked_Notification_NotificationId",
+                table: "DimissClicked",
+                column: "NotificationId",
+                principalTable: "Notification",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_DimissClicked_ApplicationUser_UserId",
+                table: "DimissClicked",
+                column: "UserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Instrumentation_Instrument_InstrumentId",
+                table: "Instrumentation",
+                column: "InstrumentId",
+                principalTable: "Instrument",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_PayPalPayment_ApplicationUser_ExecutorId",
+                table: "PayPalPayment",
+                column: "ExecutorId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_CircleMember_Circle_CircleId",
+                table: "CircleMember",
+                column: "CircleId",
+                principalTable: "Circle",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_CircleMember_ApplicationUser_MemberId",
+                table: "CircleMember",
+                column: "MemberId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Contact_PostalAddress_AddressId",
+                table: "Contact",
+                column: "AddressId",
+                principalTable: "PostalAddress",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_LiveFlow_ApplicationUser_OwnerId",
+                table: "LiveFlow",
+                column: "OwnerId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_CommandForm_Activity_ActivityCode",
+                table: "CommandForm",
+                column: "ActivityCode",
+                principalTable: "Activity",
+                principalColumn: "Code",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_PerformerProfile_Location_OrganizationAddressId",
+                table: "PerformerProfile",
+                column: "OrganizationAddressId",
+                principalTable: "Location",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_PerformerProfile_ApplicationUser_PerformerId",
+                table: "PerformerProfile",
+                column: "PerformerId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_RdvQuery_Activity_ActivityCode",
+                table: "RdvQuery",
+                column: "ActivityCode",
+                principalTable: "Activity",
+                principalColumn: "Code",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_RdvQuery_ApplicationUser_ClientId",
+                table: "RdvQuery",
+                column: "ClientId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_RdvQuery_PerformerProfile_PerformerId",
+                table: "RdvQuery",
+                column: "PerformerId",
+                principalTable: "PerformerProfile",
+                principalColumn: "PerformerId",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_UserActivity_Activity_DoesCode",
+                table: "UserActivity",
+                column: "DoesCode",
+                principalTable: "Activity",
+                principalColumn: "Code",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_UserActivity_PerformerProfile_UserId",
+                table: "UserActivity",
+                column: "UserId",
+                principalTable: "PerformerProfile",
+                principalColumn: "PerformerId",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_MailingTemplate_ApplicationUser_ManagerId",
+                table: "MailingTemplate",
+                column: "ManagerId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_MailingTemplate_ApplicationUser_SuccessorId",
+                table: "MailingTemplate",
+                column: "SuccessorId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Project_Activity_ActivityCode",
+                table: "Project",
+                column: "ActivityCode",
+                principalTable: "Activity",
+                principalColumn: "Code",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Project_ApplicationUser_ClientId",
+                table: "Project",
+                column: "ClientId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Project_GitRepositoryReference_GitId",
+                table: "Project",
+                column: "GitId",
+                principalTable: "GitRepositoryReference",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Project_PerformerProfile_PerformerId",
+                table: "Project",
+                column: "PerformerId",
+                principalTable: "PerformerProfile",
+                principalColumn: "PerformerId",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_ProjectBuildConfiguration_Project_ProjectId",
+                table: "ProjectBuildConfiguration",
+                column: "ProjectId",
+                principalTable: "Project",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(name: "FK_IdentityRoleClaim<string>_IdentityRole_RoleId", table: "AspNetRoleClaims");
+            migrationBuilder.DropForeignKey(name: "FK_IdentityUserClaim<string>_ApplicationUser_UserId", table: "AspNetUserClaims");
+            migrationBuilder.DropForeignKey(name: "FK_IdentityUserLogin<string>_ApplicationUser_UserId", table: "AspNetUserLogins");
+            migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole<string>_IdentityRole_RoleId", table: "AspNetUserRoles");
+            migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole<string>_ApplicationUser_UserId", table: "AspNetUserRoles");
+            migrationBuilder.DropForeignKey(name: "FK_Ban_ApplicationUser_TargetId", table: "Ban");
+            migrationBuilder.DropForeignKey(name: "FK_BlackListed_ApplicationUser_OwnerId", table: "BlackListed");
+            migrationBuilder.DropForeignKey(name: "FK_BlackListed_ApplicationUser_UserId", table: "BlackListed");
+            migrationBuilder.DropForeignKey(name: "FK_CircleAuthorizationToBlogPost_BlogPost_BlogPostId", table: "CircleAuthorizationToBlogPost");
+            migrationBuilder.DropForeignKey(name: "FK_CircleAuthorizationToBlogPost_Circle_CircleId", table: "CircleAuthorizationToBlogPost");
+            migrationBuilder.DropForeignKey(name: "FK_AccountBalance_ApplicationUser_UserId", table: "AccountBalance");
+            migrationBuilder.DropForeignKey(name: "FK_BalanceImpact_AccountBalance_BalanceId", table: "BalanceImpact");
+            migrationBuilder.DropForeignKey(name: "FK_CommandLine_Estimate_EstimateId", table: "CommandLine");
+            migrationBuilder.DropForeignKey(name: "FK_Estimate_ApplicationUser_ClientId", table: "Estimate");
+            migrationBuilder.DropForeignKey(name: "FK_BlogTag_BlogPost_PostId", table: "BlogTag");
+            migrationBuilder.DropForeignKey(name: "FK_BlogTag_Tag_TagId", table: "BlogTag");
+            migrationBuilder.DropForeignKey(name: "FK_Comment_ApplicationUser_AuthorId", table: "Comment");
+            migrationBuilder.DropForeignKey(name: "FK_Comment_BlogPost_PostId", table: "Comment");
+            migrationBuilder.DropForeignKey(name: "FK_Schedule_ApplicationUser_OwnerId", table: "Schedule");
+            migrationBuilder.DropForeignKey(name: "FK_ChatConnection_ApplicationUser_ApplicationUserId", table: "ChatConnection");
+            migrationBuilder.DropForeignKey(name: "FK_ChatRoomAccess_ApplicationUser_UserId", table: "ChatRoomAccess");
+            migrationBuilder.DropForeignKey(name: "FK_BrusherProfile_PerformerProfile_UserId", table: "BrusherProfile");
+            migrationBuilder.DropForeignKey(name: "FK_HairCutQuery_Activity_ActivityCode", table: "HairCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairCutQuery_ApplicationUser_ClientId", table: "HairCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairCutQuery_PerformerProfile_PerformerId", table: "HairCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairCutQuery_HairPrestation_PrestationId", table: "HairCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairMultiCutQuery_Activity_ActivityCode", table: "HairMultiCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairMultiCutQuery_ApplicationUser_ClientId", table: "HairMultiCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairMultiCutQuery_PerformerProfile_PerformerId", table: "HairMultiCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairPrestationCollectionItem_HairPrestation_PrestationId", table: "HairPrestationCollectionItem");
+            migrationBuilder.DropForeignKey(name: "FK_HairPrestationCollectionItem_HairMultiCutQuery_QueryId", table: "HairPrestationCollectionItem");
+            migrationBuilder.DropForeignKey(name: "FK_HairTaint_Color_ColorId", table: "HairTaint");
+            migrationBuilder.DropForeignKey(name: "FK_HairTaintInstance_HairPrestation_PrestationId", table: "HairTaintInstance");
+            migrationBuilder.DropForeignKey(name: "FK_HairTaintInstance_HairTaint_TaintId", table: "HairTaintInstance");
+            migrationBuilder.DropForeignKey(name: "FK_DimissClicked_Notification_NotificationId", table: "DimissClicked");
+            migrationBuilder.DropForeignKey(name: "FK_DimissClicked_ApplicationUser_UserId", table: "DimissClicked");
+            migrationBuilder.DropForeignKey(name: "FK_Instrumentation_Instrument_InstrumentId", table: "Instrumentation");
+            migrationBuilder.DropForeignKey(name: "FK_PayPalPayment_ApplicationUser_ExecutorId", table: "PayPalPayment");
+            migrationBuilder.DropForeignKey(name: "FK_CircleMember_Circle_CircleId", table: "CircleMember");
+            migrationBuilder.DropForeignKey(name: "FK_CircleMember_ApplicationUser_MemberId", table: "CircleMember");
+            migrationBuilder.DropForeignKey(name: "FK_Contact_PostalAddress_AddressId", table: "Contact");
+            migrationBuilder.DropForeignKey(name: "FK_LiveFlow_ApplicationUser_OwnerId", table: "LiveFlow");
+            migrationBuilder.DropForeignKey(name: "FK_CommandForm_Activity_ActivityCode", table: "CommandForm");
+            migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_Location_OrganizationAddressId", table: "PerformerProfile");
+            migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_ApplicationUser_PerformerId", table: "PerformerProfile");
+            migrationBuilder.DropForeignKey(name: "FK_RdvQuery_Activity_ActivityCode", table: "RdvQuery");
+            migrationBuilder.DropForeignKey(name: "FK_RdvQuery_ApplicationUser_ClientId", table: "RdvQuery");
+            migrationBuilder.DropForeignKey(name: "FK_RdvQuery_PerformerProfile_PerformerId", table: "RdvQuery");
+            migrationBuilder.DropForeignKey(name: "FK_UserActivity_Activity_DoesCode", table: "UserActivity");
+            migrationBuilder.DropForeignKey(name: "FK_UserActivity_PerformerProfile_UserId", table: "UserActivity");
+            migrationBuilder.DropForeignKey(name: "FK_MailingTemplate_ApplicationUser_ManagerId", table: "MailingTemplate");
+            migrationBuilder.DropForeignKey(name: "FK_MailingTemplate_ApplicationUser_SuccessorId", table: "MailingTemplate");
+            migrationBuilder.DropForeignKey(name: "FK_Project_Activity_ActivityCode", table: "Project");
+            migrationBuilder.DropForeignKey(name: "FK_Project_ApplicationUser_ClientId", table: "Project");
+            migrationBuilder.DropForeignKey(name: "FK_Project_GitRepositoryReference_GitId", table: "Project");
+            migrationBuilder.DropForeignKey(name: "FK_Project_PerformerProfile_PerformerId", table: "Project");
+            migrationBuilder.DropForeignKey(name: "FK_ProjectBuildConfiguration_Project_ProjectId", table: "ProjectBuildConfiguration");
+            migrationBuilder.DropColumn(name: "Public", table: "Circle");
+            migrationBuilder.AddForeignKey(
+                name: "FK_IdentityRoleClaim<string>_IdentityRole_RoleId",
+                table: "AspNetRoleClaims",
+                column: "RoleId",
+                principalTable: "AspNetRoles",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_IdentityUserClaim<string>_ApplicationUser_UserId",
+                table: "AspNetUserClaims",
+                column: "UserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_IdentityUserLogin<string>_ApplicationUser_UserId",
+                table: "AspNetUserLogins",
+                column: "UserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_IdentityUserRole<string>_IdentityRole_RoleId",
+                table: "AspNetUserRoles",
+                column: "RoleId",
+                principalTable: "AspNetRoles",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_IdentityUserRole<string>_ApplicationUser_UserId",
+                table: "AspNetUserRoles",
+                column: "UserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Ban_ApplicationUser_TargetId",
+                table: "Ban",
+                column: "TargetId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_BlackListed_ApplicationUser_OwnerId",
+                table: "BlackListed",
+                column: "OwnerId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_BlackListed_ApplicationUser_UserId",
+                table: "BlackListed",
+                column: "UserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_CircleAuthorizationToBlogPost_BlogPost_BlogPostId",
+                table: "CircleAuthorizationToBlogPost",
+                column: "BlogPostId",
+                principalTable: "BlogPost",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_CircleAuthorizationToBlogPost_Circle_CircleId",
+                table: "CircleAuthorizationToBlogPost",
+                column: "CircleId",
+                principalTable: "Circle",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_AccountBalance_ApplicationUser_UserId",
+                table: "AccountBalance",
+                column: "UserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_BalanceImpact_AccountBalance_BalanceId",
+                table: "BalanceImpact",
+                column: "BalanceId",
+                principalTable: "AccountBalance",
+                principalColumn: "UserId",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_CommandLine_Estimate_EstimateId",
+                table: "CommandLine",
+                column: "EstimateId",
+                principalTable: "Estimate",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Estimate_ApplicationUser_ClientId",
+                table: "Estimate",
+                column: "ClientId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_BlogTag_BlogPost_PostId",
+                table: "BlogTag",
+                column: "PostId",
+                principalTable: "BlogPost",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_BlogTag_Tag_TagId",
+                table: "BlogTag",
+                column: "TagId",
+                principalTable: "Tag",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Comment_ApplicationUser_AuthorId",
+                table: "Comment",
+                column: "AuthorId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Comment_BlogPost_PostId",
+                table: "Comment",
+                column: "PostId",
+                principalTable: "BlogPost",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Schedule_ApplicationUser_OwnerId",
+                table: "Schedule",
+                column: "OwnerId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_ChatConnection_ApplicationUser_ApplicationUserId",
+                table: "ChatConnection",
+                column: "ApplicationUserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_ChatRoomAccess_ApplicationUser_UserId",
+                table: "ChatRoomAccess",
+                column: "UserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_BrusherProfile_PerformerProfile_UserId",
+                table: "BrusherProfile",
+                column: "UserId",
+                principalTable: "PerformerProfile",
+                principalColumn: "PerformerId",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairCutQuery_Activity_ActivityCode",
+                table: "HairCutQuery",
+                column: "ActivityCode",
+                principalTable: "Activity",
+                principalColumn: "Code",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairCutQuery_ApplicationUser_ClientId",
+                table: "HairCutQuery",
+                column: "ClientId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairCutQuery_PerformerProfile_PerformerId",
+                table: "HairCutQuery",
+                column: "PerformerId",
+                principalTable: "PerformerProfile",
+                principalColumn: "PerformerId",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairCutQuery_HairPrestation_PrestationId",
+                table: "HairCutQuery",
+                column: "PrestationId",
+                principalTable: "HairPrestation",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairMultiCutQuery_Activity_ActivityCode",
+                table: "HairMultiCutQuery",
+                column: "ActivityCode",
+                principalTable: "Activity",
+                principalColumn: "Code",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairMultiCutQuery_ApplicationUser_ClientId",
+                table: "HairMultiCutQuery",
+                column: "ClientId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairMultiCutQuery_PerformerProfile_PerformerId",
+                table: "HairMultiCutQuery",
+                column: "PerformerId",
+                principalTable: "PerformerProfile",
+                principalColumn: "PerformerId",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairPrestationCollectionItem_HairPrestation_PrestationId",
+                table: "HairPrestationCollectionItem",
+                column: "PrestationId",
+                principalTable: "HairPrestation",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairPrestationCollectionItem_HairMultiCutQuery_QueryId",
+                table: "HairPrestationCollectionItem",
+                column: "QueryId",
+                principalTable: "HairMultiCutQuery",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairTaint_Color_ColorId",
+                table: "HairTaint",
+                column: "ColorId",
+                principalTable: "Color",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairTaintInstance_HairPrestation_PrestationId",
+                table: "HairTaintInstance",
+                column: "PrestationId",
+                principalTable: "HairPrestation",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairTaintInstance_HairTaint_TaintId",
+                table: "HairTaintInstance",
+                column: "TaintId",
+                principalTable: "HairTaint",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_DimissClicked_Notification_NotificationId",
+                table: "DimissClicked",
+                column: "NotificationId",
+                principalTable: "Notification",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_DimissClicked_ApplicationUser_UserId",
+                table: "DimissClicked",
+                column: "UserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Instrumentation_Instrument_InstrumentId",
+                table: "Instrumentation",
+                column: "InstrumentId",
+                principalTable: "Instrument",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_PayPalPayment_ApplicationUser_ExecutorId",
+                table: "PayPalPayment",
+                column: "ExecutorId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_CircleMember_Circle_CircleId",
+                table: "CircleMember",
+                column: "CircleId",
+                principalTable: "Circle",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_CircleMember_ApplicationUser_MemberId",
+                table: "CircleMember",
+                column: "MemberId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Contact_PostalAddress_AddressId",
+                table: "Contact",
+                column: "AddressId",
+                principalTable: "PostalAddress",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_LiveFlow_ApplicationUser_OwnerId",
+                table: "LiveFlow",
+                column: "OwnerId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_CommandForm_Activity_ActivityCode",
+                table: "CommandForm",
+                column: "ActivityCode",
+                principalTable: "Activity",
+                principalColumn: "Code",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_PerformerProfile_Location_OrganizationAddressId",
+                table: "PerformerProfile",
+                column: "OrganizationAddressId",
+                principalTable: "Location",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_PerformerProfile_ApplicationUser_PerformerId",
+                table: "PerformerProfile",
+                column: "PerformerId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_RdvQuery_Activity_ActivityCode",
+                table: "RdvQuery",
+                column: "ActivityCode",
+                principalTable: "Activity",
+                principalColumn: "Code",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_RdvQuery_ApplicationUser_ClientId",
+                table: "RdvQuery",
+                column: "ClientId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_RdvQuery_PerformerProfile_PerformerId",
+                table: "RdvQuery",
+                column: "PerformerId",
+                principalTable: "PerformerProfile",
+                principalColumn: "PerformerId",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_UserActivity_Activity_DoesCode",
+                table: "UserActivity",
+                column: "DoesCode",
+                principalTable: "Activity",
+                principalColumn: "Code",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_UserActivity_PerformerProfile_UserId",
+                table: "UserActivity",
+                column: "UserId",
+                principalTable: "PerformerProfile",
+                principalColumn: "PerformerId",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_MailingTemplate_ApplicationUser_ManagerId",
+                table: "MailingTemplate",
+                column: "ManagerId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_MailingTemplate_ApplicationUser_SuccessorId",
+                table: "MailingTemplate",
+                column: "SuccessorId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Project_Activity_ActivityCode",
+                table: "Project",
+                column: "ActivityCode",
+                principalTable: "Activity",
+                principalColumn: "Code",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Project_ApplicationUser_ClientId",
+                table: "Project",
+                column: "ClientId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Project_GitRepositoryReference_GitId",
+                table: "Project",
+                column: "GitId",
+                principalTable: "GitRepositoryReference",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Project_PerformerProfile_PerformerId",
+                table: "Project",
+                column: "PerformerId",
+                principalTable: "PerformerProfile",
+                principalColumn: "PerformerId",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_ProjectBuildConfiguration_Project_ProjectId",
+                table: "ProjectBuildConfiguration",
+                column: "ProjectId",
+                principalTable: "Project",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+        }
+    }
+}

src/Yavsc/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -1107,6 +1107,8 @@ namespace Yavsc.Migrations
 
                     b.Property<string>("OwnerId");
 
+                    b.Property<bool>("Public");
+
                     b.HasKey("Id");
                 });
 

src/Yavsc/Startup/Startup.OAuth.cs

@@ -19,14 +19,16 @@ using Microsoft.Extensions.WebEncoders;
 using OAuth.AspNet.AuthServer;
 using OAuth.AspNet.Tokens;
 
-namespace Yavsc {
+namespace Yavsc
+{
     using System.Threading.Tasks;
     using Auth;
     using Extensions;
     using Models;
     using Yavsc.Helpers.Auth;
 
-    public partial class Startup {
+    public partial class Startup
+    {
         public static CookieAuthenticationOptions ExternalCookieAppOptions { get; private set; }
 
         public static IdentityOptions IdentityAppOptions { get; set; }
@@ -40,23 +42,26 @@ namespace Yavsc {
 
         //  public static CookieAuthenticationOptions BearerCookieOptions { get; private set; }
 
-        private void ConfigureOAuthServices (IServiceCollection services) {
-            services.Configure<SharedAuthenticationOptions> (options => options.SignInScheme = Constants.ApplicationAuthenticationSheme);
+        private void ConfigureOAuthServices(IServiceCollection services)
+        {
+            services.Configure<SharedAuthenticationOptions>(options => options.SignInScheme = Constants.ApplicationAuthenticationSheme);
 
-            services.Add (ServiceDescriptor.Singleton (typeof (IOptions<OAuth2AppSettings>), typeof (OptionsManager<OAuth2AppSettings>)));
+            services.Add(ServiceDescriptor.Singleton(typeof(IOptions<OAuth2AppSettings>), typeof(OptionsManager<OAuth2AppSettings>)));
             // used by the YavscGoogleOAuth middelware (TODO drop it)
-            services.AddTransient<Microsoft.Extensions.WebEncoders.UrlEncoder, UrlEncoder> ();
+            services.AddTransient<Microsoft.Extensions.WebEncoders.UrlEncoder, UrlEncoder>();
 
-            services.AddAuthentication (options => {
+            services.AddAuthentication(options =>
+            {
                 options.SignInScheme = Constants.ExternalAuthenticationSheme;
             });
 
-            ProtectionProvider = new MonoDataProtectionProvider (Configuration["Site:Title"]);;
+            ProtectionProvider = new MonoDataProtectionProvider(Configuration["Site:Title"]); ;
             services.AddInstance<MonoDataProtectionProvider>
                 (ProtectionProvider);
 
-            services.AddIdentity<ApplicationUser, IdentityRole> (
-                    option => {
+            services.AddIdentity<ApplicationUser, IdentityRole>(
+                    option =>
+                    {
                         IdentityAppOptions = option;
                         option.User.AllowedUserNameCharacters += " ";
                         option.User.RequireUniqueEmail = true;
@@ -78,8 +83,8 @@ namespace Yavsc {
                          option.Cookies.ExternalCookie.DataProtectionProvider = protector;
                          */
                     }
-                ).AddEntityFrameworkStores<ApplicationDbContext> ()
-                .AddTokenProvider<EmailTokenProvider<ApplicationUser>> (Constants.DefaultFactor)
+                ).AddEntityFrameworkStores<ApplicationDbContext>()
+                .AddTokenProvider<EmailTokenProvider<ApplicationUser>>(Constants.DefaultFactor)
             // .AddTokenProvider<UserTokenProvider>(Constants.DefaultFactor)
             //  .AddTokenProvider<UserTokenProvider>(Constants.SMSFactor)
             //  .AddTokenProvider<UserTokenProvider>(Constants.EMailFactor)
@@ -87,92 +92,103 @@ namespace Yavsc {
             // .AddDefaultTokenProviders()
             ;
         }
-        private void ConfigureOAuthApp (IApplicationBuilder app,
-            SiteSettings settingsOptions, ILogger logger) {
+        private void ConfigureOAuthApp(IApplicationBuilder app,
+            SiteSettings settingsOptions, ILogger logger)
+        {
 
-            app.UseIdentity ();
-            app.UseWhen  ( context => context.Request.Path.StartsWithSegments ("/api")
-                || context.Request.Path.StartsWithSegments ("/live") ,
+            app.UseIdentity();
+            app.UseWhen(context => context.Request.Path.StartsWithSegments("/api")
+             || context.Request.Path.StartsWithSegments("/live"),
                 branchLiveOrApi =>
                 {
-                    branchLiveOrApi.UseJwtBearerAuthentication (
-                        options => {
+                    branchLiveOrApi.UseJwtBearerAuthentication(
+                        options =>
+                        {
                             options.AuthenticationScheme = JwtBearerDefaults.AuthenticationScheme;
                             options.AutomaticAuthenticate = true;
-                            options.SecurityTokenValidators.Clear ();
-                            options.SecurityTokenValidators.Add (new TicketDataFormatTokenValidator (
+                            options.SecurityTokenValidators.Clear();
+                            var tickeDataProtector = new TicketDataFormatTokenValidator(
                                 ProtectionProvider
-                            ));
+                            );
+                            options.SecurityTokenValidators.Add(tickeDataProtector);
                             options.Events = new JwtBearerEvents
                             {
-                                OnReceivingToken =  context =>
-                                {
-                                    return Task.Run( () => {
-                                        var signalRTokenHeader = context.Request.Query["signalRTokenHeader"];
-
-                                        if (!string.IsNullOrEmpty(signalRTokenHeader) &&
-                                            (context.HttpContext.WebSockets.IsWebSocketRequest || context.Request.Headers["Accept"] == "text/event-stream"))
-                                        {
-                                            context.Token = context.Request.Query["signalRTokenHeader"];
-                                        }
-                                    });
-                                }
+                                OnReceivingToken = context =>
+                               {
+                                   return Task.Run(() =>
+                                   {
+                                       var signalRTokenHeader = context.Request.Query["signalRTokenHeader"];
+
+                                       if (!string.IsNullOrEmpty(signalRTokenHeader) &&
+                                           (context.HttpContext.WebSockets.IsWebSocketRequest || context.Request.Headers["Accept"] == "text/event-stream"))
+                                       {
+                                           context.Token = context.Request.Query["signalRTokenHeader"];
+                                       }
+                                   });
+                               }
                             };
                         });
                 });
-            app.UseWhen (context => !context.Request.Path.StartsWithSegments ("/api") && !context.Request.Path.StartsWithSegments ("/live"),
-                branch => {
+            app.UseWhen(context => !context.Request.Path.StartsWithSegments("/api") && !context.Request.Path.StartsWithSegments("/live"),
+                branch =>
+                {
                     // External authentication shared cookie:
-                    branch.UseCookieAuthentication (options => {
+                    branch.UseCookieAuthentication(options =>
+                    {
                         ExternalCookieAppOptions = options;
                         options.AuthenticationScheme = Constants.ExternalAuthenticationSheme;
                         options.AutomaticAuthenticate = true;
-                        options.ExpireTimeSpan = TimeSpan.FromMinutes (5);
-                        options.LoginPath = new PathString (Constants.LoginPath.Substring (1));
-                        options.AccessDeniedPath = new PathString (Constants.LoginPath.Substring (1));
+                        options.ExpireTimeSpan = TimeSpan.FromMinutes(5);
+                        options.LoginPath = new PathString(Constants.LoginPath.Substring(1));
+                        options.AccessDeniedPath = new PathString(Constants.LoginPath.Substring(1));
                     });
 
-                    YavscGoogleAppOptions = new YavscGoogleOptions {
+                    YavscGoogleAppOptions = new YavscGoogleOptions
+                    {
                         ClientId = GoogleWebClientConfiguration["web:client_id"],
-                            ClientSecret = GoogleWebClientConfiguration["web:client_secret"],
-                            AccessType = "offline",
-                            Scope = {
+                        ClientSecret = GoogleWebClientConfiguration["web:client_secret"],
+                        AccessType = "offline",
+                        Scope = {
                                 "profile",
                                 "https://www.googleapis.com/auth/admin.directory.resource.calendar",
                                 "https://www.googleapis.com/auth/calendar",
                                 "https://www.googleapis.com/auth/calendar.events"
                             },
-                            SaveTokensAsClaims = true,
-                            UserInformationEndpoint = "https://www.googleapis.com/plus/v1/people/me",
-                            Events = new OAuthEvents {
-                                OnCreatingTicket = async context => {
-                                    using (var serviceScope = app.ApplicationServices.GetRequiredService<IServiceScopeFactory> ()
-                                        .CreateScope ()) {
-                                        var gcontext = context as GoogleOAuthCreatingTicketContext;
-                                        context.Identity.AddClaim (new Claim (YavscClaimTypes.GoogleUserId, gcontext.GoogleUserId));
-                                        var dbContext = serviceScope.ServiceProvider.GetService<ApplicationDbContext> ();
-
-                                        var store = serviceScope.ServiceProvider.GetService<IDataStore> ();
-                                        await store.StoreAsync (gcontext.GoogleUserId, new TokenResponse {
-                                            AccessToken = gcontext.TokenResponse.AccessToken,
-                                                RefreshToken = gcontext.TokenResponse.RefreshToken,
-                                                TokenType = gcontext.TokenResponse.TokenType,
-                                                ExpiresInSeconds = int.Parse (gcontext.TokenResponse.ExpiresIn),
-                                                IssuedUtc = DateTime.Now
-                                        });
-                                        await dbContext.StoreTokenAsync (gcontext.GoogleUserId,
-                                            gcontext.TokenResponse.Response,
-                                            gcontext.TokenResponse.AccessToken,
-                                            gcontext.TokenResponse.TokenType,
-                                            gcontext.TokenResponse.RefreshToken,
-                                            gcontext.TokenResponse.ExpiresIn);
-
-                                    }
+                        SaveTokensAsClaims = true,
+                        UserInformationEndpoint = "https://www.googleapis.com/plus/v1/people/me",
+                        Events = new OAuthEvents
+                        {
+                            OnCreatingTicket = async context =>
+                            {
+                                using (var serviceScope = app.ApplicationServices.GetRequiredService<IServiceScopeFactory>()
+                                    .CreateScope())
+                                {
+                                    var gcontext = context as GoogleOAuthCreatingTicketContext;
+                                    context.Identity.AddClaim(new Claim(YavscClaimTypes.GoogleUserId, gcontext.GoogleUserId));
+                                    var dbContext = serviceScope.ServiceProvider.GetService<ApplicationDbContext>();
+
+                                    var store = serviceScope.ServiceProvider.GetService<IDataStore>();
+                                    await store.StoreAsync(gcontext.GoogleUserId, new TokenResponse
+                                    {
+                                        AccessToken = gcontext.TokenResponse.AccessToken,
+                                        RefreshToken = gcontext.TokenResponse.RefreshToken,
+                                        TokenType = gcontext.TokenResponse.TokenType,
+                                        ExpiresInSeconds = int.Parse(gcontext.TokenResponse.ExpiresIn),
+                                        IssuedUtc = DateTime.Now
+                                    });
+                                    await dbContext.StoreTokenAsync(gcontext.GoogleUserId,
+                                        gcontext.TokenResponse.Response,
+                                        gcontext.TokenResponse.AccessToken,
+                                        gcontext.TokenResponse.TokenType,
+                                        gcontext.TokenResponse.RefreshToken,
+                                        gcontext.TokenResponse.ExpiresIn);
+
                                 }
                             }
+                        }
                     };
 
-                    branch.UseMiddleware<Yavsc.Auth.GoogleMiddleware> (YavscGoogleAppOptions);
+                    branch.UseMiddleware<Yavsc.Auth.GoogleMiddleware>(YavscGoogleAppOptions);
                     /* FIXME 403
                                       
                                     branch.UseTwitterAuthentication(options=>
@@ -182,30 +198,34 @@ namespace Yavsc {
                                             options.ConsumerSecret = Configuration["Authentication:Twitter:ClientSecret"];
                                     }); */
 
-                    branch.UseOAuthAuthorizationServer (
+                    branch.UseOAuthAuthorizationServer(
 
-                        options => {
+                        options =>
+                        {
                             OAuthServerAppOptions = options;
-                            options.AuthorizeEndpointPath = new PathString (Constants.AuthorizePath.Substring (1));
-                            options.TokenEndpointPath = new PathString (Constants.TokenPath.Substring (1));
+                            options.AuthorizeEndpointPath = new PathString(Constants.AuthorizePath.Substring(1));
+                            options.TokenEndpointPath = new PathString(Constants.TokenPath.Substring(1));
                             options.ApplicationCanDisplayErrors = true;
                             options.AllowInsecureHttp = true;
                             options.AuthenticationScheme = OAuthDefaults.AuthenticationType;
-                            options.TokenDataProtector = ProtectionProvider.CreateProtector ("Bearer protection");
+                            options.TokenDataProtector = ProtectionProvider.CreateProtector("Bearer protection");
 
-                            options.Provider = new OAuthAuthorizationServerProvider {
+                            options.Provider = new OAuthAuthorizationServerProvider
+                            {
                                 OnValidateClientRedirectUri = ValidateClientRedirectUri,
                                 OnValidateClientAuthentication = ValidateClientAuthentication,
                                 OnGrantResourceOwnerCredentials = GrantResourceOwnerCredentials,
                                 OnGrantClientCredentials = GrantClientCredetails
                             };
 
-                            options.AuthorizationCodeProvider = new AuthenticationTokenProvider {
+                            options.AuthorizationCodeProvider = new AuthenticationTokenProvider
+                            {
                                 OnCreate = CreateAuthenticationCode,
                                 OnReceive = ReceiveAuthenticationCode,
                             };
 
-                            options.RefreshTokenProvider = new AuthenticationTokenProvider {
+                            options.RefreshTokenProvider = new AuthenticationTokenProvider
+                            {
                                 OnCreate = CreateRefreshToken,
                                 OnReceive = ReceiveRefreshToken,
                             };
@@ -216,7 +236,7 @@ namespace Yavsc {
                     );
                 });
 
-            Environment.SetEnvironmentVariable ("GOOGLE_APPLICATION_CREDENTIALS", "google-secret.json");
+            Environment.SetEnvironmentVariable("GOOGLE_APPLICATION_CREDENTIALS", "google-secret.json");
 
         }
     }

src/Yavsc/Startup/Startup.OAuthHelpers.cs

@@ -6,6 +6,7 @@ using System.Security.Claims;
 using System.Security.Principal;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Identity;
+using Microsoft.Data.Entity;
 using Microsoft.Extensions.Logging;
 using OAuth.AspNet.AuthServer;
 using Yavsc.Models;
@@ -24,6 +25,7 @@ namespace Yavsc
               _logger.LogError($"no app for <{clientId}>");
             return app;
         }
+        
         private readonly ConcurrentDictionary<string, string> _authenticationCodes = new ConcurrentDictionary<string, string>(StringComparer.Ordinal);
 
         private Task ValidateClientRedirectUri(OAuthValidateClientRedirectUriContext context)
@@ -88,6 +90,7 @@ namespace Yavsc
             else _logger.LogWarning($"ValidateClientAuthentication: neither Basic nor Form credential were found");
             return Task.FromResult(0);
         }
+        
         UserManager<ApplicationUser> _usermanager;
            
         private async Task<Task> GrantResourceOwnerCredentials(OAuthGrantResourceOwnerCredentialsContext context)
@@ -95,7 +98,8 @@ namespace Yavsc
             _logger.LogWarning($"GrantResourceOwnerCredentials task ... {context.UserName}");
 
             ApplicationUser user = null;
-            user = await _usermanager.FindByNameAsync(context.UserName);
+            user = _dbContext.Users.Include(u=>u.Membership).First(u=>u.UserName == context.UserName);
+           
             if (await _usermanager.CheckPasswordAsync(user, context.Password))
             {
 
@@ -106,15 +110,16 @@ namespace Yavsc
                 claims.Add(new Claim(ClaimTypes.Email, user.Email));
                 claims.AddRange((await _usermanager.GetRolesAsync(user)).Select(
                     r => new Claim(ClaimTypes.Role, r)
-                ));
+                    ));
+                claims.AddRange(user.Membership.Select(
+                    m => new Claim(YavscClaimTypes.CircleMembership, m.CircleId.ToString())
+                    ));
                 ClaimsPrincipal principal = new ClaimsPrincipal(
                     new ClaimsIdentity(
                         new GenericIdentity(context.UserName, OAuthDefaults.AuthenticationType),
                         claims)
                         );
-                // TODO set a NameIdentifier, roles and scopes claims
                 context.HttpContext.User = principal;
-
                 context.Validated(principal);
             }
 
@@ -123,7 +128,10 @@ namespace Yavsc
 
         private Task GrantClientCredetails(OAuthGrantClientCredentialsContext context)
         {
-            ClaimsPrincipal principal = new ClaimsPrincipal(new ClaimsIdentity(new GenericIdentity(context.ClientId, OAuthDefaults.AuthenticationType), context.Scope.Select(x => new Claim("urn:oauth:scope", x))));
+            var id = new GenericIdentity(context.ClientId, OAuthDefaults.AuthenticationType);
+            var claims = context.Scope.Select(x => new Claim("urn:oauth:scope", x));
+            var cid = new ClaimsIdentity(id, claims);
+            ClaimsPrincipal principal = new ClaimsPrincipal(cid);
 
             context.Validated(principal);
 

src/Yavsc/Views/Account/Index.cshtml

@@ -0,0 +1,6 @@
+
+@{
+    ViewData["Title"] = @SR["Index"];
+}
+
+<a asp-action="UserList" >@SR["UserList"]</a>