From 06faa0fa0da43759fee976b6bc44ff892c5b9133 Mon Sep 17 00:00:00 2001 From: 1d0n7kn0w <3910210+1d0n7kn0w@users.noreply.github.com> Date: Mon, 13 Jul 2020 01:41:27 +0100 Subject: [PATCH 1/3] Avoid NullReferenceException if context is null --- .../Abp/PermissionManagement/PermissionDataSeedContributor.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionDataSeedContributor.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionDataSeedContributor.cs index 719dc654b8..906192fd4f 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionDataSeedContributor.cs +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionDataSeedContributor.cs @@ -37,7 +37,7 @@ namespace Volo.Abp.PermissionManagement RolePermissionValueProvider.ProviderName, "admin", permissionNames, - context.TenantId + context?.TenantId ); } } From b4a6ab42ed6519829e31ccfeb7f7cb3b28628049 Mon Sep 17 00:00:00 2001 From: 1d0n7kn0w <3910210+1d0n7kn0w@users.noreply.github.com> Date: Mon, 13 Jul 2020 03:40:37 +0100 Subject: [PATCH 2/3] Update IdentityDataSeedContributor.cs --- .../Volo/Abp/Identity/IdentityDataSeedContributor.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDataSeedContributor.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDataSeedContributor.cs index 9dd44f1fca..16695f2708 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDataSeedContributor.cs +++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDataSeedContributor.cs @@ -18,7 +18,7 @@ namespace Volo.Abp.Identity return IdentityDataSeeder.SeedAsync( context["AdminEmail"] as string ?? "admin@abp.io", context["AdminPassword"] as string ?? "1q2w3E*", - context.TenantId + context?.TenantId ); } } From a396fc1a95a28bf777c67cda2fabbf97a1082d34 Mon Sep 17 00:00:00 2001 From: 1d0n7kn0w <3910210+1d0n7kn0w@users.noreply.github.com> Date: Mon, 13 Jul 2020 04:06:04 +0100 Subject: [PATCH 3/3] Update IdentityDataSeedContributor.cs --- .../Volo/Abp/Identity/IdentityDataSeedContributor.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDataSeedContributor.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDataSeedContributor.cs index 16695f2708..a5af0acf2c 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDataSeedContributor.cs +++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDataSeedContributor.cs @@ -16,8 +16,8 @@ namespace Volo.Abp.Identity public virtual Task SeedAsync(DataSeedContext context) { return IdentityDataSeeder.SeedAsync( - context["AdminEmail"] as string ?? "admin@abp.io", - context["AdminPassword"] as string ?? "1q2w3E*", + context?["AdminEmail"] as string ?? "admin@abp.io", + context?["AdminPassword"] as string ?? "1q2w3E*", context?.TenantId ); }