From e1f9ddd19278b7612448a4e91449feb511fe55a2 Mon Sep 17 00:00:00 2001 From: Shady Nagy Date: Sat, 25 Jul 2020 23:28:21 +0200 Subject: [PATCH] BlazorShared and Services (#430) * Service to Services * Change Shared project to BlazorShared * change refrerances to BlazorShared --- eShopOnWeb.sln | 12 ++++++------ src/ApplicationCore/ApplicationCore.csproj | 4 ++++ .../Constants/AuthorizationConstants.cs | 4 ---- src/BlazorAdmin/BlazorAdmin.csproj | 2 +- src/BlazorAdmin/Constants.cs | 5 ----- src/BlazorAdmin/CustomAuthStateProvider.cs | 2 +- src/BlazorAdmin/Pages/CatalogItemPage/Create.razor | 2 +- src/BlazorAdmin/Pages/CatalogItemPage/Delete.razor | 6 +++--- .../Pages/CatalogItemPage/Details.razor | 4 ++-- src/BlazorAdmin/Pages/CatalogItemPage/Edit.razor | 2 +- src/BlazorAdmin/Pages/CatalogItemPage/List.razor | 8 ++++---- .../Pages/CatalogItemPage/List.razor.cs | 14 +++++++------- src/BlazorAdmin/Services/AuthService.cs | 2 +- .../List.CatalogBrand.cs | 2 +- .../List.CatalogBrandResult.cs | 2 +- .../List.cs | 2 +- .../CatalogItem.cs | 2 +- .../Create.CreateCatalogItemRequest.cs | 2 +- .../Create.CreateCatalogItemResult.cs | 2 +- .../Create.cs | 2 +- .../Delete.DeleteCatalogItemResult.cs | 2 +- .../Delete.cs | 2 +- .../Edit.EditCatalogItemResult.cs | 2 +- .../Edit.cs | 2 +- .../GetById.GetByIdCatalogItemResult.cs | 2 +- .../GetById.cs | 2 +- .../ListPaged.PagedCatalogItemResult.cs | 2 +- .../ListPaged.cs | 2 +- .../List.CatalogType.cs | 2 +- .../List.CatalogTypeResult.cs | 2 +- .../List.cs | 2 +- src/BlazorAdmin/Shared/MainLayout.razor | 2 +- src/BlazorAdmin/_Imports.razor | 6 +++--- .../Authorization/ClaimValue.cs | 2 +- src/BlazorShared/Authorization/Constants.cs | 14 ++++++++++++++ .../Authorization/UserInfo.cs | 2 +- src/BlazorShared/BlazorShared.csproj | 9 +++++++++ .../Identity/AppIdentityDbContextSeed.cs | 4 ++-- src/PublicApi/CatalogItemEndpoints/Create.cs | 2 +- src/PublicApi/CatalogItemEndpoints/Delete.cs | 2 +- src/PublicApi/CatalogItemEndpoints/Update.cs | 2 +- src/Shared/Shared.csproj | 7 ------- src/Web/Controllers/UserController.cs | 2 +- src/Web/Pages/Admin/EditCatalogItem.cshtml.cs | 2 +- src/Web/Pages/Admin/Index.cshtml.cs | 2 +- src/Web/Web.csproj | 2 +- 46 files changed, 87 insertions(+), 76 deletions(-) rename src/BlazorAdmin/Services/{CatalogBrandService => CatalogBrandServices}/List.CatalogBrand.cs (69%) rename src/BlazorAdmin/Services/{CatalogBrandService => CatalogBrandServices}/List.CatalogBrandResult.cs (77%) rename src/BlazorAdmin/Services/{CatalogBrandService => CatalogBrandServices}/List.cs (96%) rename src/BlazorAdmin/Services/{CatalogItemService => CatalogItemServices}/CatalogItem.cs (93%) rename src/BlazorAdmin/Services/{CatalogItemService => CatalogItemServices}/Create.CreateCatalogItemRequest.cs (93%) rename src/BlazorAdmin/Services/{CatalogItemService => CatalogItemServices}/Create.CreateCatalogItemResult.cs (81%) rename src/BlazorAdmin/Services/{CatalogItemService => CatalogItemServices}/Create.cs (95%) rename src/BlazorAdmin/Services/{CatalogItemService => CatalogItemServices}/Delete.DeleteCatalogItemResult.cs (67%) rename src/BlazorAdmin/Services/{CatalogItemService => CatalogItemServices}/Delete.cs (94%) rename src/BlazorAdmin/Services/{CatalogItemService => CatalogItemServices}/Edit.EditCatalogItemResult.cs (70%) rename src/BlazorAdmin/Services/{CatalogItemService => CatalogItemServices}/Edit.cs (95%) rename src/BlazorAdmin/Services/{CatalogItemService => CatalogItemServices}/GetById.GetByIdCatalogItemResult.cs (70%) rename src/BlazorAdmin/Services/{CatalogItemService => CatalogItemServices}/GetById.cs (94%) rename src/BlazorAdmin/Services/{CatalogItemService => CatalogItemServices}/ListPaged.PagedCatalogItemResult.cs (81%) rename src/BlazorAdmin/Services/{CatalogItemService => CatalogItemServices}/ListPaged.cs (94%) rename src/BlazorAdmin/Services/{CatalogTypeService => CatalogTypeServices}/List.CatalogType.cs (69%) rename src/BlazorAdmin/Services/{CatalogTypeService => CatalogTypeServices}/List.CatalogTypeResult.cs (77%) rename src/BlazorAdmin/Services/{CatalogTypeService => CatalogTypeServices}/List.cs (96%) rename src/{Shared => BlazorShared}/Authorization/ClaimValue.cs (90%) create mode 100644 src/BlazorShared/Authorization/Constants.cs rename src/{Shared => BlazorShared}/Authorization/UserInfo.cs (91%) create mode 100644 src/BlazorShared/BlazorShared.csproj delete mode 100644 src/Shared/Shared.csproj diff --git a/eShopOnWeb.sln b/eShopOnWeb.sln index 435595f..5742f2e 100755 --- a/eShopOnWeb.sln +++ b/eShopOnWeb.sln @@ -34,7 +34,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PublicApi", "src\PublicApi\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorAdmin", "src\BlazorAdmin\BlazorAdmin.csproj", "{71368733-80A4-4869-B215-3A7001878577}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shared", "src\Shared\Shared.csproj", "{7BDB419E-FAC1-4D43-8AA9-FB61EBE31BB8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorShared", "src\BlazorShared\BlazorShared.csproj", "{715CF7AF-A1EE-40A6-94A0-8DA3F3B2CAE9}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -78,10 +78,10 @@ Global {71368733-80A4-4869-B215-3A7001878577}.Debug|Any CPU.Build.0 = Debug|Any CPU {71368733-80A4-4869-B215-3A7001878577}.Release|Any CPU.ActiveCfg = Release|Any CPU {71368733-80A4-4869-B215-3A7001878577}.Release|Any CPU.Build.0 = Release|Any CPU - {7BDB419E-FAC1-4D43-8AA9-FB61EBE31BB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7BDB419E-FAC1-4D43-8AA9-FB61EBE31BB8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7BDB419E-FAC1-4D43-8AA9-FB61EBE31BB8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7BDB419E-FAC1-4D43-8AA9-FB61EBE31BB8}.Release|Any CPU.Build.0 = Release|Any CPU + {715CF7AF-A1EE-40A6-94A0-8DA3F3B2CAE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {715CF7AF-A1EE-40A6-94A0-8DA3F3B2CAE9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {715CF7AF-A1EE-40A6-94A0-8DA3F3B2CAE9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {715CF7AF-A1EE-40A6-94A0-8DA3F3B2CAE9}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -95,7 +95,7 @@ Global {7EFB5482-F942-4C3D-94B0-9B70596E6D0A} = {15EA4737-125B-4E6E-A806-E13B7EBCDCCF} {B5E4F33C-4667-4A55-AF6A-740F84C4CF3A} = {419A6ACE-0419-4315-A6FB-B0E63D39432E} {71368733-80A4-4869-B215-3A7001878577} = {419A6ACE-0419-4315-A6FB-B0E63D39432E} - {7BDB419E-FAC1-4D43-8AA9-FB61EBE31BB8} = {419A6ACE-0419-4315-A6FB-B0E63D39432E} + {715CF7AF-A1EE-40A6-94A0-8DA3F3B2CAE9} = {419A6ACE-0419-4315-A6FB-B0E63D39432E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {49813262-5DA3-4D61-ABD3-493C74CE8C2B} diff --git a/src/ApplicationCore/ApplicationCore.csproj b/src/ApplicationCore/ApplicationCore.csproj index 8e8906c..11dff61 100644 --- a/src/ApplicationCore/ApplicationCore.csproj +++ b/src/ApplicationCore/ApplicationCore.csproj @@ -13,4 +13,8 @@ + + + + \ No newline at end of file diff --git a/src/ApplicationCore/Constants/AuthorizationConstants.cs b/src/ApplicationCore/Constants/AuthorizationConstants.cs index c2d14c8..6c48ff2 100644 --- a/src/ApplicationCore/Constants/AuthorizationConstants.cs +++ b/src/ApplicationCore/Constants/AuthorizationConstants.cs @@ -2,10 +2,6 @@ { public class AuthorizationConstants { - public static class Roles - { - public const string ADMINISTRATORS = "Administrators"; - } // TODO: Don't use this in production public const string DEFAULT_PASSWORD = "Pass@word1"; diff --git a/src/BlazorAdmin/BlazorAdmin.csproj b/src/BlazorAdmin/BlazorAdmin.csproj index 84a9a38..9867426 100644 --- a/src/BlazorAdmin/BlazorAdmin.csproj +++ b/src/BlazorAdmin/BlazorAdmin.csproj @@ -18,7 +18,7 @@ - + diff --git a/src/BlazorAdmin/Constants.cs b/src/BlazorAdmin/Constants.cs index ae930e5..0ff40f7 100644 --- a/src/BlazorAdmin/Constants.cs +++ b/src/BlazorAdmin/Constants.cs @@ -3,10 +3,5 @@ public class Constants { public const string API_URL = "https://localhost:5099/api/"; - - public static class Roles - { - public const string ADMINISTRATORS = "Administrators"; - } } } diff --git a/src/BlazorAdmin/CustomAuthStateProvider.cs b/src/BlazorAdmin/CustomAuthStateProvider.cs index bdf4dd5..af6092e 100644 --- a/src/BlazorAdmin/CustomAuthStateProvider.cs +++ b/src/BlazorAdmin/CustomAuthStateProvider.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Components.Authorization; using System.Security.Claims; using System.Threading.Tasks; using Microsoft.Extensions.Logging; -using Shared.Authorization; +using BlazorShared.Authorization; namespace BlazorAdmin { diff --git a/src/BlazorAdmin/Pages/CatalogItemPage/Create.razor b/src/BlazorAdmin/Pages/CatalogItemPage/Create.razor index 7c86680..adecc76 100644 --- a/src/BlazorAdmin/Pages/CatalogItemPage/Create.razor +++ b/src/BlazorAdmin/Pages/CatalogItemPage/Create.razor @@ -118,7 +118,7 @@ private async Task CreateClick() { - await new BlazorAdmin.Services.CatalogItemService.Create(Auth).HandleAsync(_item); + await new BlazorAdmin.Services.CatalogItemServices.Create(Auth).HandleAsync(_item); await OnCloseClick.InvokeAsync(null); Close(); } diff --git a/src/BlazorAdmin/Pages/CatalogItemPage/Delete.razor b/src/BlazorAdmin/Pages/CatalogItemPage/Delete.razor index 82bb464..d643167 100644 --- a/src/BlazorAdmin/Pages/CatalogItemPage/Delete.razor +++ b/src/BlazorAdmin/Pages/CatalogItemPage/Delete.razor @@ -47,7 +47,7 @@
- @Services.CatalogBrandService.List.GetBrandName(Brands, _item.CatalogBrandId) + @Services.CatalogBrandServices.List.GetBrandName(Brands, _item.CatalogBrandId)
@@ -55,7 +55,7 @@
- @Services.CatalogTypeService.List.GetTypeName(Types, _item.CatalogTypeId) + @Services.CatalogTypeServices.List.GetTypeName(Types, _item.CatalogTypeId)
Price @@ -105,7 +105,7 @@ { // TODO: Add some kind of "are you sure" check before this - await new BlazorAdmin.Services.CatalogItemService.Delete(Auth).HandleAsync(id); + await new BlazorAdmin.Services.CatalogItemServices.Delete(Auth).HandleAsync(id); await OnCloseClick.InvokeAsync(null); Close(); diff --git a/src/BlazorAdmin/Pages/CatalogItemPage/Details.razor b/src/BlazorAdmin/Pages/CatalogItemPage/Details.razor index 12c8956..1539ee6 100644 --- a/src/BlazorAdmin/Pages/CatalogItemPage/Details.razor +++ b/src/BlazorAdmin/Pages/CatalogItemPage/Details.razor @@ -50,7 +50,7 @@
- @Services.CatalogBrandService.List.GetBrandName(Brands, _item.CatalogBrandId) + @Services.CatalogBrandServices.List.GetBrandName(Brands, _item.CatalogBrandId)
@@ -58,7 +58,7 @@
- @Services.CatalogTypeService.List.GetTypeName(Types, _item.CatalogTypeId) + @Services.CatalogTypeServices.List.GetTypeName(Types, _item.CatalogTypeId)
Price diff --git a/src/BlazorAdmin/Pages/CatalogItemPage/Edit.razor b/src/BlazorAdmin/Pages/CatalogItemPage/Edit.razor index 4a193ee..4e9fd24 100644 --- a/src/BlazorAdmin/Pages/CatalogItemPage/Edit.razor +++ b/src/BlazorAdmin/Pages/CatalogItemPage/Edit.razor @@ -118,7 +118,7 @@ private async Task SaveClick() { - await new BlazorAdmin.Services.CatalogItemService.Edit(Auth).HandleAsync(_item); + await new BlazorAdmin.Services.CatalogItemServices.Edit(Auth).HandleAsync(_item); Close(); } diff --git a/src/BlazorAdmin/Pages/CatalogItemPage/List.razor b/src/BlazorAdmin/Pages/CatalogItemPage/List.razor index 90125a0..d0de450 100644 --- a/src/BlazorAdmin/Pages/CatalogItemPage/List.razor +++ b/src/BlazorAdmin/Pages/CatalogItemPage/List.razor @@ -1,7 +1,7 @@ @page "/admin" -@attribute [Authorize(Roles = Constants.Roles.ADMINISTRATORS)] +@attribute [Authorize(Roles = BlazorShared.Authorization.Constants.Roles.ADMINISTRATORS)] @inject AuthService Auth -@using global::Shared.Authorization +@using global::BlazorShared.Authorization @inherits BlazorAdmin.Helpers.BlazorComponent @namespace BlazorAdmin.Pages.CatalogItemPage @@ -40,8 +40,8 @@ else - @Services.CatalogTypeService.List.GetTypeName(catalogTypes, item.CatalogTypeId) - @Services.CatalogBrandService.List.GetBrandName(catalogBrands, item.CatalogBrandId) + @Services.CatalogTypeServices.List.GetTypeName(catalogTypes, item.CatalogTypeId) + @Services.CatalogBrandServices.List.GetBrandName(catalogBrands, item.CatalogBrandId) @item.Id @item.Name @item.Description diff --git a/src/BlazorAdmin/Pages/CatalogItemPage/List.razor.cs b/src/BlazorAdmin/Pages/CatalogItemPage/List.razor.cs index a37fa02..21cbe2d 100644 --- a/src/BlazorAdmin/Pages/CatalogItemPage/List.razor.cs +++ b/src/BlazorAdmin/Pages/CatalogItemPage/List.razor.cs @@ -1,7 +1,7 @@ using BlazorAdmin.Helpers; -using BlazorAdmin.Services.CatalogBrandService; -using BlazorAdmin.Services.CatalogItemService; -using BlazorAdmin.Services.CatalogTypeService; +using BlazorAdmin.Services.CatalogBrandServices; +using BlazorAdmin.Services.CatalogItemServices; +using BlazorAdmin.Services.CatalogTypeServices; using System.Collections.Generic; using System.Threading.Tasks; @@ -22,9 +22,9 @@ namespace BlazorAdmin.Pages.CatalogItemPage { if (firstRender) { - catalogItems = await new BlazorAdmin.Services.CatalogItemService.ListPaged(Auth).HandleAsync(50); - catalogTypes = await new BlazorAdmin.Services.CatalogTypeService.List(Auth).HandleAsync(); - catalogBrands = await new BlazorAdmin.Services.CatalogBrandService.List(Auth).HandleAsync(); + catalogItems = await new BlazorAdmin.Services.CatalogItemServices.ListPaged(Auth).HandleAsync(50); + catalogTypes = await new BlazorAdmin.Services.CatalogTypeServices.List(Auth).HandleAsync(); + catalogBrands = await new BlazorAdmin.Services.CatalogBrandServices.List(Auth).HandleAsync(); CallRequestRefresh(); } @@ -54,7 +54,7 @@ namespace BlazorAdmin.Pages.CatalogItemPage private async Task ReloadCatalogItems() { - catalogItems = await new BlazorAdmin.Services.CatalogItemService.ListPaged(Auth).HandleAsync(50); + catalogItems = await new BlazorAdmin.Services.CatalogItemServices.ListPaged(Auth).HandleAsync(50); StateHasChanged(); } } diff --git a/src/BlazorAdmin/Services/AuthService.cs b/src/BlazorAdmin/Services/AuthService.cs index 12bda0a..714ef31 100644 --- a/src/BlazorAdmin/Services/AuthService.cs +++ b/src/BlazorAdmin/Services/AuthService.cs @@ -11,7 +11,7 @@ using BlazorAdmin.JavaScript; using Blazored.LocalStorage; using Microsoft.JSInterop; using Newtonsoft.Json; -using Shared.Authorization; +using BlazorShared.Authorization; namespace BlazorAdmin.Services { diff --git a/src/BlazorAdmin/Services/CatalogBrandService/List.CatalogBrand.cs b/src/BlazorAdmin/Services/CatalogBrandServices/List.CatalogBrand.cs similarity index 69% rename from src/BlazorAdmin/Services/CatalogBrandService/List.CatalogBrand.cs rename to src/BlazorAdmin/Services/CatalogBrandServices/List.CatalogBrand.cs index b535633..b8d8a5b 100644 --- a/src/BlazorAdmin/Services/CatalogBrandService/List.CatalogBrand.cs +++ b/src/BlazorAdmin/Services/CatalogBrandServices/List.CatalogBrand.cs @@ -1,4 +1,4 @@ -namespace BlazorAdmin.Services.CatalogBrandService +namespace BlazorAdmin.Services.CatalogBrandServices { public class CatalogBrand { diff --git a/src/BlazorAdmin/Services/CatalogBrandService/List.CatalogBrandResult.cs b/src/BlazorAdmin/Services/CatalogBrandServices/List.CatalogBrandResult.cs similarity index 77% rename from src/BlazorAdmin/Services/CatalogBrandService/List.CatalogBrandResult.cs rename to src/BlazorAdmin/Services/CatalogBrandServices/List.CatalogBrandResult.cs index 18f6219..88493ea 100644 --- a/src/BlazorAdmin/Services/CatalogBrandService/List.CatalogBrandResult.cs +++ b/src/BlazorAdmin/Services/CatalogBrandServices/List.CatalogBrandResult.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace BlazorAdmin.Services.CatalogBrandService +namespace BlazorAdmin.Services.CatalogBrandServices { public class CatalogBrandResult { diff --git a/src/BlazorAdmin/Services/CatalogBrandService/List.cs b/src/BlazorAdmin/Services/CatalogBrandServices/List.cs similarity index 96% rename from src/BlazorAdmin/Services/CatalogBrandService/List.cs rename to src/BlazorAdmin/Services/CatalogBrandServices/List.cs index be4cd68..fc7b7ee 100644 --- a/src/BlazorAdmin/Services/CatalogBrandService/List.cs +++ b/src/BlazorAdmin/Services/CatalogBrandServices/List.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Components.WebAssembly.Authentication; using Newtonsoft.Json; -namespace BlazorAdmin.Services.CatalogBrandService +namespace BlazorAdmin.Services.CatalogBrandServices { public class List { diff --git a/src/BlazorAdmin/Services/CatalogItemService/CatalogItem.cs b/src/BlazorAdmin/Services/CatalogItemServices/CatalogItem.cs similarity index 93% rename from src/BlazorAdmin/Services/CatalogItemService/CatalogItem.cs rename to src/BlazorAdmin/Services/CatalogItemServices/CatalogItem.cs index 5be1da1..d47c53e 100644 --- a/src/BlazorAdmin/Services/CatalogItemService/CatalogItem.cs +++ b/src/BlazorAdmin/Services/CatalogItemServices/CatalogItem.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace BlazorAdmin.Services.CatalogItemService +namespace BlazorAdmin.Services.CatalogItemServices { public class CatalogItem { diff --git a/src/BlazorAdmin/Services/CatalogItemService/Create.CreateCatalogItemRequest.cs b/src/BlazorAdmin/Services/CatalogItemServices/Create.CreateCatalogItemRequest.cs similarity index 93% rename from src/BlazorAdmin/Services/CatalogItemService/Create.CreateCatalogItemRequest.cs rename to src/BlazorAdmin/Services/CatalogItemServices/Create.CreateCatalogItemRequest.cs index 377ded0..b9d09cb 100644 --- a/src/BlazorAdmin/Services/CatalogItemService/Create.CreateCatalogItemRequest.cs +++ b/src/BlazorAdmin/Services/CatalogItemServices/Create.CreateCatalogItemRequest.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace BlazorAdmin.Services.CatalogItemService +namespace BlazorAdmin.Services.CatalogItemServices { public class CreateCatalogItemRequest { diff --git a/src/BlazorAdmin/Services/CatalogItemService/Create.CreateCatalogItemResult.cs b/src/BlazorAdmin/Services/CatalogItemServices/Create.CreateCatalogItemResult.cs similarity index 81% rename from src/BlazorAdmin/Services/CatalogItemService/Create.CreateCatalogItemResult.cs rename to src/BlazorAdmin/Services/CatalogItemServices/Create.CreateCatalogItemResult.cs index 71d68fe..f76fe3f 100644 --- a/src/BlazorAdmin/Services/CatalogItemService/Create.CreateCatalogItemResult.cs +++ b/src/BlazorAdmin/Services/CatalogItemServices/Create.CreateCatalogItemResult.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace BlazorAdmin.Services.CatalogItemService +namespace BlazorAdmin.Services.CatalogItemServices { public class CreateCatalogItemResult { diff --git a/src/BlazorAdmin/Services/CatalogItemService/Create.cs b/src/BlazorAdmin/Services/CatalogItemServices/Create.cs similarity index 95% rename from src/BlazorAdmin/Services/CatalogItemService/Create.cs rename to src/BlazorAdmin/Services/CatalogItemServices/Create.cs index ac37d82..c9fe760 100644 --- a/src/BlazorAdmin/Services/CatalogItemService/Create.cs +++ b/src/BlazorAdmin/Services/CatalogItemServices/Create.cs @@ -4,7 +4,7 @@ using System.Text; using System.Threading.Tasks; using Newtonsoft.Json; -namespace BlazorAdmin.Services.CatalogItemService +namespace BlazorAdmin.Services.CatalogItemServices { public class Create { diff --git a/src/BlazorAdmin/Services/CatalogItemService/Delete.DeleteCatalogItemResult.cs b/src/BlazorAdmin/Services/CatalogItemServices/Delete.DeleteCatalogItemResult.cs similarity index 67% rename from src/BlazorAdmin/Services/CatalogItemService/Delete.DeleteCatalogItemResult.cs rename to src/BlazorAdmin/Services/CatalogItemServices/Delete.DeleteCatalogItemResult.cs index 4b66e4e..8436815 100644 --- a/src/BlazorAdmin/Services/CatalogItemService/Delete.DeleteCatalogItemResult.cs +++ b/src/BlazorAdmin/Services/CatalogItemServices/Delete.DeleteCatalogItemResult.cs @@ -1,4 +1,4 @@ -namespace BlazorAdmin.Services.CatalogItemService +namespace BlazorAdmin.Services.CatalogItemServices { public class DeleteCatalogItemResult { diff --git a/src/BlazorAdmin/Services/CatalogItemService/Delete.cs b/src/BlazorAdmin/Services/CatalogItemServices/Delete.cs similarity index 94% rename from src/BlazorAdmin/Services/CatalogItemService/Delete.cs rename to src/BlazorAdmin/Services/CatalogItemServices/Delete.cs index ce74c67..4b36204 100644 --- a/src/BlazorAdmin/Services/CatalogItemService/Delete.cs +++ b/src/BlazorAdmin/Services/CatalogItemServices/Delete.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; using Newtonsoft.Json; -namespace BlazorAdmin.Services.CatalogItemService +namespace BlazorAdmin.Services.CatalogItemServices { public class Delete { diff --git a/src/BlazorAdmin/Services/CatalogItemService/Edit.EditCatalogItemResult.cs b/src/BlazorAdmin/Services/CatalogItemServices/Edit.EditCatalogItemResult.cs similarity index 70% rename from src/BlazorAdmin/Services/CatalogItemService/Edit.EditCatalogItemResult.cs rename to src/BlazorAdmin/Services/CatalogItemServices/Edit.EditCatalogItemResult.cs index fb17b93..9f303eb 100644 --- a/src/BlazorAdmin/Services/CatalogItemService/Edit.EditCatalogItemResult.cs +++ b/src/BlazorAdmin/Services/CatalogItemServices/Edit.EditCatalogItemResult.cs @@ -1,4 +1,4 @@ -namespace BlazorAdmin.Services.CatalogItemService +namespace BlazorAdmin.Services.CatalogItemServices { public class EditCatalogItemResult { diff --git a/src/BlazorAdmin/Services/CatalogItemService/Edit.cs b/src/BlazorAdmin/Services/CatalogItemServices/Edit.cs similarity index 95% rename from src/BlazorAdmin/Services/CatalogItemService/Edit.cs rename to src/BlazorAdmin/Services/CatalogItemServices/Edit.cs index d80f19c..7bf917a 100644 --- a/src/BlazorAdmin/Services/CatalogItemService/Edit.cs +++ b/src/BlazorAdmin/Services/CatalogItemServices/Edit.cs @@ -4,7 +4,7 @@ using System.Text; using System.Threading.Tasks; using Newtonsoft.Json; -namespace BlazorAdmin.Services.CatalogItemService +namespace BlazorAdmin.Services.CatalogItemServices { public class Edit { diff --git a/src/BlazorAdmin/Services/CatalogItemService/GetById.GetByIdCatalogItemResult.cs b/src/BlazorAdmin/Services/CatalogItemServices/GetById.GetByIdCatalogItemResult.cs similarity index 70% rename from src/BlazorAdmin/Services/CatalogItemService/GetById.GetByIdCatalogItemResult.cs rename to src/BlazorAdmin/Services/CatalogItemServices/GetById.GetByIdCatalogItemResult.cs index 5c9b7a8..e7e9f1d 100644 --- a/src/BlazorAdmin/Services/CatalogItemService/GetById.GetByIdCatalogItemResult.cs +++ b/src/BlazorAdmin/Services/CatalogItemServices/GetById.GetByIdCatalogItemResult.cs @@ -1,4 +1,4 @@ -namespace BlazorAdmin.Services.CatalogItemService +namespace BlazorAdmin.Services.CatalogItemServices { public class GetByIdCatalogItemResult { diff --git a/src/BlazorAdmin/Services/CatalogItemService/GetById.cs b/src/BlazorAdmin/Services/CatalogItemServices/GetById.cs similarity index 94% rename from src/BlazorAdmin/Services/CatalogItemService/GetById.cs rename to src/BlazorAdmin/Services/CatalogItemServices/GetById.cs index 9539fb7..aaf70c8 100644 --- a/src/BlazorAdmin/Services/CatalogItemService/GetById.cs +++ b/src/BlazorAdmin/Services/CatalogItemServices/GetById.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; using Newtonsoft.Json; -namespace BlazorAdmin.Services.CatalogItemService +namespace BlazorAdmin.Services.CatalogItemServices { public class GetById { diff --git a/src/BlazorAdmin/Services/CatalogItemService/ListPaged.PagedCatalogItemResult.cs b/src/BlazorAdmin/Services/CatalogItemServices/ListPaged.PagedCatalogItemResult.cs similarity index 81% rename from src/BlazorAdmin/Services/CatalogItemService/ListPaged.PagedCatalogItemResult.cs rename to src/BlazorAdmin/Services/CatalogItemServices/ListPaged.PagedCatalogItemResult.cs index e1217c1..531e78a 100644 --- a/src/BlazorAdmin/Services/CatalogItemService/ListPaged.PagedCatalogItemResult.cs +++ b/src/BlazorAdmin/Services/CatalogItemServices/ListPaged.PagedCatalogItemResult.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace BlazorAdmin.Services.CatalogItemService +namespace BlazorAdmin.Services.CatalogItemServices { public class PagedCatalogItemResult { diff --git a/src/BlazorAdmin/Services/CatalogItemService/ListPaged.cs b/src/BlazorAdmin/Services/CatalogItemServices/ListPaged.cs similarity index 94% rename from src/BlazorAdmin/Services/CatalogItemService/ListPaged.cs rename to src/BlazorAdmin/Services/CatalogItemServices/ListPaged.cs index 25e63e0..9663168 100644 --- a/src/BlazorAdmin/Services/CatalogItemService/ListPaged.cs +++ b/src/BlazorAdmin/Services/CatalogItemServices/ListPaged.cs @@ -3,7 +3,7 @@ using System.Net; using System.Threading.Tasks; using Newtonsoft.Json; -namespace BlazorAdmin.Services.CatalogItemService +namespace BlazorAdmin.Services.CatalogItemServices { public class ListPaged { diff --git a/src/BlazorAdmin/Services/CatalogTypeService/List.CatalogType.cs b/src/BlazorAdmin/Services/CatalogTypeServices/List.CatalogType.cs similarity index 69% rename from src/BlazorAdmin/Services/CatalogTypeService/List.CatalogType.cs rename to src/BlazorAdmin/Services/CatalogTypeServices/List.CatalogType.cs index 370e9c4..0a22de3 100644 --- a/src/BlazorAdmin/Services/CatalogTypeService/List.CatalogType.cs +++ b/src/BlazorAdmin/Services/CatalogTypeServices/List.CatalogType.cs @@ -1,4 +1,4 @@ -namespace BlazorAdmin.Services.CatalogTypeService +namespace BlazorAdmin.Services.CatalogTypeServices { public class CatalogType { diff --git a/src/BlazorAdmin/Services/CatalogTypeService/List.CatalogTypeResult.cs b/src/BlazorAdmin/Services/CatalogTypeServices/List.CatalogTypeResult.cs similarity index 77% rename from src/BlazorAdmin/Services/CatalogTypeService/List.CatalogTypeResult.cs rename to src/BlazorAdmin/Services/CatalogTypeServices/List.CatalogTypeResult.cs index a5c8721..a897967 100644 --- a/src/BlazorAdmin/Services/CatalogTypeService/List.CatalogTypeResult.cs +++ b/src/BlazorAdmin/Services/CatalogTypeServices/List.CatalogTypeResult.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace BlazorAdmin.Services.CatalogTypeService +namespace BlazorAdmin.Services.CatalogTypeServices { public class CatalogTypeResult { diff --git a/src/BlazorAdmin/Services/CatalogTypeService/List.cs b/src/BlazorAdmin/Services/CatalogTypeServices/List.cs similarity index 96% rename from src/BlazorAdmin/Services/CatalogTypeService/List.cs rename to src/BlazorAdmin/Services/CatalogTypeServices/List.cs index f23b101..c5ab999 100644 --- a/src/BlazorAdmin/Services/CatalogTypeService/List.cs +++ b/src/BlazorAdmin/Services/CatalogTypeServices/List.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Components.WebAssembly.Authentication; using Newtonsoft.Json; -namespace BlazorAdmin.Services.CatalogTypeService +namespace BlazorAdmin.Services.CatalogTypeServices { public class List { diff --git a/src/BlazorAdmin/Shared/MainLayout.razor b/src/BlazorAdmin/Shared/MainLayout.razor index aa39334..c9438fa 100644 --- a/src/BlazorAdmin/Shared/MainLayout.razor +++ b/src/BlazorAdmin/Shared/MainLayout.razor @@ -3,7 +3,7 @@ @inherits BlazorAdmin.Helpers.BlazorLayoutComponent - +
diff --git a/src/BlazorAdmin/_Imports.razor b/src/BlazorAdmin/_Imports.razor index b45b7ad..ecad015 100644 --- a/src/BlazorAdmin/_Imports.razor +++ b/src/BlazorAdmin/_Imports.razor @@ -10,8 +10,8 @@ @using BlazorAdmin @using BlazorAdmin.Shared @using BlazorAdmin.Services -@using BlazorAdmin.Services.CatalogBrandService -@using BlazorAdmin.Services.CatalogItemService -@using BlazorAdmin.Services.CatalogTypeService +@using BlazorAdmin.Services.CatalogBrandServices +@using BlazorAdmin.Services.CatalogItemServices +@using BlazorAdmin.Services.CatalogTypeServices @using Microsoft.Extensions.Logging @using BlazorAdmin.JavaScript diff --git a/src/Shared/Authorization/ClaimValue.cs b/src/BlazorShared/Authorization/ClaimValue.cs similarity index 90% rename from src/Shared/Authorization/ClaimValue.cs rename to src/BlazorShared/Authorization/ClaimValue.cs index b1b24c5..f2749cf 100644 --- a/src/Shared/Authorization/ClaimValue.cs +++ b/src/BlazorShared/Authorization/ClaimValue.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Shared.Authorization +namespace BlazorShared.Authorization { public class ClaimValue { diff --git a/src/BlazorShared/Authorization/Constants.cs b/src/BlazorShared/Authorization/Constants.cs new file mode 100644 index 0000000..59dceb6 --- /dev/null +++ b/src/BlazorShared/Authorization/Constants.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace BlazorShared.Authorization +{ + public class Constants + { + public static class Roles + { + public const string ADMINISTRATORS = "Administrators"; + } + } +} diff --git a/src/Shared/Authorization/UserInfo.cs b/src/BlazorShared/Authorization/UserInfo.cs similarity index 91% rename from src/Shared/Authorization/UserInfo.cs rename to src/BlazorShared/Authorization/UserInfo.cs index 9c4e2cc..d5ea56a 100644 --- a/src/Shared/Authorization/UserInfo.cs +++ b/src/BlazorShared/Authorization/UserInfo.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Security.Claims; using System.Text; -namespace Shared.Authorization +namespace BlazorShared.Authorization { public class UserInfo { diff --git a/src/BlazorShared/BlazorShared.csproj b/src/BlazorShared/BlazorShared.csproj new file mode 100644 index 0000000..07b614b --- /dev/null +++ b/src/BlazorShared/BlazorShared.csproj @@ -0,0 +1,9 @@ + + + + netstandard2.0 + BlazorShared + BlazorShared + + + diff --git a/src/Infrastructure/Identity/AppIdentityDbContextSeed.cs b/src/Infrastructure/Identity/AppIdentityDbContextSeed.cs index 3664fe1..e30edcd 100644 --- a/src/Infrastructure/Identity/AppIdentityDbContextSeed.cs +++ b/src/Infrastructure/Identity/AppIdentityDbContextSeed.cs @@ -8,7 +8,7 @@ namespace Microsoft.eShopWeb.Infrastructure.Identity { public static async Task SeedAsync(UserManager userManager, RoleManager roleManager) { - await roleManager.CreateAsync(new IdentityRole(AuthorizationConstants.Roles.ADMINISTRATORS)); + await roleManager.CreateAsync(new IdentityRole(BlazorShared.Authorization.Constants.Roles.ADMINISTRATORS)); var defaultUser = new ApplicationUser { UserName = "demouser@microsoft.com", Email = "demouser@microsoft.com" }; await userManager.CreateAsync(defaultUser, AuthorizationConstants.DEFAULT_PASSWORD); @@ -17,7 +17,7 @@ namespace Microsoft.eShopWeb.Infrastructure.Identity var adminUser = new ApplicationUser { UserName = adminUserName, Email = adminUserName }; await userManager.CreateAsync(adminUser, AuthorizationConstants.DEFAULT_PASSWORD); adminUser = await userManager.FindByNameAsync(adminUserName); - await userManager.AddToRoleAsync(adminUser, AuthorizationConstants.Roles.ADMINISTRATORS); + await userManager.AddToRoleAsync(adminUser, BlazorShared.Authorization.Constants.Roles.ADMINISTRATORS); } } } diff --git a/src/PublicApi/CatalogItemEndpoints/Create.cs b/src/PublicApi/CatalogItemEndpoints/Create.cs index e3c31d8..c2e828b 100644 --- a/src/PublicApi/CatalogItemEndpoints/Create.cs +++ b/src/PublicApi/CatalogItemEndpoints/Create.cs @@ -11,7 +11,7 @@ using System.Threading.Tasks; namespace Microsoft.eShopWeb.PublicApi.CatalogItemEndpoints { - [Authorize(Roles = AuthorizationConstants.Roles.ADMINISTRATORS, AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)] + [Authorize(Roles = BlazorShared.Authorization.Constants.Roles.ADMINISTRATORS, AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)] public class Create : BaseAsyncEndpoint { private readonly IAsyncRepository _itemRepository; diff --git a/src/PublicApi/CatalogItemEndpoints/Delete.cs b/src/PublicApi/CatalogItemEndpoints/Delete.cs index ed3c712..010e06a 100644 --- a/src/PublicApi/CatalogItemEndpoints/Delete.cs +++ b/src/PublicApi/CatalogItemEndpoints/Delete.cs @@ -10,7 +10,7 @@ using System.Threading.Tasks; namespace Microsoft.eShopWeb.PublicApi.CatalogItemEndpoints { - [Authorize(Roles = AuthorizationConstants.Roles.ADMINISTRATORS, AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)] + [Authorize(Roles = BlazorShared.Authorization.Constants.Roles.ADMINISTRATORS, AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)] public class Delete : BaseAsyncEndpoint { private readonly IAsyncRepository _itemRepository; diff --git a/src/PublicApi/CatalogItemEndpoints/Update.cs b/src/PublicApi/CatalogItemEndpoints/Update.cs index fe8cd96..8c97e06 100644 --- a/src/PublicApi/CatalogItemEndpoints/Update.cs +++ b/src/PublicApi/CatalogItemEndpoints/Update.cs @@ -12,7 +12,7 @@ using System.Threading.Tasks; namespace Microsoft.eShopWeb.PublicApi.CatalogItemEndpoints { - [Authorize(Roles = AuthorizationConstants.Roles.ADMINISTRATORS, AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)] + [Authorize(Roles = BlazorShared.Authorization.Constants.Roles.ADMINISTRATORS, AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)] public class Update : BaseAsyncEndpoint { private readonly IAsyncRepository _itemRepository; diff --git a/src/Shared/Shared.csproj b/src/Shared/Shared.csproj deleted file mode 100644 index 9f5c4f4..0000000 --- a/src/Shared/Shared.csproj +++ /dev/null @@ -1,7 +0,0 @@ - - - - netstandard2.0 - - - diff --git a/src/Web/Controllers/UserController.cs b/src/Web/Controllers/UserController.cs index 7c11ebc..eedce15 100644 --- a/src/Web/Controllers/UserController.cs +++ b/src/Web/Controllers/UserController.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Security.Claims; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using Shared.Authorization; +using BlazorShared.Authorization; namespace Microsoft.eShopWeb.Web.Controllers { diff --git a/src/Web/Pages/Admin/EditCatalogItem.cshtml.cs b/src/Web/Pages/Admin/EditCatalogItem.cshtml.cs index 6e1a7fe..686114d 100644 --- a/src/Web/Pages/Admin/EditCatalogItem.cshtml.cs +++ b/src/Web/Pages/Admin/EditCatalogItem.cshtml.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; namespace Microsoft.eShopWeb.Web.Pages.Admin { - [Authorize(Roles = AuthorizationConstants.Roles.ADMINISTRATORS)] + [Authorize(Roles = BlazorShared.Authorization.Constants.Roles.ADMINISTRATORS)] public class EditCatalogItemModel : PageModel { private readonly ICatalogItemViewModelService _catalogItemViewModelService; diff --git a/src/Web/Pages/Admin/Index.cshtml.cs b/src/Web/Pages/Admin/Index.cshtml.cs index 4328bb8..52a9617 100644 --- a/src/Web/Pages/Admin/Index.cshtml.cs +++ b/src/Web/Pages/Admin/Index.cshtml.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; namespace Microsoft.eShopWeb.Web.Pages.Admin { - [Authorize(Roles = AuthorizationConstants.Roles.ADMINISTRATORS)] + [Authorize(Roles = BlazorShared.Authorization.Constants.Roles.ADMINISTRATORS)] public class IndexModel : PageModel { public IndexModel() diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj index 76547c3..74ea66b 100644 --- a/src/Web/Web.csproj +++ b/src/Web/Web.csproj @@ -51,8 +51,8 @@ + -