Introduce the server SDK in the rest of server

2026-01-31 14:13:18 +08:00 · 2026-01-14 15:25:53 -05:00
parent 2a18f276a8
commit c5f950e6e7
26 changed files with 37 additions and 55 deletions
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -13,6 +13,11 @@
    <TreatWarningsAsErrors Condition="'$(TreatWarningsAsErrors)' == ''">true</TreatWarningsAsErrors>
  </PropertyGroup>

+  <PropertyGroup Label="Server SDK Settings">
+    <BitIncludeAuthentication>false</BitIncludeAuthentication>
+    <BitIncludeFeatures>false</BitIncludeFeatures>
+    <BitIncludeCaching>false</BitIncludeCaching>
+  </PropertyGroup>

  <PropertyGroup>

@@ -30,4 +35,4 @@

    <AutoFixtureAutoNSubstituteVersion>4.18.1</AutoFixtureAutoNSubstituteVersion>
  </PropertyGroup>
-</Project>
+</Project>
--- a/bitwarden_license/src/Scim/Program.cs
+++ b/bitwarden_license/src/Scim/Program.cs
@@ -8,6 +8,7 @@ public class Program
    {
        Host
            .CreateDefaultBuilder(args)
+            .UseBitwardenSdk()
            .ConfigureWebHostDefaults(webBuilder =>
            {
                webBuilder.UseStartup<Startup>();
--- a/bitwarden_license/src/Scim/Scim.csproj
+++ b/bitwarden_license/src/Scim/Scim.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
+  <Sdk Name="Bitwarden.Server.Sdk" />

  <PropertyGroup>
    <UserSecretsId>bitwarden-Scim</UserSecretsId>
--- a/bitwarden_license/src/Sso/Program.cs
+++ b/bitwarden_license/src/Sso/Program.cs
@@ -8,7 +8,7 @@ public class Program
    {
        Host
            .CreateDefaultBuilder(args)
-            .ConfigureCustomAppConfiguration(args)
+            .UseBitwardenSdk()
            .ConfigureWebHostDefaults(webBuilder =>
            {
                webBuilder.UseStartup<Startup>();
--- a/bitwarden_license/src/Sso/Sso.csproj
+++ b/bitwarden_license/src/Sso/Sso.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
+  <Sdk Name="Bitwarden.Server.Sdk" />

  <PropertyGroup>
    <UserSecretsId>bitwarden-Sso</UserSecretsId>
--- a/dev/docker-compose.yml
+++ b/dev/docker-compose.yml
@@ -145,6 +145,14 @@ services:
    profiles:
      - redis

+  aspire-dashboard:
+    image: mcr.microsoft.com/dotnet/aspire-dashboard:latest
+    ports:
+      - "18888:18888"
+      - "4317:18889"
+    profiles:
+      - telemetry
+
 volumes:
  mssql_dev_data:
  postgres_dev_data:
--- a/global.json
+++ b/global.json
@@ -6,6 +6,6 @@
  "msbuild-sdks": {
    "Microsoft.Build.Traversal": "4.1.0",
    "Microsoft.Build.Sql": "1.0.0",
-    "Bitwarden.Server.Sdk": "1.2.0"
+    "Bitwarden.Server.Sdk": "1.3.0"
  }
 }
--- a/src/Admin/Admin.csproj
+++ b/src/Admin/Admin.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
+  <Sdk Name="Bitwarden.Server.Sdk" />

  <PropertyGroup>
    <UserSecretsId>bitwarden-Admin</UserSecretsId>
--- a/src/Admin/Program.cs
+++ b/src/Admin/Program.cs
@@ -8,7 +8,7 @@ public class Program
    {
        Host
            .CreateDefaultBuilder(args)
-            .ConfigureCustomAppConfiguration(args)
+            .UseBitwardenSdk()
            .ConfigureWebHostDefaults(webBuilder =>
            {
                webBuilder.ConfigureKestrel(o =>
--- a/src/Api/Api.csproj
+++ b/src/Api/Api.csproj
@@ -1,4 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
+  <Sdk Name="Bitwarden.Server.Sdk" />
+
  <PropertyGroup>
    <UserSecretsId>bitwarden-Api</UserSecretsId>
    <MvcRazorCompileOnPublish>false</MvcRazorCompileOnPublish>
--- a/src/Api/Program.cs
+++ b/src/Api/Program.cs
@@ -8,7 +8,7 @@ public class Program
    {
        Host
            .CreateDefaultBuilder(args)
-            .ConfigureCustomAppConfiguration(args)
+            .UseBitwardenSdk()
            .ConfigureWebHostDefaults(webBuilder =>
            {
                webBuilder.UseStartup<Startup>();
--- a/src/Core/Utilities/HostBuilderExtensions.cs
+++ b/src/Core/Utilities/HostBuilderExtensions.cs
@@ -1,42 +0,0 @@
-using System.Reflection;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Hosting;
-
-namespace Bit.Core.Utilities;
-
-public static class HostBuilderExtensions
-{
-    public static IHostBuilder ConfigureCustomAppConfiguration(this IHostBuilder hostBuilder, string[] args)
-    {
-        // Reload app configuration with SelfHosted overrides.
-        return hostBuilder.ConfigureAppConfiguration((hostingContext, config) =>
-        {
-            if (Environment.GetEnvironmentVariable("globalSettings__selfHosted")?.ToLower() != "true")
-            {
-                return;
-            }
-
-            var env = hostingContext.HostingEnvironment;
-
-            config.AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
-                .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true, reloadOnChange: true)
-                .AddJsonFile("appsettings.SelfHosted.json", optional: true, reloadOnChange: true);
-
-            if (env.IsDevelopment())
-            {
-                var appAssembly = Assembly.Load(new AssemblyName(env.ApplicationName));
-                if (appAssembly != null)
-                {
-                    config.AddUserSecrets(appAssembly, optional: true);
-                }
-            }
-
-            config.AddEnvironmentVariables();
-
-            if (args != null)
-            {
-                config.AddCommandLine(args);
-            }
-        });
-    }
-}
--- a/src/Events/Events.csproj
+++ b/src/Events/Events.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
+  <Sdk Name="Bitwarden.Server.Sdk" />

  <PropertyGroup>
    <UserSecretsId>bitwarden-Events</UserSecretsId>
--- a/src/Events/Program.cs
+++ b/src/Events/Program.cs
@@ -8,7 +8,7 @@ public class Program
    {
        Host
            .CreateDefaultBuilder(args)
-            .ConfigureCustomAppConfiguration(args)
+            .UseBitwardenSdk()
            .ConfigureWebHostDefaults(webBuilder =>
            {
                webBuilder.UseStartup<Startup>();
--- a/src/EventsProcessor/EventsProcessor.csproj
+++ b/src/EventsProcessor/EventsProcessor.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
+  <Sdk Name="Bitwarden.Server.Sdk" />

  <PropertyGroup>
    <UserSecretsId>bitwarden-EventsProcessor</UserSecretsId>
--- a/src/EventsProcessor/Program.cs
+++ b/src/EventsProcessor/Program.cs
@@ -8,6 +8,7 @@ public class Program
    {
        Host
            .CreateDefaultBuilder(args)
+            .UseBitwardenSdk()
            .ConfigureWebHostDefaults(webBuilder =>
            {
                webBuilder.UseStartup<Startup>();
--- a/src/Icons/Icons.csproj
+++ b/src/Icons/Icons.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
+  <Sdk Name="Bitwarden.Server.Sdk" />

  <PropertyGroup>
    <UserSecretsId>bitwarden-Icons</UserSecretsId>
--- a/src/Icons/Program.cs
+++ b/src/Icons/Program.cs
@@ -8,6 +8,7 @@ public class Program
    {
        Host
            .CreateDefaultBuilder(args)
+            .UseBitwardenSdk()
            .ConfigureWebHostDefaults(webBuilder =>
            {
                webBuilder.UseStartup<Startup>();
--- a/src/Identity/Identity.csproj
+++ b/src/Identity/Identity.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
+  <Sdk Name="Bitwarden.Server.Sdk" />

  <PropertyGroup>
    <UserSecretsId>bitwarden-Identity</UserSecretsId>
--- a/src/Identity/Program.cs
+++ b/src/Identity/Program.cs
@@ -15,7 +15,7 @@ public class Program
    {
        return Host
            .CreateDefaultBuilder(args)
-            .ConfigureCustomAppConfiguration(args)
+            .UseBitwardenSdk()
            .ConfigureWebHostDefaults(webBuilder =>
            {
                webBuilder.UseStartup<Startup>();
--- a/src/Notifications/Notifications.csproj
+++ b/src/Notifications/Notifications.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
+  <Sdk Name="Bitwarden.Server.Sdk" />

  <PropertyGroup>
    <UserSecretsId>bitwarden-Notifications</UserSecretsId>
--- a/src/Notifications/Program.cs
+++ b/src/Notifications/Program.cs
@@ -8,7 +8,7 @@ public class Program
    {
        Host
            .CreateDefaultBuilder(args)
-            .ConfigureCustomAppConfiguration(args)
+            .UseBitwardenSdk()
            .ConfigureWebHostDefaults(webBuilder =>
            {
                webBuilder.UseStartup<Startup>();
--- a/test/Infrastructure.IntegrationTest/Infrastructure.IntegrationTest.csproj
+++ b/test/Infrastructure.IntegrationTest/Infrastructure.IntegrationTest.csproj
@@ -9,9 +9,7 @@

  <ItemGroup>
    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
    <PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" Version="8.10.0" />
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNetTestSdkVersion)" />
    <PackageReference Include="xunit.v3" Version="3.0.1" />
--- a/test/IntegrationTestCommon/IntegrationTestCommon.csproj
+++ b/test/IntegrationTestCommon/IntegrationTestCommon.csproj
@@ -8,7 +8,6 @@

  <ItemGroup>
    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.10" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
  </ItemGroup>

  <ItemGroup>
--- a/util/SeederApi/Program.cs
+++ b/util/SeederApi/Program.cs
@@ -8,7 +8,7 @@ public class Program
    {
        Host
            .CreateDefaultBuilder(args)
-            .ConfigureCustomAppConfiguration(args)
+            .UseBitwardenSdk()
            .ConfigureWebHostDefaults(webBuilder =>
            {
                webBuilder.UseStartup<Startup>();
--- a/util/SeederApi/SeederApi.csproj
+++ b/util/SeederApi/SeederApi.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
+    <Sdk Name="Bitwarden.Server.Sdk" />

    <PropertyGroup>
        <UserSecretsId>bitwarden-seeder-api</UserSecretsId>