fix: some cleanup and fixing runtime bugs, refs NOISSUE
This commit is contained in:
@@ -3,8 +3,8 @@
|
||||
{
|
||||
using (var dci = DataContext.Instance)
|
||||
{
|
||||
var user = dci.Users.Where(u => u.LdapUserName == User.Identity.Name);
|
||||
return user.Any();
|
||||
var user = dci.Users?.Where(u => u.LdapUserName == User.Identity.Name);
|
||||
return user == null ? false : user.Any();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -18,7 +18,7 @@
|
||||
<script type="importmap"></script>
|
||||
<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
|
||||
<link rel="stylesheet" href="~/css/site.css" asp-append-version="true" />
|
||||
<link rel="stylesheet" href="~/sotd.styles.css" asp-append-version="true" />
|
||||
<link rel="stylesheet" href="~/song_of_the_day.styles.css" asp-append-version="true" />
|
||||
</head>
|
||||
<body>
|
||||
<header>
|
||||
@@ -37,13 +37,15 @@
|
||||
<li class="nav-item">
|
||||
<a class="nav-link text-dark" asp-area="" asp-page="/SuggestionHelpers">Suggestion Helpers</a>
|
||||
</li>
|
||||
@if (this.User.Identity.IsAuthenticated && !DoesUserHaveClaimedPhoneNumber())
|
||||
@if (this.User != null && this.User.Identity != null &&
|
||||
this.User.Identity.IsAuthenticated && !DoesUserHaveClaimedPhoneNumber())
|
||||
{
|
||||
<li class="nav-item">
|
||||
<a class="nav-link text-dark" asp-area="" asp-page="/UnclaimedPhoneNumbers">Unclaimed Phone Numbers</a>
|
||||
</li>
|
||||
}
|
||||
@if (this.User.Identity.IsAuthenticated && DoesUserHaveClaimedPhoneNumber())
|
||||
@if (this.User != null && this.User.Identity != null &&
|
||||
this.User.Identity.IsAuthenticated && DoesUserHaveClaimedPhoneNumber())
|
||||
{
|
||||
<li class="nav-item">
|
||||
<a class="nav-link text-dark" asp-area="" asp-page="/SubmitSongs">Submit Songs</a>
|
||||
|
@@ -1,7 +1,7 @@
|
||||
@using Microsoft.AspNetCore.Authentication
|
||||
|
||||
<div class="loginform">
|
||||
@if (!this.User.Identity.IsAuthenticated)
|
||||
@if (this.User == null || this.User.Identity == null || !this.User.Identity.IsAuthenticated)
|
||||
{
|
||||
<form method="post" action="Auth/Login">
|
||||
<div>
|
||||
|
Reference in New Issue
Block a user