Skip to content

Commit 37f19ee

Browse files
committed
Merge branch 'main' into dependabot/nuget/AspireVersion-8.0.1
2 parents e4fd58b + 662916a commit 37f19ee

File tree

13 files changed

+181
-251
lines changed

13 files changed

+181
-251
lines changed

Directory.Packages.props

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
<PropertyGroup>
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
5-
<AspnetVersion>8.0.5</AspnetVersion>
6-
<MicrosoftExtensionsVersion>8.5.0</MicrosoftExtensionsVersion>
7-
<EfVersion>8.0.5</EfVersion>
8-
<AspireVersion>8.0.1</AspireVersion>
5+
<AspnetVersion>8.0.8</AspnetVersion>
6+
<MicrosoftExtensionsVersion>8.8.0</MicrosoftExtensionsVersion>
7+
<EfVersion>8.0.7</EfVersion>
8+
<AspireVersion>8.2.2</AspireVersion>
99
<AspireUnstablePackagesVersion>8.0.0-preview.8.24258.2</AspireUnstablePackagesVersion>
10-
<GrpcVersion>2.62.0</GrpcVersion>
11-
<DuendeVersion>7.0.4</DuendeVersion>
10+
<GrpcVersion>2.66.0</GrpcVersion>
11+
<DuendeVersion>7.0.6</DuendeVersion>
1212
<ApiVersioningVersion>8.1.0</ApiVersioningVersion>
1313
</PropertyGroup>
1414
<ItemGroup>
@@ -48,31 +48,31 @@
4848
<PackageVersion Include="Pgvector" Version="0.2.0" />
4949
<PackageVersion Include="Pgvector.EntityFrameworkCore" Version="0.2.0" />
5050
<!-- Version together with runtime -->
51-
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
52-
<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
53-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
51+
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />
52+
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.0" />
53+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
5454
<!-- Xabaril packages -->
5555
<PackageVersion Include="AspNetCore.HealthChecks.Uris" Version="8.0.1" />
5656
<!-- AI -->
57-
<PackageVersion Include="Microsoft.SemanticKernel" Version="1.12.0" />
57+
<PackageVersion Include="Microsoft.SemanticKernel" Version="1.20.0" />
5858
<PackageVersion Include="Microsoft.SemanticKernel.Connectors.Onnx" Version="1.10.0-alpha" />
5959
<!-- Open Telemetry -->
60-
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.1" />
61-
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.8.1" />
62-
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1" />
60+
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
61+
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.10.0" />
62+
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
6363
<PackageVersion Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.6.0-beta.3" />
64-
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.8.1" />
65-
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.8.0" />
64+
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
65+
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.10.0" />
6666
<!-- IdentityServer -->
6767
<PackageVersion Include="Duende.IdentityServer" Version="$(DuendeVersion)" />
6868
<PackageVersion Include="Duende.IdentityServer.AspNetIdentity" Version="$(DuendeVersion)" />
6969
<PackageVersion Include="Duende.IdentityServer.EntityFramework" Version="$(DuendeVersion)" />
7070
<PackageVersion Include="Duende.IdentityServer.EntityFramework.Storage" Version="$(DuendeVersion)" />
7171
<PackageVersion Include="Duende.IdentityServer.Storage" Version="$(DuendeVersion)" />
7272
<!-- VS Test -->
73-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
73+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
7474
<!-- Scaffolding -->
75-
<PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.2" />
75+
<PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.5" />
7676
<!-- Grpc -->
7777
<PackageVersion Include="Grpc.AspNetCore" Version="$(GrpcVersion)" />
7878
<PackageVersion Include="Grpc.AspNetCore.Server.ClientFactory" Version="$(GrpcVersion)" />
@@ -81,13 +81,13 @@
8181
<PackageVersion Include="Automapper" Version="13.0.1" />
8282
<PackageVersion Include="Dapper" Version="2.1.35" />
8383
<PackageVersion Include="FluentValidation.AspNetCore" Version="11.3.0" />
84-
<PackageVersion Include="MediatR" Version="12.2.0" />
84+
<PackageVersion Include="MediatR" Version="12.4.1" />
8585
<PackageVersion Include="Microsoft.Web.LibraryManager.Build" Version="2.1.175" />
8686
<PackageVersion Include="Polly" Version="8.4.0" />
87-
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.6.1" />
87+
<PackageVersion Include="Swashbuckle.AspNetCore" Version="7.2.0" />
8888
<PackageVersion Include="System.Reflection.TypeExtensions" Version="4.7.0" />
89-
<PackageVersion Include="xunit" Version="2.8.0" />
90-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.0" />
91-
<PackageVersion Include="Yarp.ReverseProxy" Version="2.1.0" />
89+
<PackageVersion Include="xunit" Version="2.9.0" />
90+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
91+
<PackageVersion Include="Yarp.ReverseProxy" Version="2.2.0" />
9292
</ItemGroup>
9393
</Project>

