From ecc9aa40d72e92119625e045de8c1a4445937043 Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Fri, 13 May 2022 12:03:34 -0400
Subject: [PATCH] resolve login issue related to 'LoginOptions:TwoFactor' and
 order list of files alphabetically

---
 Oqtane.Client/Modules/Admin/Login/Index.razor | 2 +-
 Oqtane.Client/Services/FileService.cs         | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/Login/Index.razor b/Oqtane.Client/Modules/Admin/Login/Index.razor
index d45d18e2..14916d80 100644
--- a/Oqtane.Client/Modules/Admin/Login/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Login/Index.razor
@@ -206,7 +206,7 @@
 				}
 				else
 				{
-					if (PageState.Site.Settings["LoginOptions:TwoFactor"] == "required" || user.TwoFactorRequired)
+					if ((PageState.Site.Settings.ContainsKey("LoginOptions:TwoFactor") && PageState.Site.Settings["LoginOptions:TwoFactor"] == "required") || user.TwoFactorRequired)
 					{
 						twofactor = true;
 						validated = false;
diff --git a/Oqtane.Client/Services/FileService.cs b/Oqtane.Client/Services/FileService.cs
index 75582d8c..2d6ee55f 100644
--- a/Oqtane.Client/Services/FileService.cs
+++ b/Oqtane.Client/Services/FileService.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Threading;
@@ -32,7 +33,8 @@ namespace Oqtane.Services
 
         public async Task<List<File>> GetFilesAsync(string folder)
         {
-            return await GetJsonAsync<List<File>>($"{Apiurl}?folder={folder}");
+            List<File> files = await GetJsonAsync<List<File>>($"{Apiurl}?folder={folder}");
+            return files.OrderBy(item => item.Name).ToList();
         }
 
         public async Task<List<File>> GetFilesAsync(int siteId, string folderPath)
@@ -44,7 +46,8 @@ namespace Oqtane.Services
 
             var path = WebUtility.UrlEncode(folderPath);
 
-            return await GetJsonAsync<List<File>>($"{Apiurl}/{siteId}/{path}");
+            List<File> files = await GetJsonAsync<List<File>>($"{Apiurl}/{siteId}/{path}");
+            return files.OrderBy(item => item.Name).ToList();
         }
 
         public async Task<File> GetFileAsync(int fileId)