Added new filter for early access for file and metadata at the same time + game settings early access will now show current state

Yelo420 · Yelo420 · commit da9463fc0955 · 2025-06-15T02:59:34.000+02:00
diff --git a/gamevault/Helper/LoginManager.cs b/gamevault/Helper/LoginManager.cs
@@ -113,7 +113,7 @@ public async Task<LoginState> Login(string serverUrl, string username, string pa
             return state;
         }
 
-        public async Task<LoginState> OAuthLogin(UserProfile profile, bool showWindow = true)
+        public async Task<LoginState> SSOLogin(UserProfile profile, bool showWindow = true)
         {
             // Create window in both cases, but only show it if showWindow is true
             Window win = new Window()
@@ -195,8 +195,8 @@ public async Task<LoginState> OAuthLogin(UserProfile profile, bool showWindow =
                     // Otherwise, let the navigation continue
                 }
             };
-            uiWebView.CoreWebView2.Navigate($"{profile.ServerUrl}/api/auth/oauth2/login");
-            // uiWebView.Source = new Uri($"{profile.ServerUrl}/api/auth/oauth2/login");
+            uiWebView.CoreWebView2.Navigate($"{profile.ServerUrl}/api/auth/SSO2/login");
+            // uiWebView.Source = new Uri($"{profile.ServerUrl}/api/auth/SSO2/login");
 
             // Set a timeout for hidden window mode
             if (!showWindow)
