yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implements Public Access in netcore (#10137)

Browse Source 
* 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>
This commit is contained in:
Shannon Deminick
2021-04-20 15:11:45 +10:00
committed by GitHub
parent 385cc62523
commit a1624d26a3
150 changed files with 2715 additions and 2173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Umbraco.Core/Models/Identity/ExternalLogin.cs
View File

@@ -1,28 +0,0 @@
using System;
namespace Umbraco.Cms.Core.Models.Identity
{
/// <inheritdoc />
public class ExternalLogin : IExternalLogin
{
/// <summary>
/// Initializes a new instance of the <see cref="ExternalLogin"/> class.
/// </summary>
public ExternalLogin(string loginProvider, string providerKey, string userData = null)
{
LoginProvider = loginProvider ?? throw new ArgumentNullException(nameof(loginProvider));
ProviderKey = providerKey ?? throw new ArgumentNullException(nameof(providerKey));
UserData = userData;
}
/// <inheritdoc />
public string LoginProvider { get; }
/// <inheritdoc />
public string ProviderKey { get; }
/// <inheritdoc />
public string UserData { get; }
}
}

27
src/Umbraco.Core/Models/Identity/ExternalLoginToken.cs
View File

@@ -1,27 +0,0 @@
using System;
namespace Umbraco.Cms.Core.Models.Identity
{
/// <inheritdoc />
public class ExternalLoginToken : IExternalLoginToken
{
/// <summary>
/// Initializes a new instance of the <see cref="ExternalLoginToken"/> class.
/// </summary>
public ExternalLoginToken(string loginProvider, string name, string value)
{
LoginProvider = loginProvider ?? throw new ArgumentNullException(nameof(loginProvider));
Name = name ?? throw new ArgumentNullException(nameof(name));
Value = value ?? throw new ArgumentNullException(nameof(value));
}
/// <inheritdoc />
public string LoginProvider { get; }
/// <inheritdoc />
public string Name { get; }
/// <inheritdoc />
public string Value { get; }
}
}

23
src/Umbraco.Core/Models/Identity/IExternalLogin.cs
View File

@@ -1,23 +0,0 @@
namespace Umbraco.Cms.Core.Models.Identity
{
/// <summary>
/// Used to persist external login data for a user
/// </summary>
public interface IExternalLogin
{
/// <summary>
/// Gets the login provider
/// </summary>
string LoginProvider { get; }
/// <summary>
/// Gets the provider key
/// </summary>
string ProviderKey { get; }
/// <summary>
/// Gets the user data
/// </summary>
string UserData { get; }
}
}

23
src/Umbraco.Core/Models/Identity/IExternalLoginToken.cs
View File

@@ -1,23 +0,0 @@
namespace Umbraco.Cms.Core.Models.Identity
{
/// <summary>
/// Used to persist an external login token for a user
/// </summary>
public interface IExternalLoginToken
{
/// <summary>
/// Gets the login provider
/// </summary>
string LoginProvider { get; }
/// <summary>
/// Gets the name of the token
/// </summary>
string Name { get; }
/// <summary>
/// Gets the value of the token
/// </summary>
string Value { get; }
}
}

31
src/Umbraco.Core/Models/Identity/IIdentityUserLogin.cs
View File

@@ -1,31 +0,0 @@
using Umbraco.Cms.Core.Models.Entities;
namespace Umbraco.Cms.Core.Models.Identity
{
/// <summary>
/// An external login provider linked to a user
/// </summary>
/// <typeparam name="TKey">The PK type for the user</typeparam>
public interface IIdentityUserLogin : IEntity, IRememberBeingDirty
{
/// <summary>
/// Gets or sets the login provider for the login (i.e. Facebook, Google)
/// </summary>
string LoginProvider { get; set; }
/// <summary>
/// Gets or sets key representing the login for the provider
/// </summary>
string ProviderKey { get; set; }
/// <summary>
/// Gets or sets user Id for the user who owns this login
/// </summary>
string UserId { get; set; } // TODO: This should be able to be used by both users and members
/// <summary>
/// Gets or sets any arbitrary data for the user and external provider
/// </summary>
string UserData { get; set; }
}
}

30
src/Umbraco.Core/Models/Identity/IIdentityUserToken.cs
View File

@@ -1,30 +0,0 @@
using Umbraco.Cms.Core.Models.Entities;
namespace Umbraco.Cms.Core.Models.Identity
{
/// <summary>
/// An external login provider token
/// </summary>
public interface IIdentityUserToken : IEntity
{
/// <summary>
/// Gets or sets user Id for the user who owns this token
/// </summary>
string UserId { get; set; }
/// <summary>
/// Gets or sets the login provider for the login (i.e. Facebook, Google)
/// </summary>
string LoginProvider { get; set; }
/// <summary>
/// Gets or sets the token name
/// </summary>
string Name { get; set; }
/// <summary>
/// Gets or set the token value
/// </summary>
string Value { get; set; }
}
}

46
src/Umbraco.Core/Models/Identity/IdentityUserLogin.cs
View File

@@ -1,46 +0,0 @@
using System;
using Umbraco.Cms.Core.Models.Entities;
namespace Umbraco.Cms.Core.Models.Identity
{
/// <summary>
/// Entity type for a user's login (i.e. Facebook, Google)
/// </summary>
public class IdentityUserLogin : EntityBase, IIdentityUserLogin
{
/// <summary>
/// Initializes a new instance of the <see cref="IdentityUserLogin"/> class.
/// </summary>
public IdentityUserLogin(string loginProvider, string providerKey, string userId)
{
LoginProvider = loginProvider;
ProviderKey = providerKey;
UserId = userId;
}
/// <summary>
/// Initializes a new instance of the <see cref="IdentityUserLogin"/> class.
/// </summary>
public IdentityUserLogin(int id, string loginProvider, string providerKey, string userId, DateTime createDate)
{
Id = id;
LoginProvider = loginProvider;
ProviderKey = providerKey;
UserId = userId;
CreateDate = createDate;
}
/// <inheritdoc />
public string LoginProvider { get; set; }
/// <inheritdoc />
public string ProviderKey { get; set; }
/// <inheritdoc />
public string UserId { get; set; }
/// <inheritdoc />
public string UserData { get; set; }
}
}

44
src/Umbraco.Core/Models/Identity/IdentityUserToken.cs
View File

@@ -1,44 +0,0 @@
using System;
using Umbraco.Cms.Core.Models.Entities;
namespace Umbraco.Cms.Core.Models.Identity
{
public class IdentityUserToken : EntityBase, IIdentityUserToken
{
/// <summary>
/// Initializes a new instance of the <see cref="IdentityUserToken"/> class.
/// </summary>
public IdentityUserToken(string loginProvider, string name, string value, string userId)
{
LoginProvider = loginProvider ?? throw new ArgumentNullException(nameof(loginProvider));
Name = name ?? throw new ArgumentNullException(nameof(name));
Value = value ?? throw new ArgumentNullException(nameof(value));
UserId = userId;
}
/// <summary>
/// Initializes a new instance of the <see cref="IdentityUserToken"/> class.
/// </summary>
public IdentityUserToken(int id, string loginProvider, string name, string value, string userId, DateTime createDate)
{
Id = id;
LoginProvider = loginProvider ?? throw new ArgumentNullException(nameof(loginProvider));
Name = name ?? throw new ArgumentNullException(nameof(name));
Value = value ?? throw new ArgumentNullException(nameof(value));
UserId = userId;
CreateDate = createDate;
}
/// <inheritdoc />
public string LoginProvider { get; set; }
/// <inheritdoc />
public string Name { get; set; }
/// <inheritdoc />
public string Value { get; set; }
/// <inheritdoc />
public string UserId { get; set; }
}
}