2020-02-18 08:32:06 +01:00
|
|
|
using System;
|
|
|
|
|
using Microsoft.AspNetCore.Builder;
|
|
|
|
|
using Microsoft.AspNetCore.Hosting;
|
2020-03-16 14:02:08 +01:00
|
|
|
using Microsoft.Extensions.Configuration;
|
2020-02-18 08:32:06 +01:00
|
|
|
using Microsoft.Extensions.DependencyInjection;
|
2021-04-26 21:09:06 +02:00
|
|
|
using Microsoft.Extensions.Hosting;
|
2021-02-18 11:06:02 +01:00
|
|
|
using Umbraco.Cms.Core.DependencyInjection;
|
2020-12-08 12:32:19 +01:00
|
|
|
using Umbraco.Extensions;
|
2020-02-18 08:32:06 +01:00
|
|
|
|
2021-02-18 11:06:02 +01:00
|
|
|
namespace Umbraco.Cms.Web.UI.NetCore
|
2020-02-18 08:32:06 +01:00
|
|
|
{
|
|
|
|
|
public class Startup
|
|
|
|
|
{
|
2020-04-03 01:08:52 +11:00
|
|
|
private readonly IWebHostEnvironment _env;
|
2020-03-25 18:21:44 +11:00
|
|
|
private readonly IConfiguration _config;
|
2020-03-25 20:42:02 +01:00
|
|
|
|
2020-03-25 18:21:44 +11:00
|
|
|
/// <summary>
|
2020-12-04 13:09:08 +11:00
|
|
|
/// Initializes a new instance of the <see cref="Startup"/> class.
|
2020-03-25 18:21:44 +11:00
|
|
|
/// </summary>
|
2020-08-24 14:23:08 +02:00
|
|
|
/// <param name="webHostEnvironment">The Web Host Environment</param>
|
|
|
|
|
/// <param name="config">The Configuration</param>
|
2020-03-25 18:21:44 +11:00
|
|
|
/// <remarks>
|
|
|
|
|
/// Only a few services are possible to be injected here https://github.com/dotnet/aspnetcore/issues/9337
|
|
|
|
|
/// </remarks>
|
|
|
|
|
public Startup(IWebHostEnvironment webHostEnvironment, IConfiguration config)
|
2020-03-25 20:42:02 +01:00
|
|
|
{
|
2020-04-03 01:08:52 +11:00
|
|
|
_env = webHostEnvironment ?? throw new ArgumentNullException(nameof(webHostEnvironment));
|
2020-03-25 18:21:44 +11:00
|
|
|
_config = config ?? throw new ArgumentNullException(nameof(config));
|
2020-03-25 20:42:02 +01:00
|
|
|
}
|
|
|
|
|
|
2020-12-08 12:32:19 +01:00
|
|
|
|
2020-12-23 12:02:01 +11:00
|
|
|
|
2020-12-04 13:09:08 +11:00
|
|
|
/// <summary>
|
|
|
|
|
/// Configures the services
|
|
|
|
|
/// </summary>
|
2020-12-08 12:32:19 +01:00
|
|
|
/// <remarks>
|
|
|
|
|
/// This method gets called by the runtime. Use this method to add services to the container.
|
|
|
|
|
/// For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
|
|
|
|
|
/// </remarks>
|
2020-02-18 08:32:06 +01:00
|
|
|
public void ConfigureServices(IServiceCollection services)
|
2020-05-15 15:21:15 +01:00
|
|
|
{
|
2020-12-04 13:09:08 +11:00
|
|
|
#pragma warning disable IDE0022 // Use expression body for methods
|
2020-11-20 12:24:16 +00:00
|
|
|
services.AddUmbraco(_env, _config)
|
2021-04-26 21:09:06 +02:00
|
|
|
.AddBackOffice()
|
2020-12-23 12:02:01 +11:00
|
|
|
.AddWebsite()
|
2020-12-24 18:11:16 +11:00
|
|
|
.AddComposers()
|
2020-10-22 12:23:32 +02:00
|
|
|
.Build();
|
2020-12-04 13:09:08 +11:00
|
|
|
#pragma warning restore IDE0022 // Use expression body for methods
|
2020-12-23 12:02:01 +11:00
|
|
|
|
2020-02-18 08:32:06 +01:00
|
|
|
}
|
|
|
|
|
|
2020-12-04 13:09:08 +11:00
|
|
|
/// <summary>
|
|
|
|
|
/// Configures the application
|
|
|
|
|
/// </summary>
|
Implements Public Access in netcore (#10137)
* Getting new netcore PublicAccessChecker in place
* Adds full test coverage for PublicAccessChecker
* remove PublicAccessComposer
* adjust namespaces, ensure RoleManager works, separate public access controller, reduce content controller
* Implements the required methods on IMemberManager, removes old migrated code
* Updates routing to be able to re-route, Fixes middleware ordering ensuring endpoints are last, refactors pipeline options, adds public access middleware, ensures public access follows all hops
* adds note
* adds note
* Cleans up ext methods, ensures that members identity is added on both front-end and back ends. updates how UmbracoApplicationBuilder works in that it explicitly starts endpoints at the time of calling.
* Changes name to IUmbracoEndpointBuilder
* adds note
* Fixing tests, fixing error describers so there's 2x one for back office, one for members, fixes TryConvertTo, fixes login redirect
* fixing build
* Fixes keepalive, fixes PublicAccessMiddleware to not throw, updates startup code to be more clear and removes magic that registers middleware.
* adds note
* removes unused filter, fixes build
* fixes WebPath and tests
* Looks up entities in one query
* remove usings
* Fix test, remove stylesheet
* Set status code before we write to response to avoid error
* Ensures that users and members are validated when logging in. Shares more code between users and members.
* Fixes RepositoryCacheKeys to ensure the keys are normalized
* oops didn't mean to commit this
* Fix casing issues with caching, stop boxing value types for all cache operations, stop re-creating string keys in DefaultRepositoryCachePolicy
* bah, far out this keeps getting recommitted. sorry
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
2021-04-20 15:11:45 +10:00
|
|
|
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
|
2020-02-18 08:32:06 +01:00
|
|
|
{
|
Implements Public Access in netcore (#10137)
* Getting new netcore PublicAccessChecker in place
* Adds full test coverage for PublicAccessChecker
* remove PublicAccessComposer
* adjust namespaces, ensure RoleManager works, separate public access controller, reduce content controller
* Implements the required methods on IMemberManager, removes old migrated code
* Updates routing to be able to re-route, Fixes middleware ordering ensuring endpoints are last, refactors pipeline options, adds public access middleware, ensures public access follows all hops
* adds note
* adds note
* Cleans up ext methods, ensures that members identity is added on both front-end and back ends. updates how UmbracoApplicationBuilder works in that it explicitly starts endpoints at the time of calling.
* Changes name to IUmbracoEndpointBuilder
* adds note
* Fixing tests, fixing error describers so there's 2x one for back office, one for members, fixes TryConvertTo, fixes login redirect
* fixing build
* Fixes keepalive, fixes PublicAccessMiddleware to not throw, updates startup code to be more clear and removes magic that registers middleware.
* adds note
* removes unused filter, fixes build
* fixes WebPath and tests
* Looks up entities in one query
* remove usings
* Fix test, remove stylesheet
* Set status code before we write to response to avoid error
* Ensures that users and members are validated when logging in. Shares more code between users and members.
* Fixes RepositoryCacheKeys to ensure the keys are normalized
* oops didn't mean to commit this
* Fix casing issues with caching, stop boxing value types for all cache operations, stop re-creating string keys in DefaultRepositoryCachePolicy
* bah, far out this keeps getting recommitted. sorry
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
2021-04-20 15:11:45 +10:00
|
|
|
if (env.IsDevelopment())
|
|
|
|
|
{
|
|
|
|
|
app.UseDeveloperExceptionPage();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
app.UseUmbraco()
|
Implement password config storage for members (#10170)
* Getting new netcore PublicAccessChecker in place
* Adds full test coverage for PublicAccessChecker
* remove PublicAccessComposer
* adjust namespaces, ensure RoleManager works, separate public access controller, reduce content controller
* Implements the required methods on IMemberManager, removes old migrated code
* Updates routing to be able to re-route, Fixes middleware ordering ensuring endpoints are last, refactors pipeline options, adds public access middleware, ensures public access follows all hops
* adds note
* adds note
* Cleans up ext methods, ensures that members identity is added on both front-end and back ends. updates how UmbracoApplicationBuilder works in that it explicitly starts endpoints at the time of calling.
* Changes name to IUmbracoEndpointBuilder
* adds note
* Fixing tests, fixing error describers so there's 2x one for back office, one for members, fixes TryConvertTo, fixes login redirect
* fixing build
* Updates user manager to correctly validate password hashing and injects the IBackOfficeUserPasswordChecker
* Merges PR
* Fixes up build and notes
* Implements security stamp and email confirmed for members, cleans up a bunch of repo/service level member groups stuff, shares user store code between members and users and fixes the user identity object so we arent' tracking both groups and roles.
* Security stamp for members is now working
* Fixes keepalive, fixes PublicAccessMiddleware to not throw, updates startup code to be more clear and removes magic that registers middleware.
* adds note
* removes unused filter, fixes build
* fixes WebPath and tests
* Looks up entities in one query
* remove usings
* Fix test, remove stylesheet
* Set status code before we write to response to avoid error
* Ensures that users and members are validated when logging in. Shares more code between users and members.
* merge changes
* oops
* Reducing and removing published member cache
* Fixes RepositoryCacheKeys to ensure the keys are normalized
* oops didn't mean to commit this
* Fix casing issues with caching, stop boxing value types for all cache operations, stop re-creating string keys in DefaultRepositoryCachePolicy
* oops didn't mean to comit this
* bah, far out this keeps getting recommitted. sorry
* cannot inject IPublishedMemberCache and cannot have IPublishedMember
* splits out files, fixes build
* fix tests
* removes membership provider classes
* removes membership provider classes
* updates the identity map definition
* reverts commented out lines
* reverts commented out lines
* Implements members Password config in db, fixes members cookie auth to not interfere with the back office cookie auth, fixes Startup sequence, fixes startup pipeline
* commits change to Startup
* Rename migration from `MemberTableColumns2` to `AddPasswordConfigToMemberTable`
* Fix test
* Fix tests, but adding default passwordConfig to members
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
2021-04-22 23:59:13 +10:00
|
|
|
.WithMiddleware(u =>
|
|
|
|
|
{
|
|
|
|
|
u.WithBackOffice();
|
|
|
|
|
u.WithWebsite();
|
|
|
|
|
})
|
Implements Public Access in netcore (#10137)
* Getting new netcore PublicAccessChecker in place
* Adds full test coverage for PublicAccessChecker
* remove PublicAccessComposer
* adjust namespaces, ensure RoleManager works, separate public access controller, reduce content controller
* Implements the required methods on IMemberManager, removes old migrated code
* Updates routing to be able to re-route, Fixes middleware ordering ensuring endpoints are last, refactors pipeline options, adds public access middleware, ensures public access follows all hops
* adds note
* adds note
* Cleans up ext methods, ensures that members identity is added on both front-end and back ends. updates how UmbracoApplicationBuilder works in that it explicitly starts endpoints at the time of calling.
* Changes name to IUmbracoEndpointBuilder
* adds note
* Fixing tests, fixing error describers so there's 2x one for back office, one for members, fixes TryConvertTo, fixes login redirect
* fixing build
* Fixes keepalive, fixes PublicAccessMiddleware to not throw, updates startup code to be more clear and removes magic that registers middleware.
* adds note
* removes unused filter, fixes build
* fixes WebPath and tests
* Looks up entities in one query
* remove usings
* Fix test, remove stylesheet
* Set status code before we write to response to avoid error
* Ensures that users and members are validated when logging in. Shares more code between users and members.
* Fixes RepositoryCacheKeys to ensure the keys are normalized
* oops didn't mean to commit this
* Fix casing issues with caching, stop boxing value types for all cache operations, stop re-creating string keys in DefaultRepositoryCachePolicy
* bah, far out this keeps getting recommitted. sorry
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
2021-04-20 15:11:45 +10:00
|
|
|
.WithEndpoints(u =>
|
|
|
|
|
{
|
|
|
|
|
u.UseInstallerEndpoints();
|
|
|
|
|
u.UseBackOfficeEndpoints();
|
|
|
|
|
u.UseWebsiteEndpoints();
|
|
|
|
|
});
|
2020-02-18 08:32:06 +01:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|