Compare commits
4 Commits
dangnv-lap
...
a3ecde2815
| Author | SHA1 | Date | |
|---|---|---|---|
|
a3ecde2815 | ||
|
|
d6fe1d9d52 | ||
|
|
52c5ef0d54 | ||
|
|
a91717d880 |
@@ -1,5 +0,0 @@
|
||||
<h3>MapView</h3>
|
||||
|
||||
@code {
|
||||
|
||||
}
|
||||
@@ -1,23 +1,20 @@
|
||||
@inherits LayoutComponentBase
|
||||
|
||||
<div class="page">
|
||||
<div class="sidebar">
|
||||
<NavMenu />
|
||||
</div>
|
||||
|
||||
<main>
|
||||
<div class="top-row px-4">
|
||||
<a href="https://learn.microsoft.com/aspnet/core/" target="_blank">About</a>
|
||||
</div>
|
||||
<div class="app-shell">
|
||||
<AuthorizeView>
|
||||
<Authorized>
|
||||
<NavMenu />
|
||||
</Authorized>
|
||||
</AuthorizeView>
|
||||
|
||||
<article class="content px-4">
|
||||
@Body
|
||||
</article>
|
||||
<main class="page">
|
||||
@Body
|
||||
</main>
|
||||
</div>
|
||||
|
||||
<div id="blazor-error-ui" data-nosnippet>
|
||||
An unhandled error has occurred.
|
||||
<a href="." class="reload">Reload</a>
|
||||
<span class="dismiss">🗙</span>
|
||||
</div>
|
||||
<MudPopoverProvider />
|
||||
<MudThemeProvider IsDarkMode />
|
||||
<MudDialogProvider MaxWidth="MaxWidth.ExtraLarge" />
|
||||
<MudSnackbarProvider />
|
||||
|
||||
|
||||
@@ -1,98 +1,11 @@
|
||||
|
||||
.app-shell {
|
||||
display: flex;
|
||||
min-height: 100vh;
|
||||
}
|
||||
|
||||
.page {
|
||||
position: relative;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
flex: 1 1 auto;
|
||||
min-width: 0;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
main {
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
.sidebar {
|
||||
background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%);
|
||||
}
|
||||
|
||||
.top-row {
|
||||
background-color: #f7f7f7;
|
||||
border-bottom: 1px solid #d6d5d5;
|
||||
justify-content: flex-end;
|
||||
height: 3.5rem;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.top-row ::deep a, .top-row ::deep .btn-link {
|
||||
white-space: nowrap;
|
||||
margin-left: 1.5rem;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.top-row ::deep a:hover, .top-row ::deep .btn-link:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.top-row ::deep a:first-child {
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
@media (max-width: 640.98px) {
|
||||
.top-row {
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
||||
.top-row ::deep a, .top-row ::deep .btn-link {
|
||||
margin-left: 0;
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width: 641px) {
|
||||
.page {
|
||||
flex-direction: row;
|
||||
}
|
||||
|
||||
.sidebar {
|
||||
width: 250px;
|
||||
height: 100vh;
|
||||
position: sticky;
|
||||
top: 0;
|
||||
}
|
||||
|
||||
.top-row {
|
||||
position: sticky;
|
||||
top: 0;
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
.top-row.auth ::deep a:first-child {
|
||||
flex: 1;
|
||||
text-align: right;
|
||||
width: 0;
|
||||
}
|
||||
|
||||
.top-row, article {
|
||||
padding-left: 2rem !important;
|
||||
padding-right: 1.5rem !important;
|
||||
}
|
||||
}
|
||||
|
||||
#blazor-error-ui {
|
||||
color-scheme: light only;
|
||||
background: lightyellow;
|
||||
bottom: 0;
|
||||
box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
|
||||
box-sizing: border-box;
|
||||
display: none;
|
||||
left: 0;
|
||||
padding: 0.6rem 1.25rem 0.7rem 1.25rem;
|
||||
position: fixed;
|
||||
width: 100%;
|
||||
z-index: 1000;
|
||||
}
|
||||
|
||||
#blazor-error-ui .dismiss {
|
||||
cursor: pointer;
|
||||
position: absolute;
|
||||
right: 0.75rem;
|
||||
top: 0.5rem;
|
||||
}
|
||||
|
||||
@@ -1,98 +1,67 @@
|
||||
@implements IDisposable
|
||||
<script>
|
||||
function toggleSidebar() {
|
||||
let sidebar = document.querySelector(".sidebar");
|
||||
sidebar.classList.toggle("collapsed");
|
||||
}
|
||||
</script>
|
||||
|
||||
@inject NavigationManager NavigationManager
|
||||
|
||||
<div class="top-row ps-3 navbar navbar-dark">
|
||||
<div class="container-fluid">
|
||||
<a class="navbar-brand" href="">RobotApp</a>
|
||||
<div class="sidebar collapsed">
|
||||
<div class="flex-grow-1 d-flex flex-column">
|
||||
<div class="title">
|
||||
<img src="images/logoLight.svg" alt="PhenikaaX" style="height: 35px;" onclick="toggleSidebar()" />
|
||||
<button class="btn button" onclick="toggleSidebar()">
|
||||
<i class="mdi mdi-menu" style="color: white; font-size: 35px"></i>
|
||||
</button>
|
||||
</div>
|
||||
<hr />
|
||||
@foreach (var nav in Navs)
|
||||
{
|
||||
<div class="nav-item px-3">
|
||||
<NavLink class="nav-link" href="@nav.Path" Match="@nav.Match">
|
||||
<div class="d-flex align-items-center">
|
||||
<div class="nav-icon">
|
||||
<span class="mdi @nav.Icon mdi-36px" aria-hidden="true"></span>
|
||||
</div>
|
||||
<span class="nav-label">@nav.Label</span>
|
||||
</div>
|
||||
</NavLink>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
<div class="user">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<input type="checkbox" title="Navigation menu" class="navbar-toggler" />
|
||||
|
||||
<div class="nav-scrollable" onclick="document.querySelector('.navbar-toggler').click()">
|
||||
<nav class="nav flex-column">
|
||||
<div class="nav-item px-3">
|
||||
<NavLink class="nav-link" href="" Match="NavLinkMatch.All">
|
||||
<span class="bi bi-house-door-fill-nav-menu" aria-hidden="true"></span> Home
|
||||
</NavLink>
|
||||
</div>
|
||||
|
||||
<div class="nav-item px-3">
|
||||
<NavLink class="nav-link" href="counter">
|
||||
<span class="bi bi-plus-square-fill-nav-menu" aria-hidden="true"></span> Counter
|
||||
</NavLink>
|
||||
</div>
|
||||
|
||||
<div class="nav-item px-3">
|
||||
<NavLink class="nav-link" href="weather">
|
||||
<span class="bi bi-list-nested-nav-menu" aria-hidden="true"></span> Weather
|
||||
</NavLink>
|
||||
</div>
|
||||
|
||||
<div class="nav-item px-3">
|
||||
<NavLink class="nav-link" href="auth">
|
||||
<span class="bi bi-lock-nav-menu" aria-hidden="true"></span> Auth Required
|
||||
</NavLink>
|
||||
</div>
|
||||
|
||||
<div class="nav-item px-3">
|
||||
<NavLink class="nav-link" href="maps-manager">
|
||||
<span class="bi bi-lock-nav-menu" aria-hidden="true"></span> Map Manager
|
||||
</NavLink>
|
||||
</div>
|
||||
|
||||
<AuthorizeView>
|
||||
<Authorized>
|
||||
<div class="nav-item px-3">
|
||||
<NavLink class="nav-link" href="Account/Manage">
|
||||
<span class="bi bi-person-fill-nav-menu" aria-hidden="true"></span> @context.User.Identity?.Name
|
||||
</NavLink>
|
||||
</div>
|
||||
<div class="nav-item px-3">
|
||||
<form action="Account/Logout" method="post">
|
||||
<AntiforgeryToken />
|
||||
<input type="hidden" name="ReturnUrl" value="@currentUrl" />
|
||||
<button type="submit" class="nav-link">
|
||||
<span class="bi bi-arrow-bar-left-nav-menu" aria-hidden="true"></span> Logout
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
</Authorized>
|
||||
<NotAuthorized>
|
||||
<div class="nav-item px-3">
|
||||
<NavLink class="nav-link" href="Account/Register">
|
||||
<span class="bi bi-person-nav-menu" aria-hidden="true"></span> Register
|
||||
</NavLink>
|
||||
</div>
|
||||
<div class="nav-item px-3">
|
||||
<NavLink class="nav-link" href="Account/Login">
|
||||
<span class="bi bi-person-badge-nav-menu" aria-hidden="true"></span> Login
|
||||
</NavLink>
|
||||
</div>
|
||||
</NotAuthorized>
|
||||
</AuthorizeView>
|
||||
</nav>
|
||||
</div>
|
||||
|
||||
@code {
|
||||
private string? currentUrl;
|
||||
|
||||
protected override void OnInitialized()
|
||||
public class NavModel
|
||||
{
|
||||
currentUrl = NavigationManager.ToBaseRelativePath(NavigationManager.Uri);
|
||||
NavigationManager.LocationChanged += OnLocationChanged;
|
||||
public string Icon { get; set; } = "";
|
||||
public string Path { get; set; } = "";
|
||||
public string Label { get; set; } = "";
|
||||
public NavLinkMatch Match { get; set; }
|
||||
}
|
||||
|
||||
private void OnLocationChanged(object? sender, LocationChangedEventArgs e)
|
||||
{
|
||||
currentUrl = NavigationManager.ToBaseRelativePath(e.Location);
|
||||
StateHasChanged();
|
||||
}
|
||||
public NavModel[] Navs = [
|
||||
new(){Icon = "mdi-view-dashboard", Path="/", Label = "Dashboard", Match = NavLinkMatch.All},
|
||||
new(){Icon = "mdi-file-cog", Path="/", Label = "Script Manager", Match = NavLinkMatch.All},
|
||||
new(){Icon = "mdi-file-code", Path="/", Label = "Script Editor", Match = NavLinkMatch.All},
|
||||
new(){Icon = "mdi-flag-checkered", Path="/", Label = "Missions", Match = NavLinkMatch.All},
|
||||
new(){Icon = "mdi-map-legend", Path="/", Label = "Maps", Match = NavLinkMatch.All},
|
||||
new(){Icon = "mdi-robot-mower", Path="/", Label = "Robots", Match = NavLinkMatch.All},
|
||||
new(){Icon = "mdi-robot-industrial", Path="/", Label = "Robot Models", Match = NavLinkMatch.All},
|
||||
new(){Icon = "mdi-monitor-eye", Path="/", Label = "Monitor", Match = NavLinkMatch.All},
|
||||
new(){Icon = "mdi-traffic-light", Path="/", Label = "Traffic", Match = NavLinkMatch.All},
|
||||
new(){Icon = "mdi-factory", Path="/", Label = "Open ACS", Match = NavLinkMatch.All},
|
||||
new(){Icon = "mdi-math-log", Path="/", Label = "Logs", Match = NavLinkMatch.All},
|
||||
new(){Icon = "mdi-account", Path="/", Label = "User", Match = NavLinkMatch.All},
|
||||
];
|
||||
|
||||
public void Dispose()
|
||||
private bool collapseNavMenu = true;
|
||||
|
||||
private string? NavMenuCssClass => collapseNavMenu ? "collapse" : null;
|
||||
|
||||
private void ToggleNavMenu()
|
||||
{
|
||||
NavigationManager.LocationChanged -= OnLocationChanged;
|
||||
collapseNavMenu = !collapseNavMenu;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,76 +1,96 @@
|
||||
.navbar-toggler {
|
||||
appearance: none;
|
||||
cursor: pointer;
|
||||
width: 3.5rem;
|
||||
height: 2.5rem;
|
||||
color: white;
|
||||
position: absolute;
|
||||
top: 0.5rem;
|
||||
right: 1rem;
|
||||
border: 1px solid rgba(255, 255, 255, 0.1);
|
||||
background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.55%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e") no-repeat center/1.75rem rgba(255, 255, 255, 0.1);
|
||||
|
||||
.sidebar {
|
||||
background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%);
|
||||
height: 100vh;
|
||||
width: 250px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
transition: width 0.3s;
|
||||
}
|
||||
|
||||
.navbar-toggler:checked {
|
||||
background-color: rgba(255, 255, 255, 0.5);
|
||||
}
|
||||
.sidebar.hidden {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.top-row {
|
||||
min-height: 3.5rem;
|
||||
background-color: rgba(0,0,0,0.4);
|
||||
}
|
||||
.sidebar .title {
|
||||
margin: 8px 4px 0 4px;
|
||||
flex-direction: row;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
display: flex;
|
||||
}
|
||||
|
||||
.navbar-brand {
|
||||
font-size: 1.1rem;
|
||||
}
|
||||
.sidebar .title button {
|
||||
height: 35px;
|
||||
width: 35px;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.bi {
|
||||
display: inline-block;
|
||||
position: relative;
|
||||
width: 1.25rem;
|
||||
height: 1.25rem;
|
||||
margin-right: 0.75rem;
|
||||
top: -1px;
|
||||
background-size: cover;
|
||||
}
|
||||
.sidebar:not(.collapsed) .title button {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.bi-house-door-fill-nav-menu {
|
||||
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-house-door-fill' viewBox='0 0 16 16'%3E%3Cpath d='M6.5 14.5v-3.505c0-.245.25-.495.5-.495h2c.25 0 .5.25.5.5v3.5a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5v-7a.5.5 0 0 0-.146-.354L13 5.793V2.5a.5.5 0 0 0-.5-.5h-1a.5.5 0 0 0-.5.5v1.293L8.354 1.146a.5.5 0 0 0-.708 0l-6 6A.5.5 0 0 0 1.5 7.5v7a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5Z'/%3E%3C/svg%3E");
|
||||
}
|
||||
.sidebar.collapsed {
|
||||
width: 74px;
|
||||
}
|
||||
|
||||
.bi-plus-square-fill-nav-menu {
|
||||
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-plus-square-fill' viewBox='0 0 16 16'%3E%3Cpath d='M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm6.5 4.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3a.5.5 0 0 1 1 0z'/%3E%3C/svg%3E");
|
||||
}
|
||||
.sidebar.collapsed .title {
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.bi-list-nested-nav-menu {
|
||||
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-list-nested' viewBox='0 0 16 16'%3E%3Cpath fill-rule='evenodd' d='M4.5 11.5A.5.5 0 0 1 5 11h10a.5.5 0 0 1 0 1H5a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 3 7h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 1 3h10a.5.5 0 0 1 0 1H1a.5.5 0 0 1-.5-.5z'/%3E%3C/svg%3E");
|
||||
}
|
||||
.sidebar.collapsed .title img {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.bi-lock-nav-menu {
|
||||
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-list-nested' viewBox='0 0 16 16'%3E%3Cpath d='M8 1a2 2 0 0 1 2 2v4H6V3a2 2 0 0 1 2-2zm3 6V3a3 3 0 0 0-6 0v4a2 2 0 0 0-2 2v5a2 2 0 0 0 2 2h6a2 2 0 0 0 2-2V9a2 2 0 0 0-2-2zM5 8h6a1 1 0 0 1 1 1v5a1 1 0 0 1-1 1H5a1 1 0 0 1-1-1V9a1 1 0 0 1 1-1z'/%3E%3C/svg%3E");
|
||||
}
|
||||
.sidebar.collapsed .title button {
|
||||
display: flex;
|
||||
}
|
||||
|
||||
.bi-person-nav-menu {
|
||||
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-person' viewBox='0 0 16 16'%3E%3Cpath d='M8 8a3 3 0 1 0 0-6 3 3 0 0 0 0 6Zm2-3a2 2 0 1 1-4 0 2 2 0 0 1 4 0Zm4 8c0 1-1 1-1 1H3s-1 0-1-1 1-4 6-4 6 3 6 4Zm-1-.004c-.001-.246-.154-.986-.832-1.664C11.516 10.68 10.289 10 8 10c-2.29 0-3.516.68-4.168 1.332-.678.678-.83 1.418-.832 1.664h10Z'/%3E%3C/svg%3E");
|
||||
}
|
||||
/*.sidebar .title .button {
|
||||
display: flex;
|
||||
border-radius: 20px;
|
||||
}*/
|
||||
|
||||
.bi-person-badge-nav-menu {
|
||||
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-person-badge' viewBox='0 0 16 16'%3E%3Cpath d='M6.5 2a.5.5 0 0 0 0 1h3a.5.5 0 0 0 0-1h-3zM11 8a3 3 0 1 1-6 0 3 3 0 0 1 6 0z'/%3E%3Cpath d='M4.5 0A2.5 2.5 0 0 0 2 2.5V14a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2V2.5A2.5 2.5 0 0 0 11.5 0h-7zM3 2.5A1.5 1.5 0 0 1 4.5 1h7A1.5 1.5 0 0 1 13 2.5v10.795a4.2 4.2 0 0 0-.776-.492C11.392 12.387 10.063 12 8 12s-3.392.387-4.224.803a4.2 4.2 0 0 0-.776.492V2.5z'/%3E%3C/svg%3E");
|
||||
}
|
||||
.sidebar .title .button:hover {
|
||||
background-color: rgb(5, 39, 80);
|
||||
}
|
||||
|
||||
.bi-person-fill-nav-menu {
|
||||
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-person-fill' viewBox='0 0 16 16'%3E%3Cpath d='M3 14s-1 0-1-1 1-4 6-4 6 3 6 4-1 1-1 1H3Zm5-6a3 3 0 1 0 0-6 3 3 0 0 0 0 6Z'/%3E%3C/svg%3E");
|
||||
}
|
||||
.sidebar .user {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.bi-arrow-bar-left-nav-menu {
|
||||
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-arrow-bar-left' viewBox='0 0 16 16'%3E%3Cpath d='M12.5 15a.5.5 0 0 1-.5-.5v-13a.5.5 0 0 1 1 0v13a.5.5 0 0 1-.5.5ZM10 8a.5.5 0 0 1-.5.5H3.707l2.147 2.146a.5.5 0 0 1-.708.708l-3-3a.5.5 0 0 1 0-.708l3-3a.5.5 0 1 1 .708.708L3.707 7.5H9.5a.5.5 0 0 1 .5.5Z'/%3E%3C/svg%3E");
|
||||
}
|
||||
.sidebar.collapsed .user > div {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
.sidebar.collapsed .nav-label {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.nav-item {
|
||||
font-size: 0.9rem;
|
||||
padding-bottom: 0.5rem;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.nav-item .nav-label {
|
||||
font-size: 18px;
|
||||
text-wrap: nowrap;
|
||||
}
|
||||
|
||||
.nav-item .nav-icon {
|
||||
height: 48px;
|
||||
width: 48px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.nav-item:first-of-type {
|
||||
padding-top: 1rem;
|
||||
}
|
||||
@@ -79,47 +99,19 @@
|
||||
padding-bottom: 1rem;
|
||||
}
|
||||
|
||||
.nav-item ::deep .nav-link {
|
||||
.nav-item ::deep a {
|
||||
color: #d7d7d7;
|
||||
background: none;
|
||||
border: none;
|
||||
border-radius: 4px;
|
||||
height: 3rem;
|
||||
display: flex;
|
||||
height: 48px;
|
||||
align-items: center;
|
||||
line-height: 3rem;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.nav-item ::deep a.active {
|
||||
background-color: rgba(255,255,255,0.37);
|
||||
color: white;
|
||||
}
|
||||
.nav-item ::deep a.active {
|
||||
background-color: rgba(255,255,255,0.37);
|
||||
color: white;
|
||||
}
|
||||
|
||||
.nav-item ::deep .nav-link:hover {
|
||||
background-color: rgba(255,255,255,0.1);
|
||||
color: white;
|
||||
}
|
||||
|
||||
.nav-scrollable {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.navbar-toggler:checked ~ .nav-scrollable {
|
||||
display: block;
|
||||
}
|
||||
|
||||
@media (min-width: 641px) {
|
||||
.navbar-toggler {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.nav-scrollable {
|
||||
/* Never collapse the sidebar for wide screens */
|
||||
display: block;
|
||||
|
||||
/* Allow sidebar to scroll for tall menus */
|
||||
height: calc(100vh - 3.5rem);
|
||||
overflow-y: auto;
|
||||
}
|
||||
}
|
||||
.nav-item ::deep a:hover {
|
||||
background-color: rgba(255,255,255,0.1);
|
||||
color: white;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,4 @@
|
||||
@page "/"
|
||||
|
||||
<PageTitle>Home</PageTitle>
|
||||
|
||||
<h1>Hello, world!</h1>
|
||||
|
||||
Welcome to your new app.
|
||||
@using Microsoft.AspNetCore.Authorization
|
||||
@attribute [Authorize]
|
||||
<h1>Welcome to RobotApp!</h1>
|
||||
@@ -1,181 +0,0 @@
|
||||
@page "/maps-manager"
|
||||
@using MudBlazor
|
||||
@using RobotApp.Common.Shares.Dtos
|
||||
|
||||
@attribute [Authorize]
|
||||
@inject HttpClient Http
|
||||
|
||||
<PageTitle>Map Manager</PageTitle>
|
||||
|
||||
<style>
|
||||
.selected {
|
||||
background-color: #3399ff !important;
|
||||
}
|
||||
|
||||
.selected > td {
|
||||
color: white !important;
|
||||
}
|
||||
|
||||
.selected > td .mud-input {
|
||||
color: white !important;
|
||||
}
|
||||
</style>
|
||||
|
||||
<div class="d-flex flex-row w-100 h-100 p-2 overflow-hidden">
|
||||
<div class="d-flex h-100 flex-column flex-grow-1 pe-2">
|
||||
<div class="d-flex justify-content-between align-items-center mb-2">
|
||||
<MudTextField Value="txtSearch" T="string" Label="Search" Variant="Variant.Outlined" Adornment="Adornment.End" AdornmentIcon="@Icons.Material.Filled.Search"
|
||||
AdornmentColor="Color.Secondary" ValueChanged="TextSearchChanged" Style="max-width: 550px" />
|
||||
<MudButton Class="ms-3" StartIcon="@Icons.Material.Filled.Add" Variant="Variant.Filled" Color="Color.Primary" Size="Size.Large">
|
||||
NEW
|
||||
</MudButton>
|
||||
</div>
|
||||
<div class="d-flex" style="height: 92%">
|
||||
<MudTable Class="w-100" @ref="Table" Items="@MapsShow" T="MapDto" Dense=true Hover=true ReadOnly=true FixedHeader=true RowClass="cursor-pointer" Striped="true"
|
||||
ServerData="ReloadData" Loading=@IsLoading Outlined="true" RowClassFunc="@SelectedRowClassFunc" OnRowClick="RowClickEvent" Height="95%">
|
||||
<HeaderContent>
|
||||
<MudTh>Nr</MudTh>
|
||||
<MudTh>Name</MudTh>
|
||||
<MudTh>Width (m)</MudTh>
|
||||
<MudTh>Height (m)</MudTh>
|
||||
<MudTh>Resolution (m/px)</MudTh>
|
||||
<MudTh>OriginX</MudTh>
|
||||
<MudTh>OriginY</MudTh>
|
||||
<MudTh></MudTh>
|
||||
</HeaderContent>
|
||||
<RowTemplate>
|
||||
<MudTd DataLabel="Nr">
|
||||
@(Table?.CurrentPage * Table?.RowsPerPage + MapsShow.IndexOf(context) + 1)
|
||||
</MudTd>
|
||||
<MudTd DataLabel="Name">
|
||||
@context.Name
|
||||
</MudTd>
|
||||
<MudTd DataLabel="Width">
|
||||
@context.Width
|
||||
</MudTd>
|
||||
<MudTd DataLabel="Height">
|
||||
@context.Height
|
||||
</MudTd>
|
||||
<MudTd DataLabel="Resolution">
|
||||
@context.Resolution
|
||||
</MudTd>
|
||||
<MudTd DataLabel="OriginX">
|
||||
@context.OriginX
|
||||
</MudTd>
|
||||
<MudTd DataLabel="OriginY">
|
||||
@context.OriginY
|
||||
</MudTd>
|
||||
<MudTd>
|
||||
<div class="d-flex flex-row-reverse">
|
||||
<MudMenu Icon="@Icons.Material.Filled.MoreVert" AnchorOrigin="Origin.BottomCenter">
|
||||
<MudMenuItem Icon="@Icons.Material.Filled.Edit" IconColor="Color.Info">Edit</MudMenuItem>
|
||||
<MudMenuItem Icon="@Icons.Material.Filled.Delete" IconColor="Color.Error">Delete</MudMenuItem>
|
||||
</MudMenu>
|
||||
</div>
|
||||
</MudTd>
|
||||
</RowTemplate>
|
||||
<PagerContent>
|
||||
<div class="d-flex w-100 flex-row-reverse">
|
||||
<MudTablePager Style="width: 100%;" PageSizeOptions="new[] {25 , 100, 200}" />
|
||||
</div>
|
||||
</PagerContent>
|
||||
</MudTable>
|
||||
</div>
|
||||
</div>
|
||||
<div class="map-preview">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@code {
|
||||
private string txtSearch = "";
|
||||
private bool IsLoading = false;
|
||||
|
||||
private List<MapDto> Maps = [];
|
||||
private List<MapDto> MapsShow = [];
|
||||
|
||||
private int selectedRowNumber = -1;
|
||||
private MapDto MapSelected = new();
|
||||
|
||||
private MudTable<MapDto>? Table; protected override async Task OnAfterRenderAsync(bool firstRender)
|
||||
{
|
||||
await base.OnAfterRenderAsync(firstRender);
|
||||
if (!firstRender) return;
|
||||
|
||||
await LoadMaps();
|
||||
}
|
||||
|
||||
private async Task LoadMaps()
|
||||
{
|
||||
try
|
||||
{
|
||||
IsLoading = true;
|
||||
Maps.Clear();
|
||||
StateHasChanged();
|
||||
|
||||
var maps = await Http.GetFromJsonAsync<IEnumerable<MapDto>>($"api/MapsManager?txtSearch={txtSearch}");
|
||||
Maps.AddRange(maps ?? []);
|
||||
|
||||
Table?.ReloadServerData();
|
||||
IsLoading = false;
|
||||
StateHasChanged();
|
||||
}
|
||||
catch
|
||||
{
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
private void TextSearchChanged(string text)
|
||||
{
|
||||
txtSearch = text;
|
||||
Table?.ReloadServerData();
|
||||
}
|
||||
|
||||
private bool FilterFunc(MapDto map)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(txtSearch))
|
||||
return true;
|
||||
if (map.Name is not null && map.Name.Contains(txtSearch, StringComparison.OrdinalIgnoreCase))
|
||||
return true;
|
||||
if ($"{map.Name}".Contains(txtSearch))
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
private Task<TableData<MapDto>> ReloadData(TableState state, CancellationToken _)
|
||||
{
|
||||
MapsShow.Clear();
|
||||
var tasks = new List<MapDto>();
|
||||
Maps.ForEach(map =>
|
||||
{
|
||||
if (FilterFunc(map)) tasks.Add(map);
|
||||
});
|
||||
MapsShow = tasks.Skip(state.Page * state.PageSize).Take(state.PageSize).ToList();
|
||||
return Task.FromResult(new TableData<MapDto>() { TotalItems = tasks.Count, Items = MapsShow });
|
||||
}
|
||||
|
||||
private void RowClickEvent(TableRowClickEventArgs<MapDto> tableRowClickEventArgs) { }
|
||||
|
||||
private string SelectedRowClassFunc(MapDto element, int rowNumber)
|
||||
{
|
||||
if (selectedRowNumber == rowNumber && Table?.SelectedItem != null && !Table.SelectedItem.Equals(element))
|
||||
{
|
||||
return string.Empty;
|
||||
}
|
||||
else if (selectedRowNumber == rowNumber && Table?.SelectedItem != null && Table.SelectedItem.Equals(element))
|
||||
{
|
||||
return "selected";
|
||||
}
|
||||
else if (Table?.SelectedItem != null && Table.SelectedItem.Equals(element))
|
||||
{
|
||||
selectedRowNumber = rowNumber;
|
||||
MapSelected = element;
|
||||
// NavigationMapPreviewRef.SetMapPreview(MapSelected);
|
||||
return "selected";
|
||||
}
|
||||
else
|
||||
{
|
||||
return string.Empty;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,9 +1,11 @@
|
||||
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
|
||||
using MudBlazor.Services;
|
||||
|
||||
var builder = WebAssemblyHostBuilder.CreateDefault(args);
|
||||
|
||||
builder.Services.AddAuthorizationCore();
|
||||
builder.Services.AddCascadingAuthenticationState();
|
||||
builder.Services.AddAuthenticationStateDeserialization();
|
||||
builder.Services.AddMudServices();
|
||||
|
||||
await builder.Build().RunAsync();
|
||||
|
||||
@@ -9,13 +9,9 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.1" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.1" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.9" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.9" />
|
||||
<PackageReference Include="MudBlazor" Version="8.12.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\RobotApp.Common.Shares\RobotApp.Common.Shares.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@@ -1,10 +1,18 @@
|
||||
<Router AppAssembly="typeof(Program).Assembly">
|
||||
<Found Context="routeData">
|
||||
<AuthorizeRouteView RouteData="routeData" DefaultLayout="typeof(Layout.MainLayout)">
|
||||
<NotAuthorized>
|
||||
<RedirectToLogin />
|
||||
</NotAuthorized>
|
||||
</AuthorizeRouteView>
|
||||
<FocusOnNavigate RouteData="routeData" Selector="h1" />
|
||||
</Found>
|
||||
</Router>
|
||||
@using RobotApp.Client.Layout
|
||||
|
||||
<CascadingAuthenticationState>
|
||||
<Router AppAssembly="@typeof(Program).Assembly">
|
||||
<Found Context="routeData">
|
||||
<AuthorizeRouteView RouteData="routeData" DefaultLayout="typeof(MainLayout)">
|
||||
<NotAuthorized>
|
||||
<RedirectToLogin />
|
||||
</NotAuthorized>
|
||||
</AuthorizeRouteView>
|
||||
</Found>
|
||||
<NotFound>
|
||||
<LayoutView Layout="typeof(MainLayout)">
|
||||
<p>Không tìm thấy trang.</p>
|
||||
</LayoutView>
|
||||
</NotFound>
|
||||
</Router>
|
||||
</CascadingAuthenticationState>
|
||||
|
||||
@@ -8,4 +8,4 @@
|
||||
@using Microsoft.AspNetCore.Components.Web.Virtualization
|
||||
@using Microsoft.JSInterop
|
||||
@using RobotApp.Client
|
||||
@using Microsoft.AspNetCore.Authorization
|
||||
@using MudBlazor
|
||||
|
||||
BIN
RobotApp.Client/wwwroot/images/Image-not-found.png
Normal file
BIN
RobotApp.Client/wwwroot/images/Image-not-found.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 809 B |
10
RobotApp.Client/wwwroot/images/logoDark.svg
Normal file
10
RobotApp.Client/wwwroot/images/logoDark.svg
Normal file
@@ -0,0 +1,10 @@
|
||||
<svg
|
||||
id="Layer_1"
|
||||
data-name="Layer 1"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
viewBox="0 0 32 32"
|
||||
>
|
||||
<path d="M31.81,1.79,21.29,14.32l-2.48-3a2.6,2.6,0,0,1,0-3.34l4.45-5.31a2.64,2.64,0,0,1,2-.93Z" fill="#e06e2e"/>
|
||||
<path d="M.19,1.8,10.71,14.34l2.48-2.95a2.6,2.6,0,0,0,0-3.34L8.75,2.74a2.66,2.66,0,0,0-2-.94Z" fill="#e06e2e"/>
|
||||
<path d="M32,30.21H25.36a2.61,2.61,0,0,1-2-.92L16.5,21.1a.65.65,0,0,0-1,0L8.63,29.29a2.58,2.58,0,0,1-2,.92H0L12.07,15.83,14,13.57a2.67,2.67,0,0,1,4.08,0l1.89,2.26Z" fill="#233871"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 522 B |
48
RobotApp.Client/wwwroot/images/logoLight.svg
Normal file
48
RobotApp.Client/wwwroot/images/logoLight.svg
Normal file
@@ -0,0 +1,48 @@
|
||||
<svg
|
||||
id="Layer_1"
|
||||
data-name="Layer 1"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
viewBox="0 0 370.84 59.64"
|
||||
>
|
||||
<path
|
||||
d="M66.68,0,44.62,26.28,39.43,20.1a5.45,5.45,0,0,1,0-7L48.75,2A5.53,5.53,0,0,1,53,0Z"
|
||||
fill="#e06e2e"
|
||||
/>
|
||||
<path
|
||||
d="M.4,0,22.46,26.31l5.19-6.18a5.45,5.45,0,0,0,0-7L18.33,2a5.53,5.53,0,0,0-4.22-2Z"
|
||||
fill="#e06e2e"
|
||||
/>
|
||||
<path
|
||||
d="M67.08,59.59H53.15A5.44,5.44,0,0,1,49,57.65L34.58,40.49a1.36,1.36,0,0,0-2.09,0L18.09,57.65a5.46,5.46,0,0,1-4.17,1.94H0L25.31,29.43l4-4.72a5.57,5.57,0,0,1,8.54,0l4,4.72Z"
|
||||
fill="#ffffff"
|
||||
/>
|
||||
<path
|
||||
d="M98.34,24.3A12.87,12.87,0,0,1,104,42.84a12.29,12.29,0,0,1-5.61,4.56A21.47,21.47,0,0,1,89.74,49H81.17v7.93a2.72,2.72,0,0,1-2.72,2.73H74.13V22.72H89.74a21.64,21.64,0,0,1,8.6,1.58m-1.93,17a6.52,6.52,0,0,0,2.39-5.43,6.54,6.54,0,0,0-2.39-5.43q-2.39-1.91-7-1.9H81.17V43.18h8.25q4.6,0,7-1.9"
|
||||
fill="#ffffff"
|
||||
/>
|
||||
<path
|
||||
d="M145.86,25.44V56.91a2.72,2.72,0,0,1-2.72,2.73h-4.33V43.81H119.18V59.64h-4.32a2.73,2.73,0,0,1-2.73-2.73V25.44a2.72,2.72,0,0,1,2.73-2.72h4.32V38h19.63V22.72h4.33a2.72,2.72,0,0,1,2.72,2.72"
|
||||
fill="#ffffff"
|
||||
/>
|
||||
<path
|
||||
d="M183,56.58v3h-24.8a3.6,3.6,0,0,1-3.6-3.6V26.36a3.6,3.6,0,0,1,3.6-3.6h24.05v3a2.73,2.73,0,0,1-2.73,2.73H161.62v9.57h18.29V43.7H161.62V53.86h18.65A2.72,2.72,0,0,1,183,56.58"
|
||||
fill="#ffffff"
|
||||
/>
|
||||
<path
|
||||
d="M222.73,22.76V59.59h-4.52a2.71,2.71,0,0,1-2.09-1l-20.06-24V59.59h-7V22.76h4.51a2.72,2.72,0,0,1,2.09,1l20.07,24V22.76Z"
|
||||
fill="#ffffff"
|
||||
/>
|
||||
<rect x="231.85" y="22.76" width="7.03" height="36.83" fill="#ffffff" />
|
||||
<path
|
||||
d="M261,44.18l-6,6v9.42h-7V22.76h7V41.65L273,23.57a2.71,2.71,0,0,1,1.93-.81h6.77L265.75,39.23l16.88,20.36h-7a2.72,2.72,0,0,1-2.06-.94Z"
|
||||
fill="#ffffff"
|
||||
/>
|
||||
<path
|
||||
d="M315.59,51.07H296.65l-3,6.89a2.74,2.74,0,0,1-2.5,1.63h-5.47l16.08-34.74A3.6,3.6,0,0,1,305,22.76h2.32a3.61,3.61,0,0,1,3.27,2.08l16.13,34.75h-5.59A2.72,2.72,0,0,1,318.66,58Zm-2.33-5.37-7.14-16.1L299,45.7Z"
|
||||
fill="#ffffff"
|
||||
/>
|
||||
<path
|
||||
d="M359.69,51.07H340.76l-3,6.89a2.71,2.71,0,0,1-2.49,1.63h-5.47l16.07-34.74a3.62,3.62,0,0,1,3.27-2.09h2.33a3.59,3.59,0,0,1,3.26,2.08l16.13,34.75h-5.59A2.7,2.7,0,0,1,362.77,58Zm-2.32-5.37-7.14-16.1-7.09,16.1Z"
|
||||
fill="#ffffff"
|
||||
/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.3 KiB |
@@ -1,13 +0,0 @@
|
||||
namespace RobotApp.Common.Shares.Dtos;
|
||||
|
||||
public class MapDto
|
||||
{
|
||||
public Guid Id { get; set; }
|
||||
public string Name { get; set; } = string.Empty;
|
||||
public string Description { get; set; } = string.Empty;
|
||||
public double Width { get; set; }
|
||||
public double Height { get; set; }
|
||||
public double Resolution { get; set; }
|
||||
public double OriginX { get; set; }
|
||||
public double OriginY { get; set; }
|
||||
}
|
||||
7
RobotApp.Common.Shares/Enums/RobotDirection.cs
Normal file
7
RobotApp.Common.Shares/Enums/RobotDirection.cs
Normal file
@@ -0,0 +1,7 @@
|
||||
namespace RobotApp.Common.Shares.Enums;
|
||||
|
||||
public enum RobotDirection
|
||||
{
|
||||
FORWARD,
|
||||
BACKWARD,
|
||||
}
|
||||
39
RobotApp.Common.Shares/Enums/StateType.cs
Normal file
39
RobotApp.Common.Shares/Enums/StateType.cs
Normal file
@@ -0,0 +1,39 @@
|
||||
namespace RobotApp.Common.Shares.Enums;
|
||||
|
||||
public enum RootStateType
|
||||
{
|
||||
Booting,
|
||||
Operational,
|
||||
}
|
||||
|
||||
public enum OperationalStateType
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public enum AutomationStateType
|
||||
{
|
||||
Idle,
|
||||
Executing,
|
||||
Paused,
|
||||
Charging,
|
||||
Error,
|
||||
Remote_Override,
|
||||
}
|
||||
|
||||
public enum ManualStateType
|
||||
{
|
||||
Idle,
|
||||
Active,
|
||||
}
|
||||
|
||||
public enum SafetyStateType
|
||||
{
|
||||
Init,
|
||||
Run_Ok,
|
||||
SS1,
|
||||
STO,
|
||||
PDS,
|
||||
SLS,
|
||||
Error,
|
||||
}
|
||||
8
RobotApp.Common.Shares/Enums/TrajectoryDegree.cs
Normal file
8
RobotApp.Common.Shares/Enums/TrajectoryDegree.cs
Normal file
@@ -0,0 +1,8 @@
|
||||
namespace RobotApp.Common.Shares.Enums;
|
||||
|
||||
public enum TrajectoryDegree
|
||||
{
|
||||
One,
|
||||
Two,
|
||||
Three,
|
||||
}
|
||||
80
RobotApp.Common.Shares/MathExtensions.cs
Normal file
80
RobotApp.Common.Shares/MathExtensions.cs
Normal file
@@ -0,0 +1,80 @@
|
||||
using RobotApp.Common.Shares.Model;
|
||||
|
||||
namespace RobotApp.Common.Shares;
|
||||
|
||||
public static class MathExtensions
|
||||
{
|
||||
public static (double x, double y) CurveDegreeTwo(double t, double x1, double y1, double controlPointX, double controlPointY, double x2, double y2)
|
||||
{
|
||||
var x = (1 - t) * (1 - t) * x1 + 2 * t * (1 - t) * controlPointX + t * t * x2;
|
||||
var y = (1 - t) * (1 - t) * y1 + 2 * t * (1 - t) * controlPointY + t * t * y2;
|
||||
return (x, y);
|
||||
}
|
||||
|
||||
public static (double x, double y) CurveDegreeThree(double t, double x1, double y1, double controlPoint1X, double controlPoint1Y, double controlPoint2X, double controlPoint2Y, double x2, double y2)
|
||||
{
|
||||
var x = Math.Pow(1 - t, 3) * x1 + 3 * Math.Pow(1 - t, 2) * t * controlPoint1X + 3 * Math.Pow(t, 2) * (1 - t) * controlPoint2X + Math.Pow(t, 3) * x2; ;
|
||||
var y = Math.Pow(1 - t, 3) * y1 + 3 * Math.Pow(1 - t, 2) * t * controlPoint1Y + 3 * Math.Pow(t, 2) * (1 - t) * controlPoint2Y + Math.Pow(t, 3) * y2;
|
||||
return (x, y);
|
||||
}
|
||||
|
||||
|
||||
public static (double x, double y) Curve(double t, EdgeCalculatorModel edge)
|
||||
{
|
||||
if (edge.TrajectoryDegree == Enums.TrajectoryDegree.One)
|
||||
{
|
||||
return (edge.X1 + t * (edge.X2 - edge.X1), edge.Y1 + t * (edge.Y2 - edge.Y1));
|
||||
}
|
||||
else if (edge.TrajectoryDegree == Enums.TrajectoryDegree.Two)
|
||||
{
|
||||
return CurveDegreeTwo(t, edge.X1, edge.Y1, edge.ControlPoint1X, edge.ControlPoint1Y, edge.X2, edge.Y2);
|
||||
}
|
||||
else
|
||||
{
|
||||
return CurveDegreeThree(t, edge.X1, edge.Y1, edge.ControlPoint1X, edge.ControlPoint1Y, edge.ControlPoint2X, edge.ControlPoint2Y, edge.X2, edge.Y2);
|
||||
}
|
||||
}
|
||||
|
||||
public static (double x, double y) Curve(this EdgeCalculatorModel edge, double t)
|
||||
{
|
||||
return Curve(t, edge);
|
||||
}
|
||||
|
||||
public static double GetEdgeLength(this EdgeCalculatorModel edge)
|
||||
{
|
||||
double distance = 0;
|
||||
if (edge.TrajectoryDegree == Enums.TrajectoryDegree.One)
|
||||
{
|
||||
distance = Math.Sqrt(Math.Pow(edge.X1 - edge.X2, 2) + Math.Pow(edge.Y1 - edge.Y2, 2));
|
||||
}
|
||||
else if (edge.TrajectoryDegree == Enums.TrajectoryDegree.Two)
|
||||
{
|
||||
var length = Math.Sqrt(Math.Pow(edge.X1 - edge.X2, 2) + Math.Pow(edge.Y1 - edge.Y2, 2));
|
||||
if (length == 0) return 0;
|
||||
double step = 0.1 / length;
|
||||
|
||||
for (double t = step; t <= 1.001; t += step)
|
||||
{
|
||||
(double x1, double y1) = CurveDegreeTwo(t - step, edge.X1, edge.Y1, edge.ControlPoint1X, edge.ControlPoint1Y, edge.X2, edge.Y2);
|
||||
(double x2, double y2) = CurveDegreeTwo(t, edge.X1, edge.Y1, edge.ControlPoint1X, edge.ControlPoint1Y, edge.X2, edge.Y2);
|
||||
distance += Math.Sqrt(Math.Pow(x1 - x2, 2) + Math.Pow(y1 - y2, 2));
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
var length = Math.Sqrt(Math.Pow(edge.X1 - edge.X2, 2) + Math.Pow(edge.Y1 - edge.Y2, 2));
|
||||
if (length == 0) return 0;
|
||||
double step = 0.1 / length;
|
||||
for (double t = step; t <= 1.001; t += step)
|
||||
{
|
||||
var sTime = t - step;
|
||||
(var sx, var sy) = CurveDegreeThree(1 - sTime, edge.X1, edge.Y1, edge.ControlPoint1X, edge.ControlPoint1Y, edge.ControlPoint2X, edge.ControlPoint2Y, edge.X2, edge.Y2);
|
||||
sTime = t;
|
||||
(var ex, var ey) = CurveDegreeThree(1 - sTime, edge.X1, edge.Y1, edge.ControlPoint1X, edge.ControlPoint1Y, edge.ControlPoint2X, edge.ControlPoint2Y, edge.X2, edge.Y2);
|
||||
|
||||
distance += Math.Sqrt(Math.Pow(sx - ex, 2) + Math.Pow(sy - ey, 2));
|
||||
}
|
||||
}
|
||||
return distance;
|
||||
}
|
||||
}
|
||||
16
RobotApp.Common.Shares/Model/EdgeCalculatorModel.cs
Normal file
16
RobotApp.Common.Shares/Model/EdgeCalculatorModel.cs
Normal file
@@ -0,0 +1,16 @@
|
||||
using RobotApp.Common.Shares.Enums;
|
||||
|
||||
namespace RobotApp.Common.Shares.Model;
|
||||
|
||||
public class EdgeCalculatorModel
|
||||
{
|
||||
public double X1 { get; set; }
|
||||
public double Y1 { get; set; }
|
||||
public double X2 { get; set; }
|
||||
public double Y2 { get; set; }
|
||||
public TrajectoryDegree TrajectoryDegree { get; set; }
|
||||
public double ControlPoint1X { get; set; }
|
||||
public double ControlPoint1Y { get; set; }
|
||||
public double ControlPoint2X { get; set; }
|
||||
public double ControlPoint2Y { get; set; }
|
||||
}
|
||||
@@ -2,8 +2,6 @@
|
||||
|
||||
namespace RobotApp.VDA5050.State;
|
||||
|
||||
#nullable disable
|
||||
|
||||
public enum ActionStatus
|
||||
{
|
||||
WAITING,
|
||||
@@ -15,11 +13,11 @@ public enum ActionStatus
|
||||
}
|
||||
public class ActionState
|
||||
{
|
||||
public string ActionType { get; set; }
|
||||
public string ActionType { get; set; } = string.Empty;
|
||||
[Required]
|
||||
public string ActionId { get; set; }
|
||||
public string ActionDescription { get; set; }
|
||||
public string ActionId { get; set; } = string.Empty;
|
||||
public string ActionDescription { get; set; } = string.Empty;
|
||||
[Required]
|
||||
public string ActionStatus { get; set; }
|
||||
public string ResultDescription { get; set; }
|
||||
public string ActionStatus { get; set; } = string.Empty;
|
||||
public string ResultDescription { get; set; } = string.Empty;
|
||||
}
|
||||
|
||||
@@ -3,17 +3,15 @@ using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace RobotApp.VDA5050.State;
|
||||
|
||||
#nullable disable
|
||||
|
||||
public class EdgeState
|
||||
{
|
||||
|
||||
[Required]
|
||||
public string EdgeId { get; set; }
|
||||
public string EdgeId { get; set; } = string.Empty;
|
||||
[Required]
|
||||
public int SequenceId { get; set; }
|
||||
public string EdgeDescription { get; set; }
|
||||
public string EdgeDescription { get; set; } = string.Empty;
|
||||
[Required]
|
||||
public bool Released { get; set; }
|
||||
public Trajectory Trajectory { get; set; }
|
||||
public Trajectory Trajectory { get; set; } = new();
|
||||
}
|
||||
|
||||
@@ -2,28 +2,33 @@
|
||||
|
||||
namespace RobotApp.VDA5050.State;
|
||||
|
||||
#nullable disable
|
||||
|
||||
public enum ErrorLevel
|
||||
{
|
||||
NONE,
|
||||
WARNING,
|
||||
FATAL
|
||||
}
|
||||
|
||||
public class ErrorReferences
|
||||
{
|
||||
[Required]
|
||||
public string ReferenceKey { get; set; }
|
||||
public string ReferenceKey { get; set; } = string.Empty;
|
||||
[Required]
|
||||
public string ReferenceValue { get; set; }
|
||||
public string ReferenceValue { get; set; } = string.Empty;
|
||||
}
|
||||
|
||||
public enum ErrorType
|
||||
{
|
||||
INITIALIZE_ORDER,
|
||||
}
|
||||
|
||||
public class Error
|
||||
{
|
||||
[Required]
|
||||
public string ErrorType { get; set; }
|
||||
public ErrorReferences[] ErrorReferences { get; set; }
|
||||
public string ErrorDescription { get; set; }
|
||||
public string ErrorHint { get; set; }
|
||||
public string ErrorType { get; set; } = string.Empty;
|
||||
public ErrorReferences[] ErrorReferences { get; set; } = [];
|
||||
public string ErrorDescription { get; set; } = string.Empty;
|
||||
public string ErrorHint { get; set; } = string.Empty;
|
||||
[Required]
|
||||
public string ErrorLevel { get; set; }
|
||||
public string ErrorLevel { get; set; } = string.Empty;
|
||||
}
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
namespace RobotApp.VDA5050.State;
|
||||
|
||||
#nullable disable
|
||||
|
||||
public enum InfoLevel
|
||||
{
|
||||
@@ -12,16 +11,16 @@ public enum InfoLevel
|
||||
public class InfomationReferences
|
||||
{
|
||||
[Required]
|
||||
public string ReferenceKey { get; set; }
|
||||
public string ReferenceKey { get; set; } = string.Empty;
|
||||
[Required]
|
||||
public string ReferenceValue { get; set; }
|
||||
public string ReferenceValue { get; set; } = string.Empty;
|
||||
}
|
||||
public class Information
|
||||
{
|
||||
[Required]
|
||||
public string InfoType { get; set; }
|
||||
public InfomationReferences[] InfoReferences { get; set; }
|
||||
public string InfoDescription { get; set; }
|
||||
public string InfoType { get; set; } = string.Empty;
|
||||
public InfomationReferences[] InfoReferences { get; set; } = [];
|
||||
public string InfoDescription { get; set; } = string.Empty;
|
||||
[Required]
|
||||
public string InfoLevel { get; set; }
|
||||
public string InfoLevel { get; set; } = string.Empty;
|
||||
}
|
||||
|
||||
@@ -2,15 +2,13 @@
|
||||
|
||||
namespace RobotApp.VDA5050.State;
|
||||
|
||||
#nullable disable
|
||||
|
||||
public class Load
|
||||
{
|
||||
public string LoadId { get; set; }
|
||||
public string LoadType { get; set; }
|
||||
public string LoadPosition { get; set; }
|
||||
public BoundingBoxReference BoundingBoxReference { get; set; }
|
||||
public LoadDimensions LoadDimensions { get; set; }
|
||||
public double Weight { get; set; }
|
||||
public string LoadId { get; set; } = string.Empty;
|
||||
public string LoadType { get; set; } = string.Empty;
|
||||
public string LoadPosition { get; set; } = string.Empty;
|
||||
public BoundingBoxReference BoundingBoxReference { get; set; } = new();
|
||||
public LoadDimensions LoadDimensions { get; set; } = new();
|
||||
public double Weight { get; set; }
|
||||
|
||||
}
|
||||
|
||||
@@ -1,20 +1,18 @@
|
||||
using RobotApp.VDA5050.Order;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace RobotApp.VDA5050.State;
|
||||
|
||||
#nullable disable
|
||||
|
||||
public class NodeState
|
||||
{
|
||||
[Required]
|
||||
public string NodeId { get; set; }
|
||||
public string NodeId { get; set; } = string.Empty;
|
||||
[Required]
|
||||
public int SequenceId { get; set; }
|
||||
public string NodeDescription { get; set; }
|
||||
public string NodeDescription { get; set; } = string.Empty;
|
||||
[Required]
|
||||
public bool Released { get; set; }
|
||||
public NodePosition NodePosition { get; set; }
|
||||
public NodePosition NodePosition { get; set; } = new();
|
||||
}
|
||||
|
||||
public class NodePosition
|
||||
@@ -25,6 +23,6 @@ public class NodePosition
|
||||
public double Y { get; set; }
|
||||
public double Theta { get; set; }
|
||||
[Required]
|
||||
public string MapId { get; set; } = "";
|
||||
public string MapId { get; set; } = string.Empty;
|
||||
|
||||
}
|
||||
@@ -3,8 +3,6 @@ using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace RobotApp.VDA5050.State;
|
||||
|
||||
#nullable disable
|
||||
|
||||
public enum OperatingMode
|
||||
{
|
||||
AUTOMATIC,
|
||||
@@ -17,22 +15,21 @@ public class StateMsg
|
||||
{
|
||||
[Required]
|
||||
public uint HeaderId { get; set; }
|
||||
public string Timestamp { get; set; } = DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss.fffZ");
|
||||
[Required]
|
||||
public string Timestamp { get; set; }
|
||||
public string Version { get; set; } = "1.0.0";
|
||||
[Required]
|
||||
public string Version { get; set; }
|
||||
public string Manufacturer { get; set; } = "PhenikaaX";
|
||||
[Required]
|
||||
public string Manufacturer { get; set; }
|
||||
[Required]
|
||||
public string SerialNumber { get; set; }
|
||||
public string SerialNumber { get; set; } = string.Empty;
|
||||
public Map[] Maps { get; set; } = [];
|
||||
[Required]
|
||||
public string OrderId { get; set; }
|
||||
public string OrderId { get; set; } = string.Empty;
|
||||
[Required]
|
||||
public int OrderUpdateId { get; set; }
|
||||
public string ZoneSetId { get; set; }
|
||||
public string ZoneSetId { get; set; } = string.Empty;
|
||||
[Required]
|
||||
public string LastNodeId { get; set; }
|
||||
public string LastNodeId { get; set; } = string.Empty;
|
||||
[Required]
|
||||
public int LastNodeSequenceId { get; set; }
|
||||
[Required]
|
||||
@@ -41,7 +38,7 @@ public class StateMsg
|
||||
public bool NewBaseRequest { get; set; }
|
||||
public double DistanceSinceLastNode { get; set; }
|
||||
[Required]
|
||||
public string OperatingMode { get; set; }
|
||||
public string OperatingMode { get; set; } = string.Empty;
|
||||
[Required]
|
||||
public NodeState[] NodeStates { get; set; } = [];
|
||||
[Required]
|
||||
|
||||
@@ -2,8 +2,6 @@
|
||||
|
||||
namespace RobotApp.VDA5050.Visualization;
|
||||
|
||||
#nullable disable
|
||||
|
||||
public class AgvPosition
|
||||
{
|
||||
[Required]
|
||||
@@ -11,7 +9,7 @@ public class AgvPosition
|
||||
[Required]
|
||||
public double Y { get; set; }
|
||||
[Required]
|
||||
public string MapId { get; set; }
|
||||
public string MapId { get; set; } = string.Empty;
|
||||
[Required]
|
||||
public double Theta { get; set; }
|
||||
[Required]
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
namespace RobotApp.VDA5050.Visualization;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
#nullable disable
|
||||
namespace RobotApp.VDA5050.Visualization;
|
||||
|
||||
public class VisualizationMsg
|
||||
{
|
||||
public uint HeaderId { get; set; }
|
||||
public string Timestamp { get; set; }
|
||||
public string Version { get; set; }
|
||||
public string Manufacturer { get; set; }
|
||||
public string SerialNumber { get; set; }
|
||||
public string MapId { get; set; }
|
||||
public string MapDescription { get; set; }
|
||||
public string Timestamp { get; set; } = DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss.fffZ");
|
||||
public string Version { get; set; } = "1.0.0";
|
||||
public string Manufacturer { get; set; } = "PhenikaaX";
|
||||
public string SerialNumber { get; set; } = string.Empty;
|
||||
public string MapId { get; set; } = string.Empty;
|
||||
public string MapDescription { get; set; } = string.Empty;
|
||||
public AgvPosition AgvPosition { get; set; } = new();
|
||||
public Velocity Velocity { get; set; } = new();
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio Version 18
|
||||
VisualStudioVersion = 18.0.11018.127 d18.0
|
||||
# Visual Studio Version 17
|
||||
VisualStudioVersion = 17.12.35707.178
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RobotApp", "RobotApp\RobotApp.csproj", "{BF0BB137-2EF9-4E1B-944E-9BF41C5284F7}"
|
||||
EndProject
|
||||
@@ -37,7 +37,4 @@ Global
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {CCB0B2E5-3C19-4B2E-B229-08A74F6EF27D}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
||||
@@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Identity;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.Extensions.Primitives;
|
||||
using RobotApp.Components.Account.Pages;
|
||||
using RobotApp.Components.Account.Pages.Manage;
|
||||
using RobotApp.Components.Account.Shared;
|
||||
using RobotApp.Data;
|
||||
|
||||
namespace Microsoft.AspNetCore.Routing
|
||||
@@ -21,92 +21,15 @@ namespace Microsoft.AspNetCore.Routing
|
||||
|
||||
var accountGroup = endpoints.MapGroup("/Account");
|
||||
|
||||
accountGroup.MapPost("/PerformExternalLogin", (
|
||||
HttpContext context,
|
||||
[FromServices] SignInManager<ApplicationUser> signInManager,
|
||||
[FromForm] string provider,
|
||||
[FromForm] string returnUrl) =>
|
||||
{
|
||||
IEnumerable<KeyValuePair<string, StringValues>> query = [
|
||||
new("ReturnUrl", returnUrl),
|
||||
new("Action", ExternalLogin.LoginCallbackAction)];
|
||||
|
||||
var redirectUrl = UriHelper.BuildRelative(
|
||||
context.Request.PathBase,
|
||||
"/Account/ExternalLogin",
|
||||
QueryString.Create(query));
|
||||
|
||||
var properties = signInManager.ConfigureExternalAuthenticationProperties(provider, redirectUrl);
|
||||
return TypedResults.Challenge(properties, [provider]);
|
||||
});
|
||||
|
||||
accountGroup.MapPost("/Logout", async (
|
||||
ClaimsPrincipal user,
|
||||
[FromServices] SignInManager<ApplicationUser> signInManager,
|
||||
SignInManager<ApplicationUser> signInManager,
|
||||
[FromForm] string returnUrl) =>
|
||||
{
|
||||
await signInManager.SignOutAsync();
|
||||
return TypedResults.LocalRedirect($"~/{returnUrl}");
|
||||
});
|
||||
|
||||
var manageGroup = accountGroup.MapGroup("/Manage").RequireAuthorization();
|
||||
|
||||
manageGroup.MapPost("/LinkExternalLogin", async (
|
||||
HttpContext context,
|
||||
[FromServices] SignInManager<ApplicationUser> signInManager,
|
||||
[FromForm] string provider) =>
|
||||
{
|
||||
// Clear the existing external cookie to ensure a clean login process
|
||||
await context.SignOutAsync(IdentityConstants.ExternalScheme);
|
||||
|
||||
var redirectUrl = UriHelper.BuildRelative(
|
||||
context.Request.PathBase,
|
||||
"/Account/Manage/ExternalLogins",
|
||||
QueryString.Create("Action", ExternalLogins.LinkLoginCallbackAction));
|
||||
|
||||
var properties = signInManager.ConfigureExternalAuthenticationProperties(provider, redirectUrl, signInManager.UserManager.GetUserId(context.User));
|
||||
return TypedResults.Challenge(properties, [provider]);
|
||||
});
|
||||
|
||||
var loggerFactory = endpoints.ServiceProvider.GetRequiredService<ILoggerFactory>();
|
||||
var downloadLogger = loggerFactory.CreateLogger("DownloadPersonalData");
|
||||
|
||||
manageGroup.MapPost("/DownloadPersonalData", async (
|
||||
HttpContext context,
|
||||
[FromServices] UserManager<ApplicationUser> userManager,
|
||||
[FromServices] AuthenticationStateProvider authenticationStateProvider) =>
|
||||
{
|
||||
var user = await userManager.GetUserAsync(context.User);
|
||||
if (user is null)
|
||||
{
|
||||
return Results.NotFound($"Unable to load user with ID '{userManager.GetUserId(context.User)}'.");
|
||||
}
|
||||
|
||||
var userId = await userManager.GetUserIdAsync(user);
|
||||
downloadLogger.LogInformation("User with ID '{UserId}' asked for their personal data.", userId);
|
||||
|
||||
// Only include personal data for download
|
||||
var personalData = new Dictionary<string, string>();
|
||||
var personalDataProps = typeof(ApplicationUser).GetProperties().Where(
|
||||
prop => Attribute.IsDefined(prop, typeof(PersonalDataAttribute)));
|
||||
foreach (var p in personalDataProps)
|
||||
{
|
||||
personalData.Add(p.Name, p.GetValue(user)?.ToString() ?? "null");
|
||||
}
|
||||
|
||||
var logins = await userManager.GetLoginsAsync(user);
|
||||
foreach (var l in logins)
|
||||
{
|
||||
personalData.Add($"{l.LoginProvider} external login provider key", l.ProviderKey);
|
||||
}
|
||||
|
||||
personalData.Add("Authenticator Key", (await userManager.GetAuthenticatorKeyAsync(user))!);
|
||||
var fileBytes = JsonSerializer.SerializeToUtf8Bytes(personalData);
|
||||
|
||||
context.Response.Headers.TryAdd("Content-Disposition", "attachment; filename=PersonalData.json");
|
||||
return TypedResults.File(fileBytes, contentType: "application/json", fileDownloadName: "PersonalData.json");
|
||||
});
|
||||
|
||||
return accountGroup;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
@page "/Account/ConfirmEmail"
|
||||
|
||||
@using System.Text
|
||||
@using Microsoft.AspNetCore.Identity
|
||||
@using Microsoft.AspNetCore.WebUtilities
|
||||
@using RobotApp.Data
|
||||
|
||||
@inject UserManager<ApplicationUser> UserManager
|
||||
@inject IdentityRedirectManager RedirectManager
|
||||
|
||||
<PageTitle>Confirm email</PageTitle>
|
||||
|
||||
<h1>Confirm email</h1>
|
||||
<StatusMessage Message="@statusMessage" />
|
||||
|
||||
@code {
|
||||
private string? statusMessage;
|
||||
|
||||
[CascadingParameter]
|
||||
private HttpContext HttpContext { get; set; } = default!;
|
||||
|
||||
[SupplyParameterFromQuery]
|
||||
private string? UserId { get; set; }
|
||||
|
||||
[SupplyParameterFromQuery]
|
||||
private string? Code { get; set; }
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
if (UserId is null || Code is null)
|
||||
{
|
||||
RedirectManager.RedirectTo("");
|
||||
}
|
||||
|
||||
var user = await UserManager.FindByIdAsync(UserId);
|
||||
if (user is null)
|
||||
{
|
||||
HttpContext.Response.StatusCode = StatusCodes.Status404NotFound;
|
||||
statusMessage = $"Error loading user with ID {UserId}";
|
||||
}
|
||||
else
|
||||
{
|
||||
var code = Encoding.UTF8.GetString(WebEncoders.Base64UrlDecode(Code));
|
||||
var result = await UserManager.ConfirmEmailAsync(user, code);
|
||||
statusMessage = result.Succeeded ? "Thank you for confirming your email." : "Error confirming your email.";
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,68 +0,0 @@
|
||||
@page "/Account/ConfirmEmailChange"
|
||||
|
||||
@using System.Text
|
||||
@using Microsoft.AspNetCore.Identity
|
||||
@using Microsoft.AspNetCore.WebUtilities
|
||||
@using RobotApp.Data
|
||||
|
||||
@inject UserManager<ApplicationUser> UserManager
|
||||
@inject SignInManager<ApplicationUser> SignInManager
|
||||
@inject IdentityRedirectManager RedirectManager
|
||||
|
||||
<PageTitle>Confirm email change</PageTitle>
|
||||
|
||||
<h1>Confirm email change</h1>
|
||||
|
||||
<StatusMessage Message="@message" />
|
||||
|
||||
@code {
|
||||
private string? message;
|
||||
|
||||
[CascadingParameter]
|
||||
private HttpContext HttpContext { get; set; } = default!;
|
||||
|
||||
[SupplyParameterFromQuery]
|
||||
private string? UserId { get; set; }
|
||||
|
||||
[SupplyParameterFromQuery]
|
||||
private string? Email { get; set; }
|
||||
|
||||
[SupplyParameterFromQuery]
|
||||
private string? Code { get; set; }
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
if (UserId is null || Email is null || Code is null)
|
||||
{
|
||||
RedirectManager.RedirectToWithStatus(
|
||||
"Account/Login", "Error: Invalid email change confirmation link.", HttpContext);
|
||||
}
|
||||
|
||||
var user = await UserManager.FindByIdAsync(UserId);
|
||||
if (user is null)
|
||||
{
|
||||
message = "Unable to find user with Id '{userId}'";
|
||||
return;
|
||||
}
|
||||
|
||||
var code = Encoding.UTF8.GetString(WebEncoders.Base64UrlDecode(Code));
|
||||
var result = await UserManager.ChangeEmailAsync(user, Email, code);
|
||||
if (!result.Succeeded)
|
||||
{
|
||||
message = "Error changing email.";
|
||||
return;
|
||||
}
|
||||
|
||||
// In our UI email and user name are one and the same, so when we update the email
|
||||
// we need to update the user name.
|
||||
var setUserNameResult = await UserManager.SetUserNameAsync(user, Email);
|
||||
if (!setUserNameResult.Succeeded)
|
||||
{
|
||||
message = "Error changing user name.";
|
||||
return;
|
||||
}
|
||||
|
||||
await SignInManager.RefreshSignInAsync(user);
|
||||
message = "Thank you for confirming your email change.";
|
||||
}
|
||||
}
|
||||
@@ -1,205 +0,0 @@
|
||||
@page "/Account/ExternalLogin"
|
||||
|
||||
@using System.ComponentModel.DataAnnotations
|
||||
@using System.Security.Claims
|
||||
@using System.Text
|
||||
@using System.Text.Encodings.Web
|
||||
@using Microsoft.AspNetCore.Identity
|
||||
@using Microsoft.AspNetCore.WebUtilities
|
||||
@using RobotApp.Data
|
||||
|
||||
@inject SignInManager<ApplicationUser> SignInManager
|
||||
@inject UserManager<ApplicationUser> UserManager
|
||||
@inject IUserStore<ApplicationUser> UserStore
|
||||
@inject IEmailSender<ApplicationUser> EmailSender
|
||||
@inject NavigationManager NavigationManager
|
||||
@inject IdentityRedirectManager RedirectManager
|
||||
@inject ILogger<ExternalLogin> Logger
|
||||
|
||||
<PageTitle>Register</PageTitle>
|
||||
|
||||
<StatusMessage Message="@message" />
|
||||
<h1>Register</h1>
|
||||
<h2>Associate your @ProviderDisplayName account.</h2>
|
||||
<hr />
|
||||
|
||||
<div class="alert alert-info">
|
||||
You've successfully authenticated with <strong>@ProviderDisplayName</strong>.
|
||||
Please enter an email address for this site below and click the Register button to finish
|
||||
logging in.
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-4">
|
||||
<EditForm Model="Input" OnValidSubmit="OnValidSubmitAsync" FormName="confirmation" method="post">
|
||||
<DataAnnotationsValidator />
|
||||
<ValidationSummary class="text-danger" role="alert" />
|
||||
<div class="form-floating mb-3">
|
||||
<InputText @bind-Value="Input.Email" id="Input.Email" class="form-control" autocomplete="email" placeholder="Please enter your email." />
|
||||
<label for="Input.Email" class="form-label">Email</label>
|
||||
<ValidationMessage For="() => Input.Email" />
|
||||
</div>
|
||||
<button type="submit" class="w-100 btn btn-lg btn-primary">Register</button>
|
||||
</EditForm>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@code {
|
||||
public const string LoginCallbackAction = "LoginCallback";
|
||||
|
||||
private string? message;
|
||||
private ExternalLoginInfo? externalLoginInfo;
|
||||
|
||||
[CascadingParameter]
|
||||
private HttpContext HttpContext { get; set; } = default!;
|
||||
|
||||
[SupplyParameterFromForm]
|
||||
private InputModel Input { get; set; } = new();
|
||||
|
||||
[SupplyParameterFromQuery]
|
||||
private string? RemoteError { get; set; }
|
||||
|
||||
[SupplyParameterFromQuery]
|
||||
private string? ReturnUrl { get; set; }
|
||||
|
||||
[SupplyParameterFromQuery]
|
||||
private string? Action { get; set; }
|
||||
|
||||
private string? ProviderDisplayName => externalLoginInfo?.ProviderDisplayName;
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
if (RemoteError is not null)
|
||||
{
|
||||
RedirectManager.RedirectToWithStatus("Account/Login", $"Error from external provider: {RemoteError}", HttpContext);
|
||||
}
|
||||
|
||||
var info = await SignInManager.GetExternalLoginInfoAsync();
|
||||
if (info is null)
|
||||
{
|
||||
RedirectManager.RedirectToWithStatus("Account/Login", "Error loading external login information.", HttpContext);
|
||||
}
|
||||
|
||||
externalLoginInfo = info;
|
||||
|
||||
if (HttpMethods.IsGet(HttpContext.Request.Method))
|
||||
{
|
||||
if (Action == LoginCallbackAction)
|
||||
{
|
||||
await OnLoginCallbackAsync();
|
||||
return;
|
||||
}
|
||||
|
||||
// We should only reach this page via the login callback, so redirect back to
|
||||
// the login page if we get here some other way.
|
||||
RedirectManager.RedirectTo("Account/Login");
|
||||
}
|
||||
}
|
||||
|
||||
private async Task OnLoginCallbackAsync()
|
||||
{
|
||||
if (externalLoginInfo is null)
|
||||
{
|
||||
RedirectManager.RedirectToWithStatus("Account/Login", "Error loading external login information.", HttpContext);
|
||||
}
|
||||
|
||||
// Sign in the user with this external login provider if the user already has a login.
|
||||
var result = await SignInManager.ExternalLoginSignInAsync(
|
||||
externalLoginInfo.LoginProvider,
|
||||
externalLoginInfo.ProviderKey,
|
||||
isPersistent: false,
|
||||
bypassTwoFactor: true);
|
||||
|
||||
if (result.Succeeded)
|
||||
{
|
||||
Logger.LogInformation(
|
||||
"{Name} logged in with {LoginProvider} provider.",
|
||||
externalLoginInfo.Principal.Identity?.Name,
|
||||
externalLoginInfo.LoginProvider);
|
||||
RedirectManager.RedirectTo(ReturnUrl);
|
||||
}
|
||||
else if (result.IsLockedOut)
|
||||
{
|
||||
RedirectManager.RedirectTo("Account/Lockout");
|
||||
}
|
||||
|
||||
// If the user does not have an account, then ask the user to create an account.
|
||||
if (externalLoginInfo.Principal.HasClaim(c => c.Type == ClaimTypes.Email))
|
||||
{
|
||||
Input.Email = externalLoginInfo.Principal.FindFirstValue(ClaimTypes.Email) ?? "";
|
||||
}
|
||||
}
|
||||
|
||||
private async Task OnValidSubmitAsync()
|
||||
{
|
||||
if (externalLoginInfo is null)
|
||||
{
|
||||
RedirectManager.RedirectToWithStatus("Account/Login", "Error loading external login information during confirmation.", HttpContext);
|
||||
}
|
||||
|
||||
var emailStore = GetEmailStore();
|
||||
var user = CreateUser();
|
||||
|
||||
await UserStore.SetUserNameAsync(user, Input.Email, CancellationToken.None);
|
||||
await emailStore.SetEmailAsync(user, Input.Email, CancellationToken.None);
|
||||
|
||||
var result = await UserManager.CreateAsync(user);
|
||||
if (result.Succeeded)
|
||||
{
|
||||
result = await UserManager.AddLoginAsync(user, externalLoginInfo);
|
||||
if (result.Succeeded)
|
||||
{
|
||||
Logger.LogInformation("User created an account using {Name} provider.", externalLoginInfo.LoginProvider);
|
||||
|
||||
var userId = await UserManager.GetUserIdAsync(user);
|
||||
var code = await UserManager.GenerateEmailConfirmationTokenAsync(user);
|
||||
code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code));
|
||||
|
||||
var callbackUrl = NavigationManager.GetUriWithQueryParameters(
|
||||
NavigationManager.ToAbsoluteUri("Account/ConfirmEmail").AbsoluteUri,
|
||||
new Dictionary<string, object?> { ["userId"] = userId, ["code"] = code });
|
||||
await EmailSender.SendConfirmationLinkAsync(user, Input.Email, HtmlEncoder.Default.Encode(callbackUrl));
|
||||
|
||||
// If account confirmation is required, we need to show the link if we don't have a real email sender
|
||||
if (UserManager.Options.SignIn.RequireConfirmedAccount)
|
||||
{
|
||||
RedirectManager.RedirectTo("Account/RegisterConfirmation", new() { ["email"] = Input.Email });
|
||||
}
|
||||
|
||||
await SignInManager.SignInAsync(user, isPersistent: false, externalLoginInfo.LoginProvider);
|
||||
RedirectManager.RedirectTo(ReturnUrl);
|
||||
}
|
||||
}
|
||||
|
||||
message = $"Error: {string.Join(",", result.Errors.Select(error => error.Description))}";
|
||||
}
|
||||
|
||||
private ApplicationUser CreateUser()
|
||||
{
|
||||
try
|
||||
{
|
||||
return Activator.CreateInstance<ApplicationUser>();
|
||||
}
|
||||
catch
|
||||
{
|
||||
throw new InvalidOperationException($"Can't create an instance of '{nameof(ApplicationUser)}'. " +
|
||||
$"Ensure that '{nameof(ApplicationUser)}' is not an abstract class and has a parameterless constructor");
|
||||
}
|
||||
}
|
||||
|
||||
private IUserEmailStore<ApplicationUser> GetEmailStore()
|
||||
{
|
||||
if (!UserManager.SupportsUserEmail)
|
||||
{
|
||||
throw new NotSupportedException("The default UI requires a user store with email support.");
|
||||
}
|
||||
return (IUserEmailStore<ApplicationUser>)UserStore;
|
||||
}
|
||||
|
||||
private sealed class InputModel
|
||||
{
|
||||
[Required]
|
||||
[EmailAddress]
|
||||
public string Email { get; set; } = "";
|
||||
}
|
||||
}
|
||||
@@ -1,68 +0,0 @@
|
||||
@page "/Account/ForgotPassword"
|
||||
|
||||
@using System.ComponentModel.DataAnnotations
|
||||
@using System.Text
|
||||
@using System.Text.Encodings.Web
|
||||
@using Microsoft.AspNetCore.Identity
|
||||
@using Microsoft.AspNetCore.WebUtilities
|
||||
@using RobotApp.Data
|
||||
|
||||
@inject UserManager<ApplicationUser> UserManager
|
||||
@inject IEmailSender<ApplicationUser> EmailSender
|
||||
@inject NavigationManager NavigationManager
|
||||
@inject IdentityRedirectManager RedirectManager
|
||||
|
||||
<PageTitle>Forgot your password?</PageTitle>
|
||||
|
||||
<h1>Forgot your password?</h1>
|
||||
<h2>Enter your email.</h2>
|
||||
<hr />
|
||||
<div class="row">
|
||||
<div class="col-md-4">
|
||||
<EditForm Model="Input" FormName="forgot-password" OnValidSubmit="OnValidSubmitAsync" method="post">
|
||||
<DataAnnotationsValidator />
|
||||
<ValidationSummary class="text-danger" role="alert" />
|
||||
|
||||
<div class="form-floating mb-3">
|
||||
<InputText @bind-Value="Input.Email" id="Input.Email" class="form-control" autocomplete="username" aria-required="true" placeholder="name@example.com" />
|
||||
<label for="Input.Email" class="form-label">Email</label>
|
||||
<ValidationMessage For="() => Input.Email" class="text-danger" />
|
||||
</div>
|
||||
<button type="submit" class="w-100 btn btn-lg btn-primary">Reset password</button>
|
||||
</EditForm>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@code {
|
||||
[SupplyParameterFromForm]
|
||||
private InputModel Input { get; set; } = new();
|
||||
|
||||
private async Task OnValidSubmitAsync()
|
||||
{
|
||||
var user = await UserManager.FindByEmailAsync(Input.Email);
|
||||
if (user is null || !(await UserManager.IsEmailConfirmedAsync(user)))
|
||||
{
|
||||
// Don't reveal that the user does not exist or is not confirmed
|
||||
RedirectManager.RedirectTo("Account/ForgotPasswordConfirmation");
|
||||
}
|
||||
|
||||
// For more information on how to enable account confirmation and password reset please
|
||||
// visit https://go.microsoft.com/fwlink/?LinkID=532713
|
||||
var code = await UserManager.GeneratePasswordResetTokenAsync(user);
|
||||
code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code));
|
||||
var callbackUrl = NavigationManager.GetUriWithQueryParameters(
|
||||
NavigationManager.ToAbsoluteUri("Account/ResetPassword").AbsoluteUri,
|
||||
new Dictionary<string, object?> { ["code"] = code });
|
||||
|
||||
await EmailSender.SendPasswordResetLinkAsync(user, Input.Email, HtmlEncoder.Default.Encode(callbackUrl));
|
||||
|
||||
RedirectManager.RedirectTo("Account/ForgotPasswordConfirmation");
|
||||
}
|
||||
|
||||
private sealed class InputModel
|
||||
{
|
||||
[Required]
|
||||
[EmailAddress]
|
||||
public string Email { get; set; } = "";
|
||||
}
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
@page "/Account/ForgotPasswordConfirmation"
|
||||
|
||||
<PageTitle>Forgot password confirmation</PageTitle>
|
||||
|
||||
<h1>Forgot password confirmation</h1>
|
||||
<p role="alert">
|
||||
Please check your email to reset your password.
|
||||
</p>
|
||||
@@ -1,8 +0,0 @@
|
||||
@page "/Account/InvalidPasswordReset"
|
||||
|
||||
<PageTitle>Invalid password reset</PageTitle>
|
||||
|
||||
<h1>Invalid password reset</h1>
|
||||
<p role="alert">
|
||||
The password reset link is invalid.
|
||||
</p>
|
||||
@@ -1,7 +0,0 @@
|
||||
@page "/Account/InvalidUser"
|
||||
|
||||
<PageTitle>Invalid user</PageTitle>
|
||||
|
||||
<h3>Invalid user</h3>
|
||||
|
||||
<StatusMessage />
|
||||
@@ -1,8 +0,0 @@
|
||||
@page "/Account/Lockout"
|
||||
|
||||
<PageTitle>Locked out</PageTitle>
|
||||
|
||||
<header>
|
||||
<h1 class="text-danger">Locked out</h1>
|
||||
<p class="text-danger" role="alert">This account has been locked out, please try again later.</p>
|
||||
</header>
|
||||
@@ -10,58 +10,48 @@
|
||||
@inject NavigationManager NavigationManager
|
||||
@inject IdentityRedirectManager RedirectManager
|
||||
|
||||
|
||||
<PageTitle>Log in</PageTitle>
|
||||
|
||||
<h1>Log in</h1>
|
||||
<div class="row">
|
||||
<div class="col-lg-6">
|
||||
<section>
|
||||
<StatusMessage Message="@errorMessage" />
|
||||
<EditForm Model="Input" method="post" OnValidSubmit="LoginUser" FormName="login">
|
||||
<DataAnnotationsValidator />
|
||||
<h2>Use a local account to log in.</h2>
|
||||
<hr />
|
||||
<ValidationSummary class="text-danger" role="alert" />
|
||||
<div class="form-floating mb-3">
|
||||
<InputText @bind-Value="Input.Email" id="Input.Email" class="form-control" autocomplete="username" aria-required="true" placeholder="name@example.com" />
|
||||
<label for="Input.Email" class="form-label">Email</label>
|
||||
<ValidationMessage For="() => Input.Email" class="text-danger" />
|
||||
</div>
|
||||
<div class="form-floating mb-3">
|
||||
<InputText type="password" @bind-Value="Input.Password" id="Input.Password" class="form-control" autocomplete="current-password" aria-required="true" placeholder="password" />
|
||||
<label for="Input.Password" class="form-label">Password</label>
|
||||
<ValidationMessage For="() => Input.Password" class="text-danger" />
|
||||
</div>
|
||||
<div class="checkbox mb-3">
|
||||
<label class="form-label">
|
||||
<InputCheckbox @bind-Value="Input.RememberMe" class="darker-border-checkbox form-check-input" />
|
||||
Remember me
|
||||
</label>
|
||||
</div>
|
||||
<div>
|
||||
<button type="submit" class="w-100 btn btn-lg btn-primary">Log in</button>
|
||||
</div>
|
||||
<div>
|
||||
<p>
|
||||
<a href="Account/ForgotPassword">Forgot your password?</a>
|
||||
</p>
|
||||
<p>
|
||||
<a href="@(NavigationManager.GetUriWithQueryParameters("Account/Register", new Dictionary<string, object?> { ["ReturnUrl"] = ReturnUrl }))">Register as a new user</a>
|
||||
</p>
|
||||
<p>
|
||||
<a href="Account/ResendEmailConfirmation">Resend email confirmation</a>
|
||||
</p>
|
||||
</div>
|
||||
</EditForm>
|
||||
</section>
|
||||
</div>
|
||||
<div class="col-lg-4 col-lg-offset-2">
|
||||
<section>
|
||||
<h3>Use another service to log in.</h3>
|
||||
<hr />
|
||||
<ExternalLoginPicker />
|
||||
</section>
|
||||
</div>
|
||||
<div class="w-100 h-100 d-flex flex-column justify-content-center align-items-center">
|
||||
<header class="brand">
|
||||
<img src="images/logoD.svg" alt="RobotApp" class="brand-logo" />
|
||||
<div class="brand-text">
|
||||
<h1>RobotApp</h1>
|
||||
<p>Sign in to your workspace</p>
|
||||
</div>
|
||||
</header>
|
||||
@if (!string.IsNullOrEmpty(errorMessage))
|
||||
{
|
||||
var statusMessageClass = errorMessage.StartsWith("Error") ? "danger" : "success";
|
||||
<div class="alert alert-@statusMessageClass" role="alert">
|
||||
@errorMessage
|
||||
</div>
|
||||
}
|
||||
<EditForm Model="Input" method="post" OnValidSubmit="LoginUser" FormName="login" style="width: 300px;">
|
||||
<DataAnnotationsValidator />
|
||||
<hr />
|
||||
<ValidationSummary class="text-danger" role="alert" />
|
||||
<div class="form-floating mb-3">
|
||||
<InputText @bind-Value="Input.Username" class="form-control" autocomplete="username" aria-required="true" />
|
||||
<label for="username" class="form-label">Username</label>
|
||||
<ValidationMessage For="() => Input.Username" class="text-danger" />
|
||||
</div>
|
||||
<div class="form-floating mb-3">
|
||||
<InputText type="password" @bind-Value="Input.Password" class="form-control" autocomplete="current-password" aria-required="true" />
|
||||
<label for="password" class="form-label">Password</label>
|
||||
<ValidationMessage For="() => Input.Password" class="text-danger" />
|
||||
</div>
|
||||
<div class="checkbox mb-3">
|
||||
<label class="form-label">
|
||||
<InputCheckbox @bind-Value="Input.RememberMe" class="darker-border-checkbox form-check-input" />
|
||||
Remember me
|
||||
</label>
|
||||
</div>
|
||||
<div>
|
||||
<button type="submit" class="w-100 btn btn-lg btn-primary">Log in</button>
|
||||
</div>
|
||||
</EditForm>
|
||||
</div>
|
||||
|
||||
@code {
|
||||
@@ -83,13 +73,18 @@
|
||||
// Clear the existing external cookie to ensure a clean login process
|
||||
await HttpContext.SignOutAsync(IdentityConstants.ExternalScheme);
|
||||
}
|
||||
|
||||
errorMessage = HttpContext.Request.Cookies[IdentityRedirectManager.StatusCookieName];
|
||||
|
||||
if (errorMessage is not null)
|
||||
{
|
||||
HttpContext.Response.Cookies.Delete(IdentityRedirectManager.StatusCookieName);
|
||||
}
|
||||
}
|
||||
|
||||
public async Task LoginUser()
|
||||
{
|
||||
// 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.");
|
||||
@@ -115,8 +110,7 @@
|
||||
private sealed class InputModel
|
||||
{
|
||||
[Required]
|
||||
[EmailAddress]
|
||||
public string Email { get; set; } = "";
|
||||
public string Username { get; set; } = "";
|
||||
|
||||
[Required]
|
||||
[DataType(DataType.Password)]
|
||||
@@ -125,4 +119,4 @@
|
||||
[Display(Name = "Remember me?")]
|
||||
public bool RememberMe { get; set; }
|
||||
}
|
||||
}
|
||||
}
|
||||
38
RobotApp/Components/Account/Pages/Login.razor.css
Normal file
38
RobotApp/Components/Account/Pages/Login.razor.css
Normal file
@@ -0,0 +1,38 @@
|
||||
.brand {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 14px;
|
||||
margin-bottom: 18px;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.brand-logo {
|
||||
width: 56px;
|
||||
height: 56px;
|
||||
display: block;
|
||||
filter: drop-shadow(0 10px 22px rgba(255,122,26,.25));
|
||||
}
|
||||
|
||||
.brand::before {
|
||||
content: "";
|
||||
position: absolute;
|
||||
inset: -8px -10px auto auto;
|
||||
height: 3px;
|
||||
width: 120px;
|
||||
background: linear-gradient(90deg, var(--brand-pink), var(--brand-blue));
|
||||
border-radius: 8px;
|
||||
opacity: .9;
|
||||
}
|
||||
|
||||
.brand-text h1 {
|
||||
margin: 0;
|
||||
font-size: 20px;
|
||||
font-weight: 800;
|
||||
letter-spacing: .2px;
|
||||
}
|
||||
|
||||
.brand-text p {
|
||||
margin: 2px 0 0 0;
|
||||
color: var(--muted);
|
||||
font-size: 13px;
|
||||
}
|
||||
@@ -1,101 +0,0 @@
|
||||
@page "/Account/LoginWith2fa"
|
||||
|
||||
@using System.ComponentModel.DataAnnotations
|
||||
@using Microsoft.AspNetCore.Identity
|
||||
@using RobotApp.Data
|
||||
|
||||
@inject SignInManager<ApplicationUser> SignInManager
|
||||
@inject UserManager<ApplicationUser> UserManager
|
||||
@inject IdentityRedirectManager RedirectManager
|
||||
@inject ILogger<LoginWith2fa> Logger
|
||||
|
||||
<PageTitle>Two-factor authentication</PageTitle>
|
||||
|
||||
<h1>Two-factor authentication</h1>
|
||||
<hr />
|
||||
<StatusMessage Message="@message" />
|
||||
<p>Your login is protected with an authenticator app. Enter your authenticator code below.</p>
|
||||
<div class="row">
|
||||
<div class="col-md-4">
|
||||
<EditForm Model="Input" FormName="login-with-2fa" OnValidSubmit="OnValidSubmitAsync" method="post">
|
||||
<input type="hidden" name="ReturnUrl" value="@ReturnUrl" />
|
||||
<input type="hidden" name="RememberMe" value="@RememberMe" />
|
||||
<DataAnnotationsValidator />
|
||||
<ValidationSummary class="text-danger" role="alert" />
|
||||
<div class="form-floating mb-3">
|
||||
<InputText @bind-Value="Input.TwoFactorCode" id="Input.TwoFactorCode" class="form-control" autocomplete="off" />
|
||||
<label for="Input.TwoFactorCode" class="form-label">Authenticator code</label>
|
||||
<ValidationMessage For="() => Input.TwoFactorCode" class="text-danger" />
|
||||
</div>
|
||||
<div class="checkbox mb-3">
|
||||
<label for="remember-machine" class="form-label">
|
||||
<InputCheckbox @bind-Value="Input.RememberMachine" />
|
||||
Remember this machine
|
||||
</label>
|
||||
</div>
|
||||
<div>
|
||||
<button type="submit" class="w-100 btn btn-lg btn-primary">Log in</button>
|
||||
</div>
|
||||
</EditForm>
|
||||
</div>
|
||||
</div>
|
||||
<p>
|
||||
Don't have access to your authenticator device? You can
|
||||
<a href="Account/LoginWithRecoveryCode?ReturnUrl=@ReturnUrl">log in with a recovery code</a>.
|
||||
</p>
|
||||
|
||||
@code {
|
||||
private string? message;
|
||||
private ApplicationUser user = default!;
|
||||
|
||||
[SupplyParameterFromForm]
|
||||
private InputModel Input { get; set; } = new();
|
||||
|
||||
[SupplyParameterFromQuery]
|
||||
private string? ReturnUrl { get; set; }
|
||||
|
||||
[SupplyParameterFromQuery]
|
||||
private bool RememberMe { get; set; }
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
// Ensure the user has gone through the username & password screen first
|
||||
user = await SignInManager.GetTwoFactorAuthenticationUserAsync() ??
|
||||
throw new InvalidOperationException("Unable to load two-factor authentication user.");
|
||||
}
|
||||
|
||||
private async Task OnValidSubmitAsync()
|
||||
{
|
||||
var authenticatorCode = Input.TwoFactorCode!.Replace(" ", string.Empty).Replace("-", string.Empty);
|
||||
var result = await SignInManager.TwoFactorAuthenticatorSignInAsync(authenticatorCode, RememberMe, Input.RememberMachine);
|
||||
var userId = await UserManager.GetUserIdAsync(user);
|
||||
|
||||
if (result.Succeeded)
|
||||
{
|
||||
Logger.LogInformation("User with ID '{UserId}' logged in with 2fa.", userId);
|
||||
RedirectManager.RedirectTo(ReturnUrl);
|
||||
}
|
||||
else if (result.IsLockedOut)
|
||||
{
|
||||
Logger.LogWarning("User with ID '{UserId}' account locked out.", userId);
|
||||
RedirectManager.RedirectTo("Account/Lockout");
|
||||
}
|
||||
else
|
||||
{
|
||||
Logger.LogWarning("Invalid authenticator code entered for user with ID '{UserId}'.", userId);
|
||||
message = "Error: Invalid authenticator code.";
|
||||
}
|
||||
}
|
||||
|
||||
private sealed class InputModel
|
||||
{
|
||||
[Required]
|
||||
[StringLength(7, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
|
||||
[DataType(DataType.Text)]
|
||||
[Display(Name = "Authenticator code")]
|
||||
public string? TwoFactorCode { get; set; }
|
||||
|
||||
[Display(Name = "Remember this machine")]
|
||||
public bool RememberMachine { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -1,85 +0,0 @@
|
||||
@page "/Account/LoginWithRecoveryCode"
|
||||
|
||||
@using System.ComponentModel.DataAnnotations
|
||||
@using Microsoft.AspNetCore.Identity
|
||||
@using RobotApp.Data
|
||||
|
||||
@inject SignInManager<ApplicationUser> SignInManager
|
||||
@inject UserManager<ApplicationUser> UserManager
|
||||
@inject IdentityRedirectManager RedirectManager
|
||||
@inject ILogger<LoginWithRecoveryCode> Logger
|
||||
|
||||
<PageTitle>Recovery code verification</PageTitle>
|
||||
|
||||
<h1>Recovery code verification</h1>
|
||||
<hr />
|
||||
<StatusMessage Message="@message" />
|
||||
<p>
|
||||
You have requested to log in with a recovery code. This login will not be remembered until you provide
|
||||
an authenticator app code at log in or disable 2FA and log in again.
|
||||
</p>
|
||||
<div class="row">
|
||||
<div class="col-md-4">
|
||||
<EditForm Model="Input" FormName="login-with-recovery-code" OnValidSubmit="OnValidSubmitAsync" method="post">
|
||||
<DataAnnotationsValidator />
|
||||
<ValidationSummary class="text-danger" role="alert" />
|
||||
<div class="form-floating mb-3">
|
||||
<InputText @bind-Value="Input.RecoveryCode" id="Input.RecoveryCode" class="form-control" autocomplete="off" placeholder="RecoveryCode" />
|
||||
<label for="Input.RecoveryCode" class="form-label">Recovery Code</label>
|
||||
<ValidationMessage For="() => Input.RecoveryCode" class="text-danger" />
|
||||
</div>
|
||||
<button type="submit" class="w-100 btn btn-lg btn-primary">Log in</button>
|
||||
</EditForm>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@code {
|
||||
private string? message;
|
||||
private ApplicationUser user = default!;
|
||||
|
||||
[SupplyParameterFromForm]
|
||||
private InputModel Input { get; set; } = new();
|
||||
|
||||
[SupplyParameterFromQuery]
|
||||
private string? ReturnUrl { get; set; }
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
// Ensure the user has gone through the username & password screen first
|
||||
user = await SignInManager.GetTwoFactorAuthenticationUserAsync() ??
|
||||
throw new InvalidOperationException("Unable to load two-factor authentication user.");
|
||||
}
|
||||
|
||||
private async Task OnValidSubmitAsync()
|
||||
{
|
||||
var recoveryCode = Input.RecoveryCode.Replace(" ", string.Empty);
|
||||
|
||||
var result = await SignInManager.TwoFactorRecoveryCodeSignInAsync(recoveryCode);
|
||||
|
||||
var userId = await UserManager.GetUserIdAsync(user);
|
||||
|
||||
if (result.Succeeded)
|
||||
{
|
||||
Logger.LogInformation("User with ID '{UserId}' logged in with a recovery code.", userId);
|
||||
RedirectManager.RedirectTo(ReturnUrl);
|
||||
}
|
||||
else if (result.IsLockedOut)
|
||||
{
|
||||
Logger.LogWarning("User account locked out.");
|
||||
RedirectManager.RedirectTo("Account/Lockout");
|
||||
}
|
||||
else
|
||||
{
|
||||
Logger.LogWarning("Invalid recovery code entered for user with ID '{UserId}' ", userId);
|
||||
message = "Error: Invalid recovery code entered.";
|
||||
}
|
||||
}
|
||||
|
||||
private sealed class InputModel
|
||||
{
|
||||
[Required]
|
||||
[DataType(DataType.Text)]
|
||||
[Display(Name = "Recovery Code")]
|
||||
public string RecoveryCode { get; set; } = "";
|
||||
}
|
||||
}
|
||||
@@ -1,96 +0,0 @@
|
||||
@page "/Account/Manage/ChangePassword"
|
||||
|
||||
@using System.ComponentModel.DataAnnotations
|
||||
@using Microsoft.AspNetCore.Identity
|
||||
@using RobotApp.Data
|
||||
|
||||
@inject UserManager<ApplicationUser> UserManager
|
||||
@inject SignInManager<ApplicationUser> SignInManager
|
||||
@inject IdentityUserAccessor UserAccessor
|
||||
@inject IdentityRedirectManager RedirectManager
|
||||
@inject ILogger<ChangePassword> Logger
|
||||
|
||||
<PageTitle>Change password</PageTitle>
|
||||
|
||||
<h3>Change password</h3>
|
||||
<StatusMessage Message="@message" />
|
||||
<div class="row">
|
||||
<div class="col-xl-6">
|
||||
<EditForm Model="Input" FormName="change-password" OnValidSubmit="OnValidSubmitAsync" method="post">
|
||||
<DataAnnotationsValidator />
|
||||
<ValidationSummary class="text-danger" role="alert" />
|
||||
<div class="form-floating mb-3">
|
||||
<InputText type="password" @bind-Value="Input.OldPassword" id="Input.OldPassword" class="form-control" autocomplete="current-password" aria-required="true" placeholder="Enter the old password" />
|
||||
<label for="Input.OldPassword" class="form-label">Old password</label>
|
||||
<ValidationMessage For="() => Input.OldPassword" class="text-danger" />
|
||||
</div>
|
||||
<div class="form-floating mb-3">
|
||||
<InputText type="password" @bind-Value="Input.NewPassword" id="Input.NewPassword" class="form-control" autocomplete="new-password" aria-required="true" placeholder="Enter the new password" />
|
||||
<label for="Input.NewPassword" class="form-label">New password</label>
|
||||
<ValidationMessage For="() => Input.NewPassword" class="text-danger" />
|
||||
</div>
|
||||
<div class="form-floating mb-3">
|
||||
<InputText type="password" @bind-Value="Input.ConfirmPassword" id="Input.ConfirmPassword" class="form-control" autocomplete="new-password" aria-required="true" placeholder="Enter the new password" />
|
||||
<label for="Input.ConfirmPassword" class="form-label">Confirm password</label>
|
||||
<ValidationMessage For="() => Input.ConfirmPassword" class="text-danger" />
|
||||
</div>
|
||||
<button type="submit" class="w-100 btn btn-lg btn-primary">Update password</button>
|
||||
</EditForm>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@code {
|
||||
private string? message;
|
||||
private ApplicationUser user = default!;
|
||||
private bool hasPassword;
|
||||
|
||||
[CascadingParameter]
|
||||
private HttpContext HttpContext { get; set; } = default!;
|
||||
|
||||
[SupplyParameterFromForm]
|
||||
private InputModel Input { get; set; } = new();
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
user = await UserAccessor.GetRequiredUserAsync(HttpContext);
|
||||
hasPassword = await UserManager.HasPasswordAsync(user);
|
||||
if (!hasPassword)
|
||||
{
|
||||
RedirectManager.RedirectTo("Account/Manage/SetPassword");
|
||||
}
|
||||
}
|
||||
|
||||
private async Task OnValidSubmitAsync()
|
||||
{
|
||||
var changePasswordResult = await UserManager.ChangePasswordAsync(user, Input.OldPassword, Input.NewPassword);
|
||||
if (!changePasswordResult.Succeeded)
|
||||
{
|
||||
message = $"Error: {string.Join(",", changePasswordResult.Errors.Select(error => error.Description))}";
|
||||
return;
|
||||
}
|
||||
|
||||
await SignInManager.RefreshSignInAsync(user);
|
||||
Logger.LogInformation("User changed their password successfully.");
|
||||
|
||||
RedirectManager.RedirectToCurrentPageWithStatus("Your password has been changed", HttpContext);
|
||||
}
|
||||
|
||||
private sealed class InputModel
|
||||
{
|
||||
[Required]
|
||||
[DataType(DataType.Password)]
|
||||
[Display(Name = "Current password")]
|
||||
public string OldPassword { get; set; } = "";
|
||||
|
||||
[Required]
|
||||
[StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
|
||||
[DataType(DataType.Password)]
|
||||
[Display(Name = "New password")]
|
||||
public string NewPassword { get; set; } = "";
|
||||
|
||||
[DataType(DataType.Password)]
|
||||
[Display(Name = "Confirm new password")]
|
||||
[Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")]
|
||||
public string ConfirmPassword { get; set; } = "";
|
||||
}
|
||||
}
|
||||
@@ -1,86 +0,0 @@
|
||||
@page "/Account/Manage/DeletePersonalData"
|
||||
|
||||
@using System.ComponentModel.DataAnnotations
|
||||
@using Microsoft.AspNetCore.Identity
|
||||
@using RobotApp.Data
|
||||
|
||||
@inject UserManager<ApplicationUser> UserManager
|
||||
@inject SignInManager<ApplicationUser> SignInManager
|
||||
@inject IdentityUserAccessor UserAccessor
|
||||
@inject IdentityRedirectManager RedirectManager
|
||||
@inject ILogger<DeletePersonalData> Logger
|
||||
|
||||
<PageTitle>Delete Personal Data</PageTitle>
|
||||
|
||||
<StatusMessage Message="@message" />
|
||||
|
||||
<h3>Delete Personal Data</h3>
|
||||
|
||||
<div class="alert alert-warning" role="alert">
|
||||
<p>
|
||||
<strong>Deleting this data will permanently remove your account, and this cannot be recovered.</strong>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<EditForm Model="Input" FormName="delete-user" OnValidSubmit="OnValidSubmitAsync" method="post">
|
||||
<DataAnnotationsValidator />
|
||||
<ValidationSummary class="text-danger" role="alert" />
|
||||
@if (requirePassword)
|
||||
{
|
||||
<div class="form-floating mb-3">
|
||||
<InputText type="password" @bind-Value="Input.Password" id="Input.Password" class="form-control" autocomplete="current-password" aria-required="true" placeholder="Please enter your password." />
|
||||
<label for="Input.Password" class="form-label">Password</label>
|
||||
<ValidationMessage For="() => Input.Password" class="text-danger" />
|
||||
</div>
|
||||
}
|
||||
<button class="w-100 btn btn-lg btn-danger" type="submit">Delete data and close my account</button>
|
||||
</EditForm>
|
||||
</div>
|
||||
|
||||
@code {
|
||||
private string? message;
|
||||
private ApplicationUser user = default!;
|
||||
private bool requirePassword;
|
||||
|
||||
[CascadingParameter]
|
||||
private HttpContext HttpContext { get; set; } = default!;
|
||||
|
||||
[SupplyParameterFromForm]
|
||||
private InputModel Input { get; set; } = new();
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
Input ??= new();
|
||||
user = await UserAccessor.GetRequiredUserAsync(HttpContext);
|
||||
requirePassword = await UserManager.HasPasswordAsync(user);
|
||||
}
|
||||
|
||||
private async Task OnValidSubmitAsync()
|
||||
{
|
||||
if (requirePassword && !await UserManager.CheckPasswordAsync(user, Input.Password))
|
||||
{
|
||||
message = "Error: Incorrect password.";
|
||||
return;
|
||||
}
|
||||
|
||||
var result = await UserManager.DeleteAsync(user);
|
||||
if (!result.Succeeded)
|
||||
{
|
||||
throw new InvalidOperationException("Unexpected error occurred deleting user.");
|
||||
}
|
||||
|
||||
await SignInManager.SignOutAsync();
|
||||
|
||||
var userId = await UserManager.GetUserIdAsync(user);
|
||||
Logger.LogInformation("User with ID '{UserId}' deleted themselves.", userId);
|
||||
|
||||
RedirectManager.RedirectToCurrentPage();
|
||||
}
|
||||
|
||||
private sealed class InputModel
|
||||
{
|
||||
[DataType(DataType.Password)]
|
||||
public string Password { get; set; } = "";
|
||||
}
|
||||
}
|
||||
@@ -1,64 +0,0 @@
|
||||
@page "/Account/Manage/Disable2fa"
|
||||
|
||||
@using Microsoft.AspNetCore.Identity
|
||||
@using RobotApp.Data
|
||||
|
||||
@inject UserManager<ApplicationUser> UserManager
|
||||
@inject IdentityUserAccessor UserAccessor
|
||||
@inject IdentityRedirectManager RedirectManager
|
||||
@inject ILogger<Disable2fa> Logger
|
||||
|
||||
<PageTitle>Disable two-factor authentication (2FA)</PageTitle>
|
||||
|
||||
<StatusMessage />
|
||||
<h3>Disable two-factor authentication (2FA)</h3>
|
||||
|
||||
<div class="alert alert-warning" role="alert">
|
||||
<p>
|
||||
<strong>This action only disables 2FA.</strong>
|
||||
</p>
|
||||
<p>
|
||||
Disabling 2FA does not change the keys used in authenticator apps. If you wish to change the key
|
||||
used in an authenticator app you should <a href="Account/Manage/ResetAuthenticator">reset your authenticator keys.</a>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<form @formname="disable-2fa" @onsubmit="OnSubmitAsync" method="post">
|
||||
<AntiforgeryToken />
|
||||
<button class="btn btn-danger" type="submit">Disable 2FA</button>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
@code {
|
||||
private ApplicationUser user = default!;
|
||||
|
||||
[CascadingParameter]
|
||||
private HttpContext HttpContext { get; set; } = default!;
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
user = await UserAccessor.GetRequiredUserAsync(HttpContext);
|
||||
|
||||
if (HttpMethods.IsGet(HttpContext.Request.Method) && !await UserManager.GetTwoFactorEnabledAsync(user))
|
||||
{
|
||||
throw new InvalidOperationException("Cannot disable 2FA for user as it's not currently enabled.");
|
||||
}
|
||||
}
|
||||
|
||||
private async Task OnSubmitAsync()
|
||||
{
|
||||
var disable2faResult = await UserManager.SetTwoFactorEnabledAsync(user, false);
|
||||
if (!disable2faResult.Succeeded)
|
||||
{
|
||||
throw new InvalidOperationException("Unexpected error occurred disabling 2FA.");
|
||||
}
|
||||
|
||||
var userId = await UserManager.GetUserIdAsync(user);
|
||||
Logger.LogInformation("User with ID '{UserId}' has disabled 2fa.", userId);
|
||||
RedirectManager.RedirectToWithStatus(
|
||||
"Account/Manage/TwoFactorAuthentication",
|
||||
"2fa has been disabled. You can reenable 2fa when you setup an authenticator app",
|
||||
HttpContext);
|
||||
}
|
||||
}
|
||||
@@ -1,123 +0,0 @@
|
||||
@page "/Account/Manage/Email"
|
||||
|
||||
@using System.ComponentModel.DataAnnotations
|
||||
@using System.Text
|
||||
@using System.Text.Encodings.Web
|
||||
@using Microsoft.AspNetCore.Identity
|
||||
@using Microsoft.AspNetCore.WebUtilities
|
||||
@using RobotApp.Data
|
||||
|
||||
@inject UserManager<ApplicationUser> UserManager
|
||||
@inject IEmailSender<ApplicationUser> EmailSender
|
||||
@inject IdentityUserAccessor UserAccessor
|
||||
@inject NavigationManager NavigationManager
|
||||
|
||||
<PageTitle>Manage email</PageTitle>
|
||||
|
||||
<h3>Manage email</h3>
|
||||
|
||||
<StatusMessage Message="@message"/>
|
||||
<div class="row">
|
||||
<div class="col-xl-6">
|
||||
<form @onsubmit="OnSendEmailVerificationAsync" @formname="send-verification" id="send-verification-form" method="post">
|
||||
<AntiforgeryToken />
|
||||
</form>
|
||||
<EditForm Model="Input" FormName="change-email" OnValidSubmit="OnValidSubmitAsync" method="post">
|
||||
<DataAnnotationsValidator />
|
||||
<ValidationSummary class="text-danger" role="alert" />
|
||||
@if (isEmailConfirmed)
|
||||
{
|
||||
<div class="form-floating mb-3 input-group">
|
||||
<input type="text" value="@email" id="email" class="form-control" placeholder="Enter your email" disabled />
|
||||
<div class="input-group-append">
|
||||
<span class="h-100 input-group-text text-success font-weight-bold">✓</span>
|
||||
</div>
|
||||
<label for="email" class="form-label">Email</label>
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
<div class="form-floating mb-3">
|
||||
<input type="text" value="@email" id="email" class="form-control" placeholder="Enter your email" disabled />
|
||||
<label for="email" class="form-label">Email</label>
|
||||
<button type="submit" class="btn btn-link" form="send-verification-form">Send verification email</button>
|
||||
</div>
|
||||
}
|
||||
<div class="form-floating mb-3">
|
||||
<InputText @bind-Value="Input.NewEmail" id="Input.NewEmail" class="form-control" autocomplete="email" aria-required="true" placeholder="Enter a new email" />
|
||||
<label for="Input.NewEmail" class="form-label">New email</label>
|
||||
<ValidationMessage For="() => Input.NewEmail" class="text-danger" />
|
||||
</div>
|
||||
<button type="submit" class="w-100 btn btn-lg btn-primary">Change email</button>
|
||||
</EditForm>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@code {
|
||||
private string? message;
|
||||
private ApplicationUser user = default!;
|
||||
private string? email;
|
||||
private bool isEmailConfirmed;
|
||||
|
||||
[CascadingParameter]
|
||||
private HttpContext HttpContext { get; set; } = default!;
|
||||
|
||||
[SupplyParameterFromForm(FormName = "change-email")]
|
||||
private InputModel Input { get; set; } = new();
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
user = await UserAccessor.GetRequiredUserAsync(HttpContext);
|
||||
email = await UserManager.GetEmailAsync(user);
|
||||
isEmailConfirmed = await UserManager.IsEmailConfirmedAsync(user);
|
||||
|
||||
Input.NewEmail ??= email;
|
||||
}
|
||||
|
||||
private async Task OnValidSubmitAsync()
|
||||
{
|
||||
if (Input.NewEmail is null || Input.NewEmail == email)
|
||||
{
|
||||
message = "Your email is unchanged.";
|
||||
return;
|
||||
}
|
||||
|
||||
var userId = await UserManager.GetUserIdAsync(user);
|
||||
var code = await UserManager.GenerateChangeEmailTokenAsync(user, Input.NewEmail);
|
||||
code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code));
|
||||
var callbackUrl = NavigationManager.GetUriWithQueryParameters(
|
||||
NavigationManager.ToAbsoluteUri("Account/ConfirmEmailChange").AbsoluteUri,
|
||||
new Dictionary<string, object?> { ["userId"] = userId, ["email"] = Input.NewEmail, ["code"] = code });
|
||||
|
||||
await EmailSender.SendConfirmationLinkAsync(user, Input.NewEmail, HtmlEncoder.Default.Encode(callbackUrl));
|
||||
|
||||
message = "Confirmation link to change email sent. Please check your email.";
|
||||
}
|
||||
|
||||
private async Task OnSendEmailVerificationAsync()
|
||||
{
|
||||
if (email is null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var userId = await UserManager.GetUserIdAsync(user);
|
||||
var code = await UserManager.GenerateEmailConfirmationTokenAsync(user);
|
||||
code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code));
|
||||
var callbackUrl = NavigationManager.GetUriWithQueryParameters(
|
||||
NavigationManager.ToAbsoluteUri("Account/ConfirmEmail").AbsoluteUri,
|
||||
new Dictionary<string, object?> { ["userId"] = userId, ["code"] = code });
|
||||
|
||||
await EmailSender.SendConfirmationLinkAsync(user, email, HtmlEncoder.Default.Encode(callbackUrl));
|
||||
|
||||
message = "Verification email sent. Please check your email.";
|
||||
}
|
||||
|
||||
private sealed class InputModel
|
||||
{
|
||||
[Required]
|
||||
[EmailAddress]
|
||||
[Display(Name = "New email")]
|
||||
public string? NewEmail { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -1,172 +0,0 @@
|
||||
@page "/Account/Manage/EnableAuthenticator"
|
||||
|
||||
@using System.ComponentModel.DataAnnotations
|
||||
@using System.Globalization
|
||||
@using System.Text
|
||||
@using System.Text.Encodings.Web
|
||||
@using Microsoft.AspNetCore.Identity
|
||||
@using RobotApp.Data
|
||||
|
||||
@inject UserManager<ApplicationUser> UserManager
|
||||
@inject IdentityUserAccessor UserAccessor
|
||||
@inject UrlEncoder UrlEncoder
|
||||
@inject IdentityRedirectManager RedirectManager
|
||||
@inject ILogger<EnableAuthenticator> Logger
|
||||
|
||||
<PageTitle>Configure authenticator app</PageTitle>
|
||||
|
||||
@if (recoveryCodes is not null)
|
||||
{
|
||||
<ShowRecoveryCodes RecoveryCodes="recoveryCodes.ToArray()" StatusMessage="@message" />
|
||||
}
|
||||
else
|
||||
{
|
||||
<StatusMessage Message="@message" />
|
||||
<h3>Configure authenticator app</h3>
|
||||
<div>
|
||||
<p>To use an authenticator app go through the following steps:</p>
|
||||
<ol class="list">
|
||||
<li>
|
||||
<p>
|
||||
Download a two-factor authenticator app like Microsoft Authenticator for
|
||||
<a href="https://go.microsoft.com/fwlink/?Linkid=825072">Android</a> and
|
||||
<a href="https://go.microsoft.com/fwlink/?Linkid=825073">iOS</a> or
|
||||
Google Authenticator for
|
||||
<a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=en">Android</a> and
|
||||
<a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8">iOS</a>.
|
||||
</p>
|
||||
</li>
|
||||
<li>
|
||||
<p>Scan the QR Code or enter this key <kbd>@sharedKey</kbd> into your two factor authenticator app. Spaces and casing do not matter.</p>
|
||||
<div class="alert alert-info">Learn how to <a href="https://go.microsoft.com/fwlink/?Linkid=852423">enable QR code generation</a>.</div>
|
||||
<div></div>
|
||||
<div data-url="@authenticatorUri"></div>
|
||||
</li>
|
||||
<li>
|
||||
<p>
|
||||
Once you have scanned the QR code or input the key above, your two factor authentication app will provide you
|
||||
with a unique code. Enter the code in the confirmation box below.
|
||||
</p>
|
||||
<div class="row">
|
||||
<div class="col-xl-6">
|
||||
<EditForm Model="Input" FormName="send-code" OnValidSubmit="OnValidSubmitAsync" method="post">
|
||||
<DataAnnotationsValidator />
|
||||
<div class="form-floating mb-3">
|
||||
<InputText @bind-Value="Input.Code" id="Input.Code" class="form-control" autocomplete="off" placeholder="Enter the code" />
|
||||
<label for="Input.Code" class="control-label form-label">Verification Code</label>
|
||||
<ValidationMessage For="() => Input.Code" class="text-danger" />
|
||||
</div>
|
||||
<button type="submit" class="w-100 btn btn-lg btn-primary">Verify</button>
|
||||
<ValidationSummary class="text-danger" role="alert" />
|
||||
</EditForm>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
</ol>
|
||||
</div>
|
||||
}
|
||||
|
||||
@code {
|
||||
private const string AuthenticatorUriFormat = "otpauth://totp/{0}:{1}?secret={2}&issuer={0}&digits=6";
|
||||
|
||||
private string? message;
|
||||
private ApplicationUser user = default!;
|
||||
private string? sharedKey;
|
||||
private string? authenticatorUri;
|
||||
private IEnumerable<string>? recoveryCodes;
|
||||
|
||||
[CascadingParameter]
|
||||
private HttpContext HttpContext { get; set; } = default!;
|
||||
|
||||
[SupplyParameterFromForm]
|
||||
private InputModel Input { get; set; } = new();
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
user = await UserAccessor.GetRequiredUserAsync(HttpContext);
|
||||
|
||||
await LoadSharedKeyAndQrCodeUriAsync(user);
|
||||
}
|
||||
|
||||
private async Task OnValidSubmitAsync()
|
||||
{
|
||||
// Strip spaces and hyphens
|
||||
var verificationCode = Input.Code.Replace(" ", string.Empty).Replace("-", string.Empty);
|
||||
|
||||
var is2faTokenValid = await UserManager.VerifyTwoFactorTokenAsync(
|
||||
user, UserManager.Options.Tokens.AuthenticatorTokenProvider, verificationCode);
|
||||
|
||||
if (!is2faTokenValid)
|
||||
{
|
||||
message = "Error: Verification code is invalid.";
|
||||
return;
|
||||
}
|
||||
|
||||
await UserManager.SetTwoFactorEnabledAsync(user, true);
|
||||
var userId = await UserManager.GetUserIdAsync(user);
|
||||
Logger.LogInformation("User with ID '{UserId}' has enabled 2FA with an authenticator app.", userId);
|
||||
|
||||
message = "Your authenticator app has been verified.";
|
||||
|
||||
if (await UserManager.CountRecoveryCodesAsync(user) == 0)
|
||||
{
|
||||
recoveryCodes = await UserManager.GenerateNewTwoFactorRecoveryCodesAsync(user, 10);
|
||||
}
|
||||
else
|
||||
{
|
||||
RedirectManager.RedirectToWithStatus("Account/Manage/TwoFactorAuthentication", message, HttpContext);
|
||||
}
|
||||
}
|
||||
|
||||
private async ValueTask LoadSharedKeyAndQrCodeUriAsync(ApplicationUser user)
|
||||
{
|
||||
// Load the authenticator key & QR code URI to display on the form
|
||||
var unformattedKey = await UserManager.GetAuthenticatorKeyAsync(user);
|
||||
if (string.IsNullOrEmpty(unformattedKey))
|
||||
{
|
||||
await UserManager.ResetAuthenticatorKeyAsync(user);
|
||||
unformattedKey = await UserManager.GetAuthenticatorKeyAsync(user);
|
||||
}
|
||||
|
||||
sharedKey = FormatKey(unformattedKey!);
|
||||
|
||||
var email = await UserManager.GetEmailAsync(user);
|
||||
authenticatorUri = GenerateQrCodeUri(email!, unformattedKey!);
|
||||
}
|
||||
|
||||
private string FormatKey(string unformattedKey)
|
||||
{
|
||||
var result = new StringBuilder();
|
||||
int currentPosition = 0;
|
||||
while (currentPosition + 4 < unformattedKey.Length)
|
||||
{
|
||||
result.Append(unformattedKey.AsSpan(currentPosition, 4)).Append(' ');
|
||||
currentPosition += 4;
|
||||
}
|
||||
if (currentPosition < unformattedKey.Length)
|
||||
{
|
||||
result.Append(unformattedKey.AsSpan(currentPosition));
|
||||
}
|
||||
|
||||
return result.ToString().ToLowerInvariant();
|
||||
}
|
||||
|
||||
private string GenerateQrCodeUri(string email, string unformattedKey)
|
||||
{
|
||||
return string.Format(
|
||||
CultureInfo.InvariantCulture,
|
||||
AuthenticatorUriFormat,
|
||||
UrlEncoder.Encode("Microsoft.AspNetCore.Identity.UI"),
|
||||
UrlEncoder.Encode(email),
|
||||
unformattedKey);
|
||||
}
|
||||
|
||||
private sealed class InputModel
|
||||
{
|
||||
[Required]
|
||||
[StringLength(7, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
|
||||
[DataType(DataType.Text)]
|
||||
[Display(Name = "Verification Code")]
|
||||
public string Code { get; set; } = "";
|
||||
}
|
||||
}
|
||||
@@ -1,140 +0,0 @@
|
||||
@page "/Account/Manage/ExternalLogins"
|
||||
|
||||
@using Microsoft.AspNetCore.Authentication
|
||||
@using Microsoft.AspNetCore.Identity
|
||||
@using RobotApp.Data
|
||||
|
||||
@inject UserManager<ApplicationUser> UserManager
|
||||
@inject SignInManager<ApplicationUser> SignInManager
|
||||
@inject IdentityUserAccessor UserAccessor
|
||||
@inject IUserStore<ApplicationUser> UserStore
|
||||
@inject IdentityRedirectManager RedirectManager
|
||||
|
||||
<PageTitle>Manage your external logins</PageTitle>
|
||||
|
||||
<StatusMessage />
|
||||
@if (currentLogins?.Count > 0)
|
||||
{
|
||||
<h3>Registered Logins</h3>
|
||||
<table class="table">
|
||||
<tbody>
|
||||
@foreach (var login in currentLogins)
|
||||
{
|
||||
<tr>
|
||||
<td>@login.ProviderDisplayName</td>
|
||||
<td>
|
||||
@if (showRemoveButton)
|
||||
{
|
||||
<form @formname="@($"remove-login-{login.LoginProvider}")" @onsubmit="OnSubmitAsync" method="post">
|
||||
<AntiforgeryToken />
|
||||
<div>
|
||||
<input type="hidden" name="@nameof(LoginProvider)" value="@login.LoginProvider" />
|
||||
<input type="hidden" name="@nameof(ProviderKey)" value="@login.ProviderKey" />
|
||||
<button type="submit" class="btn btn-primary" title="Remove this @login.ProviderDisplayName login from your account">Remove</button>
|
||||
</div>
|
||||
</form>
|
||||
}
|
||||
else
|
||||
{
|
||||
@:
|
||||
}
|
||||
</td>
|
||||
</tr>
|
||||
}
|
||||
</tbody>
|
||||
</table>
|
||||
}
|
||||
@if (otherLogins?.Count > 0)
|
||||
{
|
||||
<h4>Add another service to log in.</h4>
|
||||
<hr />
|
||||
<form class="form-horizontal" action="Account/Manage/LinkExternalLogin" method="post">
|
||||
<AntiforgeryToken />
|
||||
<div>
|
||||
<p>
|
||||
@foreach (var provider in otherLogins)
|
||||
{
|
||||
<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>
|
||||
}
|
||||
|
||||
@code {
|
||||
public const string LinkLoginCallbackAction = "LinkLoginCallback";
|
||||
|
||||
private ApplicationUser user = default!;
|
||||
private IList<UserLoginInfo>? currentLogins;
|
||||
private IList<AuthenticationScheme>? otherLogins;
|
||||
private bool showRemoveButton;
|
||||
|
||||
[CascadingParameter]
|
||||
private HttpContext HttpContext { get; set; } = default!;
|
||||
|
||||
[SupplyParameterFromForm]
|
||||
private string? LoginProvider { get; set; }
|
||||
|
||||
[SupplyParameterFromForm]
|
||||
private string? ProviderKey { get; set; }
|
||||
|
||||
[SupplyParameterFromQuery]
|
||||
private string? Action { get; set; }
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
user = await UserAccessor.GetRequiredUserAsync(HttpContext);
|
||||
currentLogins = await UserManager.GetLoginsAsync(user);
|
||||
otherLogins = (await SignInManager.GetExternalAuthenticationSchemesAsync())
|
||||
.Where(auth => currentLogins.All(ul => auth.Name != ul.LoginProvider))
|
||||
.ToList();
|
||||
|
||||
string? passwordHash = null;
|
||||
if (UserStore is IUserPasswordStore<ApplicationUser> userPasswordStore)
|
||||
{
|
||||
passwordHash = await userPasswordStore.GetPasswordHashAsync(user, HttpContext.RequestAborted);
|
||||
}
|
||||
|
||||
showRemoveButton = passwordHash is not null || currentLogins.Count > 1;
|
||||
|
||||
if (HttpMethods.IsGet(HttpContext.Request.Method) && Action == LinkLoginCallbackAction)
|
||||
{
|
||||
await OnGetLinkLoginCallbackAsync();
|
||||
}
|
||||
}
|
||||
|
||||
private async Task OnSubmitAsync()
|
||||
{
|
||||
var result = await UserManager.RemoveLoginAsync(user, LoginProvider!, ProviderKey!);
|
||||
if (!result.Succeeded)
|
||||
{
|
||||
RedirectManager.RedirectToCurrentPageWithStatus("Error: The external login was not removed.", HttpContext);
|
||||
}
|
||||
|
||||
await SignInManager.RefreshSignInAsync(user);
|
||||
RedirectManager.RedirectToCurrentPageWithStatus("The external login was removed.", HttpContext);
|
||||
}
|
||||
|
||||
private async Task OnGetLinkLoginCallbackAsync()
|
||||
{
|
||||
var userId = await UserManager.GetUserIdAsync(user);
|
||||
var info = await SignInManager.GetExternalLoginInfoAsync(userId);
|
||||
if (info is null)
|
||||
{
|
||||
RedirectManager.RedirectToCurrentPageWithStatus("Error: Could not load external login info.", HttpContext);
|
||||
}
|
||||
|
||||
var result = await UserManager.AddLoginAsync(user, info);
|
||||
if (!result.Succeeded)
|
||||
{
|
||||
RedirectManager.RedirectToCurrentPageWithStatus("Error: The external login was not added. External logins can only be associated with one account.", HttpContext);
|
||||
}
|
||||
|
||||
// Clear the existing external cookie to ensure a clean login process
|
||||
await HttpContext.SignOutAsync(IdentityConstants.ExternalScheme);
|
||||
|
||||
RedirectManager.RedirectToCurrentPageWithStatus("The external login was added.", HttpContext);
|
||||
}
|
||||
}
|
||||
@@ -1,68 +0,0 @@
|
||||
@page "/Account/Manage/GenerateRecoveryCodes"
|
||||
|
||||
@using Microsoft.AspNetCore.Identity
|
||||
@using RobotApp.Data
|
||||
|
||||
@inject UserManager<ApplicationUser> UserManager
|
||||
@inject IdentityUserAccessor UserAccessor
|
||||
@inject IdentityRedirectManager RedirectManager
|
||||
@inject ILogger<GenerateRecoveryCodes> Logger
|
||||
|
||||
<PageTitle>Generate two-factor authentication (2FA) recovery codes</PageTitle>
|
||||
|
||||
@if (recoveryCodes is not null)
|
||||
{
|
||||
<ShowRecoveryCodes RecoveryCodes="recoveryCodes.ToArray()" StatusMessage="@message" />
|
||||
}
|
||||
else
|
||||
{
|
||||
<h3>Generate two-factor authentication (2FA) recovery codes</h3>
|
||||
<div class="alert alert-warning" role="alert">
|
||||
<p>
|
||||
<span class="glyphicon glyphicon-warning-sign"></span>
|
||||
<strong>Put these codes in a safe place.</strong>
|
||||
</p>
|
||||
<p>
|
||||
If you lose your device and don't have the recovery codes you will lose access to your account.
|
||||
</p>
|
||||
<p>
|
||||
Generating new recovery codes does not change the keys used in authenticator apps. If you wish to change the key
|
||||
used in an authenticator app you should <a href="Account/Manage/ResetAuthenticator">reset your authenticator keys.</a>
|
||||
</p>
|
||||
</div>
|
||||
<div>
|
||||
<form @formname="generate-recovery-codes" @onsubmit="OnSubmitAsync" method="post">
|
||||
<AntiforgeryToken />
|
||||
<button class="btn btn-danger" type="submit">Generate Recovery Codes</button>
|
||||
</form>
|
||||
</div>
|
||||
}
|
||||
|
||||
@code {
|
||||
private string? message;
|
||||
private ApplicationUser user = default!;
|
||||
private IEnumerable<string>? recoveryCodes;
|
||||
|
||||
[CascadingParameter]
|
||||
private HttpContext HttpContext { get; set; } = default!;
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
user = await UserAccessor.GetRequiredUserAsync(HttpContext);
|
||||
|
||||
var isTwoFactorEnabled = await UserManager.GetTwoFactorEnabledAsync(user);
|
||||
if (!isTwoFactorEnabled)
|
||||
{
|
||||
throw new InvalidOperationException("Cannot generate recovery codes for user because they do not have 2FA enabled.");
|
||||
}
|
||||
}
|
||||
|
||||
private async Task OnSubmitAsync()
|
||||
{
|
||||
var userId = await UserManager.GetUserIdAsync(user);
|
||||
recoveryCodes = await UserManager.GenerateNewTwoFactorRecoveryCodesAsync(user, 10);
|
||||
message = "You have generated new recovery codes.";
|
||||
|
||||
Logger.LogInformation("User with ID '{UserId}' has generated new 2FA recovery codes.", userId);
|
||||
}
|
||||
}
|
||||
@@ -1,77 +0,0 @@
|
||||
@page "/Account/Manage"
|
||||
|
||||
@using System.ComponentModel.DataAnnotations
|
||||
@using Microsoft.AspNetCore.Identity
|
||||
@using RobotApp.Data
|
||||
|
||||
@inject UserManager<ApplicationUser> UserManager
|
||||
@inject SignInManager<ApplicationUser> SignInManager
|
||||
@inject IdentityUserAccessor UserAccessor
|
||||
@inject IdentityRedirectManager RedirectManager
|
||||
|
||||
<PageTitle>Profile</PageTitle>
|
||||
|
||||
<h3>Profile</h3>
|
||||
<StatusMessage />
|
||||
|
||||
<div class="row">
|
||||
<div class="col-xl-6">
|
||||
<EditForm Model="Input" FormName="profile" OnValidSubmit="OnValidSubmitAsync" method="post">
|
||||
<DataAnnotationsValidator />
|
||||
<ValidationSummary class="text-danger" role="alert" />
|
||||
<div class="form-floating mb-3">
|
||||
<input type="text" value="@username" id="username" class="form-control" placeholder="Choose your username." disabled />
|
||||
<label for="username" class="form-label">Username</label>
|
||||
</div>
|
||||
<div class="form-floating mb-3">
|
||||
<InputText @bind-Value="Input.PhoneNumber" id="Input.PhoneNumber" class="form-control" placeholder="Enter your phone number" />
|
||||
<label for="Input.PhoneNumber" class="form-label">Phone number</label>
|
||||
<ValidationMessage For="() => Input.PhoneNumber" class="text-danger" />
|
||||
</div>
|
||||
<button type="submit" class="w-100 btn btn-lg btn-primary">Save</button>
|
||||
</EditForm>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@code {
|
||||
private ApplicationUser user = default!;
|
||||
private string? username;
|
||||
private string? phoneNumber;
|
||||
|
||||
[CascadingParameter]
|
||||
private HttpContext HttpContext { get; set; } = default!;
|
||||
|
||||
[SupplyParameterFromForm]
|
||||
private InputModel Input { get; set; } = new();
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
user = await UserAccessor.GetRequiredUserAsync(HttpContext);
|
||||
username = await UserManager.GetUserNameAsync(user);
|
||||
phoneNumber = await UserManager.GetPhoneNumberAsync(user);
|
||||
|
||||
Input.PhoneNumber ??= phoneNumber;
|
||||
}
|
||||
|
||||
private async Task OnValidSubmitAsync()
|
||||
{
|
||||
if (Input.PhoneNumber != phoneNumber)
|
||||
{
|
||||
var setPhoneResult = await UserManager.SetPhoneNumberAsync(user, Input.PhoneNumber);
|
||||
if (!setPhoneResult.Succeeded)
|
||||
{
|
||||
RedirectManager.RedirectToCurrentPageWithStatus("Error: Failed to set phone number.", HttpContext);
|
||||
}
|
||||
}
|
||||
|
||||
await SignInManager.RefreshSignInAsync(user);
|
||||
RedirectManager.RedirectToCurrentPageWithStatus("Your profile has been updated", HttpContext);
|
||||
}
|
||||
|
||||
private sealed class InputModel
|
||||
{
|
||||
[Phone]
|
||||
[Display(Name = "Phone number")]
|
||||
public string? PhoneNumber { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -1,34 +0,0 @@
|
||||
@page "/Account/Manage/PersonalData"
|
||||
|
||||
@inject IdentityUserAccessor UserAccessor
|
||||
|
||||
<PageTitle>Personal Data</PageTitle>
|
||||
|
||||
<StatusMessage />
|
||||
<h3>Personal Data</h3>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<p>Your account contains personal data that you have given us. This page allows you to download or delete that data.</p>
|
||||
<p>
|
||||
<strong>Deleting this data will permanently remove your account, and this cannot be recovered.</strong>
|
||||
</p>
|
||||
<form action="Account/Manage/DownloadPersonalData" method="post">
|
||||
<AntiforgeryToken />
|
||||
<button class="btn btn-primary" type="submit">Download</button>
|
||||
</form>
|
||||
<p>
|
||||
<a href="Account/Manage/DeletePersonalData" class="btn btn-danger">Delete</a>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@code {
|
||||
[CascadingParameter]
|
||||
private HttpContext HttpContext { get; set; } = default!;
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
_ = await UserAccessor.GetRequiredUserAsync(HttpContext);
|
||||
}
|
||||
}
|
||||
@@ -1,52 +0,0 @@
|
||||
@page "/Account/Manage/ResetAuthenticator"
|
||||
|
||||
@using Microsoft.AspNetCore.Identity
|
||||
@using RobotApp.Data
|
||||
|
||||
@inject UserManager<ApplicationUser> UserManager
|
||||
@inject SignInManager<ApplicationUser> SignInManager
|
||||
@inject IdentityUserAccessor UserAccessor
|
||||
@inject IdentityRedirectManager RedirectManager
|
||||
@inject ILogger<ResetAuthenticator> Logger
|
||||
|
||||
<PageTitle>Reset authenticator key</PageTitle>
|
||||
|
||||
<StatusMessage />
|
||||
<h3>Reset authenticator key</h3>
|
||||
<div class="alert alert-warning" role="alert">
|
||||
<p>
|
||||
<span class="glyphicon glyphicon-warning-sign"></span>
|
||||
<strong>If you reset your authenticator key your authenticator app will not work until you reconfigure it.</strong>
|
||||
</p>
|
||||
<p>
|
||||
This process disables 2FA until you verify your authenticator app.
|
||||
If you do not complete your authenticator app configuration you may lose access to your account.
|
||||
</p>
|
||||
</div>
|
||||
<div>
|
||||
<form @formname="reset-authenticator" @onsubmit="OnSubmitAsync" method="post">
|
||||
<AntiforgeryToken />
|
||||
<button class="btn btn-danger" type="submit">Reset authenticator key</button>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
@code {
|
||||
[CascadingParameter]
|
||||
private HttpContext HttpContext { get; set; } = default!;
|
||||
|
||||
private async Task OnSubmitAsync()
|
||||
{
|
||||
var user = await UserAccessor.GetRequiredUserAsync(HttpContext);
|
||||
await UserManager.SetTwoFactorEnabledAsync(user, false);
|
||||
await UserManager.ResetAuthenticatorKeyAsync(user);
|
||||
var userId = await UserManager.GetUserIdAsync(user);
|
||||
Logger.LogInformation("User with ID '{UserId}' has reset their authentication app key.", userId);
|
||||
|
||||
await SignInManager.RefreshSignInAsync(user);
|
||||
|
||||
RedirectManager.RedirectToWithStatus(
|
||||
"Account/Manage/EnableAuthenticator",
|
||||
"Your authenticator app key has been reset, you will need to configure your authenticator app using the new key.",
|
||||
HttpContext);
|
||||
}
|
||||
}
|
||||
@@ -1,87 +0,0 @@
|
||||
@page "/Account/Manage/SetPassword"
|
||||
|
||||
@using System.ComponentModel.DataAnnotations
|
||||
@using Microsoft.AspNetCore.Identity
|
||||
@using RobotApp.Data
|
||||
|
||||
@inject UserManager<ApplicationUser> UserManager
|
||||
@inject SignInManager<ApplicationUser> SignInManager
|
||||
@inject IdentityUserAccessor UserAccessor
|
||||
@inject IdentityRedirectManager RedirectManager
|
||||
|
||||
<PageTitle>Set password</PageTitle>
|
||||
|
||||
<h3>Set your password</h3>
|
||||
<StatusMessage Message="@message" />
|
||||
<p class="text-info">
|
||||
You do not have a local username/password for this site. Add a local
|
||||
account so you can log in without an external login.
|
||||
</p>
|
||||
<div class="row">
|
||||
<div class="col-xl-6">
|
||||
<EditForm Model="Input" FormName="set-password" OnValidSubmit="OnValidSubmitAsync" method="post">
|
||||
<DataAnnotationsValidator />
|
||||
<ValidationSummary class="text-danger" role="alert" />
|
||||
<div class="form-floating mb-3">
|
||||
<InputText type="password" @bind-Value="Input.NewPassword" id="Input.NewPassword" class="form-control" autocomplete="new-password" placeholder="Enter the new password" />
|
||||
<label for="Input.NewPassword" class="form-label">New password</label>
|
||||
<ValidationMessage For="() => Input.NewPassword" class="text-danger" />
|
||||
</div>
|
||||
<div class="form-floating mb-3">
|
||||
<InputText type="password" @bind-Value="Input.ConfirmPassword" id="Input.ConfirmPassword" class="form-control" autocomplete="new-password" placeholder="Enter the new password" />
|
||||
<label for="Input.ConfirmPassword" class="form-label">Confirm password</label>
|
||||
<ValidationMessage For="() => Input.ConfirmPassword" class="text-danger" />
|
||||
</div>
|
||||
<button type="submit" class="w-100 btn btn-lg btn-primary">Set password</button>
|
||||
</EditForm>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@code {
|
||||
private string? message;
|
||||
private ApplicationUser user = default!;
|
||||
|
||||
[CascadingParameter]
|
||||
private HttpContext HttpContext { get; set; } = default!;
|
||||
|
||||
[SupplyParameterFromForm]
|
||||
private InputModel Input { get; set; } = new();
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
user = await UserAccessor.GetRequiredUserAsync(HttpContext);
|
||||
|
||||
var hasPassword = await UserManager.HasPasswordAsync(user);
|
||||
if (hasPassword)
|
||||
{
|
||||
RedirectManager.RedirectTo("Account/Manage/ChangePassword");
|
||||
}
|
||||
}
|
||||
|
||||
private async Task OnValidSubmitAsync()
|
||||
{
|
||||
var addPasswordResult = await UserManager.AddPasswordAsync(user, Input.NewPassword!);
|
||||
if (!addPasswordResult.Succeeded)
|
||||
{
|
||||
message = $"Error: {string.Join(",", addPasswordResult.Errors.Select(error => error.Description))}";
|
||||
return;
|
||||
}
|
||||
|
||||
await SignInManager.RefreshSignInAsync(user);
|
||||
RedirectManager.RedirectToCurrentPageWithStatus("Your password has been set.", HttpContext);
|
||||
}
|
||||
|
||||
private sealed class InputModel
|
||||
{
|
||||
[Required]
|
||||
[StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
|
||||
[DataType(DataType.Password)]
|
||||
[Display(Name = "New password")]
|
||||
public string? NewPassword { get; set; }
|
||||
|
||||
[DataType(DataType.Password)]
|
||||
[Display(Name = "Confirm new password")]
|
||||
[Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")]
|
||||
public string? ConfirmPassword { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -1,101 +0,0 @@
|
||||
@page "/Account/Manage/TwoFactorAuthentication"
|
||||
|
||||
@using Microsoft.AspNetCore.Http.Features
|
||||
@using Microsoft.AspNetCore.Identity
|
||||
@using RobotApp.Data
|
||||
|
||||
@inject UserManager<ApplicationUser> UserManager
|
||||
@inject SignInManager<ApplicationUser> SignInManager
|
||||
@inject IdentityUserAccessor UserAccessor
|
||||
@inject IdentityRedirectManager RedirectManager
|
||||
|
||||
<PageTitle>Two-factor authentication (2FA)</PageTitle>
|
||||
|
||||
<StatusMessage />
|
||||
<h3>Two-factor authentication (2FA)</h3>
|
||||
@if (canTrack)
|
||||
{
|
||||
if (is2faEnabled)
|
||||
{
|
||||
if (recoveryCodesLeft == 0)
|
||||
{
|
||||
<div class="alert alert-danger">
|
||||
<strong>You have no recovery codes left.</strong>
|
||||
<p>You must <a href="Account/Manage/GenerateRecoveryCodes">generate a new set of recovery codes</a> before you can log in with a recovery code.</p>
|
||||
</div>
|
||||
}
|
||||
else if (recoveryCodesLeft == 1)
|
||||
{
|
||||
<div class="alert alert-danger">
|
||||
<strong>You have 1 recovery code left.</strong>
|
||||
<p>You can <a href="Account/Manage/GenerateRecoveryCodes">generate a new set of recovery codes</a>.</p>
|
||||
</div>
|
||||
}
|
||||
else if (recoveryCodesLeft <= 3)
|
||||
{
|
||||
<div class="alert alert-warning">
|
||||
<strong>You have @recoveryCodesLeft recovery codes left.</strong>
|
||||
<p>You should <a href="Account/Manage/GenerateRecoveryCodes">generate a new set of recovery codes</a>.</p>
|
||||
</div>
|
||||
}
|
||||
|
||||
if (isMachineRemembered)
|
||||
{
|
||||
<form style="display: inline-block" @formname="forget-browser" @onsubmit="OnSubmitForgetBrowserAsync" method="post">
|
||||
<AntiforgeryToken />
|
||||
<button type="submit" class="btn btn-primary">Forget this browser</button>
|
||||
</form>
|
||||
}
|
||||
|
||||
<a href="Account/Manage/Disable2fa" class="btn btn-primary">Disable 2FA</a>
|
||||
<a href="Account/Manage/GenerateRecoveryCodes" class="btn btn-primary">Reset recovery codes</a>
|
||||
}
|
||||
|
||||
<h4>Authenticator app</h4>
|
||||
@if (!hasAuthenticator)
|
||||
{
|
||||
<a href="Account/Manage/EnableAuthenticator" class="btn btn-primary">Add authenticator app</a>
|
||||
}
|
||||
else
|
||||
{
|
||||
<a href="Account/Manage/EnableAuthenticator" class="btn btn-primary">Set up authenticator app</a>
|
||||
<a href="Account/Manage/ResetAuthenticator" class="btn btn-primary">Reset authenticator app</a>
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
<div class="alert alert-danger">
|
||||
<strong>Privacy and cookie policy have not been accepted.</strong>
|
||||
<p>You must accept the policy before you can enable two factor authentication.</p>
|
||||
</div>
|
||||
}
|
||||
|
||||
@code {
|
||||
private bool canTrack;
|
||||
private bool hasAuthenticator;
|
||||
private int recoveryCodesLeft;
|
||||
private bool is2faEnabled;
|
||||
private bool isMachineRemembered;
|
||||
|
||||
[CascadingParameter]
|
||||
private HttpContext HttpContext { get; set; } = default!;
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
var user = await UserAccessor.GetRequiredUserAsync(HttpContext);
|
||||
canTrack = HttpContext.Features.Get<ITrackingConsentFeature>()?.CanTrack ?? true;
|
||||
hasAuthenticator = await UserManager.GetAuthenticatorKeyAsync(user) is not null;
|
||||
is2faEnabled = await UserManager.GetTwoFactorEnabledAsync(user);
|
||||
isMachineRemembered = await SignInManager.IsTwoFactorClientRememberedAsync(user);
|
||||
recoveryCodesLeft = await UserManager.CountRecoveryCodesAsync(user);
|
||||
}
|
||||
|
||||
private async Task OnSubmitForgetBrowserAsync()
|
||||
{
|
||||
await SignInManager.ForgetTwoFactorClientAsync();
|
||||
|
||||
RedirectManager.RedirectToCurrentPageWithStatus(
|
||||
"The current browser has been forgotten. When you login again from this browser you will be prompted for your 2fa code.",
|
||||
HttpContext);
|
||||
}
|
||||
}
|
||||
@@ -1,2 +0,0 @@
|
||||
@layout ManageLayout
|
||||
@attribute [Microsoft.AspNetCore.Authorization.Authorize]
|
||||
@@ -17,44 +17,42 @@
|
||||
|
||||
<PageTitle>Register</PageTitle>
|
||||
|
||||
<h1>Register</h1>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-6">
|
||||
<StatusMessage Message="@Message" />
|
||||
<EditForm Model="Input" asp-route-returnUrl="@ReturnUrl" method="post" OnValidSubmit="RegisterUser" FormName="register">
|
||||
<DataAnnotationsValidator />
|
||||
<h2>Create a new account.</h2>
|
||||
<hr />
|
||||
<ValidationSummary class="text-danger" role="alert" />
|
||||
<div class="form-floating mb-3">
|
||||
<InputText @bind-Value="Input.Email" id="Input.Email" class="form-control" autocomplete="username" aria-required="true" placeholder="name@example.com" />
|
||||
<label for="Input.Email">Email</label>
|
||||
<ValidationMessage For="() => Input.Email" class="text-danger" />
|
||||
</div>
|
||||
<div class="form-floating mb-3">
|
||||
<InputText type="password" @bind-Value="Input.Password" id="Input.Password" class="form-control" autocomplete="new-password" aria-required="true" placeholder="password" />
|
||||
<label for="Input.Password">Password</label>
|
||||
<ValidationMessage For="() => Input.Password" class="text-danger" />
|
||||
</div>
|
||||
<div class="form-floating mb-3">
|
||||
<InputText type="password" @bind-Value="Input.ConfirmPassword" id="Input.ConfirmPassword" class="form-control" autocomplete="new-password" aria-required="true" placeholder="password" />
|
||||
<label for="Input.ConfirmPassword">Confirm Password</label>
|
||||
<ValidationMessage For="() => Input.ConfirmPassword" class="text-danger" />
|
||||
</div>
|
||||
<button type="submit" class="w-100 btn btn-lg btn-primary">Register</button>
|
||||
</EditForm>
|
||||
</div>
|
||||
<div class="col-lg-4 col-lg-offset-2">
|
||||
<section>
|
||||
<h3>Use another service to register.</h3>
|
||||
<hr />
|
||||
<ExternalLoginPicker />
|
||||
</section>
|
||||
</div>
|
||||
<div class="w-100 h-100 d-flex flex-column justify-content-center align-items-center">
|
||||
<h1>Create a new account.</h1>
|
||||
@if (!string.IsNullOrEmpty(errorMessage))
|
||||
{
|
||||
var statusMessageClass = errorMessage.StartsWith("Error") ? "danger" : "success";
|
||||
<div class="alert alert-@statusMessageClass" role="alert">
|
||||
@errorMessage
|
||||
</div>
|
||||
}
|
||||
<EditForm style="width:500px" Model="Input" asp-route-returnUrl="@ReturnUrl" method="post" OnValidSubmit="RegisterUser" FormName="register">
|
||||
<DataAnnotationsValidator />
|
||||
<hr />
|
||||
<ValidationSummary class="text-danger" role="alert" />
|
||||
<div class="form-floating mb-3 ">
|
||||
<InputText @bind-Value="Input.UserName" class="form-control" autocomplete="username" aria-required="true" placeholder="name" />
|
||||
<label for="user">UserName</label>
|
||||
<ValidationMessage For="() => Input.UserName" class="text-danger" />
|
||||
</div>
|
||||
<div class="form-floating mb-3">
|
||||
<InputText type="password" @bind-Value="Input.Password" class="form-control" autocomplete="new-password" aria-required="true" placeholder="password" />
|
||||
<label for="password">Password</label>
|
||||
<ValidationMessage For="() => Input.Password" class="text-danger" />
|
||||
</div>
|
||||
<div class="form-floating mb-3">
|
||||
<InputText type="password" @bind-Value="Input.ConfirmPassword" class="form-control" autocomplete="new-password" aria-required="true" placeholder="password" />
|
||||
<label for="confirm-password">Confirm Password</label>
|
||||
<ValidationMessage For="() => Input.ConfirmPassword" class="text-danger" />
|
||||
</div>
|
||||
<button type="submit" class="w-100 btn btn-lg btn-primary">Register</button>
|
||||
</EditForm>
|
||||
</div>
|
||||
|
||||
|
||||
@code {
|
||||
private string errorMessage = string.Empty;
|
||||
|
||||
private IEnumerable<IdentityError>? identityErrors;
|
||||
|
||||
[SupplyParameterFromForm]
|
||||
@@ -69,9 +67,9 @@
|
||||
{
|
||||
var user = CreateUser();
|
||||
|
||||
await UserStore.SetUserNameAsync(user, Input.Email, CancellationToken.None);
|
||||
var emailStore = GetEmailStore();
|
||||
await emailStore.SetEmailAsync(user, Input.Email, CancellationToken.None);
|
||||
await UserStore.SetUserNameAsync(user, Input.UserName, CancellationToken.None);
|
||||
user.NormalizedUserName = Input.UserName.ToUpperInvariant();
|
||||
user.EmailConfirmed = true;
|
||||
var result = await UserManager.CreateAsync(user, Input.Password);
|
||||
|
||||
if (!result.Succeeded)
|
||||
@@ -82,22 +80,6 @@
|
||||
|
||||
Logger.LogInformation("User created a new account with password.");
|
||||
|
||||
var userId = await UserManager.GetUserIdAsync(user);
|
||||
var code = await UserManager.GenerateEmailConfirmationTokenAsync(user);
|
||||
code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code));
|
||||
var callbackUrl = NavigationManager.GetUriWithQueryParameters(
|
||||
NavigationManager.ToAbsoluteUri("Account/ConfirmEmail").AbsoluteUri,
|
||||
new Dictionary<string, object?> { ["userId"] = userId, ["code"] = code, ["returnUrl"] = ReturnUrl });
|
||||
|
||||
await EmailSender.SendConfirmationLinkAsync(user, Input.Email, HtmlEncoder.Default.Encode(callbackUrl));
|
||||
|
||||
if (UserManager.Options.SignIn.RequireConfirmedAccount)
|
||||
{
|
||||
RedirectManager.RedirectTo(
|
||||
"Account/RegisterConfirmation",
|
||||
new() { ["email"] = Input.Email, ["returnUrl"] = ReturnUrl });
|
||||
}
|
||||
|
||||
await SignInManager.SignInAsync(user, isPersistent: false);
|
||||
RedirectManager.RedirectTo(ReturnUrl);
|
||||
}
|
||||
@@ -115,21 +97,12 @@
|
||||
}
|
||||
}
|
||||
|
||||
private IUserEmailStore<ApplicationUser> GetEmailStore()
|
||||
{
|
||||
if (!UserManager.SupportsUserEmail)
|
||||
{
|
||||
throw new NotSupportedException("The default UI requires a user store with email support.");
|
||||
}
|
||||
return (IUserEmailStore<ApplicationUser>)UserStore;
|
||||
}
|
||||
|
||||
private sealed class InputModel
|
||||
{
|
||||
[Required]
|
||||
[EmailAddress]
|
||||
[Display(Name = "Email")]
|
||||
public string Email { get; set; } = "";
|
||||
[Display(Name = "UserName")]
|
||||
public string UserName { get; set; } = "";
|
||||
|
||||
[Required]
|
||||
[StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
|
||||
@@ -142,4 +115,4 @@
|
||||
[Compare("Password", ErrorMessage = "The password and confirmation password do not match.")]
|
||||
public string ConfirmPassword { get; set; } = "";
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,68 +0,0 @@
|
||||
@page "/Account/RegisterConfirmation"
|
||||
|
||||
@using System.Text
|
||||
@using Microsoft.AspNetCore.Identity
|
||||
@using Microsoft.AspNetCore.WebUtilities
|
||||
@using RobotApp.Data
|
||||
|
||||
@inject UserManager<ApplicationUser> UserManager
|
||||
@inject IEmailSender<ApplicationUser> EmailSender
|
||||
@inject NavigationManager NavigationManager
|
||||
@inject IdentityRedirectManager RedirectManager
|
||||
|
||||
<PageTitle>Register confirmation</PageTitle>
|
||||
|
||||
<h1>Register confirmation</h1>
|
||||
|
||||
<StatusMessage Message="@statusMessage" />
|
||||
|
||||
@if (emailConfirmationLink is not null)
|
||||
{
|
||||
<p>
|
||||
This app does not currently have a real email sender registered, see <a href="https://aka.ms/aspaccountconf">these docs</a> for how to configure a real email sender.
|
||||
Normally this would be emailed: <a href="@emailConfirmationLink">Click here to confirm your account</a>
|
||||
</p>
|
||||
}
|
||||
else
|
||||
{
|
||||
<p role="alert">Please check your email to confirm your account.</p>
|
||||
}
|
||||
|
||||
@code {
|
||||
private string? emailConfirmationLink;
|
||||
private string? statusMessage;
|
||||
|
||||
[CascadingParameter]
|
||||
private HttpContext HttpContext { get; set; } = default!;
|
||||
|
||||
[SupplyParameterFromQuery]
|
||||
private string? Email { get; set; }
|
||||
|
||||
[SupplyParameterFromQuery]
|
||||
private string? ReturnUrl { get; set; }
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
if (Email is null)
|
||||
{
|
||||
RedirectManager.RedirectTo("");
|
||||
}
|
||||
|
||||
var user = await UserManager.FindByEmailAsync(Email);
|
||||
if (user is null)
|
||||
{
|
||||
HttpContext.Response.StatusCode = StatusCodes.Status404NotFound;
|
||||
statusMessage = "Error finding user for unspecified email";
|
||||
}
|
||||
else if (EmailSender is IdentityNoOpEmailSender)
|
||||
{
|
||||
// Once you add a real email sender, you should remove this code that lets you confirm the account
|
||||
var userId = await UserManager.GetUserIdAsync(user);
|
||||
var code = await UserManager.GenerateEmailConfirmationTokenAsync(user);
|
||||
code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code));
|
||||
emailConfirmationLink = NavigationManager.GetUriWithQueryParameters(
|
||||
NavigationManager.ToAbsoluteUri("Account/ConfirmEmail").AbsoluteUri,
|
||||
new Dictionary<string, object?> { ["userId"] = userId, ["code"] = code, ["returnUrl"] = ReturnUrl });
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,68 +0,0 @@
|
||||
@page "/Account/ResendEmailConfirmation"
|
||||
|
||||
@using System.ComponentModel.DataAnnotations
|
||||
@using System.Text
|
||||
@using System.Text.Encodings.Web
|
||||
@using Microsoft.AspNetCore.Identity
|
||||
@using Microsoft.AspNetCore.WebUtilities
|
||||
@using RobotApp.Data
|
||||
|
||||
@inject UserManager<ApplicationUser> UserManager
|
||||
@inject IEmailSender<ApplicationUser> EmailSender
|
||||
@inject NavigationManager NavigationManager
|
||||
@inject IdentityRedirectManager RedirectManager
|
||||
|
||||
<PageTitle>Resend email confirmation</PageTitle>
|
||||
|
||||
<h1>Resend email confirmation</h1>
|
||||
<h2>Enter your email.</h2>
|
||||
<hr />
|
||||
<StatusMessage Message="@message" />
|
||||
<div class="row">
|
||||
<div class="col-md-4">
|
||||
<EditForm Model="Input" FormName="resend-email-confirmation" OnValidSubmit="OnValidSubmitAsync" method="post">
|
||||
<DataAnnotationsValidator />
|
||||
<ValidationSummary class="text-danger" role="alert" />
|
||||
<div class="form-floating mb-3">
|
||||
<InputText @bind-Value="Input.Email" id="Input.Email" class="form-control" aria-required="true" placeholder="name@example.com" />
|
||||
<label for="Input.Email" class="form-label">Email</label>
|
||||
<ValidationMessage For="() => Input.Email" class="text-danger" />
|
||||
</div>
|
||||
<button type="submit" class="w-100 btn btn-lg btn-primary">Resend</button>
|
||||
</EditForm>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@code {
|
||||
private string? message;
|
||||
|
||||
[SupplyParameterFromForm]
|
||||
private InputModel Input { get; set; } = new();
|
||||
|
||||
private async Task OnValidSubmitAsync()
|
||||
{
|
||||
var user = await UserManager.FindByEmailAsync(Input.Email!);
|
||||
if (user is null)
|
||||
{
|
||||
message = "Verification email sent. Please check your email.";
|
||||
return;
|
||||
}
|
||||
|
||||
var userId = await UserManager.GetUserIdAsync(user);
|
||||
var code = await UserManager.GenerateEmailConfirmationTokenAsync(user);
|
||||
code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code));
|
||||
var callbackUrl = NavigationManager.GetUriWithQueryParameters(
|
||||
NavigationManager.ToAbsoluteUri("Account/ConfirmEmail").AbsoluteUri,
|
||||
new Dictionary<string, object?> { ["userId"] = userId, ["code"] = code });
|
||||
await EmailSender.SendConfirmationLinkAsync(user, Input.Email, HtmlEncoder.Default.Encode(callbackUrl));
|
||||
|
||||
message = "Verification email sent. Please check your email.";
|
||||
}
|
||||
|
||||
private sealed class InputModel
|
||||
{
|
||||
[Required]
|
||||
[EmailAddress]
|
||||
public string Email { get; set; } = "";
|
||||
}
|
||||
}
|
||||
@@ -1,103 +0,0 @@
|
||||
@page "/Account/ResetPassword"
|
||||
|
||||
@using System.ComponentModel.DataAnnotations
|
||||
@using System.Text
|
||||
@using Microsoft.AspNetCore.Identity
|
||||
@using Microsoft.AspNetCore.WebUtilities
|
||||
@using RobotApp.Data
|
||||
|
||||
@inject IdentityRedirectManager RedirectManager
|
||||
@inject UserManager<ApplicationUser> UserManager
|
||||
|
||||
<PageTitle>Reset password</PageTitle>
|
||||
|
||||
<h1>Reset password</h1>
|
||||
<h2>Reset your password.</h2>
|
||||
<hr />
|
||||
<div class="row">
|
||||
<div class="col-md-4">
|
||||
<StatusMessage Message="@Message" />
|
||||
<EditForm Model="Input" FormName="reset-password" OnValidSubmit="OnValidSubmitAsync" method="post">
|
||||
<DataAnnotationsValidator />
|
||||
<ValidationSummary class="text-danger" role="alert" />
|
||||
|
||||
<input type="hidden" name="Input.Code" value="@Input.Code" />
|
||||
<div class="form-floating mb-3">
|
||||
<InputText @bind-Value="Input.Email" id="Input.Email" class="form-control" autocomplete="username" aria-required="true" placeholder="name@example.com" />
|
||||
<label for="Input.Email" class="form-label">Email</label>
|
||||
<ValidationMessage For="() => Input.Email" class="text-danger" />
|
||||
</div>
|
||||
<div class="form-floating mb-3">
|
||||
<InputText type="password" @bind-Value="Input.Password" id="Input.Password" class="form-control" autocomplete="new-password" aria-required="true" placeholder="Please enter your password." />
|
||||
<label for="Input.Password" class="form-label">Password</label>
|
||||
<ValidationMessage For="() => Input.Password" class="text-danger" />
|
||||
</div>
|
||||
<div class="form-floating mb-3">
|
||||
<InputText type="password" @bind-Value="Input.ConfirmPassword" id="Input.ConfirmPassword" class="form-control" autocomplete="new-password" aria-required="true" placeholder="Please confirm your password." />
|
||||
<label for="Input.ConfirmPassword" class="form-label">Confirm password</label>
|
||||
<ValidationMessage For="() => Input.ConfirmPassword" class="text-danger" />
|
||||
</div>
|
||||
<button type="submit" class="w-100 btn btn-lg btn-primary">Reset</button>
|
||||
</EditForm>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@code {
|
||||
private IEnumerable<IdentityError>? identityErrors;
|
||||
|
||||
[SupplyParameterFromForm]
|
||||
private InputModel Input { get; set; } = new();
|
||||
|
||||
[SupplyParameterFromQuery]
|
||||
private string? Code { get; set; }
|
||||
|
||||
private string? Message => identityErrors is null ? null : $"Error: {string.Join(", ", identityErrors.Select(error => error.Description))}";
|
||||
|
||||
protected override void OnInitialized()
|
||||
{
|
||||
if (Code is null)
|
||||
{
|
||||
RedirectManager.RedirectTo("Account/InvalidPasswordReset");
|
||||
}
|
||||
|
||||
Input.Code = Encoding.UTF8.GetString(WebEncoders.Base64UrlDecode(Code));
|
||||
}
|
||||
|
||||
private async Task OnValidSubmitAsync()
|
||||
{
|
||||
var user = await UserManager.FindByEmailAsync(Input.Email);
|
||||
if (user is null)
|
||||
{
|
||||
// Don't reveal that the user does not exist
|
||||
RedirectManager.RedirectTo("Account/ResetPasswordConfirmation");
|
||||
}
|
||||
|
||||
var result = await UserManager.ResetPasswordAsync(user, Input.Code, Input.Password);
|
||||
if (result.Succeeded)
|
||||
{
|
||||
RedirectManager.RedirectTo("Account/ResetPasswordConfirmation");
|
||||
}
|
||||
|
||||
identityErrors = result.Errors;
|
||||
}
|
||||
|
||||
private sealed class InputModel
|
||||
{
|
||||
[Required]
|
||||
[EmailAddress]
|
||||
public string Email { get; set; } = "";
|
||||
|
||||
[Required]
|
||||
[StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
|
||||
[DataType(DataType.Password)]
|
||||
public string Password { get; set; } = "";
|
||||
|
||||
[DataType(DataType.Password)]
|
||||
[Display(Name = "Confirm password")]
|
||||
[Compare("Password", ErrorMessage = "The password and confirmation password do not match.")]
|
||||
public string ConfirmPassword { get; set; } = "";
|
||||
|
||||
[Required]
|
||||
public string Code { get; set; } = "";
|
||||
}
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
@page "/Account/ResetPasswordConfirmation"
|
||||
<PageTitle>Reset password confirmation</PageTitle>
|
||||
|
||||
<h1>Reset password confirmation</h1>
|
||||
<p role="alert">
|
||||
Your password has been reset. Please <a href="Account/Login">click here to log in</a>.
|
||||
</p>
|
||||
@@ -1,43 +0,0 @@
|
||||
@using Microsoft.AspNetCore.Authentication
|
||||
@using Microsoft.AspNetCore.Identity
|
||||
@using RobotApp.Data
|
||||
|
||||
@inject SignInManager<ApplicationUser> SignInManager
|
||||
@inject IdentityRedirectManager RedirectManager
|
||||
|
||||
@if (externalLogins.Length == 0)
|
||||
{
|
||||
<div>
|
||||
<p>
|
||||
There are no external authentication services configured. See this <a href="https://go.microsoft.com/fwlink/?LinkID=532715">article
|
||||
about setting up this ASP.NET application to support logging in via external services</a>.
|
||||
</p>
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
<form class="form-horizontal" action="Account/PerformExternalLogin" method="post">
|
||||
<div>
|
||||
<AntiforgeryToken />
|
||||
<input type="hidden" name="ReturnUrl" value="@ReturnUrl" />
|
||||
<p>
|
||||
@foreach (var provider in 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>
|
||||
}
|
||||
|
||||
@code {
|
||||
private AuthenticationScheme[] externalLogins = [];
|
||||
|
||||
[SupplyParameterFromQuery]
|
||||
private string? ReturnUrl { get; set; }
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
externalLogins = (await SignInManager.GetExternalAuthenticationSchemesAsync()).ToArray();
|
||||
}
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
@inherits LayoutComponentBase
|
||||
@layout RobotApp.Client.Layout.MainLayout
|
||||
|
||||
<h1>Manage your account</h1>
|
||||
|
||||
<div>
|
||||
<h2>Change your account settings</h2>
|
||||
<hr />
|
||||
<div class="row">
|
||||
<div class="col-lg-3">
|
||||
<ManageNavMenu />
|
||||
</div>
|
||||
<div class="col-lg-9">
|
||||
@Body
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1,37 +0,0 @@
|
||||
@using Microsoft.AspNetCore.Identity
|
||||
@using RobotApp.Data
|
||||
|
||||
@inject SignInManager<ApplicationUser> SignInManager
|
||||
|
||||
<ul class="nav nav-pills flex-column">
|
||||
<li class="nav-item">
|
||||
<NavLink class="nav-link" href="Account/Manage" Match="NavLinkMatch.All">Profile</NavLink>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<NavLink class="nav-link" href="Account/Manage/Email">Email</NavLink>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<NavLink class="nav-link" href="Account/Manage/ChangePassword">Password</NavLink>
|
||||
</li>
|
||||
@if (hasExternalLogins)
|
||||
{
|
||||
<li class="nav-item">
|
||||
<NavLink class="nav-link" href="Account/Manage/ExternalLogins">External logins</NavLink>
|
||||
</li>
|
||||
}
|
||||
<li class="nav-item">
|
||||
<NavLink class="nav-link" href="Account/Manage/TwoFactorAuthentication">Two-factor authentication</NavLink>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<NavLink class="nav-link" href="Account/Manage/PersonalData">Personal data</NavLink>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
@code {
|
||||
private bool hasExternalLogins;
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
hasExternalLogins = (await SignInManager.GetExternalAuthenticationSchemesAsync()).Any();
|
||||
}
|
||||
}
|
||||
8
RobotApp/Components/Account/Shared/RedirectToLogin.razor
Normal file
8
RobotApp/Components/Account/Shared/RedirectToLogin.razor
Normal file
@@ -0,0 +1,8 @@
|
||||
@inject NavigationManager NavigationManager
|
||||
|
||||
@code {
|
||||
protected override void OnInitialized()
|
||||
{
|
||||
NavigationManager.NavigateTo($"Account/Login?returnUrl={Uri.EscapeDataString(NavigationManager.Uri)}", forceLoad: true);
|
||||
}
|
||||
}
|
||||
@@ -1,28 +0,0 @@
|
||||
<StatusMessage Message="@StatusMessage" />
|
||||
<h3>Recovery codes</h3>
|
||||
<div class="alert alert-warning" role="alert">
|
||||
<p>
|
||||
<strong>Put these codes in a safe place.</strong>
|
||||
</p>
|
||||
<p>
|
||||
If you lose your device and don't have the recovery codes you will lose access to your account.
|
||||
</p>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
@foreach (var recoveryCode in RecoveryCodes)
|
||||
{
|
||||
<div>
|
||||
<code class="recovery-code">@recoveryCode</code>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@code {
|
||||
[Parameter]
|
||||
public string[] RecoveryCodes { get; set; } = [];
|
||||
|
||||
[Parameter]
|
||||
public string? StatusMessage { get; set; }
|
||||
}
|
||||
@@ -1,29 +0,0 @@
|
||||
@if (!string.IsNullOrEmpty(DisplayMessage))
|
||||
{
|
||||
var statusMessageClass = DisplayMessage.StartsWith("Error") ? "danger" : "success";
|
||||
<div class="alert alert-@statusMessageClass" role="alert">
|
||||
@DisplayMessage
|
||||
</div>
|
||||
}
|
||||
|
||||
@code {
|
||||
private string? messageFromCookie;
|
||||
|
||||
[Parameter]
|
||||
public string? Message { get; set; }
|
||||
|
||||
[CascadingParameter]
|
||||
private HttpContext HttpContext { get; set; } = default!;
|
||||
|
||||
private string? DisplayMessage => Message ?? messageFromCookie;
|
||||
|
||||
protected override void OnInitialized()
|
||||
{
|
||||
messageFromCookie = HttpContext.Request.Cookies[IdentityRedirectManager.StatusCookieName];
|
||||
|
||||
if (messageFromCookie is not null)
|
||||
{
|
||||
HttpContext.Response.Cookies.Delete(IdentityRedirectManager.StatusCookieName);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -5,17 +5,27 @@
|
||||
<meta charset="utf-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<base href="/" />
|
||||
<link rel="stylesheet" href="_content/MudBlazor/MudBlazor.min.css" />
|
||||
<link rel="stylesheet" href="@Assets["lib/bootstrap/css/bootstrap.min.css"]" />
|
||||
<link rel="stylesheet" href="@Assets["lib/mdi/font/css/materialdesignicons.min.css"]" />
|
||||
<link rel="stylesheet" href="@Assets["lib/bootstrap/dist/css/bootstrap.min.css"]" />
|
||||
<link rel="stylesheet" href="@Assets["app.css"]" />
|
||||
<link rel="stylesheet" href="@Assets["RobotApp.styles.css"]" />
|
||||
<ImportMap />
|
||||
<link rel="icon" type="image/png" href="favicon.png" />
|
||||
<HeadOutlet @rendermode="PageRenderMode" />
|
||||
<ImportMap @rendermode="InteractiveServer" />
|
||||
<HeadOutlet @rendermode="InteractiveServer" />
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<Routes @rendermode="PageRenderMode" />
|
||||
|
||||
<Routes />
|
||||
|
||||
<script src="_framework/blazor.web.js"></script>
|
||||
<script src="@Assets["lib/bootstrap/js/bootstrap.bundle.min.js"]"></script>
|
||||
<script src="@Assets["lib/bootstrap/js/bootstrap.min.js"]"></script>
|
||||
<script src="_content/MudBlazor/MudBlazor.min.js"></script>
|
||||
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
||||
@@ -10,3 +10,4 @@
|
||||
@using RobotApp
|
||||
@using RobotApp.Client
|
||||
@using RobotApp.Components
|
||||
@using MudBlazor
|
||||
@@ -3,7 +3,11 @@ using Microsoft.EntityFrameworkCore;
|
||||
|
||||
namespace RobotApp.Data
|
||||
{
|
||||
public class ApplicationDbContext(DbContextOptions<ApplicationDbContext> options) : IdentityDbContext<ApplicationUser>(options)
|
||||
public class ApplicationDbContext : IdentityDbContext<ApplicationUser, ApplicationRole, string>
|
||||
{
|
||||
public ApplicationDbContext(DbContextOptions<ApplicationDbContext> options) : base(options)
|
||||
{
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
9
RobotApp/Data/ApplicationRole.cs
Normal file
9
RobotApp/Data/ApplicationRole.cs
Normal file
@@ -0,0 +1,9 @@
|
||||
using Microsoft.AspNetCore.Identity;
|
||||
|
||||
namespace RobotApp.Data
|
||||
{
|
||||
public class ApplicationRole : IdentityRole
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
5
RobotApp/Interfaces/IBattery.cs
Normal file
5
RobotApp/Interfaces/IBattery.cs
Normal file
@@ -0,0 +1,5 @@
|
||||
namespace RobotApp.Interfaces;
|
||||
|
||||
public interface IBattery
|
||||
{
|
||||
}
|
||||
9
RobotApp/Interfaces/IError.cs
Normal file
9
RobotApp/Interfaces/IError.cs
Normal file
@@ -0,0 +1,9 @@
|
||||
using RobotApp.VDA5050.State;
|
||||
|
||||
namespace RobotApp.Interfaces;
|
||||
|
||||
public interface IError
|
||||
{
|
||||
bool HasFatalError { get; }
|
||||
void AddError(Error error, TimeSpan? clearAfter = null);
|
||||
}
|
||||
5
RobotApp/Interfaces/IInfomation.cs
Normal file
5
RobotApp/Interfaces/IInfomation.cs
Normal file
@@ -0,0 +1,5 @@
|
||||
namespace RobotApp.Interfaces;
|
||||
|
||||
public interface IInfomation
|
||||
{
|
||||
}
|
||||
@@ -1,5 +1,14 @@
|
||||
namespace RobotApp.Interfaces;
|
||||
using RobotApp.VDA5050.State;
|
||||
using Action = RobotApp.VDA5050.InstantAction.Action;
|
||||
|
||||
namespace RobotApp.Interfaces;
|
||||
|
||||
public interface IInstanceActions
|
||||
{
|
||||
ActionState[] ActionStates { get; }
|
||||
bool HasActionRunning { get; }
|
||||
bool AddOrderActions(Action[] actions);
|
||||
bool StartAction(string actionId);
|
||||
bool AddInstanceAction(Action action);
|
||||
bool StopAction();
|
||||
}
|
||||
|
||||
@@ -4,6 +4,9 @@ namespace RobotApp.Interfaces;
|
||||
|
||||
public enum NavigationState
|
||||
{
|
||||
None,
|
||||
Initializing,
|
||||
Initialized,
|
||||
Idle,
|
||||
Moving,
|
||||
Rotating,
|
||||
@@ -13,7 +16,7 @@ public enum NavigationState
|
||||
|
||||
public enum NavigationProccess
|
||||
{
|
||||
Started,
|
||||
None,
|
||||
InProgress,
|
||||
Completed,
|
||||
Failed,
|
||||
@@ -22,12 +25,13 @@ public enum NavigationProccess
|
||||
|
||||
public interface INavigation
|
||||
{
|
||||
bool Driving { get; }
|
||||
NavigationState State { get; }
|
||||
NavigationProccess Proccess { get; }
|
||||
bool Move(Node nodes, Edge edges);
|
||||
bool MoveStraight(double x, double y);
|
||||
bool Rotate(double angle);
|
||||
bool Paused();
|
||||
bool Resume();
|
||||
bool CancelMovement();
|
||||
void Move(Node[] nodes, Edge[] edges);
|
||||
void MoveStraight(double x, double y);
|
||||
void Rotate(double angle);
|
||||
void Paused();
|
||||
void Resume();
|
||||
void UpdateOrder(int lastBaseSequence);
|
||||
void CancelMovement();
|
||||
}
|
||||
|
||||
@@ -1,15 +1,19 @@
|
||||
using RobotApp.VDA5050.State;
|
||||
using RobotApp.VDA5050.Order;
|
||||
using RobotApp.VDA5050.State;
|
||||
|
||||
namespace RobotApp.Interfaces;
|
||||
|
||||
public interface IOrder
|
||||
{
|
||||
string OrderId { get; }
|
||||
VDA5050.InstantAction.Action[] Actions { get; }
|
||||
int OrderUpdateId { get; }
|
||||
string LastNodeId { get; }
|
||||
int LastNodeSequenceId { get; }
|
||||
|
||||
NodeState[] NodeStates { get; }
|
||||
EdgeState[] EdgeStates { get; }
|
||||
|
||||
bool StartOrder();
|
||||
bool UpdateOrder();
|
||||
bool StopOrder();
|
||||
void StartOrder(string orderId, Node[] nodes, Edge[] edges);
|
||||
void UpdateOrder(int orderUpdateId, Node[] nodes, Edge[] edges);
|
||||
void StopOrder();
|
||||
}
|
||||
|
||||
14
RobotApp/Interfaces/IPeripheral.cs
Normal file
14
RobotApp/Interfaces/IPeripheral.cs
Normal file
@@ -0,0 +1,14 @@
|
||||
namespace RobotApp.Interfaces;
|
||||
|
||||
public enum OperatingMode
|
||||
{
|
||||
AUTOMATIC,
|
||||
MANUAL,
|
||||
SEMIAUTOMATIC,
|
||||
TEACHIN,
|
||||
SERVICE,
|
||||
}
|
||||
public interface IPeripheral
|
||||
{
|
||||
OperatingMode OperatingMode { get; }
|
||||
}
|
||||
6
RobotApp/Interfaces/IRFHandler.cs
Normal file
6
RobotApp/Interfaces/IRFHandler.cs
Normal file
@@ -0,0 +1,6 @@
|
||||
namespace RobotApp.Interfaces
|
||||
{
|
||||
public class IRFHandler
|
||||
{
|
||||
}
|
||||
}
|
||||
5
RobotApp/Interfaces/ISafety.cs
Normal file
5
RobotApp/Interfaces/ISafety.cs
Normal file
@@ -0,0 +1,5 @@
|
||||
namespace RobotApp.Interfaces;
|
||||
|
||||
public interface ISafety
|
||||
{
|
||||
}
|
||||
16
RobotApp/Modbus/ModbusException.cs
Normal file
16
RobotApp/Modbus/ModbusException.cs
Normal file
@@ -0,0 +1,16 @@
|
||||
namespace RobotApp.Modbus;
|
||||
|
||||
public class ModbusException : Exception
|
||||
{
|
||||
public ModbusException()
|
||||
{
|
||||
}
|
||||
public ModbusException(string message)
|
||||
: base(message)
|
||||
{
|
||||
}
|
||||
public ModbusException(string message, Exception inner)
|
||||
: base(message, inner)
|
||||
{
|
||||
}
|
||||
}
|
||||
350
RobotApp/Modbus/ModbusTcpClient.cs
Normal file
350
RobotApp/Modbus/ModbusTcpClient.cs
Normal file
@@ -0,0 +1,350 @@
|
||||
using Microsoft.AspNetCore.Connections;
|
||||
using System.Net;
|
||||
using System.Net.Sockets;
|
||||
|
||||
namespace RobotApp.Modbus;
|
||||
|
||||
public class ModbusTcpClient(string IpAddress, int Port, byte ClientId) : IDisposable
|
||||
{
|
||||
public bool IsConnected => !disposed && tcpClient != null && tcpClient.Client.Connected && stream != null;
|
||||
|
||||
private TcpClient? tcpClient;
|
||||
private NetworkStream? stream;
|
||||
private bool disposed = false;
|
||||
|
||||
private uint transactionIdentifierInternal = 0;
|
||||
private const int connectTimeout = 3000;
|
||||
private const int readTimeout = 500;
|
||||
private const int writeTimeout = 500;
|
||||
private int numberOfRetries { get; set; } = 3;
|
||||
|
||||
~ModbusTcpClient()
|
||||
{
|
||||
Dispose(false);
|
||||
}
|
||||
|
||||
public static bool TryConnect(string ipAddress, int port, byte clientId, out ModbusTcpClient? client)
|
||||
{
|
||||
ModbusTcpClient modbusTcpClient = new(ipAddress, port, clientId);
|
||||
try
|
||||
{
|
||||
if (modbusTcpClient.Connect())
|
||||
{
|
||||
client = modbusTcpClient;
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
modbusTcpClient?.Dispose();
|
||||
client = null;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
modbusTcpClient.Dispose();
|
||||
client = null;
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public static bool TryConnect(string ipAddress, out ModbusTcpClient? client) => TryConnect(ipAddress, 502, 1, out client);
|
||||
|
||||
public bool Connect()
|
||||
{
|
||||
try
|
||||
{
|
||||
tcpClient = new TcpClient();
|
||||
var result = tcpClient.BeginConnect(IpAddress, Port, null, null);
|
||||
if (!result.AsyncWaitHandle.WaitOne(connectTimeout))
|
||||
{
|
||||
tcpClient?.Close();
|
||||
tcpClient?.Dispose();
|
||||
tcpClient = null;
|
||||
return false;
|
||||
}
|
||||
tcpClient.EndConnect(result);
|
||||
|
||||
stream = tcpClient.GetStream();
|
||||
stream.ReadTimeout = readTimeout;
|
||||
return true;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Dispose();
|
||||
throw new ModbusException("connection error", ex);
|
||||
}
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
Dispose(true);
|
||||
GC.SuppressFinalize(this);
|
||||
}
|
||||
|
||||
protected virtual void Dispose(bool disposing)
|
||||
{
|
||||
if (!disposed)
|
||||
{
|
||||
if (disposing)
|
||||
{
|
||||
stream?.Close();
|
||||
stream?.Dispose();
|
||||
tcpClient?.Close();
|
||||
tcpClient?.Dispose();
|
||||
}
|
||||
stream = null;
|
||||
tcpClient = null;
|
||||
disposed = true;
|
||||
}
|
||||
}
|
||||
|
||||
private byte[] Write(byte functionCode, UInt16 startingAddress, UInt16 quantity, CancellationToken? cancellationToken = null)
|
||||
=> Write(functionCode, startingAddress, quantity, [], cancellationToken);
|
||||
private byte[] Write(byte functionCode, UInt16 startingAddress, UInt16 quantity, byte[] multipleData, CancellationToken? cancellationToken = null)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (!IsConnected || stream is null)
|
||||
{
|
||||
if (!Connect() || !IsConnected || stream is null) throw new ConnectionAbortedException();
|
||||
}
|
||||
|
||||
transactionIdentifierInternal++;
|
||||
byte[] writeData = new byte[12 + multipleData.Length];
|
||||
var dataLength = multipleData.Length + 6;
|
||||
writeData[0] = (byte)(transactionIdentifierInternal >> 8);
|
||||
writeData[1] = (byte)(transactionIdentifierInternal & 0xFF);
|
||||
writeData[2] = 0x00;
|
||||
writeData[3] = 0x00;
|
||||
writeData[4] = (byte)(dataLength >> 8);
|
||||
writeData[5] = (byte)(dataLength & 0xFF);
|
||||
writeData[6] = ClientId;
|
||||
writeData[7] = functionCode;
|
||||
writeData[8] = (byte)(startingAddress >> 8);
|
||||
writeData[9] = (byte)(startingAddress & 0xFF);
|
||||
writeData[10] = (byte)(quantity >> 8);
|
||||
writeData[11] = (byte)(quantity & 0xFF);
|
||||
if (multipleData.Length > 0)
|
||||
{
|
||||
Array.Copy(multipleData, 0, writeData, 12, multipleData.Length);
|
||||
}
|
||||
|
||||
stream.Write(writeData, 0, writeData.Length);
|
||||
|
||||
byte[] readData = new byte[256];
|
||||
int NumberOfBytes = stream.Read(readData, 0, readData.Length);
|
||||
int attempts = 0;
|
||||
const int maxAttempts = writeTimeout / 10;
|
||||
while (NumberOfBytes == 0 && attempts ++ < maxAttempts)
|
||||
{
|
||||
cancellationToken?.ThrowIfCancellationRequested();
|
||||
NumberOfBytes = stream.Read(readData, 0, readData.Length);
|
||||
if (NumberOfBytes == 0) Thread.Sleep(10);
|
||||
}
|
||||
if (NumberOfBytes == 0) throw new TimeoutException("No response from server");
|
||||
if (writeData[0] != readData[0] || writeData[1] != readData[1]) throw new ModbusException("Transaction Identifier not match");
|
||||
if (writeData[2] != readData[2] || writeData[3] != readData[3]) throw new ModbusException("Protocol Identifier not match");
|
||||
if (writeData[6] != readData[6]) throw new ModbusException("Client ID not match");
|
||||
if (writeData[7] + 0x80 == readData[7])
|
||||
{
|
||||
throw readData[8] switch
|
||||
{
|
||||
0x01 => new ModbusException("Function code not supported by master"),
|
||||
0x02 => new ModbusException("Starting address invalid or starting address + quantity invalid"),
|
||||
0x03 => new ModbusException("quantity invalid"),
|
||||
0x04 => new ModbusException("error reading"),
|
||||
_ => new ModbusException($"Function code error: 0x{(int)readData[7]:X2}"),
|
||||
};
|
||||
}
|
||||
else if (writeData[7] != readData[7])
|
||||
{
|
||||
throw new Exception("Function code not match");
|
||||
}
|
||||
dataLength = readData[4] << 8;
|
||||
dataLength += readData[5];
|
||||
if (dataLength != NumberOfBytes - 6) throw new Exception("Length Field not match");
|
||||
|
||||
var receiveData = new byte[NumberOfBytes - 9];
|
||||
Array.Copy(readData, 9, receiveData, 0, receiveData.Length);
|
||||
return receiveData;
|
||||
}
|
||||
catch (Exception ex) when (!(ex is ModbusException || ex is TimeoutException))
|
||||
{
|
||||
throw new ModbusException("Communication error", ex);
|
||||
}
|
||||
}
|
||||
|
||||
public bool[] ReadDiscreteInputs(UInt16 startingAddress, UInt16 quantity, CancellationToken? cancellationToken = null)
|
||||
{
|
||||
if (startingAddress > 65535 | quantity > 2000)
|
||||
{
|
||||
throw new ArgumentException("Starting address must be 0 - 65535; quantity must be 0 - 2000");
|
||||
}
|
||||
var data = Write(0x02, startingAddress, quantity, cancellationToken);
|
||||
if (data.Length - 1 < ((quantity - 1) / 8)) return [];
|
||||
bool[] response = new bool[quantity];
|
||||
for (int i = 0; i < quantity; i++)
|
||||
{
|
||||
int intData = data[i / 8];
|
||||
int mask = Convert.ToInt32(Math.Pow(2, (i % 8)));
|
||||
response[i] = Convert.ToBoolean((intData & mask) / mask);
|
||||
}
|
||||
return response;
|
||||
}
|
||||
|
||||
public bool[] ReadCoils(UInt16 startingAddress, UInt16 quantity, CancellationToken? cancellationToken = null)
|
||||
{
|
||||
if (startingAddress > 65535 | quantity > 2000)
|
||||
{
|
||||
throw new ArgumentException("Starting address must be 0 - 65535; quantity must be 0 - 2000");
|
||||
}
|
||||
var data = Write(0x01, startingAddress, quantity, cancellationToken);
|
||||
if (data.Length - 1 < ((quantity - 1) / 8)) return [];
|
||||
bool[] response = new bool[quantity];
|
||||
for (int i = 0; i < quantity; i++)
|
||||
{
|
||||
int intData = data[i / 8];
|
||||
int mask = Convert.ToInt32(Math.Pow(2, (i % 8)));
|
||||
response[i] = Convert.ToBoolean((intData & mask) / mask);
|
||||
}
|
||||
return (response);
|
||||
}
|
||||
|
||||
public int[] ReadHoldingRegisters(UInt16 startingAddress, UInt16 quantity, CancellationToken? cancellationToken = null)
|
||||
{
|
||||
if (startingAddress > 65535 | quantity > 125)
|
||||
{
|
||||
throw new ArgumentException("Starting address must be 0 - 65535; quantity must be 0 - 125");
|
||||
}
|
||||
var data = Write(0x03, startingAddress, quantity, cancellationToken);
|
||||
if (data.Length < quantity * 2) return [];
|
||||
int[] response = new int[quantity];
|
||||
for (int i = 0; i < quantity; i++)
|
||||
{
|
||||
response[i] = (data[i * 2] << 8) | data[i * 2 + 1];
|
||||
}
|
||||
return (response);
|
||||
}
|
||||
|
||||
public int[] ReadInputRegisters(UInt16 startingAddress, UInt16 quantity, CancellationToken? cancellationToken = null)
|
||||
{
|
||||
if (startingAddress > 65535 | quantity > 125)
|
||||
{
|
||||
throw new ArgumentException("Starting address must be 0 - 65535; quantity must be 0 - 125");
|
||||
}
|
||||
var data = Write(0x04, startingAddress, quantity, cancellationToken);
|
||||
if (data.Length < quantity * 2) return [];
|
||||
int[] response = new int[quantity];
|
||||
for (int i = 0; i < quantity; i++)
|
||||
{
|
||||
response[i] = (data[i * 2] << 8) | data[i * 2 + 1];
|
||||
}
|
||||
return (response);
|
||||
}
|
||||
|
||||
public void WriteSingleCoil(UInt16 startingAddress, bool value, CancellationToken? cancellationToken = null)
|
||||
{
|
||||
Write(0x05, startingAddress, value ? (UInt16)0xFF00 : (UInt16)0x0000, cancellationToken);
|
||||
}
|
||||
|
||||
public void WriteSingleRegister(UInt16 startingAddress, UInt16 value, CancellationToken? cancellationToken = null)
|
||||
{
|
||||
Write(0x06, startingAddress, value, cancellationToken);
|
||||
}
|
||||
|
||||
public void WriteMultipleCoils(UInt16 startingAddress, bool[] values, CancellationToken? cancellationToken = null)
|
||||
{
|
||||
if (values == null || values.Length == 0)
|
||||
throw new ArgumentException("Values cannot be null or empty", nameof(values));
|
||||
if (values.Length > 1968)
|
||||
throw new ArgumentException("Too many coils (max 1968)", nameof(values));
|
||||
if (startingAddress > 65535)
|
||||
throw new ArgumentException("Starting address must be 0-65535", nameof(startingAddress));
|
||||
if (startingAddress + values.Length > 65536)
|
||||
throw new ArgumentException("Address range exceeds 65535", nameof(startingAddress));
|
||||
|
||||
byte byteCount = (byte)((values.Length + 7) / 8);
|
||||
var data = new byte[1 + byteCount];
|
||||
data[0] = byteCount;
|
||||
for (int i = 0; i < values.Length; i++)
|
||||
{
|
||||
if (values[i])
|
||||
{
|
||||
data[1 + (i / 8)] |= (byte)(1 << (i % 8));
|
||||
}
|
||||
}
|
||||
Write(0x0F, startingAddress, (UInt16)values.Length, data, cancellationToken);
|
||||
}
|
||||
|
||||
public void WriteMultipleRegisters(UInt16 startingAddress, UInt16[] values, CancellationToken? cancellationToken = null)
|
||||
{
|
||||
if (values == null || values.Length == 0)
|
||||
throw new ArgumentException("Values cannot be null or empty", nameof(values));
|
||||
if (values.Length > 123)
|
||||
throw new ArgumentException("Too many registers (max 123)", nameof(values));
|
||||
if (startingAddress > 65535)
|
||||
throw new ArgumentException("Starting address must be 0-65535", nameof(startingAddress));
|
||||
if (startingAddress + values.Length > 65536)
|
||||
throw new ArgumentException("Address range exceeds 65535", nameof(startingAddress));
|
||||
|
||||
byte byteCount = (byte)(values.Length * 2);
|
||||
var data = new byte[1 + byteCount];
|
||||
data[0] = byteCount;
|
||||
for (int i = 0; i < values.Length; i++)
|
||||
{
|
||||
data[1 + i * 2] = (byte)(values[i] >> 8);
|
||||
data[2 + i * 2] = (byte)(values[i] & 0xFF);
|
||||
}
|
||||
Write(0x10, startingAddress, (UInt16)values.Length, data, cancellationToken);
|
||||
}
|
||||
|
||||
public int[] ReadWriteMultipleRegisters(UInt16 startingAddressRead, UInt16 quantityRead, UInt16 startingAddressWrite, UInt16[] values, CancellationToken? cancellationToken = null)
|
||||
{
|
||||
if (values == null || values.Length == 0)
|
||||
throw new ArgumentException("Values cannot be null or empty", nameof(values));
|
||||
if (quantityRead == 0 || quantityRead > 125)
|
||||
throw new ArgumentException("Read quantity must be 1-125", nameof(quantityRead));
|
||||
if (values.Length > 121)
|
||||
throw new ArgumentException("Write quantity must be 1-121", nameof(values));
|
||||
if (startingAddressRead > 65535 || startingAddressWrite > 65535)
|
||||
throw new ArgumentException("Addresses must be 0-65535");
|
||||
if (startingAddressRead + quantityRead > 65536 || startingAddressWrite + values.Length > 65536)
|
||||
throw new ArgumentException("Address ranges exceed 65535");
|
||||
|
||||
var writeData = new byte[5 + values.Length * 2];
|
||||
writeData[0] = (byte)(startingAddressWrite >> 8);
|
||||
writeData[1] = (byte)(startingAddressWrite & 0xFF);
|
||||
writeData[2] = (byte)(values.Length >> 8);
|
||||
writeData[3] = (byte)(values.Length & 0xFF);
|
||||
writeData[4] = (byte)(values.Length * 2);
|
||||
for (int i = 0; i < values.Length; i++)
|
||||
{
|
||||
writeData[5 + i * 2] = (byte)(values[i] >> 8);
|
||||
writeData[6 + i * 2] = (byte)(values[i] & 0xFF);
|
||||
}
|
||||
var receivedData = Write(0x17, startingAddressRead, quantityRead, writeData, cancellationToken);
|
||||
if (receivedData.Length < quantityRead * 2) return [];
|
||||
var response = new int[quantityRead];
|
||||
for (int i = 0; i < quantityRead; i++)
|
||||
{
|
||||
response[i] = (receivedData[i * 2] << 8) | receivedData[i * 2 + 1];
|
||||
}
|
||||
return response;
|
||||
}
|
||||
|
||||
public bool Available(int timeout)
|
||||
{
|
||||
System.Net.NetworkInformation.Ping pingSender = new ();
|
||||
IPAddress address = System.Net.IPAddress.Parse(IpAddress);
|
||||
|
||||
string data = "phenikaaX";
|
||||
byte[] buffer = System.Text.Encoding.ASCII.GetBytes(data);
|
||||
|
||||
System.Net.NetworkInformation.PingReply reply = pingSender.Send(address, timeout, buffer);
|
||||
|
||||
return reply.Status == System.Net.NetworkInformation.IPStatus.Success;
|
||||
}
|
||||
|
||||
}
|
||||
8
RobotApp/Modbus/RegisterOrder.cs
Normal file
8
RobotApp/Modbus/RegisterOrder.cs
Normal file
@@ -0,0 +1,8 @@
|
||||
namespace RobotApp.Modbus;
|
||||
|
||||
|
||||
public enum RegisterOrder
|
||||
{
|
||||
LowHigh = 0,
|
||||
HighLow = 1
|
||||
}
|
||||
@@ -1,6 +1,8 @@
|
||||
using Microsoft.AspNetCore.Components.Authorization;
|
||||
using Microsoft.AspNetCore.Identity;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using MudBlazor.Services;
|
||||
using RobotApp.Client.Pages;
|
||||
using RobotApp.Components;
|
||||
using RobotApp.Components.Account;
|
||||
using RobotApp.Data;
|
||||
@@ -18,13 +20,11 @@ builder.Services.AddCascadingAuthenticationState();
|
||||
builder.Services.AddScoped<IdentityUserAccessor>();
|
||||
builder.Services.AddScoped<IdentityRedirectManager>();
|
||||
builder.Services.AddScoped<AuthenticationStateProvider, IdentityRevalidatingAuthenticationStateProvider>();
|
||||
builder.Services.AddMudServices();
|
||||
builder.Services.AddAuthorization();
|
||||
|
||||
builder.Services.AddAuthentication(options =>
|
||||
{
|
||||
options.DefaultScheme = IdentityConstants.ApplicationScheme;
|
||||
options.DefaultSignInScheme = IdentityConstants.ExternalScheme;
|
||||
})
|
||||
.AddIdentityCookies();
|
||||
var connectionString = builder.Configuration.GetConnectionString("DefaultConnection")
|
||||
?? throw new InvalidOperationException("Connection string 'DefaultConnection' not found.");
|
||||
|
||||
var connectionString = builder.Configuration.GetConnectionString("DefaultConnection") ?? throw new InvalidOperationException("Connection string 'DefaultConnection' not found.");
|
||||
Action<DbContextOptionsBuilder> appDbOptions = options => options.UseSqlite(connectionString, b => b.MigrationsAssembly("RobotApp"));
|
||||
@@ -32,9 +32,15 @@ Action<DbContextOptionsBuilder> appDbOptions = options => options.UseSqlite(conn
|
||||
builder.Services.AddDbContext<ApplicationDbContext>(appDbOptions);
|
||||
builder.Services.AddDatabaseDeveloperPageExceptionFilter();
|
||||
|
||||
builder.Services.AddIdentityCore<ApplicationUser>(options => options.SignIn.RequireConfirmedAccount = true)
|
||||
builder.Services.AddIdentity<ApplicationUser, ApplicationRole>(options =>
|
||||
{
|
||||
options.Lockout.AllowedForNewUsers = false;
|
||||
options.Password.RequireNonAlphanumeric = false;
|
||||
options.Password.RequireUppercase = false;
|
||||
options.Password.RequireLowercase = false;
|
||||
options.Password.RequireDigit = false;
|
||||
})
|
||||
.AddEntityFrameworkStores<ApplicationDbContext>()
|
||||
.AddSignInManager()
|
||||
.AddDefaultTokenProviders();
|
||||
|
||||
builder.Services.AddSingleton<IEmailSender<ApplicationUser>, IdentityNoOpEmailSender>();
|
||||
@@ -54,12 +60,13 @@ if (app.Environment.IsDevelopment())
|
||||
else
|
||||
{
|
||||
app.UseExceptionHandler("/Error", createScopeForErrors: true);
|
||||
// The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
|
||||
app.UseHsts();
|
||||
}
|
||||
|
||||
app.UseHttpsRedirection();
|
||||
|
||||
app.UseAuthentication();
|
||||
app.UseAuthorization();
|
||||
|
||||
app.UseAntiforgery();
|
||||
|
||||
|
||||
@@ -24,6 +24,8 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Folder Include="Layout\" />
|
||||
<Folder Include="Services\Robot\Simulation\" />
|
||||
<Folder Include="wwwroot\lib\" />
|
||||
</ItemGroup>
|
||||
|
||||
|
||||
5
RobotApp/Services/Exceptions/ActionException.cs
Normal file
5
RobotApp/Services/Exceptions/ActionException.cs
Normal file
@@ -0,0 +1,5 @@
|
||||
namespace RobotApp.Services.Exceptions;
|
||||
|
||||
public class ActionException : OrderException
|
||||
{
|
||||
}
|
||||
15
RobotApp/Services/Exceptions/OrderException.cs
Normal file
15
RobotApp/Services/Exceptions/OrderException.cs
Normal file
@@ -0,0 +1,15 @@
|
||||
using RobotApp.VDA5050.State;
|
||||
|
||||
namespace RobotApp.Services.Exceptions;
|
||||
|
||||
public class OrderException : Exception
|
||||
{
|
||||
public OrderException(string message) : base(message) { }
|
||||
public OrderException(string message, Exception inner) : base(message, inner) { }
|
||||
public OrderException() : base() { }
|
||||
public OrderException(Error error) : base()
|
||||
{
|
||||
Error = error;
|
||||
}
|
||||
public Error? Error { get; set; }
|
||||
}
|
||||
@@ -27,7 +27,6 @@ public class MQTTClient : IAsyncDisposable
|
||||
Logger = logger;
|
||||
|
||||
MqttClientFactory = new MqttClientFactory();
|
||||
MqttClient = MqttClientFactory.CreateMqttClient();
|
||||
MqttClientOptions = MqttClientFactory.CreateClientOptionsBuilder()
|
||||
.WithTcpServer(setting.HostServer, setting.Port)
|
||||
.WithCredentials(setting.UserName, setting.Password)
|
||||
@@ -38,13 +37,18 @@ public class MQTTClient : IAsyncDisposable
|
||||
.WithTopicFilter(f => f.WithTopic(VDA5050Topic.ORDER.ToTopicString()))
|
||||
.WithTopicFilter(f => f.WithTopic(VDA5050Topic.INSTANTACTIONS.ToTopicString()))
|
||||
.Build();
|
||||
}
|
||||
|
||||
public async Task ConnectAsync(CancellationToken cancellationToken = default)
|
||||
{
|
||||
MqttClient = MqttClientFactory.CreateMqttClient();
|
||||
MqttClient.DisconnectedAsync += async delegate (MqttClientDisconnectedEventArgs args)
|
||||
{
|
||||
if (args.ClientWasConnected && !IsReconnecing)
|
||||
{
|
||||
IsReconnecing = true;
|
||||
Logger.Warning("Mất kết nối tới broker, đang cố gắng kết nối lại...");
|
||||
if (MqttClient.IsConnected) await MqttClient.DisconnectAsync();
|
||||
if (MqttClient.IsConnected) await MqttClient.DisconnectAsync();
|
||||
MqttClient.Dispose();
|
||||
|
||||
await ConnectAsync();
|
||||
@@ -52,15 +56,10 @@ public class MQTTClient : IAsyncDisposable
|
||||
IsReconnecing = false;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
public async Task ConnectAsync(CancellationToken cancellationToken = default)
|
||||
{
|
||||
while (!cancellationToken.IsCancellationRequested)
|
||||
{
|
||||
try
|
||||
{
|
||||
MqttClient ??= MqttClientFactory.CreateMqttClient();
|
||||
var connection = await MqttClient.ConnectAsync(MqttClientOptions, cancellationToken);
|
||||
if (connection.ResultCode != MqttClientConnectResultCode.Success || !MqttClient.IsConnected)
|
||||
Logger.Warning($"Không thể kết nối tới broker do: {connection.ReasonString}");
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
namespace RobotApp.Services.Navigation;
|
||||
|
||||
public class NavigationController
|
||||
{
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace RobotApp.Services.Navigation.Algorithm;
|
||||
namespace RobotApp.Services.Robot.Navigation.Algorithm;
|
||||
|
||||
public class FuzzyLogic
|
||||
{
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace RobotApp.Services.Navigation.Algorithm;
|
||||
namespace RobotApp.Services.Robot.Navigation.Algorithm;
|
||||
|
||||
public class PID
|
||||
{
|
||||
22
RobotApp/Services/Robot/Navigation/DifferentialNavigation.cs
Normal file
22
RobotApp/Services/Robot/Navigation/DifferentialNavigation.cs
Normal file
@@ -0,0 +1,22 @@
|
||||
using RobotApp.Interfaces;
|
||||
|
||||
namespace RobotApp.Services.Robot.Navigation;
|
||||
|
||||
public class DifferentialNavigation(Logger<NavigationController> navLogger,
|
||||
Logger<DifferentialNavigation> Logger,
|
||||
IDriver Driver,
|
||||
ISafety Safety,
|
||||
ISensorIMU SensorIMU) : NavigationController(navLogger)
|
||||
{
|
||||
protected override void NavigationHandler()
|
||||
{
|
||||
try
|
||||
{
|
||||
// Implement differential drive navigation logic here
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.Write($"Error in DifferentialNavigation: {ex.Message}", LogLevel.Error);
|
||||
}
|
||||
}
|
||||
}
|
||||
61
RobotApp/Services/Robot/Navigation/NavigationController.cs
Normal file
61
RobotApp/Services/Robot/Navigation/NavigationController.cs
Normal file
@@ -0,0 +1,61 @@
|
||||
using RobotApp.Interfaces;
|
||||
using RobotApp.VDA5050.Order;
|
||||
|
||||
namespace RobotApp.Services.Robot.Navigation;
|
||||
|
||||
public class NavigationController(Logger<NavigationController> Logger) : INavigation
|
||||
{
|
||||
public NavigationState State { get; private set; } = NavigationState.None;
|
||||
public bool Driving { get; private set; }
|
||||
|
||||
protected const int CycleHandlerMilliseconds = 20;
|
||||
private WatchTimer<NavigationController>? NavigationTimer;
|
||||
|
||||
protected Node[] Nodes = [];
|
||||
protected Edge[] Edges = [];
|
||||
|
||||
protected void HandleNavigationStart()
|
||||
{
|
||||
NavigationTimer = new(CycleHandlerMilliseconds, NavigationHandler, Logger);
|
||||
NavigationTimer.Start();
|
||||
}
|
||||
|
||||
protected void HandleNavigationStop()
|
||||
{
|
||||
NavigationTimer?.Dispose();
|
||||
}
|
||||
|
||||
protected virtual void NavigationHandler() { }
|
||||
|
||||
public void CancelMovement()
|
||||
{
|
||||
}
|
||||
|
||||
public void Move(Node[] nodes, Edge[] edges)
|
||||
{
|
||||
Nodes = nodes;
|
||||
Edges = edges;
|
||||
State = NavigationState.Initializing;
|
||||
}
|
||||
|
||||
public void MoveStraight(double x, double y)
|
||||
{
|
||||
}
|
||||
|
||||
public void Paused()
|
||||
{
|
||||
}
|
||||
|
||||
public void Resume()
|
||||
{
|
||||
}
|
||||
|
||||
public void Rotate(double angle)
|
||||
{
|
||||
}
|
||||
|
||||
public void UpdateOrder(int lastBaseSequence)
|
||||
{
|
||||
State = NavigationState.Initialized;
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace RobotApp.Services.Navigation
|
||||
namespace RobotApp.Services.Robot.Navigation
|
||||
{
|
||||
public class NavigationManager
|
||||
{
|
||||
13
RobotApp/Services/Robot/Navigation/NavigationNode.cs
Normal file
13
RobotApp/Services/Robot/Navigation/NavigationNode.cs
Normal file
@@ -0,0 +1,13 @@
|
||||
using RobotApp.Common.Shares.Enums;
|
||||
|
||||
namespace RobotApp.Services.Robot.Navigation;
|
||||
|
||||
public class NavigationNode
|
||||
{
|
||||
public string NodeId { get; set; } = string.Empty;
|
||||
public double X { get; set; }
|
||||
public double Y { get; set; }
|
||||
public double Theta { get; set; }
|
||||
public RobotDirection Direction { get; set; }
|
||||
public string Description { get; set; } = string.Empty;
|
||||
}
|
||||
@@ -1,6 +1,31 @@
|
||||
namespace RobotApp.Services.Robot
|
||||
using RobotApp.Interfaces;
|
||||
using RobotApp.VDA5050.State;
|
||||
|
||||
namespace RobotApp.Services.Robot;
|
||||
|
||||
public class RobotAction : IInstanceActions
|
||||
{
|
||||
public class RobotAction
|
||||
public ActionState[] ActionStates { get; private set; } = [];
|
||||
|
||||
public bool HasActionRunning => throw new NotImplementedException();
|
||||
|
||||
public bool AddInstanceAction(VDA5050.InstantAction.Action action)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public bool AddOrderActions(VDA5050.InstantAction.Action[] actions)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public bool StartAction(string actionId)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public bool StopAction()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
}
|
||||
|
||||
6
RobotApp/Services/Robot/RobotBattery.cs
Normal file
6
RobotApp/Services/Robot/RobotBattery.cs
Normal file
@@ -0,0 +1,6 @@
|
||||
namespace RobotApp.Services.Robot
|
||||
{
|
||||
public class RobotBattery
|
||||
{
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,96 @@
|
||||
namespace RobotApp.Services.Robot
|
||||
using RobotApp.Interfaces;
|
||||
using RobotApp.Services.Exceptions;
|
||||
using RobotApp.VDA5050.Order;
|
||||
using RobotApp.VDA5050.State;
|
||||
|
||||
namespace RobotApp.Services.Robot;
|
||||
|
||||
public class RobotController(IOrder OrderManager,
|
||||
INavigation NavigationManager,
|
||||
IInstanceActions ActionManager,
|
||||
IBattery BatteryManager,
|
||||
ILocalization Localization,
|
||||
IPeripheral PeripheralManager,
|
||||
ISafety SafetyManager,
|
||||
IError ErrorManager,
|
||||
IInfomation InfomationManager,
|
||||
Logger<RobotController> Logger,
|
||||
RobotConnection ConnectionManager) : BackgroundService
|
||||
{
|
||||
public class RobotController
|
||||
private readonly Mutex NewOrderMutex = new();
|
||||
private readonly Mutex NewInstanceMutex = new();
|
||||
|
||||
private WatchTimer<RobotController>? UpdateStateTimer;
|
||||
private const int UpdateStateInterval = 1000;
|
||||
|
||||
protected override Task ExecuteAsync(CancellationToken stoppingToken)
|
||||
{
|
||||
UpdateStateTimer = new(UpdateStateInterval, UpdateStateHandler, Logger);
|
||||
UpdateStateTimer.Start();
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
private void UpdateStateHandler()
|
||||
{
|
||||
// xử lý cập nhật trạng thái robot và gửi thông tin qua kết nối
|
||||
}
|
||||
|
||||
public void NewOrderUpdated(OrderMsg order)
|
||||
{
|
||||
if (NewOrderMutex.WaitOne(2000))
|
||||
{
|
||||
try
|
||||
{
|
||||
if (!string.IsNullOrEmpty(OrderManager.OrderId))
|
||||
{
|
||||
if (order.OrderId != OrderManager.OrderId) throw new OrderException(RobotErrors.CreateError(ErrorType.INITIALIZE_ORDER, "1001", ErrorLevel.WARNING, $"Có order đang được thực hiện. OrderId: {OrderManager.OrderId}, OrderId mới: {order.OrderId}"));
|
||||
OrderManager.UpdateOrder(order.OrderUpdateId, order.Nodes, order.Edges);
|
||||
}
|
||||
else if (PeripheralManager.OperatingMode != Interfaces.OperatingMode.AUTOMATIC) throw new OrderException(RobotErrors.CreateError(ErrorType.INITIALIZE_ORDER, "1006", ErrorLevel.WARNING, $"Không thể khởi tạo order mới khi chế độ vận hành không phải là TỰ ĐỘNG. Chế độ hiện tại: {PeripheralManager.OperatingMode}"));
|
||||
else if(ActionManager.HasActionRunning) throw new OrderException(RobotErrors.CreateError(ErrorType.INITIALIZE_ORDER, "1007", ErrorLevel.WARNING, $"Không thể khởi tạo order mới khi có action đang thực hiện. Vui lòng chờ hoàn thành các action hiện tại."));
|
||||
else if(ErrorManager.HasFatalError) throw new OrderException(RobotErrors.CreateError(ErrorType.INITIALIZE_ORDER, "1008", ErrorLevel.WARNING, $"Không thể khởi tạo order mới khi có lỗi nghiêm trọng. Vui lòng kiểm tra và xử lý lỗi."));
|
||||
else if(NavigationManager.Driving) throw new OrderException(RobotErrors.CreateError(ErrorType.INITIALIZE_ORDER, "1009", ErrorLevel.WARNING, $"Không thể khởi tạo order mới khi robot đang di chuyển. Vui lòng dừng robot."));
|
||||
else OrderManager.StartOrder(order.OrderId, order.Nodes, order.Edges);
|
||||
}
|
||||
catch (OrderException orEx)
|
||||
{
|
||||
if (orEx.Error is not null)
|
||||
{
|
||||
ErrorManager.AddError(orEx.Error, TimeSpan.FromSeconds(10));
|
||||
Logger.Warning($"Lỗi khi xử lí Order: {orEx.Error.ErrorDescription}");
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.Warning($"Lỗi khi xử lí Order: {ex.Message}");
|
||||
}
|
||||
finally
|
||||
{
|
||||
NewOrderMutex.ReleaseMutex();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void NewInstanceActionUpdated()
|
||||
{
|
||||
if (NewInstanceMutex.WaitOne(2000))
|
||||
{
|
||||
try
|
||||
{
|
||||
|
||||
}
|
||||
catch (ActionException acEx)
|
||||
{
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
}
|
||||
finally
|
||||
{
|
||||
NewInstanceMutex.ReleaseMutex();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
41
RobotApp/Services/Robot/RobotErrors.cs
Normal file
41
RobotApp/Services/Robot/RobotErrors.cs
Normal file
@@ -0,0 +1,41 @@
|
||||
using RobotApp.VDA5050.State;
|
||||
using RobotApp.VDA5050.Type;
|
||||
|
||||
namespace RobotApp.Services.Robot;
|
||||
|
||||
public class RobotErrors
|
||||
{
|
||||
private readonly List<Error> Errors = [];
|
||||
|
||||
public void AddError(Error error, TimeSpan? clearAfter = null)
|
||||
{
|
||||
lock (Errors)
|
||||
{
|
||||
Errors.Add(error);
|
||||
}
|
||||
if (clearAfter is not null && clearAfter.HasValue)
|
||||
{
|
||||
if (clearAfter.Value < TimeSpan.Zero) throw new ArgumentOutOfRangeException(nameof(clearAfter), "TimeSpan cannot be negative.");
|
||||
_ = Task.Run(async () =>
|
||||
{
|
||||
await Task.Delay(clearAfter.Value);
|
||||
lock (Errors)
|
||||
{
|
||||
Errors.RemoveAll(e => e.ErrorType == error.ErrorType);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
public static Error CreateError(ErrorType type, string hint, ErrorLevel level, string description)
|
||||
{
|
||||
return new Error()
|
||||
{
|
||||
ErrorType = type.ToString(),
|
||||
ErrorLevel = level.ToString(),
|
||||
ErrorDescription = description,
|
||||
ErrorHint = hint,
|
||||
ErrorReferences = []
|
||||
};
|
||||
}
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user