Merge pull request #131 from DuendeSoftware/brock/reorg

organize folders/files
DuendeSoftware · Aug 17, 2022 · 15fbba8 · 15fbba8
2 parents 493d819 + ea58981
commit 15fbba8
Show file tree

Hide file tree

Showing 59 changed files with 16 additions and 18 deletions.
diff --git a/...de.Bff/BffApplicationBuilderExtensions.cs → ...ration/BffApplicationBuilderExtensions.cs b/...de.Bff/BffApplicationBuilderExtensions.cs → ...ration/BffApplicationBuilderExtensions.cs
diff --git a/src/Duende.Bff/BffBuilder.cs → src/Duende.Bff/Configuration/BffBuilder.cs b/src/Duende.Bff/BffBuilder.cs → src/Duende.Bff/Configuration/BffBuilder.cs
diff --git a/...ints/BffEndpointRouteBuilderExtensions.cs → ...tion/BffEndpointRouteBuilderExtensions.cs b/...ints/BffEndpointRouteBuilderExtensions.cs → ...tion/BffEndpointRouteBuilderExtensions.cs
diff --git a/src/Duende.Bff/BffOptions.cs → src/Duende.Bff/Configuration/BffOptions.cs b/src/Duende.Bff/BffOptions.cs → src/Duende.Bff/Configuration/BffOptions.cs
diff --git a/...dpoints/BffRemoteApiEndpointExtensions.cs → ...uration/BffRemoteApiEndpointExtensions.cs b/...dpoints/BffRemoteApiEndpointExtensions.cs → ...uration/BffRemoteApiEndpointExtensions.cs
diff --git a/...Endpoints/BffRemoteApiEndpointMetadata.cs → ...iguration/BffRemoteApiEndpointMetadata.cs b/...Endpoints/BffRemoteApiEndpointMetadata.cs → ...iguration/BffRemoteApiEndpointMetadata.cs
diff --git a/...nde.Bff/BffServiceCollectionExtensions.cs → ...uration/BffServiceCollectionExtensions.cs b/...nde.Bff/BffServiceCollectionExtensions.cs → ...uration/BffServiceCollectionExtensions.cs
diff --git a/...ts/EndpointConventionBuilderExtensions.cs → ...on/EndpointConventionBuilderExtensions.cs b/...ts/EndpointConventionBuilderExtensions.cs → ...on/EndpointConventionBuilderExtensions.cs
diff --git a/src/Duende.Bff/Duende.Bff.csproj b/src/Duende.Bff/Duende.Bff.csproj
@@ -30,17 +30,17 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <FrameworkReference Include="Microsoft.AspNetCore.App"/>
+        <FrameworkReference Include="Microsoft.AspNetCore.App" />
 
-        <PackageReference Include="MinVer" Version="4.0.0" PrivateAssets="all"/>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
+        <PackageReference Include="MinVer" Version="4.0.0" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
 
         <PackageReference Include="Duende.AccessTokenManagement.OpenIdConnect" Version="1.0.0-preview.4" />
     </ItemGroup>
 
     <ItemGroup>
