summaryrefslogtreecommitdiffstats
path: root/src/server
diff options
context:
space:
mode:
authorivarlovlie <git@ivarlovlie.no>2022-04-21 22:56:56 +0200
committerivarlovlie <git@ivarlovlie.no>2022-04-21 22:56:56 +0200
commit2f975c41933731d81e570029fb59457399ec6d0d (patch)
tree9c1ab1bfcf50472cf14f83fd79d6e637d99725eb /src/server
parent1d482a4ec2cf24dbe7cc6cb02e192e1b9545f796 (diff)
downloadbookmark-thing-2f975c41933731d81e570029fb59457399ec6d0d.tar.xz
bookmark-thing-2f975c41933731d81e570029fb59457399ec6d0d.zip
.
Diffstat (limited to 'src/server')
-rw-r--r--src/server/Api/Internal/Account/GetClaimsRoute.cs2
-rw-r--r--src/server/Api/Internal/BaseInternalRoute.cs2
-rw-r--r--src/server/Api/V1/BaseV1Route.cs2
-rw-r--r--src/server/IOL.BookmarkThing.Server.csproj16
-rw-r--r--src/server/Startup.cs2
-rw-r--r--src/server/StartupTasks.cs2
6 files changed, 14 insertions, 12 deletions
diff --git a/src/server/Api/Internal/Account/GetClaimsRoute.cs b/src/server/Api/Internal/Account/GetClaimsRoute.cs
index fde8887..b072a39 100644
--- a/src/server/Api/Internal/Account/GetClaimsRoute.cs
+++ b/src/server/Api/Internal/Account/GetClaimsRoute.cs
@@ -2,6 +2,8 @@ namespace IOL.BookmarkThing.Server.Api.Internal.Account;
public class GetClaimsRoute : RouteBaseInternalSync.WithoutRequest.WithActionResult
{
+ [ApiVersionNeutral]
+ [ApiExplorerSettings(IgnoreApi = true)]
[HttpGet("~/v{apiVersion:apiVersion}/account/claims")]
public override ActionResult Handle() {
if (HttpContext.Request.Query.ContainsKey("download")) {
diff --git a/src/server/Api/Internal/BaseInternalRoute.cs b/src/server/Api/Internal/BaseInternalRoute.cs
index e416da7..665be09 100644
--- a/src/server/Api/Internal/BaseInternalRoute.cs
+++ b/src/server/Api/Internal/BaseInternalRoute.cs
@@ -9,7 +9,7 @@ public class BaseInternalRoute : ControllerBase
/// User data for the currently logged on user.
/// </summary>
protected LoggedInInternalUser LoggedInUser => new() {
- Id = User.FindFirstValue(AppClaims.USER_ID).ToGuid(),
+ Id = User.FindFirstValue(AppClaims.USER_ID).AsGuid(),
Username = User.FindFirstValue(AppClaims.NAME),
};
diff --git a/src/server/Api/V1/BaseV1Route.cs b/src/server/Api/V1/BaseV1Route.cs
index bbccae6..29513ac 100644
--- a/src/server/Api/V1/BaseV1Route.cs
+++ b/src/server/Api/V1/BaseV1Route.cs
@@ -13,7 +13,7 @@ public class BaseV1Route : ControllerBase
/// User data for the currently logged on user.
/// </summary>
protected LoggedInV1User LoggedInUser => new() {
- Id = User.FindFirstValue(AppClaims.USER_ID).ToGuid(),
+ Id = User.FindFirstValue(AppClaims.USER_ID).AsGuid(),
Username = User.FindFirstValue(AppClaims.NAME),
};
diff --git a/src/server/IOL.BookmarkThing.Server.csproj b/src/server/IOL.BookmarkThing.Server.csproj
index 70ee0fc..efe443b 100644
--- a/src/server/IOL.BookmarkThing.Server.csproj
+++ b/src/server/IOL.BookmarkThing.Server.csproj
@@ -17,20 +17,20 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="AspNet.Security.OAuth.GitHub" Version="6.0.4" />
+ <PackageReference Include="AspNet.Security.OAuth.GitHub" Version="6.0.6" />
<PackageReference Include="EFCore.NamingConventions" Version="6.0.0" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.42" />
- <PackageReference Include="IOL.Helpers" Version="2.0.0" />
+ <PackageReference Include="IOL.Helpers" Version="3.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.0.0" />
- <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.2">
+ <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.3" />
- <PackageReference Include="Quartz.Extensions.Hosting" Version="3.3.3" />
- <PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
- <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
- <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.2.3" />
+ <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.4" />
+ <PackageReference Include="Quartz.Extensions.Hosting" Version="3.4.0" />
+ <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
+ <PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.0" />
+ <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.3.0" />
</ItemGroup>
</Project>
diff --git a/src/server/Startup.cs b/src/server/Startup.cs
index 0d7c05f..f93b743 100644
--- a/src/server/Startup.cs
+++ b/src/server/Startup.cs
@@ -137,7 +137,7 @@ public class Startup
app.UseCors(builder => {
builder.AllowAnyMethod();
builder.AllowAnyHeader();
- builder.WithOrigins("http://localhost:3000");
+ builder.WithOrigins("http://localhost:3001");
builder.AllowCredentials();
});
}
diff --git a/src/server/StartupTasks.cs b/src/server/StartupTasks.cs
index ba5ebcc..8eafd8f 100644
--- a/src/server/StartupTasks.cs
+++ b/src/server/StartupTasks.cs
@@ -23,7 +23,7 @@ public static class StartupTasks
}
Directory.CreateDirectory(path!);
- Console.WriteLine("EnsuredCreated: " + path);
+ Console.WriteLine("Created new directory: " + path);
}
}
}