From 72673eb41d2b3615c9d36f20c82f1a161fca9c80 Mon Sep 17 00:00:00 2001 From: KevinB <67744786+KevinBTech@users.noreply.github.com> Date: Mon, 29 Apr 2024 12:04:31 +0200 Subject: [PATCH 1/5] chores: add missing config in gitignore to ignore all known Visual Studio working files --- .gitignore | 372 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 351 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 0b4f3d7..1ee5385 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,20 @@ -# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* # Build results [Dd]ebug/ @@ -7,26 +23,340 @@ [Rr]eleases/ x64/ x86/ -build/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ bld/ [Bb]in/ [Oo]bj/ -[Oo]ut/ -msbuild.log -msbuild.err -msbuild.wrn - -# App settings -appsettings.json -appsettings.*.json - -# misc -.vscode -cache -.*cache -.DS_Store -*.env -.idea/ -*.pem -.history -.vercel +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd From 517a88be51af62b014215c8045be2c4d37c9335e Mon Sep 17 00:00:00 2001 From: KevinB <67744786+KevinBTech@users.noreply.github.com> Date: Mon, 29 Apr 2024 12:06:38 +0200 Subject: [PATCH 2/5] docs: add a web api without protection --- logto-csharp.sln | 28 ++++++--- .../Controllers/WeatherForecastController.cs | 35 +++++++++++ samples/sample-webapi/Program.cs | 60 +++++++++++++++++++ .../Properties/launchSettings.json | 15 +++++ samples/sample-webapi/WeatherForecast.cs | 13 ++++ .../appsettings.Development.json | 8 +++ samples/sample-webapi/appsettings.json | 9 +++ samples/sample-webapi/sample-webapi.csproj | 15 +++++ samples/sample-webapi/sample-webapi.http | 6 ++ 9 files changed, 180 insertions(+), 9 deletions(-) create mode 100644 samples/sample-webapi/Controllers/WeatherForecastController.cs create mode 100644 samples/sample-webapi/Program.cs create mode 100644 samples/sample-webapi/Properties/launchSettings.json create mode 100644 samples/sample-webapi/WeatherForecast.cs create mode 100644 samples/sample-webapi/appsettings.Development.json create mode 100644 samples/sample-webapi/appsettings.json create mode 100644 samples/sample-webapi/sample-webapi.csproj create mode 100644 samples/sample-webapi/sample-webapi.http diff --git a/logto-csharp.sln b/logto-csharp.sln index 84d890b..5e606c7 100644 --- a/logto-csharp.sln +++ b/logto-csharp.sln @@ -5,28 +5,27 @@ VisualStudioVersion = 17.0.31903.59 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D44D6C8F-1A29-4796-930F-B37ADB539EA3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Logto.AspNetCore.Authentication", "src\Logto.AspNetCore.Authentication\Logto.AspNetCore.Authentication.csproj", "{D05B1B5F-D560-492A-A566-95888C8C5C43}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logto.AspNetCore.Authentication", "src\Logto.AspNetCore.Authentication\Logto.AspNetCore.Authentication.csproj", "{D05B1B5F-D560-492A-A566-95888C8C5C43}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Logto.AspNetCore.Authentication.Tests", "src\Logto.AspNetCore.Authentication.Tests\Logto.AspNetCore.Authentication.Tests.csproj", "{0A3281B7-4673-4FCC-A138-E72E92DCD57D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logto.AspNetCore.Authentication.Tests", "src\Logto.AspNetCore.Authentication.Tests\Logto.AspNetCore.Authentication.Tests.csproj", "{0A3281B7-4673-4FCC-A138-E72E92DCD57D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{E138A45B-E985-4364-AA8A-86467AEE5693}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sample-blazor", "samples\sample-blazor\sample-blazor.csproj", "{8B6A343E-7691-468E-89D0-7A3EFACAADC1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "sample-blazor", "samples\sample-blazor\sample-blazor.csproj", "{8B6A343E-7691-468E-89D0-7A3EFACAADC1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sample-mvc", "samples\sample-mvc\sample-mvc.csproj", "{64A4D492-3ABB-410C-AE0D-6F9A8881B100}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "sample-mvc", "samples\sample-mvc\sample-mvc.csproj", "{64A4D492-3ABB-410C-AE0D-6F9A8881B100}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sample-wasm", "samples\sample-wasm\sample-wasm.csproj", "{CFF04115-513A-4A6F-BA07-C45EC28BDB63}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "sample-wasm", "samples\sample-wasm\sample-wasm.csproj", "{CFF04115-513A-4A6F-BA07-C45EC28BDB63}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sample", "samples\sample\sample.csproj", "{72761E5E-12B5-4FB8-AE83-77AEEE38D864}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "sample", "samples\sample\sample.csproj", "{72761E5E-12B5-4FB8-AE83-77AEEE38D864}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sample-webapi", "samples\sample-webapi\sample-webapi.csproj", "{FF17629C-03A0-4D82-B571-51ED92A986B6}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {D05B1B5F-D560-492A-A566-95888C8C5C43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D05B1B5F-D560-492A-A566-95888C8C5C43}.Debug|Any CPU.Build.0 = Debug|Any CPU @@ -52,6 +51,13 @@ Global {72761E5E-12B5-4FB8-AE83-77AEEE38D864}.Debug|Any CPU.Build.0 = Debug|Any CPU {72761E5E-12B5-4FB8-AE83-77AEEE38D864}.Release|Any CPU.ActiveCfg = Release|Any CPU {72761E5E-12B5-4FB8-AE83-77AEEE38D864}.Release|Any CPU.Build.0 = Release|Any CPU + {FF17629C-03A0-4D82-B571-51ED92A986B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FF17629C-03A0-4D82-B571-51ED92A986B6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FF17629C-03A0-4D82-B571-51ED92A986B6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FF17629C-03A0-4D82-B571-51ED92A986B6}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {D05B1B5F-D560-492A-A566-95888C8C5C43} = {D44D6C8F-1A29-4796-930F-B37ADB539EA3} @@ -60,5 +66,9 @@ Global {64A4D492-3ABB-410C-AE0D-6F9A8881B100} = {E138A45B-E985-4364-AA8A-86467AEE5693} {CFF04115-513A-4A6F-BA07-C45EC28BDB63} = {E138A45B-E985-4364-AA8A-86467AEE5693} {72761E5E-12B5-4FB8-AE83-77AEEE38D864} = {E138A45B-E985-4364-AA8A-86467AEE5693} + {FF17629C-03A0-4D82-B571-51ED92A986B6} = {E138A45B-E985-4364-AA8A-86467AEE5693} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {11FAC7DD-230E-46E8-9B06-D29A3D043F63} EndGlobalSection EndGlobal diff --git a/samples/sample-webapi/Controllers/WeatherForecastController.cs b/samples/sample-webapi/Controllers/WeatherForecastController.cs new file mode 100644 index 0000000..1d8ac83 --- /dev/null +++ b/samples/sample-webapi/Controllers/WeatherForecastController.cs @@ -0,0 +1,35 @@ +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; + +namespace sample_webapi.Controllers +{ + [ApiController] + [Route("[controller]")] + //[Authorize] + public class WeatherForecastController : ControllerBase + { + private static readonly string[] Summaries = new[] + { + "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" + }; + + private readonly ILogger _logger; + + public WeatherForecastController(ILogger logger) + { + _logger = logger; + } + + [HttpGet(Name = "GetWeatherForecast")] + public IEnumerable Get() + { + return Enumerable.Range(1, 5).Select(index => new WeatherForecast + { + Date = DateOnly.FromDateTime(DateTime.Now.AddDays(index)), + TemperatureC = Random.Shared.Next(-20, 55), + Summary = Summaries[Random.Shared.Next(Summaries.Length)] + }) + .ToArray(); + } + } +} diff --git a/samples/sample-webapi/Program.cs b/samples/sample-webapi/Program.cs new file mode 100644 index 0000000..40a42ba --- /dev/null +++ b/samples/sample-webapi/Program.cs @@ -0,0 +1,60 @@ +using Microsoft.AspNetCore.Authentication.JwtBearer; +using Microsoft.AspNetCore.Cors.Infrastructure; +using Microsoft.AspNetCore.HttpLogging; + +var builder = WebApplication.CreateBuilder(args); + +builder.Services.AddControllers(); + +var defaultCORSPolicyName = "Wasm"; +builder.Services.AddCors(options => +{ + var policy = new CorsPolicyBuilder(); + policy.AllowAnyOrigin() + .AllowAnyHeader() + .AllowAnyMethod(); + + options.AddPolicy(name: defaultCORSPolicyName, policy.Build()); +}); + +// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle +builder.Services.AddEndpointsApiExplorer(); +builder.Services.AddSwaggerGen(); +builder.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme) + .AddJwtBearer( + options => + { + options.Authority = "https://e24py9.logto.app/oidc"; + options.RequireHttpsMetadata = false; + options.Audience = "http://localhost:5150"; + }); + +#region Logs + +// to enable HTTP verbose logging +builder.Services.AddHttpLogging(logging => +{ + logging.LoggingFields = HttpLoggingFields.All; + logging.RequestHeaders.Add("Authorization"); + logging.RequestBodyLogLimit = 4096; + logging.ResponseBodyLogLimit = 4096; +}); + +#endregion Logs + +var app = builder.Build(); + +// Configure the HTTP request pipeline. +if (app.Environment.IsDevelopment()) +{ + app.UseSwagger(); + app.UseSwaggerUI(); +} + +app.UseCors(defaultCORSPolicyName); + +app.UseAuthorization(); + +app.MapControllers(); + +app.Run(); diff --git a/samples/sample-webapi/Properties/launchSettings.json b/samples/sample-webapi/Properties/launchSettings.json new file mode 100644 index 0000000..7e0192c --- /dev/null +++ b/samples/sample-webapi/Properties/launchSettings.json @@ -0,0 +1,15 @@ +{ + "$schema": "http://json.schemastore.org/launchsettings.json", + "profiles": { + "http": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "launchUrl": "swagger", + "applicationUrl": "http://localhost:5150", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} diff --git a/samples/sample-webapi/WeatherForecast.cs b/samples/sample-webapi/WeatherForecast.cs new file mode 100644 index 0000000..f09d31c --- /dev/null +++ b/samples/sample-webapi/WeatherForecast.cs @@ -0,0 +1,13 @@ +namespace sample_webapi +{ + public class WeatherForecast + { + public DateOnly Date { get; set; } + + public int TemperatureC { get; set; } + + public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); + + public string? Summary { get; set; } + } +} diff --git a/samples/sample-webapi/appsettings.Development.json b/samples/sample-webapi/appsettings.Development.json new file mode 100644 index 0000000..0c208ae --- /dev/null +++ b/samples/sample-webapi/appsettings.Development.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + } +} diff --git a/samples/sample-webapi/appsettings.json b/samples/sample-webapi/appsettings.json new file mode 100644 index 0000000..10f68b8 --- /dev/null +++ b/samples/sample-webapi/appsettings.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "AllowedHosts": "*" +} diff --git a/samples/sample-webapi/sample-webapi.csproj b/samples/sample-webapi/sample-webapi.csproj new file mode 100644 index 0000000..b11fba3 --- /dev/null +++ b/samples/sample-webapi/sample-webapi.csproj @@ -0,0 +1,15 @@ + + + + net8.0 + enable + enable + sample_webapi + + + + + + + + diff --git a/samples/sample-webapi/sample-webapi.http b/samples/sample-webapi/sample-webapi.http new file mode 100644 index 0000000..511fb13 --- /dev/null +++ b/samples/sample-webapi/sample-webapi.http @@ -0,0 +1,6 @@ +@sample_webapi_HostAddress = http://localhost:5150 + +GET {{sample_webapi_HostAddress}}/weatherforecast/ +Accept: application/json + +### From 9e22c68d1c1aa66b76eaf0898eb8a54ed2bba48b Mon Sep 17 00:00:00 2001 From: KevinB <67744786+KevinBTech@users.noreply.github.com> Date: Mon, 29 Apr 2024 12:07:06 +0200 Subject: [PATCH 3/5] docs: add web api call into the wasm sample --- samples/sample-wasm/Pages/Home.razor | 31 +++++++++++++++++++ samples/sample-wasm/Pages/Home.razor.cs | 14 +++++++++ samples/sample-wasm/Program.cs | 5 +++ .../WeatherForecasts/WeatherForecast.cs | 12 +++++++ .../WeatherForecastHttpClient.cs | 29 +++++++++++++++++ samples/sample-wasm/sample-wasm.csproj | 14 ++++++++- .../wwwroot/appsettings.Development.json | 19 ++++++++++++ 7 files changed, 123 insertions(+), 1 deletion(-) create mode 100644 samples/sample-wasm/WeatherForecasts/WeatherForecast.cs create mode 100644 samples/sample-wasm/WeatherForecasts/WeatherForecastHttpClient.cs create mode 100644 samples/sample-wasm/wwwroot/appsettings.Development.json diff --git a/samples/sample-wasm/Pages/Home.razor b/samples/sample-wasm/Pages/Home.razor index 9b2b9a8..c1b2062 100644 --- a/samples/sample-wasm/Pages/Home.razor +++ b/samples/sample-wasm/Pages/Home.razor @@ -19,6 +19,37 @@ @onclick="OnLogoutButtonClickAsync"> Sign out + + @if (forecasts == null) + { +

