notazof/yavsc
1
1
Fork 0
Code Issues 1 Pull requests 1 Projects 2 Releases 14 Packages Wiki Activity Actions

postit: persist settings save and apply ApiUrl changes without restart #51

Merged
notazof merged 25 commits from feat/estimate into main 2026-09-06 21:05:58 +01:00
Conversation 0 Commits 25 Files changed 141 +24 -1
1 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 5fc99d73b0 - Show all commits

postit: harden oidc settings defaults on startup

Prev Next
Paul Schneider 2026-09-06 16:20:17 +01:00
commit 5fc99d73b0
Signed by: notazof
GPG key ID: 1DD5D838E5343B06

25
src/PostIt/PostIt/ViewModels/Settings/Settings.cs
View file

@ -123,6 +123,8 @@ public partial class Settings : ViewModelBase
// build options from a torn read. // build options from a torn read.
lock (_mutationGate) lock (_mutationGate)
{ {
EnsureAuthenticationDefaultsLocked();
var options = new OidcClientOptions var options = new OidcClientOptions
{ {
Authority = Authentication.Authority, Authority = Authentication.Authority,
@ -151,6 +153,25 @@ public partial class Settings : ViewModelBase
} }
} }
private void EnsureAuthenticationDefaultsLocked()
{
Authentication ??= new AuthenticationSettings();
if (string.IsNullOrWhiteSpace(Authentication.Authority))
Authentication.Authority = AuthenticationSettings.DefaultAuthority;
if (string.IsNullOrWhiteSpace(Authentication.ClientId))
Authentication.ClientId = AuthenticationSettings.DefaultClientId;
if (string.IsNullOrWhiteSpace(Authentication.RedirectUri))
Authentication.RedirectUri = AuthenticationSettings.DesktopRedirectUri;
if (Authentication.Scopes is null || Authentication.Scopes.Length == 0)
Authentication.Scopes = AuthenticationSettings.DefaultScopes;
Authentication.RefreshScopeListText();
}
/// <summary> /// <summary>
/// Scopes the PostIt client always requires from the OIDC provider, /// Scopes the PostIt client always requires from the OIDC provider,
/// regardless of what the user has in their settings file. /// regardless of what the user has in their settings file.
@ -334,11 +355,13 @@ public partial class Settings : ViewModelBase
AuthenticationSettings.DesktopRedirectUri : settings.Authentication.RedirectUri; AuthenticationSettings.DesktopRedirectUri : settings.Authentication.RedirectUri;
if (settings.Authentication.Scopes is null || settings.Authentication.Scopes.Length == 0) if (settings.Authentication.Scopes is null || settings.Authentication.Scopes.Length == 0)
{ {
settings.Authentication.Scopes = AuthenticationSettings.DefaultScopes; this.Authentication.Scopes = AuthenticationSettings.DefaultScopes;
} }
else else
this.Authentication.Scopes = settings.Authentication.Scopes; this.Authentication.Scopes = settings.Authentication.Scopes;
} }
EnsureAuthenticationDefaultsLocked();
} }
// A disk load (or an embedded-resource fallback) is the // A disk load (or an embedded-resource fallback) is the
// baseline, not a user edit. Clear the dirty flag last // baseline, not a user edit. Clear the dirty flag last