From 02cfd822e77f5c430e7a5398b3f46e735ea408ae Mon Sep 17 00:00:00 2001
From: liangshiwei <liangshiw@outlook.com>
Date: Tue, 22 Dec 2020 17:10:42 +0800
Subject: [PATCH 1/2] Avoid using array index in taghelper expressions

---
 .../Pages/Consent.cshtml                      | 30 ++++++++++---------
 .../FeatureManagementModal.cshtml             | 14 +++++----
 .../Pages/Identity/Users/CreateModal.cshtml   |  5 ++--
 .../Pages/Identity/Users/EditModal.cshtml     |  7 +++--
 4 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Consent.cshtml b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Consent.cshtml
index 8fb7e918e1..02b4f75416 100644
--- a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Consent.cshtml
+++ b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Consent.cshtml
@@ -32,22 +32,23 @@
                 <ul class="list-group">
                     @for (var i = 0; i < Model.ConsentInput.IdentityScopes.Count; i++)
                     {
+                        var identityScope = Model.ConsentInput.IdentityScopes[i];
                         <li class="list-group-item">
                             <div class="form-check">
-                                <label asp-for="@Model.ConsentInput.IdentityScopes[i].Checked" class="form-check-label">
-                                    <input asp-for="@Model.ConsentInput.IdentityScopes[i].Checked" class="form-check-input"  />
-                                    @Model.ConsentInput.IdentityScopes[i].DisplayName
-                                    @if (Model.ConsentInput.IdentityScopes[i].Required)
+                                <label asp-for="@identityScope.Checked" for="ConsentInput_IdentityScopes_@(i)__Checked" class="form-check-label">
+                                    <input name="ConsentInput.IdentityScopes[@i].Checked" id="ConsentInput_IdentityScopes_@(i)__Checked" asp-for="@identityScope.Checked" class="form-check-input"  />
+                                    @identityScope.DisplayName
+                                    @if (identityScope.Required)
                                     {
                                         <span><em>(required)</em></span>
                                     }
                                 </label>
                             </div>
-                            <input asp-for="@Model.ConsentInput.IdentityScopes[i].Name" type="hidden" /> @* TODO: Use attributes on the view model instead of using hidden here *@
-                            @if (Model.ConsentInput.IdentityScopes[i].Description != null)
+                            <input name="ConsentInput.IdentityScopes[@i].Name" id="ConsentInput_IdentityScopes_@(i)Name" asp-for="@identityScope.Name" type="hidden" /> @* TODO: Use attributes on the view model instead of using hidden here *@
+                            @if (identityScope.Description != null)
                             {
                                 <div class="consent-description">
-                                    @Model.ConsentInput.IdentityScopes[i].Description
+                                    @identityScope.Description
                                 </div>
                             }
                         </li>
@@ -62,22 +63,23 @@
                 <ul class="list-group">
                     @for (var i = 0; i < Model.ConsentInput.ApiScopes.Count; i++)
                     {
+                        var apiScope = Model.ConsentInput.ApiScopes[i];
                         <li class="list-group-item">
                             <div class="form-check">
-                                <label asp-for="@Model.ConsentInput.ApiScopes[i].Checked" class="form-check-label">
-                                    <input asp-for="@Model.ConsentInput.ApiScopes[i].Checked" class="form-check-input" disabled="@Model.ConsentInput.ApiScopes[i].Required" />
-                                    @Model.ConsentInput.ApiScopes[i].DisplayName
-                                    @if (Model.ConsentInput.ApiScopes[i].Required)
+                                <label asp-for="@apiScope.Checked" for="ConsentInput_ApiScopes_@(i)__Checked" class="form-check-label">
+                                    <input name="ConsentInput.ApiScopes[@i].Checked" id="ConsentInput_ApiScopes_@(i)__Checked" asp-for="@apiScope.Checked" class="form-check-input" disabled="@apiScope.Required" />
+                                    @apiScope.DisplayName
+                                    @if (apiScope.Required)
                                     {
                                         <span><em>(required)</em></span>
                                     }
                                 </label>
                             </div>
-                            <input asp-for="@Model.ConsentInput.ApiScopes[i].Name" type="hidden" /> @* TODO: Use attributes on the view model instead of using hidden here *@
-                            @if (Model.ConsentInput.ApiScopes[i].Description != null)
+                            <input name="ConsentInput.ApiScopes[@i].Name" id="ConsentInput_ApiScopes_@(i)Name" asp-for="@apiScope.Name" type="hidden" /> @* TODO: Use attributes on the view model instead of using hidden here *@
+                            @if (apiScope.Description != null)
                             {
                                 <div class="consent-description">
-                                    @Model.ConsentInput.ApiScopes[i].Description
+                                    @apiScope.Description
                                 </div>
                             }
                         </li>
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml
index a5592c2f28..f3080b7275 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml
@@ -32,14 +32,15 @@
                 <abp-tabs name="FeaturesTabs" tab-style="PillVertical" vertical-header-size="_4" class="custom-scroll-container">
                     @for (var i = 0; i < featureGroups.Count; i++)
                     {
-                        <abp-tab title="@featureGroups[i].DisplayName" name="v-pills-tab-@featureGroups[i].GetNormalizedGroupName()">
-                            <h4>@featureGroups[i].DisplayName</h4>
+                        var featureGroup = featureGroups[i];
+                        <abp-tab title="@featureGroup.DisplayName" name="v-pills-tab-@featureGroup.GetNormalizedGroupName()">
+                            <h4>@featureGroup.DisplayName</h4>
                             <hr class="mt-2 mb-3"/>
                             <div class="custom-scroll-content">
                                 <div class="pl-1 pt-1">
-                                    @for (var j = 0; j < featureGroups[i].Features.Count; j++)
+                                    @for (var j = 0; j < featureGroup.Features.Count; j++)
                                     {
-                                        var feature = featureGroups[i].Features[j];
+                                        var feature = featureGroup.Features[j];
                                         var disabled = Model.IsDisabled(feature.Provider.Name);
                                         <div class="mt-2">
 
@@ -48,7 +49,7 @@
 
                                             @if (feature.ValueType is ToggleStringValueType)
                                             {
-                                                <abp-input asp-for="@featureGroups[i].Features[j].Value"
+                                                <abp-input asp-for="@feature.Value"
                                                            type="checkbox"
                                                            name="FeatureGroups[@i].Features[@j].BoolValue"
                                                            label="@feature.DisplayName"
@@ -67,8 +68,9 @@
                                                     type = "number";
                                                 }
 
-                                                <abp-input asp-for="@featureGroups[i].Features[j].Value"
+                                                <abp-input asp-for="@feature.Value"
                                                            label="@feature.DisplayName"
+                                                           name="featureGroups[@i].Features[@j].Value"
                                                            disabled="@disabled"
                                                            type="@type"
                                                            group-data-feature-name="@feature.Name"
diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml
index df17154d56..868d749e3b 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml
@@ -59,8 +59,9 @@
                 <abp-tab title="@L["Roles"].Value">
                     @for (var i = 0; i < Model.Roles.Length; i++)
                     {
-                        <abp-input asp-for="@Model.Roles[i].IsAssigned" label="@Model.Roles[i].Name" />
-                        <input asp-for="@Model.Roles[i].Name" />
+                        var role = Model.Roles[i];
+                        <abp-input id="Role_@(i)__IsAssigned" name="Roles[@i].IsAssigned" asp-for="@role.IsAssigned" label="@role.Name" />
+                        <input name="Roles[@i].Name" asp-for="@role.Name" />
                     }
                 </abp-tab>
             </abp-tabs>
diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml
index cea3034cb0..ca290a33ed 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml
@@ -18,7 +18,7 @@
         <abp-modal-header title="@L["Edit"].Value"></abp-modal-header>
         <abp-modal-body>
             <abp-tabs name="create-user-modal-tabs">
-                <abp-tab title="@L["UserInformations"].Value">                   
+                <abp-tab title="@L["UserInformations"].Value">
                     <input asp-for="UserInfo.Id" />
                     <input asp-for="UserInfo.ConcurrencyStamp" />
                     <abp-input asp-for="UserInfo.UserName" />
@@ -60,8 +60,9 @@
                 <abp-tab title="@L["Roles"].Value">
                     @for (var i = 0; i < Model.Roles.Length; i++)
                     {
-                        <abp-input asp-for="@Model.Roles[i].IsAssigned" label="@Model.Roles[i].Name" />
-                        <input asp-for="@Model.Roles[i].Name" />
+                        var role = Model.Roles[i];
+                        <abp-input id="Role_@(i)__IsAssigned" name="Roles[@i].IsAssigned" asp-for="@role.IsAssigned" label="@role.Name" />
+                        <input name="Roles[@i].Name" asp-for="@role.Name" />
                     }
                 </abp-tab>
             </abp-tabs>

From 7bd51048aa309ae3fadbef1128c68a020c8a95b6 Mon Sep 17 00:00:00 2001
From: liangshiwei <liangshiw@outlook.com>
Date: Tue, 22 Dec 2020 20:36:54 +0800
Subject: [PATCH 2/2] Use AbpIdNameTagHelper

---
 .../Pages/Consent.cshtml                                  | 8 ++++----
 .../Pages/Identity/Users/CreateModal.cshtml               | 4 ++--
 .../Pages/Identity/Users/EditModal.cshtml                 | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Consent.cshtml b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Consent.cshtml
index 02b4f75416..47459bc81b 100644
--- a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Consent.cshtml
+++ b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Consent.cshtml
@@ -36,7 +36,7 @@
                         <li class="list-group-item">
                             <div class="form-check">
                                 <label asp-for="@identityScope.Checked" for="ConsentInput_IdentityScopes_@(i)__Checked" class="form-check-label">
-                                    <input name="ConsentInput.IdentityScopes[@i].Checked" id="ConsentInput_IdentityScopes_@(i)__Checked" asp-for="@identityScope.Checked" class="form-check-input"  />
+                                    <input abp-id-name="@Model.ConsentInput.IdentityScopes[i].Checked" asp-for="@identityScope.Checked" class="form-check-input"  />
                                     @identityScope.DisplayName
                                     @if (identityScope.Required)
                                     {
@@ -44,7 +44,7 @@
                                     }
                                 </label>
                             </div>
-                            <input name="ConsentInput.IdentityScopes[@i].Name" id="ConsentInput_IdentityScopes_@(i)Name" asp-for="@identityScope.Name" type="hidden" /> @* TODO: Use attributes on the view model instead of using hidden here *@
+                            <input abp-id-name="@Model.ConsentInput.IdentityScopes[i].Name" asp-for="@identityScope.Name" type="hidden" /> @* TODO: Use attributes on the view model instead of using hidden here *@
                             @if (identityScope.Description != null)
                             {
                                 <div class="consent-description">
@@ -67,7 +67,7 @@
                         <li class="list-group-item">
                             <div class="form-check">
                                 <label asp-for="@apiScope.Checked" for="ConsentInput_ApiScopes_@(i)__Checked" class="form-check-label">
-                                    <input name="ConsentInput.ApiScopes[@i].Checked" id="ConsentInput_ApiScopes_@(i)__Checked" asp-for="@apiScope.Checked" class="form-check-input" disabled="@apiScope.Required" />
+                                    <input abp-id-name="@Model.ConsentInput.ApiScopes[i].Checked" asp-for="@apiScope.Checked" class="form-check-input" disabled="@apiScope.Required" />
                                     @apiScope.DisplayName
                                     @if (apiScope.Required)
                                     {
@@ -75,7 +75,7 @@
                                     }
                                 </label>
                             </div>
-                            <input name="ConsentInput.ApiScopes[@i].Name" id="ConsentInput_ApiScopes_@(i)Name" asp-for="@apiScope.Name" type="hidden" /> @* TODO: Use attributes on the view model instead of using hidden here *@
+                            <input abp-id-name="@Model.ConsentInput.ApiScopes[i].Name" asp-for="@apiScope.Name" type="hidden" /> @* TODO: Use attributes on the view model instead of using hidden here *@
                             @if (apiScope.Description != null)
                             {
                                 <div class="consent-description">
diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml
index 868d749e3b..3fbe633cd4 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml
@@ -60,8 +60,8 @@
                     @for (var i = 0; i < Model.Roles.Length; i++)
                     {
                         var role = Model.Roles[i];
-                        <abp-input id="Role_@(i)__IsAssigned" name="Roles[@i].IsAssigned" asp-for="@role.IsAssigned" label="@role.Name" />
-                        <input name="Roles[@i].Name" asp-for="@role.Name" />
+                        <abp-input abp-id-name="@Model.Roles[i].IsAssigned" asp-for="@role.IsAssigned" label="@role.Name" />
+                        <input abp-id-name="@Model.Roles[i].Name" asp-for="@role.Name" />
                     }
                 </abp-tab>
             </abp-tabs>
diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml
index ca290a33ed..d570a0f794 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml
@@ -61,8 +61,8 @@
                     @for (var i = 0; i < Model.Roles.Length; i++)
                     {
                         var role = Model.Roles[i];
-                        <abp-input id="Role_@(i)__IsAssigned" name="Roles[@i].IsAssigned" asp-for="@role.IsAssigned" label="@role.Name" />
-                        <input name="Roles[@i].Name" asp-for="@role.Name" />
+                        <abp-input abp-id-name="@Model.Roles[i].IsAssigned" asp-for="@role.IsAssigned" label="@role.Name" />
+                        <input abp-id-name="@Model.Roles[i].Name" asp-for="@role.Name" />
                     }
                 </abp-tab>
             </abp-tabs>