-        <None Include="../../LICENSE" Pack="true" Visible="false" PackagePath=""/>
-        <None Include="../../icon.png" Pack="true" Visible="false" PackagePath=""/>
+        <None Include="../../LICENSE" Pack="true" Visible="false" PackagePath="" />
+        <None Include="../../icon.png" Pack="true" Visible="false" PackagePath="" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Duende.Bff/Endpoints/BffApiAttribute.cs → ...Bff/EndpointProcessing/BffApiAttribute.cs b/src/Duende.Bff/Endpoints/BffApiAttribute.cs → ...Bff/EndpointProcessing/BffApiAttribute.cs
diff --git a/...dpoints/BffApiSkipAntiforgeryAttribute.cs → ...cessing/BffApiSkipAntiforgeryAttribute.cs b/...dpoints/BffApiSkipAntiforgeryAttribute.cs → ...cessing/BffApiSkipAntiforgeryAttribute.cs
diff --git a/...ffAuthorizationMiddlewareResultHandler.cs → ...ffAuthorizationMiddlewareResultHandler.cs b/...ffAuthorizationMiddlewareResultHandler.cs → ...ffAuthorizationMiddlewareResultHandler.cs
diff --git a/src/Duende.Bff/BffMiddleware.cs → ...e.Bff/EndpointProcessing/BffMiddleware.cs b/src/Duende.Bff/BffMiddleware.cs → ...e.Bff/EndpointProcessing/BffMiddleware.cs
diff --git a/...Endpoints/BffUserAccessTokenParameters.cs → ...rocessing/BffUserAccessTokenParameters.cs b/...Endpoints/BffUserAccessTokenParameters.cs → ...rocessing/BffUserAccessTokenParameters.cs
diff --git a/src/Duende.Bff/Endpoints/IBffApiEndpoint.cs → ...Bff/EndpointProcessing/IBffApiEndpoint.cs b/src/Duende.Bff/Endpoints/IBffApiEndpoint.cs → ...Bff/EndpointProcessing/IBffApiEndpoint.cs
diff --git a/...de.Bff/Endpoints/IBffApiSkipAntiforgry.cs → ...dpointProcessing/IBffApiSkipAntiforgry.cs b/...de.Bff/Endpoints/IBffApiSkipAntiforgry.cs → ...dpointProcessing/IBffApiSkipAntiforgry.cs
diff --git a/...points/DefaultBackchannelLogoutService.cs → ...Logout/DefaultBackchannelLogoutService.cs b/...points/DefaultBackchannelLogoutService.cs → ...Logout/DefaultBackchannelLogoutService.cs
diff --git a/...ff/Endpoints/IBackchannelLogoutService.cs → ...hannelLogout/IBackchannelLogoutService.cs b/...ff/Endpoints/IBackchannelLogoutService.cs → ...hannelLogout/IBackchannelLogoutService.cs
diff --git a/...ff/Endpoints/DefaultDiagnosticsService.cs → .../Diagnostics/DefaultDiagnosticsService.cs b/...ff/Endpoints/DefaultDiagnosticsService.cs → .../Diagnostics/DefaultDiagnosticsService.cs
diff --git a/...ende.Bff/Endpoints/IDiagnosticsService.cs → ...rvices/Diagnostics/IDiagnosticsService.cs b/...ende.Bff/Endpoints/IDiagnosticsService.cs → ...rvices/Diagnostics/IDiagnosticsService.cs
diff --git a/src/Duende.Bff/IBffEndpointService.cs → ...f/EndpointServices/IBffEndpointService.cs b/src/Duende.Bff/IBffEndpointService.cs → ...f/EndpointServices/IBffEndpointService.cs
diff --git a/...ende.Bff/Endpoints/DefaultLoginService.cs → ...ointServices/Login/DefaultLoginService.cs b/...ende.Bff/Endpoints/DefaultLoginService.cs → ...ointServices/Login/DefaultLoginService.cs
diff --git a/src/Duende.Bff/Endpoints/ILoginService.cs → ...f/EndpointServices/Login/ILoginService.cs b/src/Duende.Bff/Endpoints/ILoginService.cs → ...f/EndpointServices/Login/ILoginService.cs
diff --git a/...nde.Bff/Endpoints/DefaultLogoutService.cs → ...ntServices/Logout/DefaultLogoutService.cs b/...nde.Bff/Endpoints/DefaultLogoutService.cs → ...ntServices/Logout/DefaultLogoutService.cs
diff --git a/src/Duende.Bff/Endpoints/ILogoutService.cs → ...EndpointServices/Logout/ILogoutService.cs b/src/Duende.Bff/Endpoints/ILogoutService.cs → ...EndpointServices/Logout/ILogoutService.cs
diff --git a/src/Duende.Bff/BffOpenIdConnectEvents.cs → ...ces/SilentLogin/BffOpenIdConnectEvents.cs b/src/Duende.Bff/BffOpenIdConnectEvents.cs → ...ces/SilentLogin/BffOpenIdConnectEvents.cs
diff --git a/...ints/DefaultSilentLoginCallbackService.cs → ...ogin/DefaultSilentLoginCallbackService.cs b/...ints/DefaultSilentLoginCallbackService.cs → ...ogin/DefaultSilentLoginCallbackService.cs
diff --git a/...ff/Endpoints/DefaultSilentLoginService.cs → .../SilentLogin/DefaultSilentLoginService.cs b/...ff/Endpoints/DefaultSilentLoginService.cs → .../SilentLogin/DefaultSilentLoginService.cs
diff --git a/.../Endpoints/ISilentLoginCallbackService.cs → ...ilentLogin/ISilentLoginCallbackService.cs b/.../Endpoints/ISilentLoginCallbackService.cs → ...ilentLogin/ISilentLoginCallbackService.cs
diff --git a/...ende.Bff/Endpoints/ISilentLoginService.cs → ...rvices/SilentLogin/ISilentLoginService.cs b/...ende.Bff/Endpoints/ISilentLoginService.cs → ...rvices/SilentLogin/ISilentLoginService.cs
diff --git a/...PostConfigureOidcOptionsForSilentLogin.cs → ...PostConfigureOidcOptionsForSilentLogin.cs b/...PostConfigureOidcOptionsForSilentLogin.cs → ...PostConfigureOidcOptionsForSilentLogin.cs
diff --git a/...uende.Bff/Endpoints/DefaultUserService.cs → ...dpointServices/User/DefaultUserService.cs b/...uende.Bff/Endpoints/DefaultUserService.cs → ...dpointServices/User/DefaultUserService.cs
diff --git a/src/Duende.Bff/Endpoints/IUserService.cs → ...Bff/EndpointServices/User/IUserService.cs b/src/Duende.Bff/Endpoints/IUserService.cs → ...Bff/EndpointServices/User/IUserService.cs
diff --git a/...nts/AuthenticationPropertiesExtensions.cs → ...ons/AuthenticationPropertiesExtensions.cs b/...nts/AuthenticationPropertiesExtensions.cs → ...ons/AuthenticationPropertiesExtensions.cs
diff --git a/...agement/AuthenticationTicketExtensions.cs → ...ensions/AuthenticationTicketExtensions.cs b/...agement/AuthenticationTicketExtensions.cs → ...ensions/AuthenticationTicketExtensions.cs
diff --git a/src/Duende.Bff/Extensions.cs → ...e.Bff/Extensions/HttpContextExtensions.cs b/src/Duende.Bff/Extensions.cs → ...e.Bff/Extensions/HttpContextExtensions.cs
@@ -10,7 +10,7 @@
 
 namespace Duende.Bff;
 
