dimitar/rent-a-car
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

register

Browse Source
This commit is contained in:
ani_konarcheva@abv.bg
2022-04-01 16:30:44 +03:00
parent 0f3e02cb92
commit aad682be3e
14 changed files with 164 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
RentACar/WebApp/Areas/Identity/Pages/Account/Login.cshtml
View File

@@ -14,9 +14,9 @@
<hr />
<div asp-validation-summary="All" class="text-danger"></div>
<div class="form-group">
<label asp-for="Input.Email"></label>
<input asp-for="Input.Email" class="form-control" />
<span asp-validation-for="Input.Email" class="text-danger"></span>
<label asp-for="Input.Username"></label>
<input asp-for="Input.Username" class="form-control" />
<span asp-validation-for="Input.Username" class="text-danger"></span>
</div>
<div class="form-group">
<label asp-for="Input.Password"></label>

5
RentACar/WebApp/Areas/Identity/Pages/Account/Login.cshtml.cs
View File

@@ -44,8 +44,7 @@ namespace WebApp.Areas.Identity.Pages.Account
public class InputModel
{
[Required]
[EmailAddress]
public string Email { get; set; }
public string Username { get; set; }
[Required]
[DataType(DataType.Password)]
@@ -82,7 +81,7 @@ namespace WebApp.Areas.Identity.Pages.Account
{
// This doesn't count login failures towards account lockout
// To enable password failures to trigger account lockout, set lockoutOnFailure: true
var result = await _signInManager.PasswordSignInAsync(Input.Email, Input.Password, Input.RememberMe, lockoutOnFailure: false);
var result = await _signInManager.PasswordSignInAsync(Input.Username, Input.Password, Input.RememberMe, lockoutOnFailure: false);
if (result.Succeeded)
{
_logger.LogInformation("User logged in.");

30
RentACar/WebApp/Areas/Identity/Pages/Account/Register.cshtml
View File

@@ -17,6 +17,36 @@
<input asp-for="Input.Email" class="form-control" />
<span asp-validation-for="Input.Email" class="text-danger"></span>
</div>
<div class="form-group">
<label asp-for="Input.FirstName"></label>
<input asp-for="Input.FirstName" class="form-control" />
<span asp-validation-for="Input.FirstName" class="text-danger"></span>
</div>
<div class="form-group">
<label asp-for="Input.LastName"></label>
<input asp-for="Input.LastName" class="form-control" />
<span asp-validation-for="Input.LastName" class="text-danger"></span>
</div>
<div class="form-group">
<label asp-for="Input.IsAdmin"></label>
<input asp-for="Input.IsAdmin" class="form-control" />
<span asp-validation-for="Input.IsAdmin" class="text-danger"></span>
</div>
<div class="form-group">
<label asp-for="Input.EGN"></label>
<input asp-for="Input.EGN" class="form-control" />
<span asp-validation-for="Input.EGN" class="text-danger"></span>
</div>
<div class="form-group">
<label asp-for="Input.PhoneNumber"></label>
<input asp-for="Input.PhoneNumber" class="form-control" />
<span asp-validation-for="Input.PhoneNumber" class="text-danger"></span>
</div>
<div class="form-group">
<label asp-for="Input.UserName"></label>
<input asp-for="Input.UserName" class="form-control" />
<span asp-validation-for="Input.UserName" class="text-danger"></span>
</div>
<div class="form-group">
<label asp-for="Input.Password"></label>
<input asp-for="Input.Password" class="form-control" />

47
RentACar/WebApp/Areas/Identity/Pages/Account/Register.cshtml.cs
View File

@@ -52,6 +52,25 @@ namespace WebApp.Areas.Identity.Pages.Account
[Display(Name = "Email")]
public string Email { get; set; }
[Required]
public string UserName { get; set; }
[Required]
public string FirstName { get; set; }
[Required]
public string LastName { get; set; }
public bool IsAdmin { get; set; }
[Required]
[StringLength(10, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 10)]
public string EGN { get; set; }
[Required]
[DataType(DataType.PhoneNumber)]
[StringLength(10, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 10)]
public string PhoneNumber { get; set; }
[Required]
[StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
[DataType(DataType.Password)]
@@ -76,25 +95,23 @@ namespace WebApp.Areas.Identity.Pages.Account
ExternalLogins = (await _signInManager.GetExternalAuthenticationSchemesAsync()).ToList();
if (ModelState.IsValid)
{
var user = new User { UserName = Input.Email, Email = Input.Email };
var user = new User { Id = Guid.NewGuid().ToString(), UserName = Input.UserName, Email = Input.Email, FirstName = Input.FirstName, LastName = Input.LastName, PhoneNumber = Input.PhoneNumber, PersonalNumber = Input.EGN, IsAdmin = Input.IsAdmin};
var result = await _userManager.CreateAsync(user, Input.Password);
if (result.Succeeded)
{
_logger.LogInformation("User created a new account with password.");
var code = await _userManager.GenerateEmailConfirmationTokenAsync(user);
code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code));
var callbackUrl = Url.Page(
"/Account/ConfirmEmail",
pageHandler: null,
values: new { area = "Identity", userId = user.Id, code = code, returnUrl = returnUrl },
protocol: Request.Scheme);
await _signInManager.SignInAsync(user, isPersistent: false);
return LocalRedirect(returnUrl);
_logger.LogInformation("User created a new account with password.");
await _signInManager.SignInAsync(user, isPersistent: false);
if (Input.IsAdmin == true)
{
await _userManager.AddToRoleAsync(user, "Admin");
}
else
{
await _userManager.AddToRoleAsync(user, "User");
}
return LocalRedirect(returnUrl);
}
foreach (var error in result.Errors)
{
ModelState.AddModelError(string.Empty, error.Description);

5
RentACar/WebApp/Controllers/HomeController.cs
View File

@@ -25,6 +25,11 @@ namespace API.Controllers
public IActionResult Privacy()
{
if(!this.User.Identity.IsAuthenticated)
{
return Redirect("");
}
return View();
}

42
RentACar/WebApp/Startup.cs
View File

@@ -48,7 +48,7 @@ namespace API
}
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
public void Configure(IApplicationBuilder app, IWebHostEnvironment env, IServiceProvider serviceProvider)
{
if (env.IsDevelopment())
{
@@ -68,7 +68,7 @@ namespace API
app.UseAuthentication();
app.UseAuthorization();
CreateUserRoles(serviceProvider).Wait();
app.UseEndpoints(endpoints =>
{
endpoints.MapControllerRoute(
@@ -77,5 +77,43 @@ namespace API
endpoints.MapRazorPages();
});
}
private async System.Threading.Tasks.Task CreateUserRoles(IServiceProvider serviceProvider)
{
var RoleManager = serviceProvider.GetRequiredService<RoleManager<IdentityRole>>();
var UserManager = serviceProvider.GetRequiredService<UserManager<User>>();
string[] roleNames = { "Admin", "User"};
IdentityResult roleResult;
foreach (var roleName in roleNames)
{
var roleCheck = await RoleManager.RoleExistsAsync(roleName);
if (!roleCheck)
{
roleResult = await RoleManager.CreateAsync(new IdentityRole(roleName));
}
}
var user = new User();
user.UserName = "admin";
user.Id = Guid.NewGuid().ToString();
user.FirstName = "Admin";
user.LastName = "Admin";
user.PersonalNumber = "1234567890";
user.PhoneNumber = "0888888888";
user.Email = "admin@admin.admin";
user.IsAdmin = true;
string userPWD = "password";
var _user = await UserManager.FindByNameAsync(user.UserName);
if (_user == null)
{
IdentityResult chkUser = await UserManager.CreateAsync(user, userPWD);
if (chkUser.Succeeded)
{
await UserManager.AddToRoleAsync(user, "Admin");
}
}
}
}
}

61
RentACar/WebApp/Views/Cars/Index.cshtml
View File

@@ -5,9 +5,11 @@
}
<h1>Index</h1>
<p>
<a asp-action="Create">New Car</a>
@if (this.User.IsInRole("Admin"))
{
<a asp-action="Create">New car</a>
}
</p>
<table class="table">
<thead>
@@ -34,32 +36,33 @@
</tr>
</thead>
<tbody>
@foreach (var item in Model) {
<tr>
<td>
@Html.DisplayFor(modelItem => item.Brand)
</td>
<td>
@Html.DisplayFor(modelItem => item.Model)
</td>
<td>
@Html.DisplayFor(modelItem => item.Year)
</td>
<td>
@Html.DisplayFor(modelItem => item.CountPassengerSeats)
</td>
<td>
@Html.DisplayFor(modelItem => item.Description)
</td>
<td>
@Html.DisplayFor(modelItem => item.PriceForDay)
</td>
<td>
<a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
<a asp-action="Details" asp-route-id="@item.Id">Details</a> |
<a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
</td>
</tr>
}
@foreach (var item in Model)
{
<tr>
<td>
@Html.DisplayFor(modelItem => item.Brand)
</td>
<td>
@Html.DisplayFor(modelItem => item.Model)
</td>
<td>
@Html.DisplayFor(modelItem => item.Year)
</td>
<td>
@Html.DisplayFor(modelItem => item.CountPassengerSeats)
</td>
<td>
@Html.DisplayFor(modelItem => item.Description)
</td>
<td>
@Html.DisplayFor(modelItem => item.PriceForDay)
</td>
<td>
<a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
<a asp-action="Details" asp-route-id="@item.Id">Details</a> |
<a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
</td>
</tr>
}
</tbody>
</table>

9
RentACar/WebApp/Views/Shared/_Layout.cshtml
View File

@@ -27,6 +27,15 @@
<li class="nav-item">
<a class="nav-link text-dark" asp-area="" asp-controller="Cars" asp-action="Index">Cars</a>
</li>
@if (this.User.IsInRole("Admin"))
{
<li class="nav-item">
<a class="nav-link text-dark" asp-area="" asp-controller="Cars" asp-action="Create">Create Car</a>
</li>
<li class="nav-item">
<a class="nav-link text-dark" asp-area="" asp-controller="Rents" asp-action="Index">Rents</a>
</li>
}
</ul>
<partial name="_LoginPartial" />
</div>