@@ -442,8 +442,8 @@ private async void CheckOnlineStatus(object sender, EventArgs e)
             {               
                 if (!IsLoggedIn())
                 {
-                    bool isLoggedInWithOAuth = Preferences.Get(AppConfigKey.IsLoggedInWithOAuth, GetUserProfile().UserConfigFile) == "1";
-                    if (!isLoggedInWithOAuth)
+                    bool isLoggedInWithSSO = Preferences.Get(AppConfigKey.IsLoggedInWithSSO, GetUserProfile().UserConfigFile) == "1";
+                    if (!isLoggedInWithSSO)
                     {
                         string[] credencials = WebHelper.GetCredentials();
                         await Login(GetUserProfile().ServerUrl, credencials[0], credencials[1]);
diff --git a/gamevault/Helper/Web/OAuthHttpClient.cs b/gamevault/Helper/Web/OAuthHttpClient.cs
@@ -11,7 +11,7 @@
 
 namespace gamevault.Helper
 {
-    public class OAuthHttpClient
+    public class SSOHttpClient
     {
         private readonly HttpClient _httpClient;
         private string _accessToken;
@@ -21,7 +21,7 @@ public class OAuthHttpClient
         public string UserName;
         public string Password;
 
-        public OAuthHttpClient()
+        public SSOHttpClient()
         {
             _httpClient = new HttpClient();
             _httpClient.DefaultRequestHeaders.UserAgent.ParseAdd($"GameVault/{SettingsViewModel.Instance.Version}");
diff --git a/gamevault/Helper/Web/WebHelper.cs b/gamevault/Helper/Web/WebHelper.cs
@@ -21,7 +21,7 @@ namespace gamevault.Helper
 {
     internal class WebHelper
     {
-        private static readonly OAuthHttpClient HttpClient = new OAuthHttpClient();
+        private static readonly SSOHttpClient HttpClient = new SSOHttpClient();
         private static readonly HttpClient BaseHttpClient = new HttpClient();
         static WebHelper() { }
         internal static void SetCredentials(string serverUrl, string username, string password)
diff --git a/gamevault/Models/AppInfo.cs b/gamevault/Models/AppInfo.cs
@@ -58,7 +58,7 @@ public enum AppConfigKey
         UserID,
         LoginRememberMe,
         LastUserProfile,
-        IsLoggedInWithOAuth,
+        IsLoggedInWithSSO,
         LastImageOptimization
 
     }
diff --git a/gamevault/UserControls/GameSettingsUserControl.xaml b/gamevault/UserControls/GameSettingsUserControl.xaml
@@ -633,7 +633,7 @@
                                         <TextBox Width="100" Margin="115,0,0,0" mah:TextBoxHelper.Watermark="{Binding Game.Metadata.AgeRating}" mah:TextBoxHelper.UseFloatingWatermark="True" Text="{Binding UpdateGame.UserMetadata.AgeRating,TargetNullValue='',FallbackValue={x:Null}}" mah:ControlsHelper.CornerRadius="5"/>
                                         <DatePicker Width="100" Margin="69,0,0,0" SelectedDate="{Binding UpdateGame.UserMetadata.ReleaseDate}" mah:TextBoxHelper.Watermark="{Binding Path=Game.Metadata.ReleaseDate,StringFormat='{}{0:dd/MM/yyyy}'}" mah:ControlsHelper.CornerRadius="5" mah:TextBoxHelper.UseFloatingWatermark="True"/>
                                         <TextBox Width="100" Margin="67,0,0,0" mah:TextBoxHelper.Watermark="{Binding Game.Metadata.Rating}" mah:TextBoxHelper.UseFloatingWatermark="True" Text="{Binding UpdateGame.UserMetadata.Rating}" mah:ControlsHelper.CornerRadius="5"/>
-                                        <CheckBox Content="Yes" IsChecked="{Binding UpdateGame.UserMetadata.EarlyAccess}" Margin="68,0,0,0"/>
+                                        <CheckBox Content="{Binding Game.Metadata.EarlyAccess}" IsChecked="{Binding UpdateGame.UserMetadata.EarlyAccess}" Margin="68,0,0,0"/>
                                     </StackPanel>
 
                                     <TextBlock Text="Default Launch Executable" FontSize="15" FontWeight="Bold" TextDecorations="Underline" Margin="0,5,0,5"/>
diff --git a/gamevault/UserControls/GameViewUserControl.xaml b/gamevault/UserControls/GameViewUserControl.xaml
@@ -257,14 +257,17 @@
                                             <TextBlock Text="{Binding Path=Game.Type,Converter={StaticResource enumDescConv}}" VerticalAlignment="Center" Margin="8,0,8,0" FontSize="10" FontWeight="Bold" Foreground="#FF424242"/>
                                         </Border>
                                     </Button>
-                                    <Border CornerRadius="5" Background="Gainsboro" Height="25" Margin="0,0,0,0">
+                                    <Border CornerRadius="5" Background="Gainsboro" Height="25" Margin="5,0,0,0">
                                         <Border.Style>
                                             <Style TargetType="{x:Type Border}">
                                                 <Setter Property="Visibility" Value="Collapsed"/>
                                                 <Style.Triggers>
                                                     <DataTrigger Binding="{Binding Path=Game.EarlyAccess}" Value="True">
                                                         <Setter Property="Visibility" Value="Visible"/>
                                                     </DataTrigger>
+                                                    <DataTrigger Binding="{Binding Path=Game.Metadata.EarlyAccess}" Value="True">
+                                                        <Setter Property="Visibility" Value="Visible"/>
+                                                    </DataTrigger>
                                                 </Style.Triggers>
                                             </Style>
                                         </Border.Style>
diff --git a/gamevault/UserControls/LibraryUserControl.xaml.cs b/gamevault/UserControls/LibraryUserControl.xaml.cs
@@ -292,7 +292,7 @@ private string ApplyFilter(string filter)
             }
             if (uiFilterEarlyAccess.IsChecked == true)
             {
-                filter += "&filter.early_access=$eq:true";
+                filter += "&filter.early_access=$eq:true&filter.metadata.early_access=$eq:true";
             }
             if (uiFilterReleaseDateRangeSelector.IsValid())
             {
diff --git a/gamevault/UserControls/SettingsUserControl.xaml.cs b/gamevault/UserControls/SettingsUserControl.xaml.cs
@@ -168,8 +168,8 @@ private async void Logout_Click(object sender, RoutedEventArgs e)
             {
                 try
                 {
-                    bool isLoggedInWithOAuth = Preferences.Get(AppConfigKey.IsLoggedInWithOAuth, LoginManager.Instance.GetUserProfile().UserConfigFile) == "1";
-                    if (isLoggedInWithOAuth)
+                    bool isLoggedInWithSSO = Preferences.Get(AppConfigKey.IsLoggedInWithSSO, LoginManager.Instance.GetUserProfile().UserConfigFile) == "1";
+                    if (isLoggedInWithSSO)
                     {
                         //await WebHelper.PostAsync($"{SettingsViewModel.Instance.ServerUrl}/api/auth/revoke", "{" + $"\"refresh_token\": \"{WebHelper.GetRefreshToken()}\"" + "}");
                     }
@@ -197,14 +197,14 @@ private async void LogoutFromAllDevices_Click(object sender, RoutedEventArgs e)
             //{
             //    try
             //    {
-            //        bool isLoggedInWithOAuth = Preferences.Get(AppConfigKey.IsLoggedInWithOAuth, LoginManager.Instance.GetUserProfile().UserConfigFile) == "1";
-            //        if (isLoggedInWithOAuth)
+            //        bool isLoggedInWithSSO = Preferences.Get(AppConfigKey.IsLoggedInWithSSO, LoginManager.Instance.GetUserProfile().UserConfigFile) == "1";
+            //        if (isLoggedInWithSSO)
             //        {
             //            await WebHelper.PostAsync($"{SettingsViewModel.Instance.ServerUrl}/api/auth/revoke/all", "");
             //        }
             //        else
             //        {
-            //            MainWindowViewModel.Instance.AppBarText = "This action is only possible if the user is logged in via OAuth";
+            //            MainWindowViewModel.Instance.AppBarText = "This action is only possible if the user is logged in via SSO";
             //        }
             //    }
             //    catch (Exception ex)
diff --git a/gamevault/Windows/LoginWindow.xaml b/gamevault/Windows/LoginWindow.xaml
@@ -170,7 +170,7 @@
                         <TextBlock Text="Sign In" FontSize="30" HorizontalAlignment="Center"/>
                         <TextBlock Text="Specify Your Server URL" TextDecorations="Underline" Margin="0,15,0,5"/>
                         <TextBox Text="{Binding LoginUser.ServerUrl}" mah:ControlsHelper.CornerRadius="5" BorderThickness="2"/>
-                        <StackPanel IsEnabled="{Binding LoginUser.IsLoggedInWithOAuth,Converter={StaticResource invBoolConv}}">
+                        <StackPanel IsEnabled="{Binding LoginUser.IsLoggedInWithSSO,Converter={StaticResource invBoolConv}}">
                             <TextBlock Text="Username or Email" TextDecorations="Underline" Margin="0,15,0,5"/>
                             <TextBox Text="{Binding LoginUser.Username}" mah:ControlsHelper.CornerRadius="5" BorderThickness="2"/>
 
@@ -182,7 +182,7 @@
                             <TextBlock Text="OR" HorizontalAlignment="Center" Margin="10,0,10,0"/>
                             <Rectangle Fill="{DynamicResource MahApps.Brushes.ThemeForeground}" Width="70" Height="2"/>
                         </StackPanel>
-                        <CheckBox IsChecked="{Binding LoginUser.IsLoggedInWithOAuth}" Content="Sign in using your Identity Provider" mah:CheckBoxHelper.CheckCornerRadius="5" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,15,0,0"/>
+                        <CheckBox IsChecked="{Binding LoginUser.IsLoggedInWithSSO}" Content="Sign in using your Identity Provider" mah:CheckBoxHelper.CheckCornerRadius="5" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,15,0,0"/>
                     </StackPanel>
                     <uc:IconButton Text="Save and Login" Height="30" Margin="0,0,10,10" Width="100" HorizontalAlignment="Right" VerticalAlignment="Bottom" Click="SaveAndLogin_Click"/>
                     <uc:IconButton Text="Back" Kind="Skeleton" BorderThickness="1" Height="30" Margin="10,0,0,10" Width="100" HorizontalAlignment="Left" VerticalAlignment="Bottom" Click="Back_Click" Tag="{x:Static local:LoginStep.SignInOrSignUp}"/>
@@ -194,7 +194,7 @@
                         <TextBlock Text="Sign Up" FontSize="30" HorizontalAlignment="Center"/>
                         <TextBlock Text="Specify Your Server URL" TextDecorations="Underline" Margin="0,15,0,5"/>
                         <TextBox Text="{Binding SignupUser.ServerUrl}" mah:ControlsHelper.CornerRadius="5" BorderThickness="2"/>
-                        <StackPanel IsEnabled="{Binding SignupUser.IsLoggedInWithOAuth,Converter={StaticResource invBoolConv}}">
+                        <StackPanel IsEnabled="{Binding SignupUser.IsLoggedInWithSSO,Converter={StaticResource invBoolConv}}">
                             <Grid>
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="Auto"/>
@@ -248,7 +248,7 @@
                                 <Rectangle Fill="{DynamicResource MahApps.Brushes.ThemeForeground}" Width="70" Height="2"/>
                             </StackPanel>
                         </StackPanel>
-                        <CheckBox IsChecked="{Binding SignupUser.IsLoggedInWithOAuth}" Content="Sign up using your Identity Provider" mah:CheckBoxHelper.CheckCornerRadius="5" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,15,0,0"/>
+                        <CheckBox IsChecked="{Binding SignupUser.IsLoggedInWithSSO}" Content="Sign up using your Identity Provider" mah:CheckBoxHelper.CheckCornerRadius="5" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,15,0,0"/>
                     </StackPanel>
                     <uc:IconButton Text="Save and Sign Up" Height="30" Margin="0,0,10,10" Width="100" HorizontalAlignment="Right" VerticalAlignment="Bottom" Click="SaveAndSignUp_Click"/>
                     <uc:IconButton Text="Back" Kind="Skeleton" BorderThickness="1" Height="30" Margin="10,0,0,10" Width="100" HorizontalAlignment="Left" VerticalAlignment="Bottom" Click="Back_Click" Tag="{x:Static local:LoginStep.SignInOrSignUp}"/>
diff --git a/gamevault/Windows/LoginWindow.xaml.cs b/gamevault/Windows/LoginWindow.xaml.cs
@@ -28,7 +28,7 @@ public class LoginUser
         public string FirstName { get; set; }
         public string LastName { get; set; }
         public string EMail { get; set; }
-        public bool IsLoggedInWithOAuth { get; set; }
+        public bool IsLoggedInWithSSO { get; set; }
     }
     public enum LoginStep
     {
@@ -114,7 +114,7 @@ private UserProfile SetupUserProfile(LoginUser user)
             UserProfile profile = ProfileManager.CreateUserProfile(cleanedServerUrl);
             profile.ServerUrl = user.ServerUrl;
             Preferences.Set(AppConfigKey.ServerUrl, user.ServerUrl, profile.UserConfigFile);
-            if (!user.IsLoggedInWithOAuth)
+            if (!user.IsLoggedInWithSSO)
             {
                 profile.Name = user.Username;
                 ViewModel.UserProfiles.Add(profile);
@@ -123,7 +123,7 @@ private UserProfile SetupUserProfile(LoginUser user)
             }
             else
             {
-                Preferences.Set(AppConfigKey.IsLoggedInWithOAuth, "1", profile.UserConfigFile);
+                Preferences.Set(AppConfigKey.IsLoggedInWithSSO, "1", profile.UserConfigFile);
             }
             return profile;
         }
@@ -165,7 +165,7 @@ private void ValidateSignInData(LoginUser loginUser)
 
             loginUser.ServerUrl = ValidateUriScheme(loginUser.ServerUrl);
 
-            if (!ViewModel.LoginUser.IsLoggedInWithOAuth)
+            if (!ViewModel.LoginUser.IsLoggedInWithSSO)
             {
                 if (string.IsNullOrWhiteSpace(loginUser.Username))
                     throw new ArgumentException("Username is not set");
@@ -182,17 +182,17 @@ private async Task Login(UserProfile profile, bool firstTimeLogin = false, bool
                 ViewModel.StatusText = "Logging in...";
                 ViewModel.LoginStepIndex = (int)LoginStep.LoadingAction;
             }
-            bool isLoggedInWithOAuth = Preferences.Get(AppConfigKey.IsLoggedInWithOAuth, profile.UserConfigFile) == "1";
+            bool isLoggedInWithSSO = Preferences.Get(AppConfigKey.IsLoggedInWithSSO, profile.UserConfigFile) == "1";
             LoginState state = LoginState.Success;
-            if (!isLoggedInWithOAuth)
+            if (!isLoggedInWithSSO)
             {
                 string username = Preferences.Get(AppConfigKey.Username, profile.UserConfigFile);
                 string password = Preferences.Get(AppConfigKey.Password, profile.UserConfigFile, true);
                 state = await LoginManager.Instance.Login(profile.ServerUrl, username, password);
             }
             else
             {
-                state = await LoginManager.Instance.OAuthLogin(profile, firstTimeLogin);
+                state = await LoginManager.Instance.SSOLogin(profile, firstTimeLogin);
                 if (state == LoginState.Success)
                 {
                     Preferences.Set(AppConfigKey.Username, LoginManager.Instance.GetCurrentUser().Username, profile.UserConfigFile);
@@ -206,7 +206,7 @@ private async Task Login(UserProfile profile, bool firstTimeLogin = false, bool
                     }
                     catch
                     {
-                        await Task.Delay(1500);//For slower machines, we have to wait for the webview of OAuthLogin to free the web cache
+                        await Task.Delay(1500);//For slower machines, we have to wait for the webview of SSOLogin to free the web cache
                         ProfileManager.DeleteUserProfile(profile);
                     }
                 }
@@ -259,7 +259,7 @@ private async void SaveAndSignUp_Click(object sender, RoutedEventArgs e)
             {
                 ValidateSignUpData();
                 LoginState state = LoginState.Success;
-                if (!ViewModel.SignupUser.IsLoggedInWithOAuth)
+                if (!ViewModel.SignupUser.IsLoggedInWithSSO)
                 {
                     state = await LoginManager.Instance.Register(ViewModel.SignupUser);//Only non-provider login has a additional call. Else its just a login, because the server will create the account internally
                 }
@@ -289,7 +289,7 @@ private void ValidateSignUpData()
                 throw new Exception("Server URL is not set");
             }
             ViewModel.SignupUser.ServerUrl = ValidateUriScheme(ViewModel.SignupUser.ServerUrl);
-            if (!ViewModel.SignupUser.IsLoggedInWithOAuth)
+            if (!ViewModel.SignupUser.IsLoggedInWithSSO)
             {
                 if (string.IsNullOrWhiteSpace(ViewModel.SignupUser.Password) || string.IsNullOrWhiteSpace(ViewModel.SignupUser.RepeatPassword))
                 {

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ public async Task<LoginState> Login(string serverUrl, string username, string pa`
`113`	`113`	`return state;`
`114`	`114`	`}`
`115`	`115`
`116`		`- public async Task<LoginState> OAuthLogin(UserProfile profile, bool showWindow = true)`
	`116`	`+ public async Task<LoginState> SSOLogin(UserProfile profile, bool showWindow = true)`
`117`	`117`	`{`
`118`	`118`	`// Create window in both cases, but only show it if showWindow is true`
`119`	`119`	`Window win = new Window()`
`@@ -195,8 +195,8 @@ public async Task<LoginState> OAuthLogin(UserProfile profile, bool showWindow =`
`195`	`195`	`// Otherwise, let the navigation continue`
`196`	`196`	`}`
`197`	`197`	`};`
`198`		`- uiWebView.CoreWebView2.Navigate($"{profile.ServerUrl}/api/auth/oauth2/login");`
`199`		`- // uiWebView.Source = new Uri($"{profile.ServerUrl}/api/auth/oauth2/login");`
	`198`	`+ uiWebView.CoreWebView2.Navigate($"{profile.ServerUrl}/api/auth/SSO2/login");`
	`199`	`+ // uiWebView.Source = new Uri($"{profile.ServerUrl}/api/auth/SSO2/login");`
`200`	`200`
`201`	`201`	`// Set a timeout for hidden window mode`
`202`	`202`	`if (!showWindow)`
`@@ -442,8 +442,8 @@ private async void CheckOnlineStatus(object sender, EventArgs e)`
`442`	`442`	`{`
`443`	`443`	`if (!IsLoggedIn())`
`444`	`444`	`{`
`445`		`- bool isLoggedInWithOAuth = Preferences.Get(AppConfigKey.IsLoggedInWithOAuth, GetUserProfile().UserConfigFile) == "1";`
`446`		`- if (!isLoggedInWithOAuth)`
	`445`	`+ bool isLoggedInWithSSO = Preferences.Get(AppConfigKey.IsLoggedInWithSSO, GetUserProfile().UserConfigFile) == "1";`
	`446`	`+ if (!isLoggedInWithSSO)`
`447`	`447`	`{`
`448`	`448`	`string[] credencials = WebHelper.GetCredentials();`
`449`	`449`	`await Login(GetUserProfile().ServerUrl, credencials[0], credencials[1]);`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace gamevault.Helper`
`13`	`13`	`{`
`14`		`- public class OAuthHttpClient`
	`14`	`+ public class SSOHttpClient`
`15`	`15`	`{`
`16`	`16`	`private readonly HttpClient _httpClient;`
`17`	`17`	`private string _accessToken;`
`@@ -21,7 +21,7 @@ public class OAuthHttpClient`
`21`	`21`	`public string UserName;`
`22`	`22`	`public string Password;`
`23`	`23`
`24`		`- public OAuthHttpClient()`
	`24`	`+ public SSOHttpClient()`
`25`	`25`	`{`
`26`	`26`	`_httpClient = new HttpClient();`
`27`	`27`	`_httpClient.DefaultRequestHeaders.UserAgent.ParseAdd($"GameVault/{SettingsViewModel.Instance.Version}");`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ namespace gamevault.Helper`
`21`	`21`	`{`
`22`	`22`	`internal class WebHelper`
`23`	`23`	`{`
`24`		`- private static readonly OAuthHttpClient HttpClient = new OAuthHttpClient();`
	`24`	`+ private static readonly SSOHttpClient HttpClient = new SSOHttpClient();`
`25`	`25`	`private static readonly HttpClient BaseHttpClient = new HttpClient();`
`26`	`26`	`static WebHelper() { }`
`27`	`27`	`internal static void SetCredentials(string serverUrl, string username, string password)`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public enum AppConfigKey`
`58`	`58`	`UserID,`
`59`	`59`	`LoginRememberMe,`
`60`	`60`	`LastUserProfile,`
`61`		`- IsLoggedInWithOAuth,`
	`61`	`+ IsLoggedInWithSSO,`
`62`	`62`	`LastImageOptimization`
`63`	`63`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,7 @@ private string ApplyFilter(string filter)`
`292`	`292`	`}`
`293`	`293`	`if (uiFilterEarlyAccess.IsChecked == true)`
`294`	`294`	`{`
`295`		`- filter += "&filter.early_access=$eq:true";`
	`295`	`+ filter += "&filter.early_access=$eq:true&filter.metadata.early_access=$eq:true";`
`296`	`296`	`}`
`297`	`297`	`if (uiFilterReleaseDateRangeSelector.IsValid())`
`298`	`298`	`{`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public class LoginUser`
`28`	`28`	`public string FirstName { get; set; }`
`29`	`29`	`public string LastName { get; set; }`
`30`	`30`	`public string EMail { get; set; }`
`31`		`- public bool IsLoggedInWithOAuth { get; set; }`
	`31`	`+ public bool IsLoggedInWithSSO { get; set; }`
`32`	`32`	`}`
`33`	`33`	`public enum LoginStep`
`34`	`34`	`{`
`@@ -114,7 +114,7 @@ private UserProfile SetupUserProfile(LoginUser user)`
`114`	`114`	`UserProfile profile = ProfileManager.CreateUserProfile(cleanedServerUrl);`
`115`	`115`	`profile.ServerUrl = user.ServerUrl;`
`116`	`116`	`Preferences.Set(AppConfigKey.ServerUrl, user.ServerUrl, profile.UserConfigFile);`
`117`		`- if (!user.IsLoggedInWithOAuth)`
	`117`	`+ if (!user.IsLoggedInWithSSO)`
`118`	`118`	`{`
`119`	`119`	`profile.Name = user.Username;`
`120`	`120`	`ViewModel.UserProfiles.Add(profile);`
`@@ -123,7 +123,7 @@ private UserProfile SetupUserProfile(LoginUser user)`
`123`	`123`	`}`
`124`	`124`	`else`
`125`	`125`	`{`
`126`		`- Preferences.Set(AppConfigKey.IsLoggedInWithOAuth, "1", profile.UserConfigFile);`
	`126`	`+ Preferences.Set(AppConfigKey.IsLoggedInWithSSO, "1", profile.UserConfigFile);`
`127`	`127`	`}`
`128`	`128`	`return profile;`
`129`	`129`	`}`
`@@ -165,7 +165,7 @@ private void ValidateSignInData(LoginUser loginUser)`
`165`	`165`
`166`	`166`	`loginUser.ServerUrl = ValidateUriScheme(loginUser.ServerUrl);`
`167`	`167`
`168`		`- if (!ViewModel.LoginUser.IsLoggedInWithOAuth)`
	`168`	`+ if (!ViewModel.LoginUser.IsLoggedInWithSSO)`
`169`	`169`	`{`
`170`	`170`	`if (string.IsNullOrWhiteSpace(loginUser.Username))`
`171`	`171`	`throw new ArgumentException("Username is not set");`
`@@ -182,17 +182,17 @@ private async Task Login(UserProfile profile, bool firstTimeLogin = false, bool`
`182`	`182`	`ViewModel.StatusText = "Logging in...";`
`183`	`183`	`ViewModel.LoginStepIndex = (int)LoginStep.LoadingAction;`
`184`	`184`	`}`
`185`		`- bool isLoggedInWithOAuth = Preferences.Get(AppConfigKey.IsLoggedInWithOAuth, profile.UserConfigFile) == "1";`
	`185`	`+ bool isLoggedInWithSSO = Preferences.Get(AppConfigKey.IsLoggedInWithSSO, profile.UserConfigFile) == "1";`
`186`	`186`	`LoginState state = LoginState.Success;`
`187`		`- if (!isLoggedInWithOAuth)`
	`187`	`+ if (!isLoggedInWithSSO)`
`188`	`188`	`{`
`189`	`189`	`string username = Preferences.Get(AppConfigKey.Username, profile.UserConfigFile);`
`190`	`190`	`string password = Preferences.Get(AppConfigKey.Password, profile.UserConfigFile, true);`
`191`	`191`	`state = await LoginManager.Instance.Login(profile.ServerUrl, username, password);`
`192`	`192`	`}`
`193`	`193`	`else`
`194`	`194`	`{`
`195`		`- state = await LoginManager.Instance.OAuthLogin(profile, firstTimeLogin);`
	`195`	`+ state = await LoginManager.Instance.SSOLogin(profile, firstTimeLogin);`
`196`	`196`	`if (state == LoginState.Success)`
`197`	`197`	`{`
`198`	`198`	`Preferences.Set(AppConfigKey.Username, LoginManager.Instance.GetCurrentUser().Username, profile.UserConfigFile);`
`@@ -206,7 +206,7 @@ private async Task Login(UserProfile profile, bool firstTimeLogin = false, bool`
`206`	`206`	`}`
`207`	`207`	`catch`
`208`	`208`	`{`
`209`		`- await Task.Delay(1500);//For slower machines, we have to wait for the webview of OAuthLogin to free the web cache`
	`209`	`+ await Task.Delay(1500);//For slower machines, we have to wait for the webview of SSOLogin to free the web cache`
`210`	`210`	`ProfileManager.DeleteUserProfile(profile);`
`211`	`211`	`}`
`212`	`212`	`}`
`@@ -259,7 +259,7 @@ private async void SaveAndSignUp_Click(object sender, RoutedEventArgs e)`
`259`	`259`	`{`
`260`	`260`	`ValidateSignUpData();`
`261`	`261`	`LoginState state = LoginState.Success;`
`262`		`- if (!ViewModel.SignupUser.IsLoggedInWithOAuth)`
	`262`	`+ if (!ViewModel.SignupUser.IsLoggedInWithSSO)`
`263`	`263`	`{`
`264`	`264`	`state = await LoginManager.Instance.Register(ViewModel.SignupUser);//Only non-provider login has a additional call. Else its just a login, because the server will create the account internally`
`265`	`265`	`}`
`@@ -289,7 +289,7 @@ private void ValidateSignUpData()`
`289`	`289`	`throw new Exception("Server URL is not set");`
`290`	`290`	`}`
`291`	`291`	`ViewModel.SignupUser.ServerUrl = ValidateUriScheme(ViewModel.SignupUser.ServerUrl);`
`292`		`- if (!ViewModel.SignupUser.IsLoggedInWithOAuth)`
	`292`	`+ if (!ViewModel.SignupUser.IsLoggedInWithSSO)`
`293`	`293`	`{`
`294`	`294`	`if (string.IsNullOrWhiteSpace(ViewModel.SignupUser.Password) \|\| string.IsNullOrWhiteSpace(ViewModel.SignupUser.RepeatPassword))`
`295`	`295`	`{`