Skip to content
This repository was archived by the owner on Sep 26, 2024. It is now read-only.

Separating system and task logs #44

Merged
slewis74 merged 2 commits into from
Mar 18, 2021
Merged

Separating system and task logs #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae4f70c
new logging infra
slewis74 Mar 8, 2021
b966548
package updates
slewis74 Mar 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/Server.AzureAD/AzureADAuthenticationProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace Octopus.Server.Extensibility.Authentication.AzureAD
class AzureADAuthenticationProvider : OpenIDConnectAuthenticationProvider<IAzureADConfigurationStore>
{
public const string ProviderName = "Azure AD";
public AzureADAuthenticationProvider(ILog log, IAzureADConfigurationStore configurationStore) : base(log, configurationStore)
public AzureADAuthenticationProvider(ISystemLog log, IAzureADConfigurationStore configurationStore) : base(log, configurationStore)
{
}

Expand Down
2 changes: 1 addition & 1 deletion source/Server.AzureAD/Configuration/AzureADConfigureCommands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace Octopus.Server.Extensibility.Authentication.AzureAD.Configuration
class AzureADConfigureCommands : OpenIdConnectConfigureCommands<IAzureADConfigurationStore>
{
public AzureADConfigureCommands(
ILog log,
ISystemLog log,
Lazy<IAzureADConfigurationStore> configurationStore,
Lazy<IWebPortalConfigurationStore> webPortalConfigurationStore)
: base(log, configurationStore, webPortalConfigurationStore)
Expand Down
2 changes: 1 addition & 1 deletion source/Server.AzureAD/Issuer/AzureADKeyRetriever.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace Octopus.Server.Extensibility.Authentication.AzureAD.Issuer
{
class AzureADKeyRetriever : KeyRetriever<IAzureADConfigurationStore, IKeyJsonParser>, IAzureADKeyRetriever
{
public AzureADKeyRetriever(IAzureADConfigurationStore configurationStore, IKeyJsonParser keyParser, ILog log) : base(configurationStore, keyParser, log)
public AzureADKeyRetriever(ISystemLog log, IAzureADConfigurationStore configurationStore, IKeyJsonParser keyParser) : base(log, configurationStore, keyParser)
{
}
}
Expand Down
2 changes: 1 addition & 1 deletion source/Server.AzureAD/Server.AzureAD.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Octopus.Diagnostics" Version="1.3.5" />
<PackageReference Include="Octopus.Diagnostics" Version="2.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion source/Server.AzureAD/Tokens/AzureADAuthTokenHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace Octopus.Server.Extensibility.Authentication.AzureAD.Tokens
{
class AzureADAuthTokenHandler : OpenIDConnectAuthTokenWithRolesHandler<IAzureADConfigurationStore, IAzureADKeyRetriever, IIdentityProviderConfigDiscoverer>, IAzureADAuthTokenHandler
{
public AzureADAuthTokenHandler(ILog log, IAzureADConfigurationStore configurationStore, IIdentityProviderConfigDiscoverer identityProviderConfigDiscoverer, IAzureADKeyRetriever keyRetriever) : base(log, configurationStore, identityProviderConfigDiscoverer, keyRetriever)
public AzureADAuthTokenHandler(ISystemLog log, IAzureADConfigurationStore configurationStore, IIdentityProviderConfigDiscoverer identityProviderConfigDiscoverer, IAzureADKeyRetriever keyRetriever) : base(log, configurationStore, identityProviderConfigDiscoverer, keyRetriever)
{
}
}
Expand Down
6 changes: 3 additions & 3 deletions source/Server.AzureAD/Web/AzureADUserAuthenticatedAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ namespace Octopus.Server.Extensibility.Authentication.AzureAD.Web
class AzureADUserAuthenticatedAction : UserAuthenticatedAction<IAzureADConfigurationStore, IAzureADAuthTokenHandler, IAzureADIdentityCreator>
{
public AzureADUserAuthenticatedAction(
ILog log,
ISystemLog log,
IAzureADAuthTokenHandler authTokenHandler,
IAzureADPrincipalToUserResourceMapper principalToUserResourceMapper,
IUpdateableUserStore userStore,
IAzureADConfigurationStore configurationStore,
IAuthCookieCreator authCookieCreator,
IInvalidLoginTracker loginTracker,
ISleep sleep,
ISleep sleep,
IAzureADIdentityCreator identityCreator,
IClock clock,
IClock clock,
IUrlEncoder encoder) :
base(
log,
Expand Down
6 changes: 3 additions & 3 deletions source/Server.AzureAD/Web/AzureADUserAuthenticationAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ namespace Octopus.Server.Extensibility.Authentication.AzureAD.Web
class AzureADUserAuthenticationAction : UserAuthenticationAction<IAzureADConfigurationStore>
{
public AzureADUserAuthenticationAction(
ILog log,
IAzureADConfigurationStore configurationStore,
IIdentityProviderConfigDiscoverer identityProviderConfigDiscoverer,
ISystemLog log,
IAzureADConfigurationStore configurationStore,
IIdentityProviderConfigDiscoverer identityProviderConfigDiscoverer,
IAzureADAuthorizationEndpointUrlBuilder urlBuilder,
IApiActionModelBinder modelBinder,
IAuthenticationConfigurationStore authenticationConfigurationStore) : base(log, configurationStore, identityProviderConfigDiscoverer, urlBuilder, modelBinder, authenticationConfigurationStore)
Expand Down
2 changes: 1 addition & 1 deletion source/Server.GoogleApps/Configuration/GoogleAppsConfigureCommands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace Octopus.Server.Extensibility.Authentication.GoogleApps.Configuration
class GoogleAppsConfigureCommands : OpenIdConnectConfigureCommands<IGoogleAppsConfigurationStore>
{
public GoogleAppsConfigureCommands(
ILog log,
ISystemLog log,
Lazy<IGoogleAppsConfigurationStore> configurationStore,
Lazy<IWebPortalConfigurationStore> webPortalConfigurationStore)
: base(log, configurationStore, webPortalConfigurationStore)
Expand Down
2 changes: 1 addition & 1 deletion source/Server.GoogleApps/GoogleAppsAuthenticationProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class GoogleAppsAuthenticationProvider : OpenIDConnectAuthenticationProvider<IGo
{
public const string ProviderName = "Google Apps";

public GoogleAppsAuthenticationProvider(ILog log, IGoogleAppsConfigurationStore configurationStore) : base(log, configurationStore)
public GoogleAppsAuthenticationProvider(ISystemLog log, IGoogleAppsConfigurationStore configurationStore) : base(log, configurationStore)
{
}

Expand Down
2 changes: 1 addition & 1 deletion source/Server.GoogleApps/Issuer/GoogleKeyRetriever.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace Octopus.Server.Extensibility.Authentication.GoogleApps.Issuer
{
class GoogleKeyRetriever : KeyRetriever<IGoogleAppsConfigurationStore, IKeyJsonParser>, IGoogleKeyRetriever
{
public GoogleKeyRetriever(IGoogleAppsConfigurationStore configurationStore, IKeyJsonParser keyParser, ILog log) : base(configurationStore, keyParser, log)
public GoogleKeyRetriever(ISystemLog log, IGoogleAppsConfigurationStore configurationStore, IKeyJsonParser keyParser) : base(log, configurationStore, keyParser)
{
}
}
Expand Down
2 changes: 1 addition & 1 deletion source/Server.GoogleApps/Tokens/GoogleAuthTokenHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace Octopus.Server.Extensibility.Authentication.GoogleApps.Tokens
{
class GoogleAuthTokenHandler : OpenIDConnectAuthTokenHandler<IGoogleAppsConfigurationStore, IGoogleKeyRetriever, IIdentityProviderConfigDiscoverer>, IGoogleAuthTokenHandler
{
public GoogleAuthTokenHandler(ILog log, IGoogleAppsConfigurationStore configurationStore, IIdentityProviderConfigDiscoverer identityProviderConfigDiscoverer, IGoogleKeyRetriever keyRetriever) : base(log, configurationStore, identityProviderConfigDiscoverer, keyRetriever)
public GoogleAuthTokenHandler(ISystemLog log, IGoogleAppsConfigurationStore configurationStore, IIdentityProviderConfigDiscoverer identityProviderConfigDiscoverer, IGoogleKeyRetriever keyRetriever) : base(log, configurationStore, identityProviderConfigDiscoverer, keyRetriever)
{
}

Expand Down
6 changes: 3 additions & 3 deletions source/Server.GoogleApps/Web/GoogleAppsUserAuthenticatedAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@

namespace Octopus.Server.Extensibility.Authentication.GoogleApps.Web
{
class GoogleAppsUserAuthenticatedAction
class GoogleAppsUserAuthenticatedAction
: UserAuthenticatedAction<IGoogleAppsConfigurationStore, IGoogleAuthTokenHandler, IGoogleAppsIdentityCreator>
{
public GoogleAppsUserAuthenticatedAction(
ILog log,
ISystemLog log,
IGoogleAuthTokenHandler authTokenHandler,
IPrincipalToUserResourceMapper principalToUserResourceMapper,
IUpdateableUserStore userStore,
Expand All @@ -23,7 +23,7 @@ public GoogleAppsUserAuthenticatedAction(
IInvalidLoginTracker loginTracker,
ISleep sleep,
IGoogleAppsIdentityCreator identityCreator,
IClock clock, IUrlEncoder encoder)
IClock clock, IUrlEncoder encoder)
: base(log, authTokenHandler, principalToUserResourceMapper, userStore, configurationStore, authCookieCreator, loginTracker, sleep, identityCreator, clock, encoder)
{
}
Expand Down
8 changes: 4 additions & 4 deletions source/Server.GoogleApps/Web/GoogleAppsUserAuthenticationAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ namespace Octopus.Server.Extensibility.Authentication.GoogleApps.Web
class GoogleAppsUserAuthenticationAction : UserAuthenticationAction<IGoogleAppsConfigurationStore>
{
public GoogleAppsUserAuthenticationAction(
ILog log,
IGoogleAppsConfigurationStore configurationStore,
IIdentityProviderConfigDiscoverer identityProviderConfigDiscoverer,
ISystemLog log,
IGoogleAppsConfigurationStore configurationStore,
IIdentityProviderConfigDiscoverer identityProviderConfigDiscoverer,
IGoogleAppsAuthorizationEndpointUrlBuilder urlBuilder,
IApiActionModelBinder modelBinder,
IAuthenticationConfigurationStore authenticationConfigurationStore)
IAuthenticationConfigurationStore authenticationConfigurationStore)
: base(log, configurationStore, identityProviderConfigDiscoverer, urlBuilder, modelBinder, authenticationConfigurationStore)
{
}
Expand Down
2 changes: 1 addition & 1 deletion source/Server.OctopusID/Configuration/OctopusIDConfigureCommands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace Octopus.Server.Extensibility.Authentication.OctopusID.Configuration
class OctopusIDConfigureCommands : OpenIdConnectConfigureCommands<IOctopusIDConfigurationStore>
{
public OctopusIDConfigureCommands(
ILog log,
ISystemLog log,
Lazy<IOctopusIDConfigurationStore> configurationStore,
Lazy<IWebPortalConfigurationStore> webPortalConfigurationStore)
: base(log, configurationStore, webPortalConfigurationStore)
Expand Down
2 changes: 1 addition & 1 deletion source/Server.OctopusID/Issuer/OctopusIDKeyRetriever.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace Octopus.Server.Extensibility.Authentication.OctopusID.Issuer
{
class OctopusIDKeyRetriever : KeyRetriever<IOctopusIDConfigurationStore, IKeyJsonParser>, IOctopusIDKeyRetriever
{
public OctopusIDKeyRetriever(IOctopusIDConfigurationStore configurationStore, IKeyJsonParser keyParser, ILog log) : base(configurationStore, keyParser, log)
public OctopusIDKeyRetriever(ISystemLog log, IOctopusIDConfigurationStore configurationStore, IKeyJsonParser keyParser) : base(log, configurationStore, keyParser)
{
}
}
Expand Down
2 changes: 1 addition & 1 deletion source/Server.OctopusID/OctopusIDAuthenticationProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class OctopusIDAuthenticationProvider : OpenIDConnectAuthenticationProvider<IOct
{
public const string ProviderName = "Octopus ID";

public OctopusIDAuthenticationProvider(ILog log, IOctopusIDConfigurationStore configurationStore) : base(log, configurationStore)
public OctopusIDAuthenticationProvider(ISystemLog log, IOctopusIDConfigurationStore configurationStore) : base(log, configurationStore)
{
}

Expand Down
2 changes: 1 addition & 1 deletion source/Server.OctopusID/Server.OctopusID.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Octopus.Diagnostics" Version="1.3.5" />
<PackageReference Include="Octopus.Diagnostics" Version="2.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion source/Server.OctopusID/Tokens/OctopusIDAuthTokenHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace Octopus.Server.Extensibility.Authentication.OctopusID.Tokens
{
class OctopusIDAuthTokenHandler : OpenIDConnectAuthTokenWithRolesHandler<IOctopusIDConfigurationStore, IOctopusIDKeyRetriever, IOctopusIdentityProviderConfigDiscoverer>, IOctopusIDAuthTokenHandler
{
public OctopusIDAuthTokenHandler(ILog log, IOctopusIDConfigurationStore configurationStore, IOctopusIdentityProviderConfigDiscoverer identityProviderConfigDiscoverer, IOctopusIDKeyRetriever keyRetriever) : base(log, configurationStore, identityProviderConfigDiscoverer, keyRetriever)
public OctopusIDAuthTokenHandler(ISystemLog log, IOctopusIDConfigurationStore configurationStore, IOctopusIdentityProviderConfigDiscoverer identityProviderConfigDiscoverer, IOctopusIDKeyRetriever keyRetriever) : base(log, configurationStore, identityProviderConfigDiscoverer, keyRetriever)
{
}
}
Expand Down
6 changes: 3 additions & 3 deletions source/Server.OctopusID/Web/OctopusIDUserAuthenticatedAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace Octopus.Server.Extensibility.Authentication.OctopusID.Web
class OctopusIDUserAuthenticatedAction : UserAuthenticatedAction<IOctopusIDConfigurationStore, IOctopusIDAuthTokenHandler, IOctopusIDIdentityCreator>
{
public OctopusIDUserAuthenticatedAction(
ILog log,
ISystemLog log,
IOctopusIDAuthTokenHandler authTokenHandler,
IOctopusIDPrincipalToUserResourceMapper principalToUserResourceMapper,
IUpdateableUserStore userStore,
Expand All @@ -32,8 +32,8 @@ public OctopusIDUserAuthenticatedAction(
authCookieCreator,
loginTracker,
sleep,
identityCreator,
clock,
identityCreator,
clock,
encoder)
{
}
Expand Down
6 changes: 3 additions & 3 deletions source/Server.OctopusID/Web/OctopusIDUserAuthenticationAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ namespace Octopus.Server.Extensibility.Authentication.OctopusID.Web
class OctopusIDUserAuthenticationAction : UserAuthenticationAction<IOctopusIDConfigurationStore>
{
public OctopusIDUserAuthenticationAction(
ILog log,
IOctopusIDConfigurationStore configurationStore,
IOctopusIdentityProviderConfigDiscoverer identityProviderConfigDiscoverer,
ISystemLog log,
IOctopusIDConfigurationStore configurationStore,
IOctopusIdentityProviderConfigDiscoverer identityProviderConfigDiscoverer,
IOctopusIDAuthorizationEndpointUrlBuilder urlBuilder,
IApiActionModelBinder modelBinder,
IAuthenticationConfigurationStore authenticationConfigurationStore) : base(log, configurationStore, identityProviderConfigDiscoverer, urlBuilder, modelBinder, authenticationConfigurationStore)
Expand Down
2 changes: 1 addition & 1 deletion source/Server.Okta/Configuration/OktaConfigureCommands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace Octopus.Server.Extensibility.Authentication.Okta.Configuration
class OktaConfigureCommands : OpenIdConnectConfigureCommands<IOktaConfigurationStore>
{
public OktaConfigureCommands(
ILog log,
ISystemLog log,
Lazy<IOktaConfigurationStore> configurationStore,
Lazy<IWebPortalConfigurationStore> webPortalConfigurationStore)
: base(log, configurationStore, webPortalConfigurationStore)
Expand Down
2 changes: 1 addition & 1 deletion source/Server.Okta/Issuer/OktaKeyRetriever.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace Octopus.Server.Extensibility.Authentication.Okta.Issuer
{
class OktaKeyRetriever : KeyRetriever<IOktaConfigurationStore, IKeyJsonParser>, IOktaKeyRetriever
{
public OktaKeyRetriever(IOktaConfigurationStore configurationStore, IKeyJsonParser keyParser, ILog log) : base(configurationStore, keyParser, log)
public OktaKeyRetriever(ISystemLog log, IOktaConfigurationStore configurationStore, IKeyJsonParser keyParser) : base(log, configurationStore, keyParser)
{
}
}
Expand Down
2 changes: 1 addition & 1 deletion source/Server.Okta/OktaAuthenticationProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class OktaAuthenticationProvider : OpenIDConnectAuthenticationProvider<IOktaConf
{
public const string ProviderName = "Okta";

public OktaAuthenticationProvider(ILog log, IOktaConfigurationStore configurationStore) : base(log, configurationStore)
public OktaAuthenticationProvider(ISystemLog log, IOktaConfigurationStore configurationStore) : base(log, configurationStore)
{
}

Expand Down
2 changes: 1 addition & 1 deletion source/Server.Okta/Server.Okta.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Octopus.Diagnostics" Version="1.3.5" />
<PackageReference Include="Octopus.Diagnostics" Version="2.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion source/Server.Okta/Tokens/OktaAuthTokenHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace Octopus.Server.Extensibility.Authentication.Okta.Tokens
{
class OktaAuthTokenHandler : OpenIDConnectAuthTokenWithRolesHandler<IOktaConfigurationStore, IOktaKeyRetriever, IIdentityProviderConfigDiscoverer>, IOktaAuthTokenHandler
{
public OktaAuthTokenHandler(ILog log, IOktaConfigurationStore configurationStore, IIdentityProviderConfigDiscoverer identityProviderConfigDiscoverer, IOktaKeyRetriever keyRetriever) : base(log, configurationStore, identityProviderConfigDiscoverer, keyRetriever)
public OktaAuthTokenHandler(ISystemLog log, IOktaConfigurationStore configurationStore, IIdentityProviderConfigDiscoverer identityProviderConfigDiscoverer, IOktaKeyRetriever keyRetriever) : base(log, configurationStore, identityProviderConfigDiscoverer, keyRetriever)
{
}
}
Expand Down
6 changes: 3 additions & 3 deletions source/Server.Okta/Web/OktaUserAuthenticatedAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace Octopus.Server.Extensibility.Authentication.Okta.Web
class OktaUserAuthenticatedAction : UserAuthenticatedAction<IOktaConfigurationStore, IOktaAuthTokenHandler, IOktaIdentityCreator>
{
public OktaUserAuthenticatedAction(
ILog log,
ISystemLog log,
IOktaAuthTokenHandler authTokenHandler,
IOktaPrincipalToUserResourceMapper principalToUserResourceMapper,
IUpdateableUserStore userStore,
Expand All @@ -33,8 +33,8 @@ public OktaUserAuthenticatedAction(
authCookieCreator,
loginTracker,
sleep,
identityCreator,
clock,
identityCreator,
clock,
encoder)
{
}
Expand Down
6 changes: 3 additions & 3 deletions source/Server.Okta/Web/OktaUserAuthenticationAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ namespace Octopus.Server.Extensibility.Authentication.Okta.Web
class OktaUserAuthenticationAction : UserAuthenticationAction<IOktaConfigurationStore>
{
public OktaUserAuthenticationAction(
ILog log,
IOktaConfigurationStore configurationStore,
IIdentityProviderConfigDiscoverer identityProviderConfigDiscoverer,
ISystemLog log,
IOktaConfigurationStore configurationStore,
IIdentityProviderConfigDiscoverer identityProviderConfigDiscoverer,
IOktaAuthorizationEndpointUrlBuilder urlBuilder,
IApiActionModelBinder modelBinder,
IAuthenticationConfigurationStore authenticationConfigurationStore) : base(log, configurationStore, identityProviderConfigDiscoverer, urlBuilder, modelBinder, authenticationConfigurationStore)
Expand Down
10 changes: 5 additions & 5 deletions source/Server.OpenIDConnect.Common/Certificates/KeyRetriever.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ public abstract class KeyRetriever<TStore, TKeyParser> : IKeyRetriever
where TKeyParser : IKeyJsonParser
{
readonly TKeyParser keyParser;
readonly ILog log;
readonly ISystemLog log;
readonly object funcLock = new object();
Task<IDictionary<string, AsymmetricSecurityKey>>? certRetrieveTask;

protected readonly TStore ConfigurationStore;

protected KeyRetriever(TStore configurationStore,
TKeyParser keyParser,
ILog log)
protected KeyRetriever(ISystemLog log,
TStore configurationStore,
TKeyParser keyParser)
{
ConfigurationStore = configurationStore;
this.keyParser = keyParser;
Expand All @@ -42,7 +42,7 @@ public Task<IDictionary<string, AsymmetricSecurityKey>> GetKeysAsync(IssuerConfi

certRetrieveTask = DoGetKeyAsync(issuerConfiguration);
return certRetrieveTask;
}
}
}

protected virtual string GetDownloadUri(IssuerConfiguration issuerConfiguration)
Expand Down
4 changes: 2 additions & 2 deletions source/Server.OpenIDConnect.Common/Configuration/OpenIDConnectConfigureCommands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ namespace Octopus.Server.Extensibility.Authentication.OpenIDConnect.Common.Confi
public abstract class OpenIdConnectConfigureCommands<TStore> : IContributeToConfigureCommand
where TStore : IOpenIDConnectConfigurationStore
{
protected readonly ILog Log;
protected readonly ISystemLog Log;
protected readonly Lazy<TStore> ConfigurationStore;
readonly Lazy<IWebPortalConfigurationStore> webPortalConfigurationStore;

protected OpenIdConnectConfigureCommands(
ILog log,
ISystemLog log,
Lazy<TStore> configurationStore,
Lazy<IWebPortalConfigurationStore> webPortalConfigurationStore)
{
Expand Down
Loading