diff --git a/BaronSoftware.SSO.Sample/MainWindow.xaml.cs b/BaronSoftware.SSO.Sample/MainWindow.xaml.cs index 8bfa1ff..7f9e00c 100644 --- a/BaronSoftware.SSO.Sample/MainWindow.xaml.cs +++ b/BaronSoftware.SSO.Sample/MainWindow.xaml.cs @@ -25,12 +25,11 @@ namespace BaronSoftware.SSO.Sample var option = new BaronSSOOption() { - Authority = _settings.Oidc.Authority, - ClientId = _settings.Oidc.ClientId, - RedirectUri = _settings.Oidc.RedirectUri, - ExtraUserValidator = new SimpleUserValidator(), - LicenseCheckInterval = 15, - RefreshTokenDestroyed = () => { MessageBox.Show("토큰이 끊겼습니다. 다시 로그인 하세요"); }, + Authority = "https://app.brsw.kr/oidc", + ClientId = "16d5f1b3-dd42-43be-87f0-5e18c0e12c6e", + RedirectUri = "http://localhost:9090/eg-bim/drawer/auth/callback", + PostLogoutRedirectUri = "http://localhost:9090/eg-bim/drawer/logout/callback", + ExtraUserValidator = new SimpleUserValidator() }; _license = new BaronSSO(option); diff --git a/BaronSoftware.SSO/BaronSSO.cs b/BaronSoftware.SSO/BaronSSO.cs index de4cc07..71c081f 100644 --- a/BaronSoftware.SSO/BaronSSO.cs +++ b/BaronSoftware.SSO/BaronSSO.cs @@ -68,7 +68,10 @@ namespace BaronSoftware.SSO { UserInfo? user = null; if (option.EnableAutoLogin) + { user = UserInfo.FromSsoFile(); + await LoginWindow.ClearSessionCookiesAsync(); + } await SignInAsync(user?.RefreshToken); } @@ -161,6 +164,9 @@ namespace BaronSoftware.SSO licenseCheckScheduler = new Schedule(async () => { + if (option.RefreshTokenDestroyed == null) + return; + // 오프라인의 경우 주기적인 인증을 무시한다. // 단, 언제든 온라인 상태가 될 수 있으니 주기 인증을 멈추지는 않는다. var isOnline = await CheckConnection(); diff --git a/BaronSoftware.SSO/BaronSSOOption.cs b/BaronSoftware.SSO/BaronSSOOption.cs index 61068e3..d45006b 100644 --- a/BaronSoftware.SSO/BaronSSOOption.cs +++ b/BaronSoftware.SSO/BaronSSOOption.cs @@ -68,7 +68,6 @@ namespace BaronSoftware.SSO } } - public Action RefreshTokenDestroyed { get; set; } } } diff --git a/BaronSoftware.SSO/BaronSoftware.SSO.csproj b/BaronSoftware.SSO/BaronSoftware.SSO.csproj index 2150b8c..76a65f5 100644 --- a/BaronSoftware.SSO/BaronSoftware.SSO.csproj +++ b/BaronSoftware.SSO/BaronSoftware.SSO.csproj @@ -6,6 +6,10 @@ enable true True + 1.0.1 + BaronSoftware.SSO + Baron 기술개발센터 + Baron 기술개발센터