Update vor Blazorise
This commit is contained in:
@@ -5,121 +5,121 @@
|
||||
ViewData["Title"] = "Anmelden";
|
||||
}
|
||||
|
||||
<h1>@ViewData["Title"]</h1>
|
||||
<h1>@ViewData["Title"]</h1>
|
||||
|
||||
<div class="card shadow-lg p-3 mb-5 bg-white rounded">
|
||||
<h4 class="card-header">Login</h4>
|
||||
<div class="card-body">
|
||||
<form id="account" method="post">
|
||||
<h4>Bitte melden Sie sich mit Ihrer UserID/Passwort an</h4>
|
||||
<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" value="hutter@shub.ch" />
|
||||
<span asp-validation-for="Input.Email" class="text-danger"></span>
|
||||
<div class="card shadow-lg p-3 mb-5 bg-white rounded">
|
||||
<h4 class="card-header">Login</h4>
|
||||
<div class="card-body">
|
||||
<form id="account" method="post">
|
||||
<h4>Bitte melden Sie sich mit Ihrer UserID/Passwort an</h4>
|
||||
<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" value="hutter@shub.ch" />
|
||||
<span asp-validation-for="Input.Email" class="text-danger"></span>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label asp-for="Input.Password"></label>
|
||||
@* <input asp-for="Input.Password" class="form-control" value="Admin*123" />
|
||||
*@ <input asp-for="Input.Password" class="form-control" value="b" />
|
||||
<span asp-validation-for="Input.Password" class="text-danger"></span>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="checkbox">
|
||||
<label asp-for="Input.RememberMe">
|
||||
<input asp-for="Input.RememberMe" />
|
||||
@Html.DisplayNameFor(m => m.Input.RememberMe)
|
||||
</label>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label asp-for="Input.Password"></label>
|
||||
@* <input asp-for="Input.Password" class="form-control" value="Admin*123" />
|
||||
*@ <input asp-for="Input.Password" class="form-control" value="b" />
|
||||
<span asp-validation-for="Input.Password" class="text-danger"></span>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="checkbox">
|
||||
<label asp-for="Input.RememberMe">
|
||||
<input asp-for="Input.RememberMe" />
|
||||
@Html.DisplayNameFor(m => m.Input.RememberMe)
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<button type="submit" class="btn btn-primary">Log in</button>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<p>
|
||||
<a id="forgot-password" asp-page="./ForgotPassword">Passwort vergessen?</a>
|
||||
</p>
|
||||
<p>
|
||||
<a asp-page="./Register" asp-route-returnUrl="@Model.ReturnUrl">Neu registrieren</a>
|
||||
</p>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<button type="submit" class="btn btn-primary">Log in</button>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<p>
|
||||
<a id="forgot-password" asp-page="./ForgotPassword">Passwort vergessen?</a>
|
||||
</p>
|
||||
<p>
|
||||
<a asp-page="./Register" asp-route-returnUrl="@Model.ReturnUrl">Neu registrieren</a>
|
||||
</p>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@*<div class="row">
|
||||
<div class="col-md-4">
|
||||
<section>
|
||||
<form id="account" method="post">
|
||||
<h4>Use a local account to log in.</h4>
|
||||
<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>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label asp-for="Input.Password"></label>
|
||||
<input asp-for="Input.Password" class="form-control" />
|
||||
<span asp-validation-for="Input.Password" class="text-danger"></span>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="checkbox">
|
||||
<label asp-for="Input.RememberMe">
|
||||
<input asp-for="Input.RememberMe" />
|
||||
@Html.DisplayNameFor(m => m.Input.RememberMe)
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<button type="submit" class="btn btn-primary">Log in</button>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<p>
|
||||
<a id="forgot-password" asp-page="./ForgotPassword">Forgot your password?</a>
|
||||
</p>
|
||||
<p>
|
||||
<a asp-page="./Register" asp-route-returnUrl="@Model.ReturnUrl">Register as a new user</a>
|
||||
</p>
|
||||
</div>
|
||||
</form>
|
||||
</section>
|
||||
</div>
|
||||
<div class="col-md-6 col-md-offset-2">
|
||||
<section>
|
||||
<h4>Use another service to log in.</h4>
|
||||
<hr />
|
||||
@{
|
||||
if ((Model.ExternalLogins?.Count ?? 0) == 0)
|
||||
{
|
||||
<div>
|
||||
<p>
|
||||
There are no external authentication services configured. See <a href="https://go.microsoft.com/fwlink/?LinkID=532715">this article</a>
|
||||
for details on setting up this ASP.NET application to support logging in via external services.
|
||||
</p>
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
<form id="external-account" asp-page="./ExternalLogin" asp-route-returnUrl="@Model.ReturnUrl" method="post" class="form-horizontal">
|
||||
<div>
|
||||
<p>
|
||||
@foreach (var provider in Model.ExternalLogins)
|
||||
{
|
||||
<button type="submit" class="btn btn-primary" name="provider" value="@provider.Name" title="Log in using your @provider.DisplayName account">@provider.DisplayName</button>
|
||||
}
|
||||
</p>
|
||||
</div>
|
||||
</form>
|
||||
}
|
||||
}
|
||||
</section>
|
||||
</div>
|
||||
@*<div class="row">
|
||||
<div class="col-md-4">
|
||||
<section>
|
||||
<form id="account" method="post">
|
||||
<h4>Use a local account to log in.</h4>
|
||||
<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>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label asp-for="Input.Password"></label>
|
||||
<input asp-for="Input.Password" class="form-control" />
|
||||
<span asp-validation-for="Input.Password" class="text-danger"></span>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="checkbox">
|
||||
<label asp-for="Input.RememberMe">
|
||||
<input asp-for="Input.RememberMe" />
|
||||
@Html.DisplayNameFor(m => m.Input.RememberMe)
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<button type="submit" class="btn btn-primary">Log in</button>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<p>
|
||||
<a id="forgot-password" asp-page="./ForgotPassword">Forgot your password?</a>
|
||||
</p>
|
||||
<p>
|
||||
<a asp-page="./Register" asp-route-returnUrl="@Model.ReturnUrl">Register as a new user</a>
|
||||
</p>
|
||||
</div>
|
||||
</form>
|
||||
</section>
|
||||
</div>
|
||||
<div class="col-md-6 col-md-offset-2">
|
||||
<section>
|
||||
<h4>Use another service to log in.</h4>
|
||||
<hr />
|
||||
@{
|
||||
if ((Model.ExternalLogins?.Count ?? 0) == 0)
|
||||
{
|
||||
<div>
|
||||
<p>
|
||||
There are no external authentication services configured. See <a href="https://go.microsoft.com/fwlink/?LinkID=532715">this article</a>
|
||||
for details on setting up this ASP.NET application to support logging in via external services.
|
||||
</p>
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
<form id="external-account" asp-page="./ExternalLogin" asp-route-returnUrl="@Model.ReturnUrl" method="post" class="form-horizontal">
|
||||
<div>
|
||||
<p>
|
||||
@foreach (var provider in Model.ExternalLogins)
|
||||
{
|
||||
<button type="submit" class="btn btn-primary" name="provider" value="@provider.Name" title="Log in using your @provider.DisplayName account">@provider.DisplayName</button>
|
||||
}
|
||||
</p>
|
||||
</div>
|
||||
</form>
|
||||
}
|
||||
}
|
||||
</section>
|
||||
</div>
|
||||
</div>*@
|
||||
|
||||
|
||||
@section Scripts {
|
||||
<partial name="_ValidationScriptsPartial" />
|
||||
@section Scripts {
|
||||
<partial name="_ValidationScriptsPartial" />
|
||||
}
|
||||
|
||||
@@ -13,7 +13,11 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Blazored.SessionStorage;
|
||||
using BlazorApp.Helper;
|
||||
using BWPMModels;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace BlazorApp.Areas.Identity.Pages.Account
|
||||
|
||||
{
|
||||
[AllowAnonymous]
|
||||
public class LoginModel : PageModel
|
||||
@@ -23,7 +27,7 @@ namespace BlazorApp.Areas.Identity.Pages.Account
|
||||
private readonly ILogger<LoginModel> _logger;
|
||||
private readonly RoleManager<IdentityRole> _roleManager;
|
||||
private SessionState sessionState;
|
||||
|
||||
private string rurl = "";
|
||||
public LoginModel(SignInManager<IdentityUser> signInManager,
|
||||
ILogger<LoginModel> logger,
|
||||
UserManager<IdentityUser> userManager)
|
||||
@@ -65,10 +69,10 @@ namespace BlazorApp.Areas.Identity.Pages.Account
|
||||
autologin = ph.GetParameter("autologin");
|
||||
if (autologin == "true")
|
||||
{
|
||||
await AutoLogin(returnUrl);
|
||||
returnUrl = returnUrl ?? Url.Content("~/");
|
||||
ReturnUrl = returnUrl;
|
||||
Response.Redirect(returnUrl);
|
||||
await AutoLogin(returnUrl);
|
||||
//returnUrl = returnUrl ?? Url.Content("~/");
|
||||
//ReturnUrl = returnUrl;
|
||||
Response.Redirect(rurl);
|
||||
}
|
||||
if (!string.IsNullOrEmpty(ErrorMessage))
|
||||
{
|
||||
@@ -96,8 +100,17 @@ namespace BlazorApp.Areas.Identity.Pages.Account
|
||||
var result = await _signInManager.PasswordSignInAsync(Input.Email, Input.Password, Input.RememberMe, lockoutOnFailure: false);
|
||||
if (result.Succeeded)
|
||||
{
|
||||
|
||||
dbhelper dbh = new dbhelper();
|
||||
dbh.Get_Tabledata("SELECT dbo.AspNetUsers.Email, dbo.AspNetRoles.Name, dbo.AspNetUsers.Id FROM dbo.AspNetUsers INNER JOIN dbo.AspNetUserRoles ON dbo.AspNetUsers.Id = dbo.AspNetUserRoles.UserId INNER JOIN dbo.AspNetRoles ON dbo.AspNetUserRoles.RoleId = dbo.AspNetRoles.Id where dbo.aspnetusers.email='" + Input.Email + "'", false, true);
|
||||
if (dbh.dsdaten.Tables[0].Rows.Count>0)
|
||||
{
|
||||
if (dbh.dsdaten.Tables[0].Rows[0]["Name"].ToString()=="Lehrer") { returnUrl = "/Teacher/Dashboard"; }
|
||||
if (dbh.dsdaten.Tables[0].Rows[0]["Name"].ToString() == "Firma") { returnUrl = "/Company/Dashboard"; }
|
||||
if (dbh.dsdaten.Tables[0].Rows[0]["Name"].ToString() == "Administrators") { returnUrl = "/Admin/Dashboard"; }
|
||||
|
||||
};
|
||||
_logger.LogInformation("User logged in.");
|
||||
|
||||
return LocalRedirect(returnUrl);
|
||||
}
|
||||
if (result.RequiresTwoFactor)
|
||||
@@ -136,7 +149,17 @@ namespace BlazorApp.Areas.Identity.Pages.Account
|
||||
if (result.Succeeded)
|
||||
{
|
||||
_logger.LogInformation("User logged in.");
|
||||
returnUrl = returnUrl ?? Url.Content("~/");
|
||||
//returnUrl = returnUrl ?? Url.Content("~/");
|
||||
dbhelper dbh = new dbhelper();
|
||||
dbh.Get_Tabledata("SELECT dbo.AspNetUsers.Email, dbo.AspNetRoles.Name, dbo.AspNetUsers.Id FROM dbo.AspNetUsers INNER JOIN dbo.AspNetUserRoles ON dbo.AspNetUsers.Id = dbo.AspNetUserRoles.UserId INNER JOIN dbo.AspNetRoles ON dbo.AspNetUserRoles.RoleId = dbo.AspNetRoles.Id where dbo.aspnetusers.email='" + EMail + "'", false, true);
|
||||
if (dbh.dsdaten.Tables[0].Rows.Count > 0)
|
||||
{
|
||||
if (dbh.dsdaten.Tables[0].Rows[0]["Name"].ToString() == "Lehrer") { returnUrl = "/Teacher/Dashboard"; }
|
||||
if (dbh.dsdaten.Tables[0].Rows[0]["Name"].ToString() == "Firma") { returnUrl = "/Company/Dashboard"; }
|
||||
if (dbh.dsdaten.Tables[0].Rows[0]["Name"].ToString() == "Administrators") { returnUrl = "/Admin/Dashboard"; }
|
||||
|
||||
};
|
||||
rurl = returnUrl;
|
||||
return LocalRedirect(returnUrl);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user