bit365/hello-shop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

零度框架 1.0 版本正式发布，共 184 项改进。

Browse Source
This commit is contained in:
hello 2024-05-31 12:28:02 +08:00
parent c14a872b77
commit baf06cd88f
182 changed files with 2537 additions and 1613 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
HelloShop.sln
View File

@ -1,4 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 12.00

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.9.34414.90
MinimumVisualStudioVersion = 10.0.40219.1
@ -26,6 +27,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelloShop.ProductService.Un
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelloShop.ProductService.FunctionalTests", "tests\HelloShop.ProductService.FunctionalTests\HelloShop.ProductService.FunctionalTests.csproj", "{45932B7F-6ED0-40F3-AA2C-F14A844FEE18}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloShop.HybridApp", "src\HelloShop.HybridApp\HelloShop.HybridApp.csproj", "{E58F82E2-2E48-459B-A40E-497F24FC6DC1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloShop.FunctionalTests", "tests\HelloShop.FunctionalTests\HelloShop.FunctionalTests.csproj", "{6BAA9747-E0D0-41B9-8A1B-88B777498C43}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -72,6 +77,16 @@ Global
{45932B7F-6ED0-40F3-AA2C-F14A844FEE18}.Debug|Any CPU.Build.0 = Debug|Any CPU
{45932B7F-6ED0-40F3-AA2C-F14A844FEE18}.Release|Any CPU.ActiveCfg = Release|Any CPU
{45932B7F-6ED0-40F3-AA2C-F14A844FEE18}.Release|Any CPU.Build.0 = Release|Any CPU
{E58F82E2-2E48-459B-A40E-497F24FC6DC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E58F82E2-2E48-459B-A40E-497F24FC6DC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E58F82E2-2E48-459B-A40E-497F24FC6DC1}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{E58F82E2-2E48-459B-A40E-497F24FC6DC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E58F82E2-2E48-459B-A40E-497F24FC6DC1}.Release|Any CPU.Build.0 = Release|Any CPU
{E58F82E2-2E48-459B-A40E-497F24FC6DC1}.Release|Any CPU.Deploy.0 = Release|Any CPU
{6BAA9747-E0D0-41B9-8A1B-88B777498C43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6BAA9747-E0D0-41B9-8A1B-88B777498C43}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6BAA9747-E0D0-41B9-8A1B-88B777498C43}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6BAA9747-E0D0-41B9-8A1B-88B777498C43}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -87,6 +102,8 @@ Global
{02EBA5AD-84B4-4AF4-B519-72061C08800D} = {1AD03316-A743-4E9D-B3BC-FB9499D15141}
{2022279A-E39F-4489-82AE-39AC53C594C9} = {29BE158E-825E-48AB-A02D-4E537A5DC502}
{45932B7F-6ED0-40F3-AA2C-F14A844FEE18} = {29BE158E-825E-48AB-A02D-4E537A5DC502}
{E58F82E2-2E48-459B-A40E-497F24FC6DC1} = {1AD03316-A743-4E9D-B3BC-FB9499D15141}
{6BAA9747-E0D0-41B9-8A1B-88B777498C43} = {29BE158E-825E-48AB-A02D-4E537A5DC502}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {845545A8-2006-46C3-ABD7-5BDF63F3858C}

5
src/HelloShop.ApiService/Controllers/PermissionsController.cs
View File

@ -1,4 +1,7 @@
using HelloShop.ApiService.Services;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using HelloShop.ApiService.Services;
using HelloShop.ServiceDefaults.Permissions;
using Microsoft.AspNetCore.Mvc;

5
src/HelloShop.ApiService/Controllers/ValuesController.cs
View File

@ -1,4 +1,7 @@
using Microsoft.AspNetCore.Mvc;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using Microsoft.AspNetCore.Mvc;
namespace HelloShop.ApiService.Controllers;

15
src/HelloShop.ApiService/Extensions/OpenApiConfigureOptions.cs
View File

