Moves use_open_id_auth_with_config to the Saturn.Extensions.Authorization project, obsoletes the old member and forwards it to the new project. (#236)

Author: ChrSteinert

src/Saturn.Extensions.Authorization/OAuth.fs

@@ -1,19 +1,17 @@
 module Saturn
 
-open Saturn
-open FSharp.Control.Tasks.V2.ContextInsensitive
+open System
+
 open Microsoft.AspNetCore
 open Microsoft.Extensions.DependencyInjection
 open Microsoft.AspNetCore.Builder
+open Microsoft.AspNetCore.Authentication
 open Microsoft.AspNetCore.Authentication.Cookies
-open Microsoft.AspNetCore.Http
-open System.Threading.Tasks
-open System
 open Microsoft.AspNetCore.Authentication.Google
-open Microsoft.AspNetCore.Authentication
-open System.Net.Http
-open System.Net.Http.Headers
-open Newtonsoft.Json.Linq
+open Microsoft.AspNetCore.Authentication.OpenIdConnect
+open Microsoft.AspNetCore.Http
+
+open Saturn
 
 let private addCookie state (c : AuthenticationBuilder) = if not state.CookiesAlreadyAdded then c.AddCookie() |> ignore
 
@@ -185,3 +183,25 @@ type Saturn.Application.ApplicationBuilder with
           AppConfigs = middleware::state.AppConfigs
           CookiesAlreadyAdded = true
       }
+
+    /// Enables OpenId authentication with custom configuration
+    [<CustomOperation("use_open_id_auth_with_config")>]
+    member __.UseOpenIdAuthWithConfig(state: ApplicationState, (config: Action<OpenIdConnect.OpenIdConnectOptions>)) =
+        let middleware (app : IApplicationBuilder) =
+            app.UseAuthentication()
+
+        let service (s: IServiceCollection) =
+            let authBuilder = s.AddAuthentication(fun authConfig ->
+                authConfig.DefaultScheme <- CookieAuthenticationDefaults.AuthenticationScheme
+                authConfig.DefaultChallengeScheme <- OpenIdConnectDefaults.AuthenticationScheme
+                authConfig.DefaultSignInScheme <- CookieAuthenticationDefaults.AuthenticationScheme)
+            addCookie state authBuilder
+            authBuilder.AddOpenIdConnect(OpenIdConnectDefaults.AuthenticationScheme, config) |> ignore
+
+            s
+
+        { state with
+            ServicesConfig = service::state.ServicesConfig
+            AppConfigs = middleware::state.AppConfigs
+            CookiesAlreadyAdded = true }
+

src/Saturn.Extensions.Authorization/paket.references

@@ -3,8 +3,10 @@ group netstandard2.0
   FSharp.Core framework: netstandard2.0
   Microsoft.AspNetCore.Authentication.Google framework: netstandard2.0
   Microsoft.AspNetCore.Authentication.OAuth framework: netstandard2.0
+  Microsoft.AspNetCore.Authentication.OpenIdConnect framework: netstandard2.0
 
 group netcoreapp3.1
   FSharp.Core framework: netcoreapp3.1
   Microsoft.AspNetCore.Authentication.Google framework: netcoreapp3.1
+  Microsoft.AspNetCore.Authentication.OpenIdConnect framework: netcoreapp3.1
 

src/Saturn.Extensions.OpenIdConnect/OpenId.fs

@@ -19,21 +19,6 @@ module OpenId =
     type Saturn.Application.ApplicationBuilder with
         /// Enables OpenId authentication with custom configuration
         [<CustomOperation("use_open_id_auth_with_config")>]
-        member __.UseOpenIdAuthWithConfig(state: ApplicationState, (config: Action<OpenIdConnect.OpenIdConnectOptions>)) =
-            let middleware (app : IApplicationBuilder) =
-                app.UseAuthentication()
-
-            let service (s: IServiceCollection) =
-                let authBuilder = s.AddAuthentication(fun authConfig ->
-                    authConfig.DefaultScheme <- CookieAuthenticationDefaults.AuthenticationScheme
-                    authConfig.DefaultChallengeScheme <- OpenIdConnectDefaults.AuthenticationScheme
-                    authConfig.DefaultSignInScheme <- CookieAuthenticationDefaults.AuthenticationScheme)
-                addCookie state authBuilder
-                authBuilder.AddOpenIdConnect(OpenIdConnectDefaults.AuthenticationScheme, config) |> ignore
-
-                s
-
-            { state with
-                ServicesConfig = service::state.ServicesConfig
-                AppConfigs = middleware::state.AppConfigs
-                CookiesAlreadyAdded = true }
+        [<Obsolete("This operation has been moved to the Saturn.Extensions.Authorization project.")>]
+        member this.UseOpenIdAuthWithConfig_Obsolete(state: ApplicationState, (config: Action<OpenIdConnect.OpenIdConnectOptions>)) =
+            this.UseOpenIdAuthWithConfig(state, config)

src/Saturn.Extensions.OpenIdConnect/Saturn.Extensions.OpenIdConnect.fsproj

@@ -11,6 +11,7 @@
     <ProjectReference Include="..\Saturn\Saturn.fsproj">
       <Name>Saturn.fsproj</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Saturn.Extensions.Authorization\Saturn.Extensions.Authorization.fsproj" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="OpenId.fs" />