Merge branch 'main' into snyk-upgrade-dddd15e7bde228afaba277f7459bc842

marvinkobit · Mar 13, 2023 · 233b058 · 233b058
2 parents c0886a3 + f10e07e
commit 233b058
Show file tree

Hide file tree

Showing 54 changed files with 5,865 additions and 632 deletions.
diff --git a/Labtracker/Account/Login.aspx.cs b/Labtracker/Account/Login.aspx.cs
@@ -50,6 +50,7 @@ protected void LogIn(object sender, EventArgs e)
                                           true);
                         break;
                     case SignInStatus.Failure:
+                        break;
                     default:
                         FailureText.Text = "Invalid login attempt";
                         ErrorMessage.Visible = true;

diff --git a/Labtracker/Account/Manage.aspx b/Labtracker/Account/Manage.aspx
diff --git a/Labtracker/Account/Manage.aspx.cs b/Labtracker/Account/Manage.aspx.cs
@@ -9,11 +9,13 @@
 using Microsoft.Owin.Security;
 using Owin;
 using Labtracker.Models;
+using System.Web.Providers.Entities;
 
 namespace Labtracker.Account
 {
     public partial class Manage : System.Web.UI.Page
     {
+
         protected string SuccessMessage
         {
             get;
@@ -36,7 +38,7 @@ private bool HasPassword(ApplicationUserManager manager)
         protected void Page_Load()
         {
             var manager = Context.GetOwinContext().GetUserManager<ApplicationUserManager>();
-
+            UsernameText.Text = User.Identity.GetUserName();
             HasPhoneNumber = String.IsNullOrEmpty(manager.GetPhoneNumber(User.Identity.GetUserId()));
 
             // Enable this after setting up two-factor authentientication
@@ -124,5 +126,12 @@ protected void TwoFactorEnable_Click(object sender, EventArgs e)
 
             Response.Redirect("/Account/Manage");
         }
+
+        protected void SignOut(object sender, EventArgs e)
+        {
+            var authenticationManager = HttpContext.Current.GetOwinContext().Authentication;
+            authenticationManager.SignOut();
+            Response.Redirect("~/login.aspx");
+        }
     }
 }
diff --git a/Labtracker/Account/Manage.aspx.designer.cs b/Labtracker/Account/Manage.aspx.designer.cs