deps (#29)

swuecho · Jun 30, 2024 · 3766e71 · 3766e71
1 parent bd1c68a
commit 3766e71
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 38 deletions.
diff --git a/api/Note.fs b/api/Note.fs
@@ -129,17 +129,8 @@ let createNewUser conn email password =
 
     //let jwtSecret = JwtSecrets.GetJwtSecret conn "logbook"
 
-        // Get the JWT key from the environment variable
-    let jwtKey = 
-        match System.Environment.GetEnvironmentVariable("JWT_SECRET") with
-        | null -> failwith "JWT_SECRET environment variable not found"
-        | key -> key
-
-    // Get the audience from the environment variable
-    let audience = 
-        match System.Environment.GetEnvironmentVariable("JWT_AUDIENCE") with
-        | null -> failwith "JWT_AUDIENCE environment variable not found"
-        | aud -> aud
+    let jwtKey = Util.getEnvVar "JWT_SECRET"
+    let audience = Util.getEnvVar "JWT_AUDIENCE"
 
 
     let issuer = "logbook-swuecho.github.com"
@@ -149,6 +140,7 @@ let createNewUser conn email password =
 
     jwt
 
+
 let login: HttpHandler =
     fun ctx ->
         Request.mapJson
@@ -165,19 +157,8 @@ let login: HttpHandler =
                     // check if user is admin
                     let role = if user.IsSuperuser then "admin" else "user"
 
-                    // let jwtSecret = JwtSecrets.GetJwtSecret conn "logbook"
-
-                    let jwtKey = 
-                        match System.Environment.GetEnvironmentVariable("JWT_SECRET") with
-                        | null -> failwith "JWT_SECRET environment variable not found"
-                        | key -> key
-
-                    // Get the audience from the environment variable
-                    let audience = 
-                        match System.Environment.GetEnvironmentVariable("JWT_AUDIENCE") with
-                        | null -> failwith "JWT_AUDIENCE environment variable not found"
-                        | aud -> aud
-
+                    let jwtKey = Util.getEnvVar "JWT_SECRET"
+                    let audience = Util.getEnvVar "JWT_AUDIENCE"
                     let issuer = "logbook-swuecho.github.com"
 
                     if passwordMatches then

diff --git a/api/Notepad.fsproj b/api/Notepad.fsproj
@@ -4,6 +4,7 @@
     <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="Util.fs" />
     <Compile Include="Auth.fs" />
     <Compile Include="HttpAuth.fs" />
     <Compile Include="Token.fs" />
@@ -23,8 +24,8 @@
     <PackageReference Include="FSharp.Data" Version="6.2.0" />
     <PackageReference Include="jieba.NET" Version="0.42.2" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.5" />
-    <PackageReference Include="Npgsql" Version="7.0.4" />
+    <PackageReference Include="Npgsql" Version="8.0.3" />
     <PackageReference Include="Npgsql.FSharp" Version="5.7.0" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.30.1" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.6.0" />
   </ItemGroup>
 </Project>
diff --git a/api/Program.fs b/api/Program.fs
@@ -55,19 +55,11 @@ let authUserMiddleware (app: IApplicationBuilder) =
     app.Use(middleware)
 
 
+
+
 let authService (services: IServiceCollection) =
-
-    // Get the JWT key from the environment variable
-    let jwtKey = 
-        match System.Environment.GetEnvironmentVariable("JWT_SECRET") with
-        | null -> failwith "JWT_SECRET environment variable not found"
-        | key -> key
-
-    // Get the audience from the environment variable
-    let audience = 
-        match System.Environment.GetEnvironmentVariable("JWT_AUDIENCE") with
-        | null -> failwith "JWT_AUDIENCE environment variable not found"
-        | aud -> aud
+    let jwtKey = Util.getEnvVar "JWT_SECRET"
+    let audience = Util.getEnvVar "JWT_AUDIENCE"
 
 
     let _ =

diff --git a/api/Util.fs b/api/Util.fs
@@ -0,0 +1,6 @@
+module Util
+
+let getEnvVar varName =
+        match System.Environment.GetEnvironmentVariable(varName) with
+        | null -> failwith (sprintf "%s environment variable not found" varName)
+        | value -> value