-internal static class Extensions
+internal static class HttpContextExtensions
 {
     public static void CheckForBffMiddleware(this HttpContext context, BffOptions options)
     {

diff --git a/...ende.Bff/Endpoints/IReturnUrlValidator.cs → ...Duende.Bff/General/IReturnUrlValidator.cs b/...ende.Bff/Endpoints/IReturnUrlValidator.cs → ...Duende.Bff/General/IReturnUrlValidator.cs
@@ -17,12 +17,3 @@ public interface IReturnUrlValidator
     /// <returns></returns>
     Task<bool> IsValidAsync(string returnUrl);
 }
-
-class LocalUrlReturnUrlValidator : IReturnUrlValidator
-{
-    /// <inheritdoc/>
-    public Task<bool> IsValidAsync(string returnUrl)
-    {
-        return Task.FromResult(Util.IsLocalUrl(returnUrl));
-    }
-}
diff --git a/src/Duende.Bff/Endpoints/License.cs → src/Duende.Bff/General/License.cs b/src/Duende.Bff/Endpoints/License.cs → src/Duende.Bff/General/License.cs
diff --git a/src/Duende.Bff/Endpoints/LicenseValidator.cs → src/Duende.Bff/General/LicenseValidator.cs b/src/Duende.Bff/Endpoints/LicenseValidator.cs → src/Duende.Bff/General/LicenseValidator.cs
diff --git a/src/Duende.Bff/Endpoints/Util.cs → ...Bff/General/LocalUrlReturnUrlValidator.cs b/src/Duende.Bff/Endpoints/Util.cs → ...Bff/General/LocalUrlReturnUrlValidator.cs
@@ -1,12 +1,19 @@
-// Copyright (c) Duende Software. All rights reserved.
+// Copyright (c) Duende Software. All rights reserved.
 // See LICENSE in the project root for license information.
 
 using System;
+using System.Threading.Tasks;
 
 namespace Duende.Bff;
 
-internal static class Util
+class LocalUrlReturnUrlValidator : IReturnUrlValidator
 {
+    /// <inheritdoc/>
+    public Task<bool> IsValidAsync(string returnUrl)
+    {
+        return Task.FromResult(IsLocalUrl(returnUrl));
+    }
+
     internal static bool IsLocalUrl(string url)
     {
         if (string.IsNullOrEmpty(url))
@@ -44,4 +51,4 @@ static bool HasControlCharacter(ReadOnlySpan<char> readOnlySpan)
             return false;
         }
     }
-}
+}
diff --git a/src/Duende.Bff/Log.cs → src/Duende.Bff/General/Log.cs b/src/Duende.Bff/Log.cs → src/Duende.Bff/General/Log.cs
diff --git a/src/Duende.Bff/TokenType.cs → src/Duende.Bff/General/TokenType.cs b/src/Duende.Bff/TokenType.cs → src/Duende.Bff/General/TokenType.cs
diff --git a/...ureApplicationCookieRevokeRefreshToken.cs → ...ureApplicationCookieRevokeRefreshToken.cs b/...ureApplicationCookieRevokeRefreshToken.cs → ...ureApplicationCookieRevokeRefreshToken.cs
diff --git a/...tConfigureApplicationCookieTicketStore.cs → ...tConfigureApplicationCookieTicketStore.cs b/...tConfigureApplicationCookieTicketStore.cs → ...tConfigureApplicationCookieTicketStore.cs
diff --git a/...tConfigureApplicationValidatePrincipal.cs → ...tConfigureApplicationValidatePrincipal.cs b/...tConfigureApplicationValidatePrincipal.cs → ...tConfigureApplicationValidatePrincipal.cs
diff --git a/...nt/PostConfigureSlidingExpirationCheck.cs → ...on/PostConfigureSlidingExpirationCheck.cs b/...nt/PostConfigureSlidingExpirationCheck.cs → ...on/PostConfigureSlidingExpirationCheck.cs
diff --git a/...onManagement/ISessionRevocationService.cs → ...t/Revocation/ISessionRevocationService.cs b/...onManagement/ISessionRevocationService.cs → ...t/Revocation/ISessionRevocationService.cs
diff --git a/...Management/NopSessionRevocationService.cs → ...Revocation/NopSessionRevocationService.cs b/...Management/NopSessionRevocationService.cs → ...Revocation/NopSessionRevocationService.cs
diff --git a/...ionManagement/SessionRevocationService.cs → ...nt/Revocation/SessionRevocationService.cs b/...ionManagement/SessionRevocationService.cs → ...nt/Revocation/SessionRevocationService.cs
diff --git a/...ff/SessionManagement/IUserSessionStore.cs → ...agement/SessionStore/IUserSessionStore.cs b/...ff/SessionManagement/IUserSessionStore.cs → ...agement/SessionStore/IUserSessionStore.cs
diff --git a/...ionManagement/IUserSessionStoreCleanup.cs → .../SessionStore/IUserSessionStoreCleanup.cs b/...ionManagement/IUserSessionStoreCleanup.cs → .../SessionStore/IUserSessionStoreCleanup.cs
diff --git a/...ionManagement/InMemoryUserSessionStore.cs → .../SessionStore/InMemoryUserSessionStore.cs b/...ionManagement/InMemoryUserSessionStore.cs → .../SessionStore/InMemoryUserSessionStore.cs
diff --git a/...f/SessionManagement/SessionCleanupHost.cs → ...gement/SessionStore/SessionCleanupHost.cs b/...f/SessionManagement/SessionCleanupHost.cs → ...gement/SessionStore/SessionCleanupHost.cs
diff --git a/...ende.Bff/SessionManagement/UserSession.cs → ...ionManagement/SessionStore/UserSession.cs b/...ende.Bff/SessionManagement/UserSession.cs → ...ionManagement/SessionStore/UserSession.cs
diff --git a/...ff/SessionManagement/UserSessionUpdate.cs → ...agement/SessionStore/UserSessionUpdate.cs b/...ff/SessionManagement/UserSessionUpdate.cs → ...agement/SessionStore/UserSessionUpdate.cs
diff --git a/...f/SessionManagement/UserSessionsFilter.cs → ...gement/SessionStore/UserSessionsFilter.cs b/...f/SessionManagement/UserSessionsFilter.cs → ...gement/SessionStore/UserSessionsFilter.cs
diff --git a/...f/SessionManagement/IServerTicketStore.cs → ...agement/TicketStore/IServerTicketStore.cs b/...f/SessionManagement/IServerTicketStore.cs → ...agement/TicketStore/IServerTicketStore.cs
diff --git a/...essionManagement/ServerSideTicketStore.cs → ...ment/TicketStore/ServerSideTicketStore.cs b/...essionManagement/ServerSideTicketStore.cs → ...ment/TicketStore/ServerSideTicketStore.cs
diff --git a/....Bff/SessionManagement/TicketStoreShim.cs → ...Management/TicketStore/TicketStoreShim.cs b/....Bff/SessionManagement/TicketStoreShim.cs → ...Management/TicketStore/TicketStoreShim.cs