From dc1981f91dfbb30c3e9414c09f4e226282ce5dfe Mon Sep 17 00:00:00 2001 From: maliming Date: Wed, 26 Feb 2020 11:18:07 +0800 Subject: [PATCH] Fix scopes may be null bug. --- .../Pages/Consent.cshtml.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Consent.cshtml.cs b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Consent.cshtml.cs index 3fb68feaca..c583005188 100644 --- a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Consent.cshtml.cs +++ b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Consent.cshtml.cs @@ -187,7 +187,9 @@ namespace Volo.Abp.Account.Web.Pages public List GetAllowedScopeNames() { - return IdentityScopes.Union(ApiScopes).Where(s => s.Checked).Select(s => s.Name).ToList(); + var identityScopes = IdentityScopes ?? new List(); + var apiScopes = IdentityScopes ?? new List(); + return identityScopes.Union(apiScopes).Where(s => s.Checked).Select(s => s.Name).ToList(); } }