Identity.API/Controllers/AccountController.cs

Lines changed: 1 addition & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
33

44
namespace Identity.API.Controllers;
5-
using eShop.Identity.API.Models.AccountViewModels;
5+
66
using Identity.API.Models.Account;
77

88
[SecurityHeaders]
@@ -38,64 +38,6 @@ public AccountController(
3838
_context = context;
3939
}
4040

41-
[HttpGet]
42-
public IActionResult Register()
43-
{
44-
return View();
45-
}
46-
47-
[HttpPost]
48-
[ValidateAntiForgeryToken]
49-
public async Task<IActionResult> RegisterCreate(RegisterViewModel model)
50-
{
51-
if (ModelState.IsValid)
52-
{
53-
var user = new ApplicationUser
54-
{
55-
UserName = model.Email,
56-
Email = model.Email,
57-
CardNumber = model.CardNumber,
58-
SecurityNumber = model.SecurityNumber,
59-
Expiration = model.Expiration,
60-
CardHolderName = model.CardHolderName,
61-
CardType = model.CardType,
62-
Street = model.Street,
63-
City = model.City,
64-
State = model.State,
65-
Country = model.Country,
66-
ZipCode = model.ZipCode,
67-
Name = model.Name,
68-
LastName = model.LastName
69-
};
70-
var result = await _userManager.CreateAsync(user, model.Password);
71-
if (result.Succeeded)
72-
{
73-
await _signInManager.SignInAsync(user, isPersistent: false);
74-
return RedirectToAction(nameof(HomeController.Index), "Home");
75-
}
76-
foreach (var error in result.Errors)
77-
{
78-
ModelState.AddModelError(string.Empty, error.Description);
79-
}
80-
}
81-
82-
// If we got this far, something failed, redisplay form
83-
return View(model);
84-
}
85-
86-
//[HttpPost]
87-
//[ValidateAntiForgeryToken]
88-
//public async Task<IActionResult> RegisterCreate([Bind("Id,Email,Password,ConfirmPassword")] RegisterViewModel registerViewModel)
89-
//{
90-
// if (ModelState.IsValid)
91-
// {
92-
// _context.Add(registerViewModel);
93-
// await _context.SaveChangesAsync();
94-
// return RedirectToAction(nameof(Index));
95-
// }
96-
// return View(registerViewModel);
97-
//}
98-
9941
/// <summary>
10042
/// Entry point into the login workflow
10143
/// </summary>

Identity.API/Controllers/RegisterViewModelsController.cs renamed to Identity.API/Controllers/RegisterController.cs

Lines changed: 62 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,33 @@
11
namespace Identity.API.Controllers;
2+
23
using System.Linq;
34
using System.Threading.Tasks;
45
using Microsoft.AspNetCore.Mvc;
56
using Microsoft.EntityFrameworkCore;
67
using eShop.Identity.API.Data;
78
using eShop.Identity.API.Models.AccountViewModels;
89