+ Loading data... +

+ } + else + { + + + + + + + + + + + @foreach (var forecast in forecasts) + { + + + + + + + } + +
DateTemp. (C)Temp. (F)Summary
@forecast.Date.ToShortDateString()@forecast.TemperatureC@forecast.TemperatureF@forecast.Summary
+ }

diff --git a/samples/sample-wasm/Pages/Home.razor.cs b/samples/sample-wasm/Pages/Home.razor.cs index dbd0638..e13f6c7 100644 --- a/samples/sample-wasm/Pages/Home.razor.cs +++ b/samples/sample-wasm/Pages/Home.razor.cs @@ -1,20 +1,28 @@ namespace sample_wasm.Pages; + using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Web; using Blorc.OpenIdConnect; using Microsoft.AspNetCore.Components.Authorization; +using sample_wasm.WeatherForecasts; [Authorize] public partial class Home : ComponentBase { [Inject] public required IUserManager UserManager { get; set; } + + [Inject] + WeatherForecastHttpClient WeatherForecastHttpClient { get; set; } + public TimeSpan? SignOutTimeSpan { get; set; } public User? User { get; set; } + private WeatherForecast[] forecasts; + [CascadingParameter] protected Task? AuthenticationStateTask { get; set; } @@ -24,6 +32,12 @@ protected override async Task OnInitializedAsync() UserManager.UserActivity += OnUserManagerUserActivity; UserManager.UserInactivity += OnUserManagerUserInactivity; + + if(User is not null) + { + forecasts = await WeatherForecastHttpClient.GetForecastAsync(); + } + } private void OnUserManagerUserInactivity(object? sender, UserInactivityEventArgs args) diff --git a/samples/sample-wasm/Program.cs b/samples/sample-wasm/Program.cs index 8b5a9f7..6dcdca3 100644 --- a/samples/sample-wasm/Program.cs +++ b/samples/sample-wasm/Program.cs @@ -3,6 +3,7 @@ using Blorc.OpenIdConnect; using Blorc.Services; using sample_wasm; +using sample_wasm.WeatherForecasts; var builder = WebAssemblyHostBuilder.CreateDefault(args); builder.RootComponents.Add("#app"); @@ -18,6 +19,10 @@ builder.Configuration.Bind("IdentityServer", options); }); +builder.Services + .AddHttpClient(client => client.BaseAddress = new Uri("http://localhost:5150/")) + .AddAccessToken(); // to get a token that will be sent to the API + var webAssemblyHost = builder.Build(); await webAssemblyHost diff --git a/samples/sample-wasm/WeatherForecasts/WeatherForecast.cs b/samples/sample-wasm/WeatherForecasts/WeatherForecast.cs new file mode 100644 index 0000000..62254ec --- /dev/null +++ b/samples/sample-wasm/WeatherForecasts/WeatherForecast.cs @@ -0,0 +1,12 @@ +namespace sample_wasm.WeatherForecasts; + +public class WeatherForecast +{ + public DateTime Date { get; set; } + + public string Summary { get; set; } + + public int TemperatureC { get; set; } + + public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); +} diff --git a/samples/sample-wasm/WeatherForecasts/WeatherForecastHttpClient.cs b/samples/sample-wasm/WeatherForecasts/WeatherForecastHttpClient.cs new file mode 100644 index 0000000..fda5f55 --- /dev/null +++ b/samples/sample-wasm/WeatherForecasts/WeatherForecastHttpClient.cs @@ -0,0 +1,29 @@ +using System.Net.Http.Json; + +namespace sample_wasm.WeatherForecasts; + +public class WeatherForecastHttpClient +{ + private readonly HttpClient _http; + + public WeatherForecastHttpClient(HttpClient http) + { + _http = http; + } + + public async Task GetForecastAsync() + { + var forecasts = Array.Empty(); + + try + { + forecasts = await _http.GetFromJsonAsync("WeatherForecast"); + } + catch + { + // ignored + } + + return forecasts; + } +} diff --git a/samples/sample-wasm/sample-wasm.csproj b/samples/sample-wasm/sample-wasm.csproj index b7544a1..0e1da1b 100644 --- a/samples/sample-wasm/sample-wasm.csproj +++ b/samples/sample-wasm/sample-wasm.csproj @@ -1,4 +1,4 @@ - + net8.0 @@ -6,10 +6,22 @@ enable + + + Always + + + + + + Always + + + diff --git a/samples/sample-wasm/wwwroot/appsettings.Development.json b/samples/sample-wasm/wwwroot/appsettings.Development.json new file mode 100644 index 0000000..d9f6a6c --- /dev/null +++ b/samples/sample-wasm/wwwroot/appsettings.Development.json @@ -0,0 +1,19 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Trace" + } + }, + "IdentityServer": { + "Authority": "https://e24py9.logto.app/oidc", + "ClientId": "qrvrvx6c2jx9lbsfn9g3m", + "RedirectUri": "https://localhost:7119/", + "PostLogoutRedirectUri": "https://localhost:7119/", + "ResponseType": "code", + "Scope": "openid profile read", + "Resource": "http://localhost:5150/", + "ExtraTokenParams": { + "resource": "http://localhost:5150/" // Ensure the key "resource" is lowercase + } + } +} From 04de2a2b29ac7d2328eb28e8e8bb3bfe30253351 Mon Sep 17 00:00:00 2001 From: KevinB <67744786+KevinBTech@users.noreply.github.com> Date: Mon, 29 Apr 2024 14:10:06 +0200 Subject: [PATCH 4/5] docs: the endpoint required authorization --- .../Controllers/WeatherForecastController.cs | 2 +- samples/sample-webapi/Program.cs | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/samples/sample-webapi/Controllers/WeatherForecastController.cs b/samples/sample-webapi/Controllers/WeatherForecastController.cs index 1d8ac83..54ca6ae 100644 --- a/samples/sample-webapi/Controllers/WeatherForecastController.cs +++ b/samples/sample-webapi/Controllers/WeatherForecastController.cs @@ -5,7 +5,7 @@ namespace sample_webapi.Controllers { [ApiController] [Route("[controller]")] - //[Authorize] + [Authorize] public class WeatherForecastController : ControllerBase { private static readonly string[] Summaries = new[] diff --git a/samples/sample-webapi/Program.cs b/samples/sample-webapi/Program.cs index 40a42ba..6ff7537 100644 --- a/samples/sample-webapi/Program.cs +++ b/samples/sample-webapi/Program.cs @@ -20,14 +20,7 @@ // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle builder.Services.AddEndpointsApiExplorer(); builder.Services.AddSwaggerGen(); -builder.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme) - .AddJwtBearer( - options => - { - options.Authority = "https://e24py9.logto.app/oidc"; - options.RequireHttpsMetadata = false; - options.Audience = "http://localhost:5150"; - }); +builder.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme).AddJwtBearer(); #region Logs From 77552f0d1fd78bfc20787931acdaf79e2d4efc56 Mon Sep 17 00:00:00 2001 From: KevinB <67744786+KevinBTech@users.noreply.github.com> Date: Mon, 29 Apr 2024 14:10:12 +0200 Subject: [PATCH 5/5] docs: update readme --- .../wwwroot/appsettings.Development.json | 8 +--- samples/sample-webapi/README.md | 38 +++++++++++++++++++ .../appsettings.Development.json | 11 ++++-- samples/sample-webapi/appsettings.json | 3 +- 4 files changed, 48 insertions(+), 12 deletions(-) create mode 100644 samples/sample-webapi/README.md diff --git a/samples/sample-wasm/wwwroot/appsettings.Development.json b/samples/sample-wasm/wwwroot/appsettings.Development.json index d9f6a6c..5afd2b2 100644 --- a/samples/sample-wasm/wwwroot/appsettings.Development.json +++ b/samples/sample-wasm/wwwroot/appsettings.Development.json @@ -5,15 +5,11 @@ } }, "IdentityServer": { - "Authority": "https://e24py9.logto.app/oidc", + "Authority": "https://.logto.app/oidc", "ClientId": "qrvrvx6c2jx9lbsfn9g3m", "RedirectUri": "https://localhost:7119/", "PostLogoutRedirectUri": "https://localhost:7119/", "ResponseType": "code", - "Scope": "openid profile read", - "Resource": "http://localhost:5150/", - "ExtraTokenParams": { - "resource": "http://localhost:5150/" // Ensure the key "resource" is lowercase - } + "Scope": "openid profile" } } diff --git a/samples/sample-webapi/README.md b/samples/sample-webapi/README.md new file mode 100644 index 0000000..82a374f --- /dev/null +++ b/samples/sample-webapi/README.md @@ -0,0 +1,38 @@ +# Logto ASP.NET Web API sample project + +This sample project shows how to use LogTo when proecting an API. +You can use it with the sample-wasm project example! + +## Prerequisites + +- .NET 6.0 or higher +- A [Logto Cloud](https://logto.io/) account or a self-hosted Logto +- A Logto single-page application created +- Set up an API resource in Logto + +If you don't have the Logto application created, please follow the [⚡ Get started](https://docs.logto.io/docs/tutorials/get-started/) guide to create one. + +## Configuration + +Update the `appsettings.Development.json` of the wasm sample with the following structure: + +```jsonc +{ + // ... + "IdentityServer": { + //... + "Scope": "... scope-permision-name" // Add more scopes if needed + "Resource": "", + "ExtraTokenParams": { + "resource": "" // Ensure the key is lowercase + } + } + } +} +``` + +## Run the sample + +```bash +dotnet run # or `dotnet watch` to run in watch mode +``` diff --git a/samples/sample-webapi/appsettings.Development.json b/samples/sample-webapi/appsettings.Development.json index 0c208ae..97b055c 100644 --- a/samples/sample-webapi/appsettings.Development.json +++ b/samples/sample-webapi/appsettings.Development.json @@ -1,8 +1,11 @@ { - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" + "Authentication": { + "Schemes": { + "Bearer": { + "Authority": "https://.logto.app/oidc", + "ValidAudiences": [ "" ], + "RequireHttpsMetadata": false // true if you are using HTTPS audiences, false if not + } } } } diff --git a/samples/sample-webapi/appsettings.json b/samples/sample-webapi/appsettings.json index 10f68b8..b30c908 100644 --- a/samples/sample-webapi/appsettings.json +++ b/samples/sample-webapi/appsettings.json @@ -1,8 +1,7 @@ { "Logging": { "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" + "Default": "Trace" } }, "AllowedHosts": "*"