diff options
-rw-r--r-- | Plugins/OAuth2ClientApplications/src/Endpoints/ApplicationEndpoint.cs | 15 | ||||
-rw-r--r-- | Plugins/OAuth2ClientApplications/src/Endpoints/ScopesEndpoint.cs | 24 |
2 files changed, 13 insertions, 26 deletions
diff --git a/Plugins/OAuth2ClientApplications/src/Endpoints/ApplicationEndpoint.cs b/Plugins/OAuth2ClientApplications/src/Endpoints/ApplicationEndpoint.cs index ddc83c8..786fb7f 100644 --- a/Plugins/OAuth2ClientApplications/src/Endpoints/ApplicationEndpoint.cs +++ b/Plugins/OAuth2ClientApplications/src/Endpoints/ApplicationEndpoint.cs @@ -42,6 +42,7 @@ using VNLib.Plugins.Essentials.Oauth.Applications; using VNLib.Plugins.Extensions.Validation; using VNLib.Plugins.Extensions.Loading; using VNLib.Plugins.Extensions.Loading.Sql; +using VNLib.Plugins.Extensions.Loading.Routing; using VNLib.Plugins.Extensions.Data.Extensions; using VNLib.Plugins.Essentials.Users; using VNLib.Plugins.Extensions.Loading.Users; @@ -51,6 +52,8 @@ using static VNLib.Plugins.Essentials.Statics; namespace OAuth2ClientApplications.Endpoints { + [EndpointPath("{{path}}")] + [EndpointLogName("Applications")] [ConfigurationName("applications")] internal sealed class ApplicationEndpoint : ProtectedWebEndpoint { @@ -64,14 +67,12 @@ namespace OAuth2ClientApplications.Endpoints public ApplicationEndpoint(PluginBase plugin, IConfigScope config) { - //Get configuration variables from plugin - string? path = config["path"].GetString(); - MaxAppsPerUser = config["max_apps_per_user"].GetInt32(); - - InitPathAndLog(path, plugin.Log); + MaxAppsPerUser = config.GetRequiredProperty<int>("max_apps_per_user"); - //Load apps - Applications = new(plugin.GetContextOptions(), plugin.GetOrCreateSingleton<ManagedPasswordHashing>()); + Applications = new( + conextOptions: plugin.GetContextOptions(), + secretHashing: plugin.GetOrCreateSingleton<ManagedPasswordHashing>() + ); Users = plugin.GetOrCreateSingleton<UserManager>(); diff --git a/Plugins/OAuth2ClientApplications/src/Endpoints/ScopesEndpoint.cs b/Plugins/OAuth2ClientApplications/src/Endpoints/ScopesEndpoint.cs index b89b591..654bbb1 100644 --- a/Plugins/OAuth2ClientApplications/src/Endpoints/ScopesEndpoint.cs +++ b/Plugins/OAuth2ClientApplications/src/Endpoints/ScopesEndpoint.cs @@ -1,5 +1,5 @@ /* -* Copyright (c) 2023 Vaughn Nugent +* Copyright (c) 2024 Vaughn Nugent * * Library: VNLib * Package: OAuth2ClientApplications @@ -22,35 +22,21 @@ * along with this program. If not, see https://www.gnu.org/licenses/. */ -using System.Linq; - using VNLib.Plugins; using VNLib.Plugins.Essentials; using VNLib.Plugins.Essentials.Endpoints; using VNLib.Plugins.Extensions.Loading; +using VNLib.Plugins.Extensions.Loading.Routing; namespace OAuth2ClientApplications.Endpoints { + [EndpointPath("{{path}}")] [ConfigurationName("scopes")] - internal sealed class ScopesEndpoint : UnprotectedWebEndpoint + internal sealed class ScopesEndpoint(PluginBase plugin, IConfigScope config) : UnprotectedWebEndpoint { - private readonly string[] _permissions; - - public ScopesEndpoint(PluginBase plugin, IConfigScope config) - { - //Get configuration variables from plugin - string? path = config["path"].GetString(); - - //Get scope permissions - _permissions = config["scopes"].EnumerateArray() - .Select(p => p.GetString()!) - .Where(p => p!= null) - .ToArray(); - - InitPathAndLog(path, plugin.Log); - } + private readonly string[] _permissions = config.GetRequiredProperty<string[]>("scopes"); protected override VfReturnType Get(HttpEntity entity) { |