9-
public class RegisterViewModelsController : Controller
10+
public class RegisterController : Controller
1011
{
1112
private readonly ApplicationDbContext _context;
13+
private readonly UserManager<ApplicationUser> _userManager;
14+
private readonly SignInManager<ApplicationUser> _signInManager;
1215

13-
public RegisterViewModelsController(ApplicationDbContext context)
16+
public RegisterController(ApplicationDbContext context, UserManager<ApplicationUser> userManager, SignInManager<ApplicationUser> signInManager)
1417
{
1518
_context = context;
19+
_userManager = userManager;
20+
_signInManager = signInManager;
21+
_context = context;
1622
}
1723

18-
// GET: RegisterViewModels
24+
// GET: Register
1925
public async Task<IActionResult> Index()
2026
{
2127
return View(await _context.RegisterViewModel.ToListAsync());
2228
}
2329

24-
// GET: RegisterViewModels/Details/5
30+
// GET: Register/Details/5
2531
public async Task<IActionResult> Details(int? id)
2632
{
2733
if (id == null)
@@ -39,18 +45,63 @@ public async Task<IActionResult> Details(int? id)
3945
return View(registerViewModel);
4046
}
4147

42-
// GET: RegisterViewModels/Create
48+
[HttpGet]
49+
public IActionResult Register()
50+
{
51+
return View();
52+
}
53+
54+
[HttpPost]
55+
[ValidateAntiForgeryToken]
56+
public async Task<IActionResult> Create(RegisterViewModel model)
57+
{
58+
if (ModelState.IsValid)
59+
{
60+
var user = new ApplicationUser
61+
{
62+
UserName = model.Email,
63+
Email = model.Email,
64+
CardNumber = model.CardNumber,
65+
SecurityNumber = model.SecurityNumber,
66+
Expiration = model.Expiration,
67+
CardHolderName = model.CardHolderName,
68+
CardType = model.CardType,
69+
Street = model.Street,
70+
City = model.City,
71+
State = model.State,
72+
Country = model.Country,
73+
ZipCode = model.ZipCode,
74+
Name = model.Name,
75+
LastName = model.LastName
76+
};
77+
var result = await _userManager.CreateAsync(user, model.Password);
78+
if (result.Succeeded)
79+
{
80+
await _signInManager.SignInAsync(user, isPersistent: false);
81+
return RedirectToAction(nameof(HomeController.Index), "Home");
82+
}
83+
foreach (var error in result.Errors)
84+
{
85+
ModelState.AddModelError(string.Empty, error.Description);
86+
}
87+
}
88+
89+
// If we got this far, something failed, redisplay form
90+
return View(model);
91+
}
92+
93+
// GET: Register/Create
4394
public IActionResult Create()
4495
{
4596
return View();
4697
}
4798

48-
// POST: RegisterViewModels/Create
99+
// POST: Register/Create
49100
// To protect from overposting attacks, enable the specific properties you want to bind to.
50101
// For more details, see http://go.microsoft.com/fwlink/?LinkId=317598.
51102
[HttpPost]
52103
[ValidateAntiForgeryToken]
53-
public async Task<IActionResult> Create([Bind("Id,Email,Password,ConfirmPassword")] RegisterViewModel registerViewModel)
104+
public async Task<IActionResult> OriginalCreate([Bind("Id,Email,Password,ConfirmPassword")] RegisterViewModel registerViewModel)
54105
{
55106
if (ModelState.IsValid)
56107
{
@@ -61,7 +112,7 @@ public async Task<IActionResult> Create([Bind("Id,Email,Password,ConfirmPassword
61112
return View(registerViewModel);
62113
}
63114

64-
// GET: RegisterViewModels/Edit/5
115+
// GET: Register/Edit/5
65116
public async Task<IActionResult> Edit(int? id)
66117
{
67118
if (id == null)
@@ -77,7 +128,7 @@ public async Task<IActionResult> Edit(int? id)
77128
return View(registerViewModel);
78129
}
79130

80-
// POST: RegisterViewModels/Edit/5
131+
// POST: Register/Edit/5
81132
// To protect from overposting attacks, enable the specific properties you want to bind to.
82133
// For more details, see http://go.microsoft.com/fwlink/?LinkId=317598.
83134
[HttpPost]
@@ -112,7 +163,7 @@ public async Task<IActionResult> Edit(int id, [Bind("Id,Email,Password,ConfirmPa
112163
return View(registerViewModel);
113164
}
114165

115-
// GET: RegisterViewModels/Delete/5
166+
// GET: Register/Delete/5
116167
public async Task<IActionResult> Delete(int? id)
117168
{
118169
if (id == null)
@@ -130,7 +181,7 @@ public async Task<IActionResult> Delete(int? id)
130181
return View(registerViewModel);
131182
}
132183

133-
// POST: RegisterViewModels/Delete/5
184+
// POST: Register/Delete/5
134185
[HttpPost, ActionName("Delete")]
135186
[ValidateAntiForgeryToken]
136187
public async Task<IActionResult> DeleteConfirmed(int id)

Identity.API/Models/Account/RegisterViewModel.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ public record RegisterViewModel
3333
public string ZipCode { get; set; }
3434
public string Name { get; set; }
3535
public string LastName { get; set; }
36+
public string ReturnUrl { get; set; }
3637

3738
public ApplicationUser User { get; init; }
3839
}

Identity.API/Views/Account/Login.cshtml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@model LoginViewModel
2+
@using Identity.API.Controllers
23

34
<div class="login-page">
45
<div class="container">
@@ -37,7 +38,7 @@
3738
<p>The default users are alice/bob, password: Pass123$</p>
3839
</div>
3940
<button class="btn btn-primary" name="button" value="login">Login</button>
40-
<button class="btn btn-primary" name="button" value="registercreate" asp-action="RegisterCreate">Register</button>
41+
<button class="btn btn-primary" name="button" value="create" asp-controller="Register" asp-action="Create">Register</button>
4142
</div>
4243
</form>
4344
</div>

Identity.API/Views/Account/RegisterCreate.cshtml

Lines changed: 0 additions & 64 deletions
This file was deleted.

0 commit comments

Comments
 (0)