Revert filescoped (#2227)

* Revert "Add git blame entry (#2226)"

This reverts commit 239286737d.

* Revert "Turn on file scoped namespaces (#2225)"

This reverts commit 34fb4cca2a.

src/Api/Startup.cs

@@ -17,208 +17,209 @@ using Microsoft.Extensions.DependencyInjection.Extensions;
 using Bit.Commercial.Core.Utilities;
 #endif
 
-namespace Bit.Api;
-
-public class Startup
+namespace Bit.Api
 {
-    public Startup(IWebHostEnvironment env, IConfiguration configuration)
+    public class Startup
     {
-        CultureInfo.DefaultThreadCurrentCulture = new CultureInfo("en-US");
-        Configuration = configuration;
-        Environment = env;
-    }
-
-    public IConfiguration Configuration { get; private set; }
-    public IWebHostEnvironment Environment { get; set; }
-
-    public void ConfigureServices(IServiceCollection services)
-    {
-        // Options
-        services.AddOptions();
-
-        // Settings
-        var globalSettings = services.AddGlobalSettingsServices(Configuration, Environment);
-        if (!globalSettings.SelfHosted)
+        public Startup(IWebHostEnvironment env, IConfiguration configuration)
         {
-            services.Configure<IpRateLimitOptions>(Configuration.GetSection("IpRateLimitOptions"));
-            services.Configure<IpRateLimitPolicies>(Configuration.GetSection("IpRateLimitPolicies"));
+            CultureInfo.DefaultThreadCurrentCulture = new CultureInfo("en-US");
+            Configuration = configuration;
+            Environment = env;
         }
 
-        // Data Protection
-        services.AddCustomDataProtectionServices(Environment, globalSettings);
+        public IConfiguration Configuration { get; private set; }
+        public IWebHostEnvironment Environment { get; set; }
 
-        // Event Grid
-        if (!string.IsNullOrWhiteSpace(globalSettings.EventGridKey))
+        public void ConfigureServices(IServiceCollection services)
         {
-            ApiHelpers.EventGridKey = globalSettings.EventGridKey;
-        }
+            // Options
+            services.AddOptions();
 
-        // Stripe Billing
-        StripeConfiguration.ApiKey = globalSettings.Stripe.ApiKey;
-        StripeConfiguration.MaxNetworkRetries = globalSettings.Stripe.MaxNetworkRetries;
-
-        // Repositories
-        services.AddSqlServerRepositories(globalSettings);
-
-        // Context
-        services.AddScoped<ICurrentContext, CurrentContext>();
-        services.TryAddSingleton<IHttpContextAccessor, HttpContextAccessor>();
-
-        // Caching
-        services.AddMemoryCache();
-        services.AddDistributedCache(globalSettings);
-
-        // BitPay
-        services.AddSingleton<BitPayClient>();
-
-        if (!globalSettings.SelfHosted)
-        {
-            services.AddIpRateLimiting(globalSettings);
-        }
-
-        // Identity
-        services.AddCustomIdentityServices(globalSettings);
-        services.AddIdentityAuthenticationServices(globalSettings, Environment, config =>
-        {
-            config.AddPolicy("Application", policy =>
+            // Settings
+            var globalSettings = services.AddGlobalSettingsServices(Configuration, Environment);
+            if (!globalSettings.SelfHosted)
             {
-                policy.RequireAuthenticatedUser();
-                policy.RequireClaim(JwtClaimTypes.AuthenticationMethod, "Application", "external");
-                policy.RequireClaim(JwtClaimTypes.Scope, "api");
-            });
-            config.AddPolicy("Web", policy =>
-            {
-                policy.RequireAuthenticatedUser();
-                policy.RequireClaim(JwtClaimTypes.AuthenticationMethod, "Application", "external");
-                policy.RequireClaim(JwtClaimTypes.Scope, "api");
-                policy.RequireClaim(JwtClaimTypes.ClientId, "web");
-            });
-            config.AddPolicy("Push", policy =>
-            {
-                policy.RequireAuthenticatedUser();
-                policy.RequireClaim(JwtClaimTypes.Scope, "api.push");
-            });
-            config.AddPolicy("Licensing", policy =>
-            {
-                policy.RequireAuthenticatedUser();
-                policy.RequireClaim(JwtClaimTypes.Scope, "api.licensing");
-            });
-            config.AddPolicy("Organization", policy =>
-            {
-                policy.RequireAuthenticatedUser();
-                policy.RequireClaim(JwtClaimTypes.Scope, "api.organization");
-            });
-            config.AddPolicy("Installation", policy =>
-            {
-                policy.RequireAuthenticatedUser();
-                policy.RequireClaim(JwtClaimTypes.Scope, "api.installation");
-            });
-        });
+                services.Configure<IpRateLimitOptions>(Configuration.GetSection("IpRateLimitOptions"));
+                services.Configure<IpRateLimitPolicies>(Configuration.GetSection("IpRateLimitPolicies"));
+            }
 
-        services.AddScoped<AuthenticatorTokenProvider>();
+            // Data Protection
+            services.AddCustomDataProtectionServices(Environment, globalSettings);
 
-        // Services
-        services.AddBaseServices(globalSettings);
-        services.AddDefaultServices(globalSettings);
-        services.AddCoreLocalizationServices();
+            // Event Grid
+            if (!string.IsNullOrWhiteSpace(globalSettings.EventGridKey))
+            {
+                ApiHelpers.EventGridKey = globalSettings.EventGridKey;
+            }
+
+            // Stripe Billing
+            StripeConfiguration.ApiKey = globalSettings.Stripe.ApiKey;
+            StripeConfiguration.MaxNetworkRetries = globalSettings.Stripe.MaxNetworkRetries;
+
+            // Repositories
+            services.AddSqlServerRepositories(globalSettings);
+
+            // Context
+            services.AddScoped<ICurrentContext, CurrentContext>();
+            services.TryAddSingleton<IHttpContextAccessor, HttpContextAccessor>();
+
+            // Caching
+            services.AddMemoryCache();
+            services.AddDistributedCache(globalSettings);
+
+            // BitPay
+            services.AddSingleton<BitPayClient>();
+
+            if (!globalSettings.SelfHosted)
+            {
+                services.AddIpRateLimiting(globalSettings);
+            }
+
+            // Identity
+            services.AddCustomIdentityServices(globalSettings);
+            services.AddIdentityAuthenticationServices(globalSettings, Environment, config =>
+            {
+                config.AddPolicy("Application", policy =>
+                {
+                    policy.RequireAuthenticatedUser();
+                    policy.RequireClaim(JwtClaimTypes.AuthenticationMethod, "Application", "external");
+                    policy.RequireClaim(JwtClaimTypes.Scope, "api");
+                });
+                config.AddPolicy("Web", policy =>
+                {
+                    policy.RequireAuthenticatedUser();
+                    policy.RequireClaim(JwtClaimTypes.AuthenticationMethod, "Application", "external");
+                    policy.RequireClaim(JwtClaimTypes.Scope, "api");
+                    policy.RequireClaim(JwtClaimTypes.ClientId, "web");
+                });
+                config.AddPolicy("Push", policy =>
+                {
+                    policy.RequireAuthenticatedUser();
+                    policy.RequireClaim(JwtClaimTypes.Scope, "api.push");
+                });
+                config.AddPolicy("Licensing", policy =>
+                {
+                    policy.RequireAuthenticatedUser();
+                    policy.RequireClaim(JwtClaimTypes.Scope, "api.licensing");
+                });
+                config.AddPolicy("Organization", policy =>
+                {
+                    policy.RequireAuthenticatedUser();
+                    policy.RequireClaim(JwtClaimTypes.Scope, "api.organization");
+                });
+                config.AddPolicy("Installation", policy =>
+                {
+                    policy.RequireAuthenticatedUser();
+                    policy.RequireClaim(JwtClaimTypes.Scope, "api.installation");
+                });
+            });
+
+            services.AddScoped<AuthenticatorTokenProvider>();
+
+            // Services
+            services.AddBaseServices(globalSettings);
+            services.AddDefaultServices(globalSettings);
+            services.AddCoreLocalizationServices();
 
 #if OSS
-        services.AddOosServices();
+            services.AddOosServices();
 #else
-        services.AddCommCoreServices();
+            services.AddCommCoreServices();
 #endif
 
-        // MVC
-        services.AddMvc(config =>
-        {
-            config.Conventions.Add(new ApiExplorerGroupConvention());
-            config.Conventions.Add(new PublicApiControllersModelConvention());
-        });
-
-        services.AddSwagger(globalSettings);
-        Jobs.JobsHostedService.AddJobsServices(services, globalSettings.SelfHosted);
-        services.AddHostedService<Jobs.JobsHostedService>();
-
-        if (CoreHelpers.SettingHasValue(globalSettings.ServiceBus.ConnectionString) &&
-            CoreHelpers.SettingHasValue(globalSettings.ServiceBus.ApplicationCacheTopicName))
-        {
-            services.AddHostedService<Core.HostedServices.ApplicationCacheHostedService>();
-        }
-    }
-
-    public void Configure(
-        IApplicationBuilder app,
-        IWebHostEnvironment env,
-        IHostApplicationLifetime appLifetime,
-        GlobalSettings globalSettings,
-        ILogger<Startup> logger)
-    {
-        IdentityModelEventSource.ShowPII = true;
-        app.UseSerilog(env, appLifetime, globalSettings);
-
-        // Add general security headers
-        app.UseMiddleware<SecurityHeadersMiddleware>();
-
-        // Default Middleware
-        app.UseDefaultMiddleware(env, globalSettings);
-
-        if (!globalSettings.SelfHosted)
-        {
-            // Rate limiting
-            app.UseMiddleware<CustomIpRateLimitMiddleware>();
-        }
-        else
-        {
-            app.UseForwardedHeaders(globalSettings);
-        }
-
-        // Add localization
-        app.UseCoreLocalization();
-
-        // Add static files to the request pipeline.
-        app.UseStaticFiles();
-
-        // Add routing
-        app.UseRouting();
-
-        // Add Cors
-        app.UseCors(policy => policy.SetIsOriginAllowed(o => CoreHelpers.IsCorsOriginAllowed(o, globalSettings))
-            .AllowAnyMethod().AllowAnyHeader().AllowCredentials());
-
-        // Add authentication and authorization to the request pipeline.
-        app.UseAuthentication();
-        app.UseAuthorization();
-
-        // Add current context
-        app.UseMiddleware<CurrentContextMiddleware>();
-
-        // Add endpoints to the request pipeline.
-        app.UseEndpoints(endpoints => endpoints.MapDefaultControllerRoute());
-
-        // Add Swagger
-        if (Environment.IsDevelopment() || globalSettings.SelfHosted)
-        {
-            app.UseSwagger(config =>
+            // MVC
+            services.AddMvc(config =>
             {
-                config.RouteTemplate = "specs/{documentName}/swagger.json";
-                config.PreSerializeFilters.Add((swaggerDoc, httpReq) =>
-                    swaggerDoc.Servers = new List<OpenApiServer>
-                    {
-                        new OpenApiServer { Url = globalSettings.BaseServiceUri.Api }
-                    });
+                config.Conventions.Add(new ApiExplorerGroupConvention());
+                config.Conventions.Add(new PublicApiControllersModelConvention());
             });
-            app.UseSwaggerUI(config =>
+
+            services.AddSwagger(globalSettings);
+            Jobs.JobsHostedService.AddJobsServices(services, globalSettings.SelfHosted);
+            services.AddHostedService<Jobs.JobsHostedService>();
+
+            if (CoreHelpers.SettingHasValue(globalSettings.ServiceBus.ConnectionString) &&
+                CoreHelpers.SettingHasValue(globalSettings.ServiceBus.ApplicationCacheTopicName))
             {
-                config.DocumentTitle = "Bitwarden API Documentation";
-                config.RoutePrefix = "docs";
-                config.SwaggerEndpoint($"{globalSettings.BaseServiceUri.Api}/specs/public/swagger.json",
-                    "Bitwarden Public API");
-                config.OAuthClientId("accountType.id");
-                config.OAuthClientSecret("secretKey");
-            });
+                services.AddHostedService<Core.HostedServices.ApplicationCacheHostedService>();
+            }
         }
 
-        // Log startup
-        logger.LogInformation(Constants.BypassFiltersEventId, globalSettings.ProjectName + " started.");
+        public void Configure(
+            IApplicationBuilder app,
+            IWebHostEnvironment env,
+            IHostApplicationLifetime appLifetime,
+            GlobalSettings globalSettings,
+            ILogger<Startup> logger)
+        {
+            IdentityModelEventSource.ShowPII = true;
+            app.UseSerilog(env, appLifetime, globalSettings);
+
+            // Add general security headers
+            app.UseMiddleware<SecurityHeadersMiddleware>();
+
+            // Default Middleware
+            app.UseDefaultMiddleware(env, globalSettings);
+
+            if (!globalSettings.SelfHosted)
+            {
+                // Rate limiting
+                app.UseMiddleware<CustomIpRateLimitMiddleware>();
+            }
+            else
+            {
+                app.UseForwardedHeaders(globalSettings);
+            }
+
+            // Add localization
+            app.UseCoreLocalization();
+
+            // Add static files to the request pipeline.
+            app.UseStaticFiles();
+
+            // Add routing
+            app.UseRouting();
+
+            // Add Cors
+            app.UseCors(policy => policy.SetIsOriginAllowed(o => CoreHelpers.IsCorsOriginAllowed(o, globalSettings))
+                .AllowAnyMethod().AllowAnyHeader().AllowCredentials());
+
+            // Add authentication and authorization to the request pipeline.
+            app.UseAuthentication();
+            app.UseAuthorization();
+
+            // Add current context
+            app.UseMiddleware<CurrentContextMiddleware>();
+
+            // Add endpoints to the request pipeline.
+            app.UseEndpoints(endpoints => endpoints.MapDefaultControllerRoute());
+
+            // Add Swagger
+            if (Environment.IsDevelopment() || globalSettings.SelfHosted)
+            {
+                app.UseSwagger(config =>
+                {
+                    config.RouteTemplate = "specs/{documentName}/swagger.json";
+                    config.PreSerializeFilters.Add((swaggerDoc, httpReq) =>
+                        swaggerDoc.Servers = new List<OpenApiServer>
+                        {
+                            new OpenApiServer { Url = globalSettings.BaseServiceUri.Api }
+                        });
+                });
+                app.UseSwaggerUI(config =>
+                {
+                    config.DocumentTitle = "Bitwarden API Documentation";
+                    config.RoutePrefix = "docs";
+                    config.SwaggerEndpoint($"{globalSettings.BaseServiceUri.Api}/specs/public/swagger.json",
+                        "Bitwarden Public API");
+                    config.OAuthClientId("accountType.id");
+                    config.OAuthClientSecret("secretKey");
+                });
+            }
+
+            // Log startup
+            logger.LogInformation(Constants.BypassFiltersEventId, globalSettings.ProjectName + " started.");
+        }
     }
 }