From 9ddece0eac4dc3718c4f9279b4695d645a3e3cef Mon Sep 17 00:00:00 2001
From: vnugent <public@vaughnnugent.com>
Date: Thu, 2 Nov 2023 01:50:06 -0400
Subject: also carried away

---
 .../src/Endpoints/AccessTokenEndpoint.cs                            | 6 ++----
 .../src/Endpoints/RevocationEndpoint.cs                             | 3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'libs/VNLib.Plugins.Sessions.OAuth/src/Endpoints')

diff --git a/libs/VNLib.Plugins.Sessions.OAuth/src/Endpoints/AccessTokenEndpoint.cs b/libs/VNLib.Plugins.Sessions.OAuth/src/Endpoints/AccessTokenEndpoint.cs
index 77cad38..dc0530f 100644
--- a/libs/VNLib.Plugins.Sessions.OAuth/src/Endpoints/AccessTokenEndpoint.cs
+++ b/libs/VNLib.Plugins.Sessions.OAuth/src/Endpoints/AccessTokenEndpoint.cs
@@ -46,7 +46,6 @@ namespace VNLib.Plugins.Sessions.OAuth.Endpoints
     /// Grants authorization to OAuth2 clients to protected resources
     /// with access tokens
     /// </summary>
-    [ConfigurationName(O2SessionProviderEntry.OAUTH2_CONFIG_KEY)]
     internal sealed class AccessTokenEndpoint : ResourceEndpointBase
     {
         private readonly IApplicationTokenFactory TokenFactory;
@@ -60,14 +59,13 @@ namespace VNLib.Plugins.Sessions.OAuth.Endpoints
             DisableSessionsRequired = true
         };
 
-        public AccessTokenEndpoint(PluginBase pbase, IConfigScope config)
+        public AccessTokenEndpoint(PluginBase pbase, IConfigScope config, IApplicationTokenFactory tokenFactory)
         {
             string? path = config["token_path"].GetString();;
 
             InitPathAndLog(path, pbase.Log);
 
-            //Get the session provider, as its a token factory
-            TokenFactory = pbase.GetOrCreateSingleton<OAuth2SessionProvider>();
+            TokenFactory = tokenFactory;
 
             Applications = new(pbase.GetContextOptions(), pbase.GetOrCreateSingleton<ManagedPasswordHashing>());
 
diff --git a/libs/VNLib.Plugins.Sessions.OAuth/src/Endpoints/RevocationEndpoint.cs b/libs/VNLib.Plugins.Sessions.OAuth/src/Endpoints/RevocationEndpoint.cs
index 45a8391..bdb4e4e 100644
--- a/libs/VNLib.Plugins.Sessions.OAuth/src/Endpoints/RevocationEndpoint.cs
+++ b/libs/VNLib.Plugins.Sessions.OAuth/src/Endpoints/RevocationEndpoint.cs
@@ -46,8 +46,7 @@ namespace VNLib.Plugins.Sessions.OAuth.Endpoints
         {
             //Revoke the access token, by invalidating it
             entity.Session.Invalidate();
-            entity.CloseResponse(System.Net.HttpStatusCode.OK);
-            return VfReturnType.VirtualSkip;
+            return VirtualOk(entity);
         }
     }
 }
-- 
cgit