- Updated login process

microsoft · Jun 30, 2023 · 398a3aa · 398a3aa
1 parent e4053df
commit 398a3aa
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/ready/AzNamingTool/Shared/MainLayout.razor b/ready/AzNamingTool/Shared/MainLayout.razor
@@ -27,7 +27,11 @@
             {
                 if (currentuser != "System")
                 {
-                    <div class="w-100">@("User: " + currentuser)</div>
+                    <div class="w-100">
+                        @(
+                            "User: " + currentuser
+                            )
+                    </div>
                 }
             }
             @if (admin)
@@ -105,18 +109,18 @@
         {
             OpenPasswordModal();
         }
-        // Set the current user
-        var currentuservalue = await session.GetAsync<string>("currentuser");
-        if (!String.IsNullOrEmpty(currentuservalue.Value))
-        {
-            currentuser = currentuservalue.Value;
-        }
     }
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
         var adminresult = await session.GetAsync<bool>("admin");
         admin = (bool)adminresult.Value;
+        // Set the current user
+        var currentuservalue = await session.GetAsync<string>("currentuser");
+        if (!String.IsNullOrEmpty(currentuservalue.Value))
+        {
+            currentuser = currentuservalue.Value;
+        }
         if (firstRender)
         {
             // Check if the user has manually logged out. If so, don't attempt to identity them.