Merge branch 'master' into cleanup

Author: fretje

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Roles/RoleAppService.cs

@@ -73,11 +73,6 @@ public override async Task Delete(EntityDto<int> input)
             CheckDeletePermission();
 
             var role = await _roleManager.FindByIdAsync(input.Id.ToString());
-            if (role.IsStatic)
-            {
-                throw new UserFriendlyException(L("CanNotDeleteStaticRole"));
-            }
-
             var users = await _userManager.GetUsersInRoleAsync(role.NormalizedName);
 
             foreach (var user in users)

aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/Seed/Host/HostRoleAndUserCreator.cs

@@ -35,6 +35,34 @@ private void CreateHostRoleAndUsers()
                 _context.SaveChanges();
             }
 
+            // Grant all permissions to admin role for host
+
+            var grantedPermissions = _context.Permissions.IgnoreQueryFilters()
+                .OfType<RolePermissionSetting>()
+                .Where(p => p.TenantId == null && p.RoleId == adminRoleForHost.Id)
+                .Select(p => p.Name)
+                .ToList();
+
+            var permissions = PermissionFinder
+                .GetAllPermissions(new AbpProjectNameAuthorizationProvider())
+                .Where(p => p.MultiTenancySides.HasFlag(MultiTenancySides.Host) &&
+                            !grantedPermissions.Contains(p.Name))
+                .ToList();
+
+            if (permissions.Any())
+            {
+                _context.Permissions.AddRange(
+                    permissions.Select(permission => new RolePermissionSetting
+                    {
+                        TenantId = null,
+                        Name = permission.Name,
+                        IsGranted = true,
+                        RoleId = adminRoleForHost.Id
+                    })
+                );
+                _context.SaveChanges();
+            }
+
             // Admin user for host
 
             var adminUserForHost = _context.Users.IgnoreQueryFilters().FirstOrDefault(u => u.TenantId == null && u.UserName == AbpUserBase.AdminUserName);
@@ -61,25 +89,6 @@ private void CreateHostRoleAndUsers()
                 _context.UserRoles.Add(new UserRole(null, adminUserForHost.Id, adminRoleForHost.Id));
                 _context.SaveChanges();
 
-                // Grant all permissions
-                var permissions = PermissionFinder
-                    .GetAllPermissions(new AbpProjectNameAuthorizationProvider())
-                    .Where(p => p.MultiTenancySides.HasFlag(MultiTenancySides.Host))
-                    .ToList();
-
-                foreach (var permission in permissions)
-                {
-                    _context.Permissions.Add(
-                        new RolePermissionSetting
-                        {
-                            TenantId = null,
-                            Name = permission.Name,
-                            IsGranted = true,
-                            RoleId = adminRoleForHost.Id
-                        });
-                }
-                _context.SaveChanges();
-
                 // User account of admin user
                 _context.UserAccounts.Add(new UserAccount
                 {

aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/Seed/Tenants/TenantRoleAndUserBuilder.cs

@@ -37,24 +37,33 @@ private void CreateRolesAndUsers()
             {
                 adminRole = _context.Roles.Add(new Role(_tenantId, StaticRoleNames.Tenants.Admin, StaticRoleNames.Tenants.Admin) { IsStatic = true }).Entity;
                 _context.SaveChanges();
+            }
 
-                // Grant all permissions to admin role
-                var permissions = PermissionFinder
-                    .GetAllPermissions(new AbpProjectNameAuthorizationProvider())
-                    .Where(p => p.MultiTenancySides.HasFlag(MultiTenancySides.Tenant))
-                    .ToList();
+            // Grant all permissions to admin role
 
-                foreach (var permission in permissions)
-                {
-                    _context.Permissions.Add(
-                        new RolePermissionSetting
-                        {
-                            TenantId = _tenantId,
-                            Name = permission.Name,
-                            IsGranted = true,
-                            RoleId = adminRole.Id
-                        });
-                }
+            var grantedPermissions = _context.Permissions.IgnoreQueryFilters()
+                .OfType<RolePermissionSetting>()
+                .Where(p => p.TenantId == _tenantId && p.RoleId == adminRole.Id)
+                .Select(p => p.Name)
+                .ToList();
+
+            var permissions = PermissionFinder
+                .GetAllPermissions(new AbpProjectNameAuthorizationProvider())
+                .Where(p => p.MultiTenancySides.HasFlag(MultiTenancySides.Tenant) &&
+                            !grantedPermissions.Contains(p.Name))
+                .ToList();
+
+            if (permissions.Any())
+            {
+                _context.Permissions.AddRange(
+                    permissions.Select(permission => new RolePermissionSetting
+                    {
+                        TenantId = _tenantId,
+                        Name = permission.Name,
+                        IsGranted = true,
+                        RoleId = adminRole.Id
+                    })
+                );
                 _context.SaveChanges();
             }
 

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/wwwroot/swagger/ui/on-complete.js

@@ -11,7 +11,7 @@ var abp = abp || {};
             return false;
         }
         var cookieAuth = new SwaggerClient.ApiKeyAuthorization(abp.auth.tokenHeaderName, 'Bearer ' + authToken, 'header');
-        swaggerUi.api.clientAuthorizations.add(abp.auth.tokenHeaderName, cookieAuth);
+        swaggerUi.api.clientAuthorizations.add('bearerAuth', cookieAuth);
         return true;
     }