@ -1,10 +1,13 @@
using HelloShop.ApiService.Infrastructure;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using HelloShop.ApiService.Infrastructure;
using Microsoft.Extensions.Options;
using Swashbuckle.AspNetCore.SwaggerUI;
namespace HelloShop.ApiService.Extensions;
public class OpenApiConfigureOptions(IConfiguredServiceEndPointResolver serviceResolver, HttpClient httpClient) : IConfigureOptions<SwaggerUIOptions>
public class OpenApiConfigureOptions(IConfiguredServiceEndPointResolver serviceResolver, HttpClient httpClient, ILogger<OpenApiConfigureOptions> logger) : IConfigureOptions<SwaggerUIOptions>
{
public void Configure(SwaggerUIOptions options)
{
@ -16,8 +19,9 @@ public class OpenApiConfigureOptions(IConfiguredServiceEndPointResolver serviceR
{
UriBuilder uriBuilder = new(endPoint) { Path = "swagger/v1/swagger.json" };
try
{
HttpResponseMessage response = httpClient.GetAsync(uriBuilder.Uri).GetAwaiter().GetResult();
if (response.IsSuccessStatusCode)
{
urlDescriptors.Add(new UrlDescriptor
@ -28,6 +32,11 @@ public class OpenApiConfigureOptions(IConfiguredServiceEndPointResolver serviceR
break;
}
}
catch (Exception ex)
{
logger.LogError(ex, "Failed to get swagger endpoint for {ServiceName}", serviceEndpoint.ServiceName);
}
}
}
options.ConfigObject.Urls = urlDescriptors;

7
src/HelloShop.ApiService/HelloShop.ApiService.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
@ -9,7 +9,6 @@
<ProjectReference Include="..\HelloShop.ServiceDefaults\HelloShop.ServiceDefaults.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery.Yarp" Version="9.0.0-preview.3.24210.17" />
<PackageReference Include="Yarp.ReverseProxy" Version="2.1.0" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery.Yarp" Version="8.0.1" />
</ItemGroup>
</Project>

5
src/HelloShop.ApiService/Infrastructure/ConfiguredServiceEndPoint.cs
View File

@ -1,4 +1,7 @@
namespace HelloShop.ApiService.Infrastructure
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
namespace HelloShop.ApiService.Infrastructure
{
public class ConfiguredServiceEndPoint
{

8
src/HelloShop.ApiService/Infrastructure/ConfiguredServiceEndPointResolver.cs
View File

@ -1,10 +1,12 @@

// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using Microsoft.Extensions.Options;
using Microsoft.Extensions.ServiceDiscovery.Abstractions;
using Microsoft.Extensions.ServiceDiscovery;
namespace HelloShop.ApiService.Infrastructure;
public class ConfiguredServiceEndPointResolver(IConfiguration configuration, IOptions<ConfigurationServiceEndPointResolverOptions> resolverOptions) : IConfiguredServiceEndPointResolver
public class ConfiguredServiceEndPointResolver(IConfiguration configuration, IOptions<ConfigurationServiceEndpointProviderOptions> resolverOptions) : IConfiguredServiceEndPointResolver
{
private readonly Lazy<IReadOnlyCollection<ConfiguredServiceEndPoint>> _serviceEndPoints = new(() =>
{

5
src/HelloShop.ApiService/Infrastructure/CustomReverseProxyConfigProvider.cs
View File

@ -1,4 +1,7 @@
using Yarp.ReverseProxy.Configuration;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using Yarp.ReverseProxy.Configuration;
using Yarp.ReverseProxy.LoadBalancing;
namespace HelloShop.ApiService.Infrastructure;

5
src/HelloShop.ApiService/Infrastructure/IConfiguredServiceEndPointResolver.cs
View File

@ -1,4 +1,7 @@
namespace HelloShop.ApiService.Infrastructure;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
namespace HelloShop.ApiService.Infrastructure;
public interface IConfiguredServiceEndPointResolver
{

5
src/HelloShop.ApiService/Infrastructure/IReverseProxyConfigProvider.cs
View File

@ -1,4 +1,7 @@
using Yarp.ReverseProxy.Configuration;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using Yarp.ReverseProxy.Configuration;
namespace HelloShop.ApiService.Infrastructure;

9
src/HelloShop.ApiService/Program.cs
View File

@ -1,10 +1,13 @@
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using HelloShop.ApiService.Extensions;
using HelloShop.ApiService.Infrastructure;
using Yarp.ReverseProxy.Configuration;
using HelloShop.ApiService.Services;
using HelloShop.ServiceDefaults.Extensions;
using Microsoft.Extensions.Options;
using Swashbuckle.AspNetCore.SwaggerUI;
using HelloShop.ApiService.Extensions;
using HelloShop.ApiService.Services;
using Yarp.ReverseProxy.Configuration;
var builder = WebApplication.CreateBuilder(args);

12
src/HelloShop.ApiService/Properties/launchSettings.json
View File

@ -6,7 +6,17 @@
"dotnetRunMessages": true,
"launchBrowser": true,
"launchUrl": "swagger",
"applicationUrl": "http://localhost:5391",
"applicationUrl": "http://localhost:8001",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"https": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"launchUrl": "swagger",
"applicationUrl": "https://localhost:8101;http://localhost:8001",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}

5
src/HelloShop.ApiService/Services/IPermissionService.cs
View File

@ -1,4 +1,7 @@
using HelloShop.ServiceDefaults.Permissions;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using HelloShop.ServiceDefaults.Permissions;
namespace HelloShop.ApiService.Services;

7
src/HelloShop.ApiService/Services/PermissionService.cs
View File

@ -1,4 +1,7 @@
using HelloShop.ApiService.Infrastructure;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using HelloShop.ApiService.Infrastructure;
using HelloShop.ServiceDefaults.Permissions;
namespace HelloShop.ApiService.Services;
@ -13,7 +16,7 @@ public class PermissionService(HttpClient httpClient, IConfiguredServiceEndPoint
IReadOnlyCollection<ConfiguredServiceEndPoint> serviceEndPoints = await serviceEndPointResolver.GetConfiguredServiceEndpointsAsync(cancellationToken);
await Parallel.ForEachAsync(serviceEndPoints, new ParallelOptions{ CancellationToken= cancellationToken}, async (serviceEndPoint, cancelToken) =>
await Parallel.ForEachAsync(serviceEndPoints, new ParallelOptions { CancellationToken = cancellationToken }, async (serviceEndPoint, cancelToken) =>
{
UriBuilder uriBuilder = new(serviceEndPoint.ServiceName) { Path = "api/Permissions/PermissionDefinitions" };

6
src/HelloShop.AppHost/HelloShop.AppHost.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsAspireHost>true</IsAspireHost>
@ -15,6 +15,6 @@
<ProjectReference Include="..\HelloShop.WebApp\HelloShop.WebApp.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.0.0-preview.3.24210.17" />
<PackageReference Include="Aspire.Hosting.AppHost" Version="8.0.1" />
</ItemGroup>
</Project>

5
src/HelloShop.AppHost/Program.cs
View File

@ -1,8 +1,11 @@
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
var builder = DistributedApplication.CreateBuilder(args);
var identityService = builder.AddProject<Projects.HelloShop_IdentityService>("identityservice");
var orderingService=builder.AddProject<Projects.HelloShop_OrderingService>("orderingservice").WithReference(identityService);
var orderingService = builder.AddProject<Projects.HelloShop_OrderingService>("orderingservice").WithReference(identityService);
var productService = builder.AddProject<Projects.HelloShop_ProductService>("productservice").WithReference(identityService);

19
src/HelloShop.AppHost/Properties/launchSettings.json
View File

@ -1,15 +1,28 @@
{
"$schema": "http://json.schemastore.org/launchsettings.json",
"$schema": "https://json.schemastore.org/launchsettings.json",
"profiles": {
"https": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"applicationUrl": "https://localhost:8100;http://localhost:8000",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development",
"DOTNET_ENVIRONMENT": "Development",
"DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21017",
"DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22002"
}
},
"http": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"applicationUrl": "http://localhost:15016",
"applicationUrl": "http://localhost:8000",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development",
"DOTNET_ENVIRONMENT": "Development",
"DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:16173"
"DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:19004",
"DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:20155"
}
}
}

4
src/HelloShop.BasketService/HelloShop.BasketService.csproj
View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
@ -8,7 +8,7 @@
<Protobuf Include="Protos\greet.proto" GrpcServices="Server" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Grpc.AspNetCore" Version="2.62.0" />
<PackageReference Include="Grpc.AspNetCore" Version="2.63.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\HelloShop.ServiceDefaults\HelloShop.ServiceDefaults.csproj" />

4
src/HelloShop.BasketService/Program.cs
View File

@ -1,4 +1,8 @@
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using HelloShop.BasketService.Services;
using HelloShop.ServiceDefaults.Extensions;
var builder = WebApplication.CreateBuilder(args);

4
src/HelloShop.BasketService/Properties/launchSettings.json
View File

@ -5,7 +5,7 @@
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": false,
"applicationUrl": "http://localhost:5079",
"applicationUrl": "http://localhost:8004",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
@ -14,7 +14,7 @@
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": false,
"applicationUrl": "https://localhost:7022;http://localhost:5079",
"applicationUrl": "https://localhost:8104;http://localhost:8004",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}

4
src/HelloShop.BasketService/Services/GreeterService.cs
View File

@ -1,5 +1,7 @@
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using Grpc.Core;
using HelloShop.BasketService;
namespace HelloShop.BasketService.Services;

7
src/HelloShop.BasketService/appsettings.json
View File

@ -5,10 +5,5 @@
"Microsoft.AspNetCore": "Warning"
}
},
"AllowedHosts": "*",
"Kestrel": {
"EndpointDefaults": {
"Protocols": "Http2"
}
}
"AllowedHosts": "*"
}

2
src/HelloShop.HybridApp/App.xaml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?xml version="1.0" encoding="UTF-8" ?>
<Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:local="clr-namespace:HelloShop.HybridApp"

5
src/HelloShop.HybridApp/App.xaml.cs
View File

@ -1,4 +1,7 @@
namespace HelloShop.HybridApp
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
namespace HelloShop.HybridApp
{
public partial class App : Application
{

2
src/HelloShop.HybridApp/Routes.razor → src/HelloShop.HybridApp/Components/Routes.razor
View File

@ -1,6 +1,6 @@
<Router AppAssembly="@typeof(MauiProgram).Assembly">
<Found Context="routeData">
<RouteView RouteData="@routeData" DefaultLayout="@typeof(Components.Layout.MainLayout)" />
<RouteView RouteData="@routeData" DefaultLayout="@typeof(Layout.MainLayout)" />
<FocusOnNavigate RouteData="@routeData" Selector="h1" />
</Found>
</Router>

0
src/HelloShop.HybridApp/_Imports.razor → src/HelloShop.HybridApp/Components/_Imports.razor
View File

28
src/HelloShop.HybridApp/HelloShop.HybridApp.csproj
View File

@ -1,15 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
<PropertyGroup>
<TargetFrameworks>net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
<!-- <TargetFrameworks>$(TargetFrameworks);net9.0-tizen</TargetFrameworks> -->
<!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
<!-- Note for MacCatalyst:
The default runtime is maccatalyst-x64, except in Release config, in which case the default is maccatalyst-x64;maccatalyst-arm64.
When specifying both architectures, use the plural <RuntimeIdentifiers> instead of the singular <RuntimeIdentifier>.
The Mac App Store will NOT accept apps with ONLY maccatalyst-arm64 indicated;
either BOTH runtimes must be indicated or ONLY macatalyst-x64. -->
<!-- For example: <RuntimeIdentifiers>maccatalyst-x64;maccatalyst-arm64</RuntimeIdentifiers> -->
<OutputType>Exe</OutputType>
<RootNamespace>HelloShop.HybridApp</RootNamespace>
<UseMaui>true</UseMaui>
@ -17,13 +20,17 @@
<ImplicitUsings>enable</ImplicitUsings>
<EnableDefaultCssItems>false</EnableDefaultCssItems>
<Nullable>enable</Nullable>
<!-- Display name -->
<ApplicationTitle>HelloShop.HybridApp</ApplicationTitle>
<!-- App Identifier -->
<ApplicationId>com.companyname.helloshop.hybridapp</ApplicationId>
<!-- Versions -->
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
<ApplicationVersion>1</ApplicationVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">14.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">24.0</SupportedOSPlatformVersion>
@ -31,23 +38,30 @@
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
</PropertyGroup>
<ItemGroup>
<!-- App Icon -->
<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
<!-- Splash Screen -->
<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
<!-- Images -->
<MauiImage Include="Resources\Images\*" />
<MauiImage Update="Resources\Images\dotnet_bot.svg" BaseSize="168,208" />
<!-- Custom Fonts -->
<MauiFont Include="Resources\Fonts\*" />
<!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0-preview.1.24080.9" />
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.40" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.40" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="8.0.40" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
</ItemGroup>
</Project>

4
src/HelloShop.HybridApp/MainPage.xaml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8" ?>
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:local="clr-namespace:HelloShop.HybridApp"
@ -7,7 +7,7 @@
<BlazorWebView x:Name="blazorWebView" HostPage="wwwroot/index.html">
<BlazorWebView.RootComponents>
<RootComponent Selector="#app" ComponentType="{x:Type local:Routes}" />
<RootComponent Selector="#app" ComponentType="{x:Type local:Components.Routes}" />
</BlazorWebView.RootComponents>
</BlazorWebView>

5
src/HelloShop.HybridApp/MainPage.xaml.cs
View File

@ -1,4 +1,7 @@
namespace HelloShop.HybridApp
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
namespace HelloShop.HybridApp
{
public partial class MainPage : ContentPage
{

5
src/HelloShop.HybridApp/MauiProgram.cs
View File

@ -1,4 +1,7 @@
using Microsoft.Extensions.Logging;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using Microsoft.Extensions.Logging;
namespace HelloShop.HybridApp
{

6
src/HelloShop.HybridApp/Platforms/Android/MainActivity.cs
View File

@ -1,6 +1,8 @@
using Android.App;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using Android.App;
using Android.Content.PM;
using Android.OS;
namespace HelloShop.HybridApp
{

5
src/HelloShop.HybridApp/Platforms/Android/MainApplication.cs
View File

@ -1,4 +1,7 @@
using Android.App;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using Android.App;
using Android.Runtime;
namespace HelloShop.HybridApp

5
src/HelloShop.HybridApp/Platforms/MacCatalyst/AppDelegate.cs
View File

@ -1,4 +1,7 @@
using Foundation;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using Foundation;
namespace HelloShop.HybridApp
{

4
src/HelloShop.HybridApp/Platforms/MacCatalyst/Program.cs
View File

@ -1,4 +1,6 @@
using ObjCRuntime;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using UIKit;
namespace HelloShop.HybridApp

3
src/HelloShop.HybridApp/Platforms/Tizen/Main.cs
View File

@ -1,3 +1,6 @@
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using Microsoft.Maui;
using Microsoft.Maui.Hosting;
using System;

2
src/HelloShop.HybridApp/Platforms/Tizen/tizen-manifest.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="maui-application-id-placeholder" version="0.0.0" api-version="7" xmlns="http://tizen.org/ns/packages">
<manifest package="maui-application-id-placeholder" version="0.0.0" api-version="8" xmlns="http://tizen.org/ns/packages">
<profile name="common" />
<ui-application appid="maui-application-id-placeholder" exec="HelloShop.HybridApp.dll" multiple="false" nodisplay="false" taskmanage="true" type="dotnet" launch_mode="single">
<label>maui-application-title-placeholder</label>

2
src/HelloShop.HybridApp/Platforms/Windows/App.xaml
View File

@ -1,4 +1,4 @@
<maui:MauiWinUIApplication
<maui:MauiWinUIApplication
x:Class="HelloShop.HybridApp.WinUI.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

3
src/HelloShop.HybridApp/Platforms/Windows/App.xaml.cs
View File

@ -1,4 +1,5 @@
using Microsoft.UI.Xaml;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
// To learn more about WinUI, the WinUI project structure,
// and more about our project templates, see: http://aka.ms/winui-project-info.

2
src/HelloShop.HybridApp/Platforms/Windows/Package.appxmanifest
View File

@ -8,7 +8,7 @@
<Identity Name="maui-package-name-placeholder" Publisher="CN=User Name" Version="0.0.0.0" />
<mp:PhoneIdentity PhoneProductId="5A3B6515-D86E-4266-8B27-B8E3D7427D85" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
<mp:PhoneIdentity PhoneProductId="FD31B999-5B05-455A-86DB-F866D70C7A97" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
<Properties>
<DisplayName>$placeholder$</DisplayName>

5
src/HelloShop.HybridApp/Platforms/iOS/AppDelegate.cs
View File

@ -1,4 +1,7 @@
using Foundation;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using Foundation;
namespace HelloShop.HybridApp
{

4
src/HelloShop.HybridApp/Platforms/iOS/Program.cs
View File

@ -1,4 +1,6 @@
using ObjCRuntime;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using UIKit;
namespace HelloShop.HybridApp

BIN
src/HelloShop.HybridApp/Resources/Fonts/OpenSans-Regular.ttf
View File

Binary file not shown.

2
src/HelloShop.HybridApp/Resources/Raw/AboutAssets.txt
View File

@ -4,7 +4,7 @@ is automatically handled by the following `MauiAsset` Build Action within your `
<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
These files will be deployed with you package and will be accessible using Essentials:
These files will be deployed with your package and will be accessible using Essentials:
async Task LoadMauiAsset()
{

5
src/HelloShop.IdentityService/Authentication/CustomJwtBearerDefaults.cs
View File

@ -1,4 +1,7 @@
namespace HelloShop.IdentityService;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
namespace HelloShop.IdentityService;
public class CustomJwtBearerDefaults
{

5
src/HelloShop.IdentityService/Authentication/CustomJwtBearerExtensions.cs
View File

@ -1,4 +1,7 @@
using HelloShop.IdentityService.Entities;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using HelloShop.IdentityService.Entities;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Identity;

5
src/HelloShop.IdentityService/Authentication/CustomJwtBearerHandler.cs
View File

@ -1,4 +1,7 @@
using Microsoft.AspNetCore.Authentication;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authentication.BearerToken;
using Microsoft.Extensions.Options;
using Microsoft.IdentityModel.Tokens;

5
src/HelloShop.IdentityService/Authentication/CustomJwtBearerOptions.cs
View File

@ -1,4 +1,7 @@
using Microsoft.AspNetCore.Authentication;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using Microsoft.AspNetCore.Authentication;
using Microsoft.IdentityModel.Tokens;
namespace HelloShop.IdentityService;

5
src/HelloShop.IdentityService/Authentication/CustomUserClaimsPrincipalFactory.cs
View File

@ -1,4 +1,7 @@
using HelloShop.ServiceDefaults.Constants;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using HelloShop.ServiceDefaults.Constants;
using Microsoft.AspNetCore.Identity;
using Microsoft.Extensions.Options;
using System.Security.Claims;

5
src/HelloShop.IdentityService/Authorization/LocalPermissionChecker.cs
View File

@ -1,4 +1,7 @@
using HelloShop.IdentityService.Entities;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using HelloShop.IdentityService.Entities;
using HelloShop.IdentityService.EntityFrameworks;
using HelloShop.ServiceDefaults.Authorization;
using Microsoft.EntityFrameworkCore;

6
src/HelloShop.IdentityService/AutoMapper/UsersMapConfiguration.cs
View File

@ -1,7 +1,9 @@
using AutoMapper;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using AutoMapper;
using HelloShop.IdentityService.Entities;
using HelloShop.IdentityService.Models.Users;
using Microsoft.Extensions.Options;
namespace HelloShop.IdentityService.AutoMapper;

5
src/HelloShop.IdentityService/Constants/DbConstants.cs
View File

@ -1,4 +1,7 @@
namespace HelloShop.IdentityService.Constants
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
namespace HelloShop.IdentityService.Constants
{
public class DbConstants
{

5
src/HelloShop.IdentityService/Controllers/AccountController.cs
View File

@ -1,4 +1,7 @@
using HelloShop.IdentityService.Entities;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using HelloShop.IdentityService.Entities;
using Microsoft.AspNetCore.Authentication.BearerToken;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.Http.HttpResults;

6
src/HelloShop.IdentityService/Controllers/HelloWorldController.cs
View File

@ -1,6 +1,8 @@
using Microsoft.AspNetCore.Mvc;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Localization;
using System.Globalization;
using System.Reflection;
namespace HelloShop.IdentityService.Controllers;

14
src/HelloShop.IdentityService/Controllers/PermissionsController.cs
View File

@ -1,7 +1,8 @@
using HelloShop.IdentityService.Entities;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using HelloShop.IdentityService.Entities;
using HelloShop.IdentityService.EntityFrameworks;
using HelloShop.ServiceDefaults.Authorization;
using HelloShop.ServiceDefaults.Constants;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
@ -9,12 +10,13 @@ using Microsoft.EntityFrameworkCore;
[Route("api/[controller]")]
[ApiController]
[Authorize]
public class PermissionsController(IPermissionChecker permissionChecker) : ControllerBase
public class PermissionsController(IdentityServiceDbContext dbContext) : ControllerBase
{
[HttpHead]
public async Task<IActionResult> CheckPermission(string permissionName, string? resourceType = null, string? resourceId = null)
public async Task<IActionResult> CheckPermission(int roleId, string permissionName, string? resourceType = null, string? resourceId = null)
{
if(await permissionChecker.IsGrantedAsync(permissionName, resourceType, resourceId))
if (await dbContext.Set<PermissionGranted>().AnyAsync(x => x.RoleId == roleId && x.PermissionName == permissionName && x.ResourceType == resourceType && x.ResourceId == resourceId))
{
return Ok();
}

7
src/HelloShop.IdentityService/Controllers/UsersController.cs
View File

@ -1,14 +1,17 @@
using AutoMapper;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using AutoMapper;
using FluentValidation;
using HelloShop.IdentityService.Entities;
using HelloShop.IdentityService.EntityFrameworks;
using HelloShop.IdentityService.Models.Users;
using HelloShop.ServiceDefaults.Authorization;
using HelloShop.ServiceDefaults.Extensions;
using HelloShop.ServiceDefaults.Models.Paging;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using HelloShop.ServiceDefaults.Extensions;
// For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860

3
src/HelloShop.IdentityService/Controllers/WeatherForecastController.cs
View File

@ -1,3 +1,6 @@
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using Microsoft.AspNetCore.Mvc;
namespace HelloShop.IdentityService.Controllers;

6
src/HelloShop.IdentityService/DataSeeding/UserDataSeedingProvider.cs
View File

@ -1,5 +1,7 @@
using HelloShop.IdentityService.Entities;
using HelloShop.IdentityService.EntityFrameworks;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using HelloShop.IdentityService.Entities;
using HelloShop.ServiceDefaults.Infrastructure;
using Microsoft.AspNetCore.Identity;
using Microsoft.EntityFrameworkCore;

5
src/HelloShop.IdentityService/Entities/PermissionGranted.cs
View File

@ -1,4 +1,7 @@
namespace HelloShop.IdentityService.Entities;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
namespace HelloShop.IdentityService.Entities;
public class PermissionGranted
{

4
src/HelloShop.IdentityService/Entities/Role.cs
View File

@ -5,8 +5,8 @@ using Microsoft.AspNetCore.Identity;
namespace HelloShop.IdentityService.Entities
{
public class Role: IdentityRole<int>
public class Role : IdentityRole<int>
{
public DateTimeOffset CreationTime { get; set; }=TimeProvider.System.GetUtcNow();
public DateTimeOffset CreationTime { get; set; } = TimeProvider.System.GetUtcNow();
}
}

1
src/HelloShop.IdentityService/Entities/User.cs
View File

@ -2,7 +2,6 @@
// See the license file in the project root for more information.
using HelloShop.ServiceDefaults.Authorization;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Identity;
namespace HelloShop.IdentityService.Entities

5
src/HelloShop.IdentityService/EntityFrameworks/EntityConfigurations/PermissionGrantedEntityTypeConfiguration.cs
View File

@ -1,4 +1,7 @@
using HelloShop.IdentityService.Entities;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using HelloShop.IdentityService.Entities;
using Microsoft.EntityFrameworkCore;
namespace HelloShop.IdentityService.EntityFrameworks.EntityConfigurations;

2
src/HelloShop.IdentityService/EntityFrameworks/EntityConfigurations/RoleClaimEntityTypeConfiguration.cs
View File

@ -2,8 +2,8 @@
// See the license file in the project root for more information.
using Microsoft.AspNetCore.Identity;
using Microsoft.EntityFrameworkCore.Metadata.Builders;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders;
namespace HelloShop.IdentityService.EntityFrameworks.EntityConfigurations
{

2
src/HelloShop.IdentityService/EntityFrameworks/EntityConfigurations/RoleEntityTypeConfiguration.cs
View File

@ -2,8 +2,8 @@
// See the license file in the project root for more information.
using HelloShop.IdentityService.Entities;
using Microsoft.EntityFrameworkCore.Metadata.Builders;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders;
namespace HelloShop.IdentityService.EntityFrameworks.EntityConfigurations
{

2
src/HelloShop.IdentityService/EntityFrameworks/EntityConfigurations/UserClaimEntityTypeConfiguration.cs
View File

@ -2,8 +2,8 @@
// See the license file in the project root for more information.
using Microsoft.AspNetCore.Identity;
using Microsoft.EntityFrameworkCore.Metadata.Builders;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders;
namespace HelloShop.IdentityService.EntityFrameworks.EntityConfigurations
{

5
src/HelloShop.IdentityService/EntityFrameworks/EntityConfigurations/UserEntityTypeConfiguration.cs
View File

@ -1,4 +1,7 @@
using HelloShop.IdentityService.Entities;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using HelloShop.IdentityService.Entities;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders;

2
src/HelloShop.IdentityService/EntityFrameworks/EntityConfigurations/UserLoginEntityTypeConfiguration.cs
View File

@ -2,8 +2,8 @@
// See the license file in the project root for more information.
using Microsoft.AspNetCore.Identity;
using Microsoft.EntityFrameworkCore.Metadata.Builders;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders;
namespace HelloShop.IdentityService.EntityFrameworks.EntityConfigurations
{

2
src/HelloShop.IdentityService/EntityFrameworks/EntityConfigurations/UserTokenEntityTypeConfiguration.cs
View File

@ -2,8 +2,8 @@
// See the license file in the project root for more information.
using Microsoft.AspNetCore.Identity;
using Microsoft.EntityFrameworkCore.Metadata.Builders;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders;
namespace HelloShop.IdentityService.EntityFrameworks.EntityConfigurations
{

5
src/HelloShop.IdentityService/EntityFrameworks/IdentityServiceDbContext.cs
View File

@ -1,4 +1,7 @@
using HelloShop.IdentityService.Entities;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using HelloShop.IdentityService.Entities;
using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore;
using System.Reflection;

4
src/HelloShop.IdentityService/EntityFrameworks/Migrations/20240403122821_InitialCreate.cs
View File

@ -1,4 +1,6 @@
using System;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using Microsoft.EntityFrameworkCore.Migrations;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;

20
src/HelloShop.IdentityService/HelloShop.IdentityService.csproj
View File

@ -1,23 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.0-preview.3.24172.13" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.0-preview.3.24172.13" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0-preview.3.24172.4">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.0-preview.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\HelloShop.ServiceDefaults\HelloShop.ServiceDefaults.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\Models\" />
<Folder Include="Resources\Models\Users\" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.6" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
</ItemGroup>
</Project>

5
src/HelloShop.IdentityService/Models/Accounts/AccountLoginRequest.cs
View File

@ -1,4 +1,7 @@
using System.Text.Json.Serialization;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using System.Text.Json.Serialization;
namespace HelloShop.IdentityService;

5
src/HelloShop.IdentityService/Models/Accounts/AccountRefreshRequest.cs
View File

@ -1,4 +1,7 @@
namespace HelloShop.IdentityService;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
namespace HelloShop.IdentityService;
public class AccountRefreshRequest
{

5
src/HelloShop.IdentityService/Models/Accounts/AccountRegisterRequest.cs
View File

@ -1,4 +1,7 @@
namespace HelloShop.IdentityService;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
namespace HelloShop.IdentityService;
public class AccountRegisterRequest
{

4
src/HelloShop.IdentityService/Models/Users/UserCreateRequest.cs
View File

@ -1,5 +1,5 @@
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
namespace HelloShop.IdentityService.Models.Users;

5
src/HelloShop.IdentityService/Models/Users/UserDetailsResponse.cs
View File

@ -1,4 +1,7 @@
namespace HelloShop.IdentityService.Models.Users;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
namespace HelloShop.IdentityService.Models.Users;
public class UserDetailsResponse
{

5
src/HelloShop.IdentityService/Models/Users/UserListItem.cs
View File

@ -1,4 +1,7 @@
namespace HelloShop.IdentityService;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
namespace HelloShop.IdentityService;
public class UserListItem
{

5
src/HelloShop.IdentityService/Models/Users/UserListRequest.cs
View File

@ -1,4 +1,7 @@
using HelloShop.ServiceDefaults.Models.Paging;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using HelloShop.ServiceDefaults.Models.Paging;
namespace HelloShop.IdentityService.Models.Users;

5
src/HelloShop.IdentityService/Models/Users/UserUpdateRequest.cs
View File

@ -1,4 +1,7 @@
namespace HelloShop.IdentityService.Models.Users;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
namespace HelloShop.IdentityService.Models.Users;
public class UserUpdateRequest
{

5
src/HelloShop.IdentityService/PermissionProviders/IdentityPermissionDefinitionProvider.cs
View File

@ -1,4 +1,7 @@
using HelloShop.ServiceDefaults.Permissions;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using HelloShop.ServiceDefaults.Permissions;
namespace HelloShop.IdentityService;

5
src/HelloShop.IdentityService/PermissionProviders/IdentityPermissions.cs
View File

@ -1,4 +1,7 @@
namespace HelloShop.IdentityService;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
namespace HelloShop.IdentityService;
public static class IdentityPermissions
{

6
src/HelloShop.IdentityService/Program.cs
View File

@ -1,7 +1,9 @@
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using HelloShop.IdentityService;
using HelloShop.IdentityService.Authorization;
using HelloShop.IdentityService.Constants;
using HelloShop.IdentityService.DataSeeding;
using HelloShop.IdentityService.Entities;
using HelloShop.IdentityService.EntityFrameworks;
using HelloShop.ServiceDefaults.Authorization;
@ -64,8 +66,6 @@ var app = builder.Build();
app.MapDefaultEndpoints();
app.UseHttpsRedirection();
app.UseAuthorization();
app.UseCors(options => options.AllowAnyOrigin().AllowAnyMethod().AllowAnyHeader());

22
src/HelloShop.IdentityService/Properties/launchSettings.json
View File

@ -1,20 +1,12 @@
{
"$schema": "http://json.schemastore.org/launchsettings.json",
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "http://localhost:20874",
"sslPort": 44391
}
},
"$schema": "https://json.schemastore.org/launchsettings.json",
"profiles": {
"http": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"launchUrl": "swagger",
"applicationUrl": "http://localhost:5119",
"applicationUrl": "http://localhost:8002",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
@ -24,15 +16,7 @@
"dotnetRunMessages": true,
"launchBrowser": true,
"launchUrl": "swagger",
"applicationUrl": "https://localhost:7266;http://localhost:5119",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": true,
"launchUrl": "swagger",
"applicationUrl": "https://localhost:8102;http://localhost:8002",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}

7
src/HelloShop.IdentityService/Validations/Users/UserCreateRequestValidator.cs
View File

@ -1,4 +1,7 @@
using FluentValidation;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using FluentValidation;
using HelloShop.IdentityService.Entities;
using HelloShop.IdentityService.EntityFrameworks;
using HelloShop.IdentityService.Models.Users;
@ -9,7 +12,7 @@ namespace HelloShop.IdentityService.Validations.Users;
public class UserCreateRequestValidator : AbstractValidator<UserCreateRequest>
{
public UserCreateRequestValidator(IdentityServiceDbContext dbContext,IStringLocalizer<UserCreateRequest> localizer )
public UserCreateRequestValidator(IdentityServiceDbContext dbContext, IStringLocalizer<UserCreateRequest> localizer)
{
RuleFor(m => m.UserName).NotNull().NotEmpty().Length(8, 16).Matches("^[a-zA-Z]+$");

5
src/HelloShop.IdentityService/Validations/Users/UserUpdateRequestValidator.cs
View File

@ -1,4 +1,7 @@
using FluentValidation;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using FluentValidation;
using HelloShop.IdentityService.Entities;
using HelloShop.IdentityService.EntityFrameworks;
using HelloShop.IdentityService.Models.Users;

3
src/HelloShop.IdentityService/WeatherForecast.cs
View File

@ -1,3 +1,6 @@
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
namespace HelloShop.IdentityService;
public class WeatherForecast

5
src/HelloShop.IdentityService/Welcome.cs
View File

@ -1,4 +1,7 @@
namespace HelloShop.IdentityService;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
namespace HelloShop.IdentityService;
public class Welcome
{

3
src/HelloShop.OrderingService/Controllers/WeatherForecastController.cs
View File

@ -1,3 +1,6 @@
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using Microsoft.AspNetCore.Mvc;
namespace HelloShop.OrderingService.Controllers;

5
src/HelloShop.OrderingService/HelloShop.OrderingService.csproj
View File

@ -1,12 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\HelloShop.ServiceDefaults\HelloShop.ServiceDefaults.csproj" />
</ItemGroup>

5
src/HelloShop.OrderingService/Program.cs
View File

@ -1,3 +1,6 @@
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using HelloShop.ServiceDefaults.Extensions;
var builder = WebApplication.CreateBuilder(args);
@ -13,8 +16,6 @@ var app = builder.Build();
app.MapDefaultEndpoints();
app.UseHttpsRedirection();
app.UseAuthorization();
app.UseCors(options => options.AllowAnyOrigin().AllowAnyMethod().AllowAnyHeader());

22
src/HelloShop.OrderingService/Properties/launchSettings.json
View File

@ -1,20 +1,12 @@
{
"$schema": "http://json.schemastore.org/launchsettings.json",
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "http://localhost:39547",
"sslPort": 44369
}
},
"$schema": "https://json.schemastore.org/launchsettings.json",
"profiles": {
"http": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"launchUrl": "swagger",
"applicationUrl": "http://localhost:5015",
"applicationUrl": "http://localhost:8005",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
@ -24,15 +16,7 @@
"dotnetRunMessages": true,
"launchBrowser": true,
"launchUrl": "swagger",
"applicationUrl": "https://localhost:7250;http://localhost:5015",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": true,
"launchUrl": "swagger",
"applicationUrl": "https://localhost:8105;http://localhost:8005",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}

3
src/HelloShop.OrderingService/WeatherForecast.cs
View File

@ -1,3 +1,6 @@
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
namespace HelloShop.OrderingService;
public class WeatherForecast

5
src/HelloShop.ProductService/AutoMapper/ProductsMapConfiguration.cs
View File

@ -1,4 +1,7 @@
using AutoMapper;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using AutoMapper;
using HelloShop.ProductService.Entities.Products;
using HelloShop.ProductService.Models.Products;

5
src/HelloShop.ProductService/Constants/DbConstants.cs
View File

@ -1,4 +1,7 @@
namespace HelloShop.ProductService.Constants;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
namespace HelloShop.ProductService.Constants;
public static class DbConstants
{

11
src/HelloShop.ProductService/Controllers/BrandsController.cs
View File

@ -1,13 +1,16 @@
using AutoMapper;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using AutoMapper;
using HelloShop.ProductService.Entities.Products;
using HelloShop.ProductService.EntityFrameworks;
using HelloShop.ProductService.Models.Products;
using HelloShop.ProductService.PermissionProviders;
using HelloShop.ServiceDefaults.Extensions;
using HelloShop.ServiceDefaults.Models.Paging;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using HelloShop.ServiceDefaults.Extensions;
using Microsoft.AspNetCore.Authorization;
using HelloShop.ProductService.PermissionProviders;
namespace HelloShop.ProductService;
[Route("api/[controller]")]

93
src/HelloShop.ProductService/Controllers/MockProductsController.cs Normal file
View File

@ -0,0 +1,93 @@
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using AutoMapper;
using HelloShop.ProductService.Entities.Products;
using HelloShop.ProductService.Models.Products;
using HelloShop.ProductService.PermissionProviders;
using HelloShop.ProductService.Services;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
namespace HelloShop.ProductService.Controllers
{
[Route("api/[controller]")]
[ApiController]
public class MockProductsController(IProductService productService, IMapper mapper) : ControllerBase
{
[HttpGet]
[Authorize(CatalogPermissions.Products.Default)]
public async Task<ActionResult<IEnumerable<ProductListItem>>> GetProducts()
{
List<Product> products = await productService.GetAllAsync();
return mapper.Map<List<ProductListItem>>(products);
}
[HttpGet("{id}")]
[Authorize(CatalogPermissions.Products.Details)]
public async Task<ActionResult<ProductDetailsResponse>> GetProduct(int id)
{
Product? entity = await productService.FindAsync(id);
if (entity is null)
{
return NotFound();
}
return mapper.Map<ProductDetailsResponse>(entity);
}
[HttpPost]
[Authorize(CatalogPermissions.Products.Create)]
public async Task<ActionResult<ProductDetailsResponse>> PostProduct(ProductCreateRequest model)
{
Product entity = mapper.Map<Product>(model);
await productService.CreateAsync(entity);
ProductDetailsResponse result = mapper.Map<ProductDetailsResponse>(entity);
return CreatedAtAction(nameof(GetProduct), new { id = entity.Id }, result);
}
[HttpPut("{id}")]
[Authorize(CatalogPermissions.Products.Update)]
public async Task<IActionResult> PutProduct(int id, ProductUpdateRequest model)
{
if (id != model.Id)
{
return BadRequest();
}
Product? entity = await productService.FindAsync(id);
if (entity is null)
{
return NotFound();
}
mapper.Map(model, entity);
await productService.UpdateAsyc(entity);
return NoContent();
}
[HttpDelete("{id}")]
[Authorize(CatalogPermissions.Products.Delete)]
public async Task<IActionResult> DeleteProduct(int id)
{
Product? entity = await productService.FindAsync(id);
if (entity is null)
{
return NotFound();
}
await productService.DeleteAsync(entity);
return NoContent();
}
}
}

27
src/HelloShop.ProductService/Controllers/ProductsController.cs
View File

@ -1,20 +1,23 @@
using HelloShop.ProductService.Entities.Products;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using AutoMapper;
using HelloShop.ProductService.Entities.Products;
using HelloShop.ProductService.EntityFrameworks;
using HelloShop.ProductService.Models.Products;
using HelloShop.ServiceDefaults.Models.Paging;
using Microsoft.AspNetCore.Mvc;
using HelloShop.ServiceDefaults.Extensions;
using AutoMapper;
using Microsoft.EntityFrameworkCore;
using Microsoft.AspNetCore.Authorization;
using HelloShop.ProductService.PermissionProviders;
using HelloShop.ServiceDefaults.Extensions;
using HelloShop.ServiceDefaults.Models.Paging;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
namespace HelloShop.ProductService;
[Route("api/[controller]")]
[ApiController]
public class ProductsController(ProductServiceDbContext dbContext, IMapper mapper) : ControllerBase
{
[Route("api/[controller]")]
[ApiController]
public class ProductsController(ProductServiceDbContext dbContext, IMapper mapper) : ControllerBase
{
[HttpGet]
[Authorize(CatalogPermissions.Products.Default)]
public async Task<ActionResult<PagedResponse<ProductListItem>>> GetProducts([FromQuery] KeywordSearchRequest model)
@ -115,4 +118,4 @@ namespace HelloShop.ProductService;
return NoContent();
}
}
}

5
src/HelloShop.ProductService/DataSeeding/ProductDataSeedingProvider.cs
View File

@ -1,4 +1,7 @@
using HelloShop.ProductService.Entities.Products;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using HelloShop.ProductService.Entities.Products;
using HelloShop.ProductService.EntityFrameworks;
using HelloShop.ServiceDefaults.Infrastructure;

5
src/HelloShop.ProductService/Entities/Products/Brand.cs
View File

@ -1,4 +1,7 @@
namespace HelloShop.ProductService.Entities.Products
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
namespace HelloShop.ProductService.Entities.Products
{
public class Brand
{

5
src/HelloShop.ProductService/Entities/Products/Product.cs
View File

@ -1,4 +1,7 @@
namespace HelloShop.ProductService.Entities.Products
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
namespace HelloShop.ProductService.Entities.Products
{
public class Product
{

11
src/HelloShop.ProductService/EntityFrameworks/EntityConfigurations/Products/BrandEntityTypeConfiguration.cs
View File

@ -1,14 +1,17 @@
using HelloShop.ProductService.Entities.Products;
// Copyright (c) HelloShop Corporation. All rights reserved.
// See the license file in the project root for more information.
using HelloShop.ProductService.Entities.Products;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders;
namespace HelloShop.ProductService.EntityFrameworks.EntityConfigurations.Products;
public class BrandEntityTypeConfiguration : IEntityTypeConfiguration<Brand>
{
public class BrandEntityTypeConfiguration : IEntityTypeConfiguration<Brand>
{
public void Configure(EntityTypeBuilder<Brand> builder)
{
builder.ToTable("Brands");
builder.Property(x => x.Name).HasMaxLength(32);
}
}
}

Some files were not shown because too many files have changed in this diff Show More