From 00bf20ed87e523b479ca96de3d8b4bc0204eb826 Mon Sep 17 00:00:00 2001 From: vnugent Date: Sun, 28 Jul 2024 19:30:33 -0400 Subject: Squashed commit of the following: commit 1924c688e4b758e4129a3b4126d54b68c75336ea Author: vnugent Date: Sat Jul 27 22:13:06 2024 -0400 integrate latest extensions features commit 0e965d22599ddcedac4aa0c46e2cc34c39f202e1 Merge: 4df5cfd af31e7e Author: vnugent Date: Sun May 19 12:15:08 2024 -0400 Merge branch 'master' into develop commit 4df5cfd547a3d5da63070fd98f4d0ddc4fa22121 Author: vnugent Date: Thu May 2 16:46:35 2024 -0400 spring project cleanup commit a4e42fcc5ca811425b26897c982990e78b5eafcb Merge: 6ed9d9e 7614119 Author: vnugent Date: Sun Mar 24 21:08:49 2024 -0400 Merge branch 'master' into develop commit 6ed9d9edc21526ce7575ae3128cc881c85100f18 Author: vnugent Date: Sun Mar 10 21:58:28 2024 -0400 source tree project location updated commit 850a60e02bd083a797ffb5f48229fab502e8aede Author: vnugent Date: Mon Feb 12 20:27:53 2024 -0500 refactor: integrate the latest sql library updates commit c70a61bc1bf683c2097e3a2481d9dfb9adbd31ea Author: vnugent Date: Sun Feb 4 01:30:25 2024 -0500 submit pending changes --- .../src/Endpoints/ApplicationEndpoint.cs | 15 +++++++------- .../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("max_apps_per_user"); - //Load apps - Applications = new(plugin.GetContextOptions(), plugin.GetOrCreateSingleton()); + Applications = new( + conextOptions: plugin.GetContextOptions(), + secretHashing: plugin.GetOrCreateSingleton() + ); Users = plugin.GetOrCreateSingleton(); 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("scopes"); protected override VfReturnType Get(HttpEntity entity) { -- cgit