Feature/windows auth

src/Skoruba.IdentityServer4.Admin.BusinessLogic.Identity/Dtos/Identity/Interfaces/IUserDto.cs

@@ -13,5 +13,6 @@ public interface IUserDto : IBaseUserDto
         bool TwoFactorEnabled { get; set; }
         int AccessFailedCount { get; set; }
         DateTimeOffset? LockoutEnd { get; set; }
+        string PhotoUrl { get; set; }
     }
 }

src/Skoruba.IdentityServer4.Admin.BusinessLogic.Identity/Dtos/Identity/UserDto.cs

@@ -28,5 +28,7 @@ public class UserDto<TKey> : BaseUserDto<TKey>, IUserDto
         public int AccessFailedCount { get; set; }
 
         public DateTimeOffset? LockoutEnd { get; set; }
+
+        public string PhotoUrl { get; set; }
     }
 }

src/Skoruba.IdentityServer4.Admin.BusinessLogic.Identity/Services/IdentityService.cs

@@ -98,8 +98,8 @@ public virtual async Task<TUsersDto> GetRoleUsersAsync(string roleId, string sea
             await AuditEventLogger.LogEventAsync(new RoleUsersRequestedEvent<TUsersDto>(usersDto));
 
             return usersDto;
-        }
-
+        }
+
         public virtual async Task<TUsersDto> GetClaimUsersAsync(string claimType, string claimValue, int page = 1, int pageSize = 10)
         {
             var pagedList = await IdentityRepository.GetClaimUsersAsync(claimType, claimValue, page, pageSize);
@@ -426,19 +426,19 @@ public virtual async Task<TRoleClaimsDto> GetRoleClaimsAsync(string roleId, int
             await AuditEventLogger.LogEventAsync(new RoleClaimsRequestedEvent<TRoleClaimsDto>(roleClaimDtos));
 
             return roleClaimDtos;
-        }
-
-		public virtual async Task<TRoleClaimsDto> GetUserRoleClaimsAsync(string userId, string claimSearchText, int page = 1, int pageSize = 10)
-		{
-			var userExists = await IdentityRepository.ExistsUserAsync(userId);
-			if (!userExists) throw new UserFriendlyErrorPageException(string.Format(IdentityServiceResources.UserDoesNotExist().Description, userId), IdentityServiceResources.UserDoesNotExist().Description);
-
-			var identityRoleClaims = await IdentityRepository.GetUserRoleClaimsAsync(userId, claimSearchText, page, pageSize);
-			var roleClaimDtos = Mapper.Map<TRoleClaimsDto>(identityRoleClaims);
-
-			return roleClaimDtos;
-		}
-
+        }
+
+		public virtual async Task<TRoleClaimsDto> GetUserRoleClaimsAsync(string userId, string claimSearchText, int page = 1, int pageSize = 10)
+		{
+			var userExists = await IdentityRepository.ExistsUserAsync(userId);
+			if (!userExists) throw new UserFriendlyErrorPageException(string.Format(IdentityServiceResources.UserDoesNotExist().Description, userId), IdentityServiceResources.UserDoesNotExist().Description);
+
+			var identityRoleClaims = await IdentityRepository.GetUserRoleClaimsAsync(userId, claimSearchText, page, pageSize);
+			var roleClaimDtos = Mapper.Map<TRoleClaimsDto>(identityRoleClaims);
+
+			return roleClaimDtos;
+		}
+
 		public virtual async Task<TRoleClaimsDto> GetRoleClaimAsync(string roleId, int claimId)
         {
             var roleExists = await IdentityRepository.ExistsRoleAsync(roleId);

src/Skoruba.IdentityServer4.Admin.EntityFramework.Identity/Repositories/IdentityRepository.cs

@@ -103,8 +103,8 @@ public virtual async Task<PagedList<TUser>> GetRoleUsersAsync(string roleId, str
             pagedList.PageSize = pageSize;
 
             return pagedList;
-        }
-
+        }
+
         public virtual async Task<PagedList<TUser>> GetClaimUsersAsync(string claimType, string claimValue, int page = 1, int pageSize = 10)
         {
             var pagedList = new PagedList<TUser>();
@@ -262,26 +262,26 @@ public virtual async Task<PagedList<TRoleClaim>> GetRoleClaimsAsync(string roleI
             pagedList.PageSize = pageSize;
 
             return pagedList;
-        }
-
-		public virtual async Task<PagedList<TRoleClaim>> GetUserRoleClaimsAsync(string userId, string claimSearchText, int page = 1, int pageSize = 10)
-		{
-			var id = ConvertKeyFromString(userId);
-			Expression<Func<TRoleClaim, bool>> searchCondition = x => x.ClaimType.Contains(claimSearchText);
-			var claimsQ = DbContext.Set<TUserRole>().Where(x => x.UserId.Equals(id))
-				.Join(DbContext.Set<TRoleClaim>().WhereIf(!string.IsNullOrEmpty(claimSearchText), searchCondition), ur => ur.RoleId, rc => rc.RoleId, (ur, rc) => rc);
-
-			var claims= await claimsQ.PageBy(x => x.Id, page, pageSize)
-				.ToListAsync();
-
-			var pagedList = new PagedList<TRoleClaim>();
-			pagedList.Data.AddRange(claims);
-			pagedList.TotalCount = await claimsQ.CountAsync();
-			pagedList.PageSize = pageSize;
-
-			return pagedList;
-		}
-
+        }
+
+		public virtual async Task<PagedList<TRoleClaim>> GetUserRoleClaimsAsync(string userId, string claimSearchText, int page = 1, int pageSize = 10)
+		{
+			var id = ConvertKeyFromString(userId);
+			Expression<Func<TRoleClaim, bool>> searchCondition = x => x.ClaimType.Contains(claimSearchText);
+			var claimsQ = DbContext.Set<TUserRole>().Where(x => x.UserId.Equals(id))
+				.Join(DbContext.Set<TRoleClaim>().WhereIf(!string.IsNullOrEmpty(claimSearchText), searchCondition), ur => ur.RoleId, rc => rc.RoleId, (ur, rc) => rc);
+
+			var claims= await claimsQ.PageBy(x => x.Id, page, pageSize)
+				.ToListAsync();
+
+			var pagedList = new PagedList<TRoleClaim>();
+			pagedList.Data.AddRange(claims);
+			pagedList.TotalCount = await claimsQ.CountAsync();
+			pagedList.PageSize = pageSize;
+
+			return pagedList;
+		}
+
 		public virtual Task<TUserClaim> GetUserClaimAsync(string userId, int claimId)
         {
             var userIdConverted = ConvertKeyFromString(userId);

src/Skoruba.IdentityServer4.Admin.EntityFramework.Identity/Repositories/Interfaces/IIdentityRepository.cs

@@ -1,85 +1,85 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Identity;
-using Skoruba.IdentityServer4.Admin.EntityFramework.Extensions.Common;
-
-namespace Skoruba.IdentityServer4.Admin.EntityFramework.Identity.Repositories.Interfaces
-{
-	public interface IIdentityRepository<TUser, TRole, TKey, TUserClaim, TUserRole, TUserLogin, TRoleClaim, TUserToken>
-	    where TUser : IdentityUser<TKey>
-	    where TRole : IdentityRole<TKey>
-	    where TKey : IEquatable<TKey>
-	    where TUserClaim : IdentityUserClaim<TKey>
-	    where TUserRole : IdentityUserRole<TKey>
-	    where TUserLogin : IdentityUserLogin<TKey>
-	    where TRoleClaim : IdentityRoleClaim<TKey>
-	    where TUserToken : IdentityUserToken<TKey>
-    {
-        Task<bool> ExistsUserAsync(string userId);
-
-        Task<bool> ExistsRoleAsync(string roleId);
-
-        Task<PagedList<TUser>> GetUsersAsync(string search, int page = 1, int pageSize = 10);
-
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Identity;
+using Skoruba.IdentityServer4.Admin.EntityFramework.Extensions.Common;
+
+namespace Skoruba.IdentityServer4.Admin.EntityFramework.Identity.Repositories.Interfaces
+{
+	public interface IIdentityRepository<TUser, TRole, TKey, TUserClaim, TUserRole, TUserLogin, TRoleClaim, TUserToken>
+	    where TUser : IdentityUser<TKey>
+	    where TRole : IdentityRole<TKey>
+	    where TKey : IEquatable<TKey>
+	    where TUserClaim : IdentityUserClaim<TKey>
+	    where TUserRole : IdentityUserRole<TKey>
+	    where TUserLogin : IdentityUserLogin<TKey>
+	    where TRoleClaim : IdentityRoleClaim<TKey>
+	    where TUserToken : IdentityUserToken<TKey>
+    {
+        Task<bool> ExistsUserAsync(string userId);
+
+        Task<bool> ExistsRoleAsync(string roleId);
+
+        Task<PagedList<TUser>> GetUsersAsync(string search, int page = 1, int pageSize = 10);
+
         Task<PagedList<TUser>> GetRoleUsersAsync(string roleId, string search, int page = 1, int pageSize = 10);
 
-        Task<PagedList<TUser>> GetClaimUsersAsync(string claimType, string claimValue, int page = 1, int pageSize = 10);
-
-        Task<PagedList<TRole>> GetRolesAsync(string search, int page = 1, int pageSize = 10);
-
-        Task<(IdentityResult identityResult, TKey roleId)> CreateRoleAsync(TRole role);
-
-        Task<TRole> GetRoleAsync(TKey roleId);
-
-        Task<List<TRole>> GetRolesAsync();
-
-        Task<(IdentityResult identityResult, TKey roleId)> UpdateRoleAsync(TRole role);
-
-        Task<TUser> GetUserAsync(string userId);
-
-        Task<(IdentityResult identityResult, TKey userId)> CreateUserAsync(TUser user);
-
-        Task<(IdentityResult identityResult, TKey userId)> UpdateUserAsync(TUser user);
-
-        Task<IdentityResult> DeleteUserAsync(string userId);
-
-        Task<IdentityResult> CreateUserRoleAsync(string userId, string roleId);
-
-        Task<PagedList<TRole>> GetUserRolesAsync(string userId, int page = 1, int pageSize = 10);
-
-        Task<IdentityResult> DeleteUserRoleAsync(string userId, string roleId);
-
-        Task<PagedList<TUserClaim>> GetUserClaimsAsync(string userId, int page = 1, int pageSize = 10);
-
-        Task<TUserClaim> GetUserClaimAsync(string userId, int claimId);
-
-        Task<IdentityResult> CreateUserClaimsAsync(TUserClaim claims);
-
-        Task<IdentityResult> DeleteUserClaimAsync(string userId, int claimId);
-
-        Task<List<UserLoginInfo>> GetUserProvidersAsync(string userId);
-
-        Task<IdentityResult> DeleteUserProvidersAsync(string userId, string providerKey, string loginProvider);
-
-        Task<TUserLogin> GetUserProviderAsync(string userId, string providerKey);
-
-        Task<IdentityResult> UserChangePasswordAsync(string userId, string password);
-
-        Task<IdentityResult> CreateRoleClaimsAsync(TRoleClaim claims);
-
-        Task<PagedList<TRoleClaim>> GetRoleClaimsAsync(string roleId, int page = 1, int pageSize = 10);
-
-		Task<PagedList<TRoleClaim>> GetUserRoleClaimsAsync(string userId, string claimSearchText, int page = 1, int pageSize = 10);
-
-		Task<TRoleClaim> GetRoleClaimAsync(string roleId, int claimId);
-
-        Task<IdentityResult> DeleteRoleClaimAsync(string roleId, int claimId);
-
-        Task<IdentityResult> DeleteRoleAsync(TRole role);
-
-        bool AutoSaveChanges { get; set; }
-
-        Task<int> SaveAllChangesAsync();
-    }
+        Task<PagedList<TUser>> GetClaimUsersAsync(string claimType, string claimValue, int page = 1, int pageSize = 10);
+
+        Task<PagedList<TRole>> GetRolesAsync(string search, int page = 1, int pageSize = 10);
+
+        Task<(IdentityResult identityResult, TKey roleId)> CreateRoleAsync(TRole role);
+
+        Task<TRole> GetRoleAsync(TKey roleId);
+
+        Task<List<TRole>> GetRolesAsync();
+
+        Task<(IdentityResult identityResult, TKey roleId)> UpdateRoleAsync(TRole role);
+
+        Task<TUser> GetUserAsync(string userId);
+
+        Task<(IdentityResult identityResult, TKey userId)> CreateUserAsync(TUser user);
+
+        Task<(IdentityResult identityResult, TKey userId)> UpdateUserAsync(TUser user);
+
+        Task<IdentityResult> DeleteUserAsync(string userId);
+
+        Task<IdentityResult> CreateUserRoleAsync(string userId, string roleId);
+
+        Task<PagedList<TRole>> GetUserRolesAsync(string userId, int page = 1, int pageSize = 10);
+
+        Task<IdentityResult> DeleteUserRoleAsync(string userId, string roleId);
+
+        Task<PagedList<TUserClaim>> GetUserClaimsAsync(string userId, int page = 1, int pageSize = 10);
+
+        Task<TUserClaim> GetUserClaimAsync(string userId, int claimId);
+
+        Task<IdentityResult> CreateUserClaimsAsync(TUserClaim claims);
+
+        Task<IdentityResult> DeleteUserClaimAsync(string userId, int claimId);
+
+        Task<List<UserLoginInfo>> GetUserProvidersAsync(string userId);
+
+        Task<IdentityResult> DeleteUserProvidersAsync(string userId, string providerKey, string loginProvider);
+
+        Task<TUserLogin> GetUserProviderAsync(string userId, string providerKey);
+
+        Task<IdentityResult> UserChangePasswordAsync(string userId, string password);
+
+        Task<IdentityResult> CreateRoleClaimsAsync(TRoleClaim claims);
+
+        Task<PagedList<TRoleClaim>> GetRoleClaimsAsync(string roleId, int page = 1, int pageSize = 10);
+
+		Task<PagedList<TRoleClaim>> GetUserRoleClaimsAsync(string userId, string claimSearchText, int page = 1, int pageSize = 10);
+
+		Task<TRoleClaim> GetRoleClaimAsync(string roleId, int claimId);
+
+        Task<IdentityResult> DeleteRoleClaimAsync(string roleId, int claimId);
+
+        Task<IdentityResult> DeleteRoleAsync(TRole role);
+
+        bool AutoSaveChanges { get; set; }
+
+        Task<int> SaveAllChangesAsync();
+    }
 }

src/Skoruba.IdentityServer4.Admin.EntityFramework.PostgreSQL/Migrations/DataProtection/20200325152924_DbInit.cs

@@ -0,0 +1,31 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+namespace Skoruba.IdentityServer4.Admin.EntityFramework.PostgreSQL.Migrations.DataProtection
+{
+    public partial class DbInit : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "DataProtectionKeys",
+                columns: table => new
+                {
+                    Id = table.Column<int>(nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    FriendlyName = table.Column<string>(nullable: true),
+                    Xml = table.Column<string>(nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_DataProtectionKeys", x => x.Id);
+                });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "DataProtectionKeys");
+        }
+    }
+}

src/Skoruba.IdentityServer4.Admin/Properties/launchSettings.json

@@ -1,6 +1,6 @@
 {
     "iisSettings": {
-        "windowsAuthentication": false,
+        "windowsAuthentication": true,
         "anonymousAuthentication": true,
         "iisExpress": {
             "applicationUrl": "https://localhost:44303",

src/Skoruba.IdentityServer4.Admin/Views/Identity/UserProfile.cshtml

@@ -50,7 +50,14 @@
 
             <div class="row">
                 <div class="col-lg-2 mb-3">
-                    <img-gravatar email="@Model.Email" class="img-thumbnail" size="150" />
+                    @if (!string.IsNullOrEmpty(Model.PhotoUrl))
+                    {
+                        <img class="img-thumbnail" size="150" src="@Model.PhotoUrl" />
+                    }
+                    else
+                    {
+                        <img-gravatar email="@Model.Email" class="img-thumbnail" size="150" />
+                    }                    
                 </div>
                 <div class="col-sm-10">
                     <!--Input - text -->