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

Review fixes https://github.com/umbraco/Umbraco-CMS/pull/9968

Browse Source
This commit is contained in:
Bjarke Berg
2021-03-16 10:44:55 +01:00
parent 836f4a9203
commit 1a573fcb75
7 changed files with 17 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@ namespace Umbraco.Cms.Core.Models.Identity
/// <summary>
/// An external login provider token
/// </summary>
public interface IIdentityUserToken : IEntity, IRememberBeingDirty
public interface IIdentityUserToken : IEntity
{
/// <summary>
/// Gets or sets user Id for the user who owns this token

6
src/Umbraco.Core/Services/IExternalLoginService.cs
View File

@@ -55,12 +55,6 @@ namespace Umbraco.Cms.Core.Services
/// </remarks>
void Save(int userId, IEnumerable<IExternalLoginToken> tokens);
/// <summary>
/// Save a single external login record
/// </summary>
/// <param name="login"></param>
void Save(IIdentityUserLogin login); // TODO: This is unused apart from tests, perhaps remove it?
/// <summary>
/// Deletes all user logins - normally used when a member is deleted
/// </summary>

2
src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
View File

@@ -156,7 +156,7 @@ namespace Umbraco.Cms.Infrastructure.Migrations.Install
{
_configManipulator.SaveConnectionString(EmbeddedDatabaseConnectionString, Constants.DbProviderNames.SqlCe);
var path = _hostingEnvironment.MapPathContentRoot(Path.Combine("App_Data", "Umbraco.sdf"));
var path = _hostingEnvironment.MapPathContentRoot(Path.Combine(Constants.SystemDirectories.Data, "Umbraco.sdf"));
if (File.Exists(path) == false)
{
// this should probably be in a "using (new SqlCeEngine)" clause but not sure

5
src/Umbraco.Infrastructure/Security/UmbracoIdentityUser.cs
View File

@@ -190,7 +190,7 @@ namespace Umbraco.Cms.Core.Models.Identity
get
{
// return if it exists
if (_tokens != null)
if (_tokens is not null)
{
return _tokens;
}
@@ -198,7 +198,8 @@ namespace Umbraco.Cms.Core.Models.Identity
_tokens = new ObservableCollection<IIdentityUserToken>();
// if the callback is there and hasn't been created yet then execute it and populate the logins
if (_getTokens != null && !_getTokens.IsValueCreated)
// if (_getTokens != null && !_getTokens.IsValueCreated)
if (_getTokens?.IsValueCreated != true)
{
foreach (IIdentityUserToken l in _getTokens.Value)
{

10
src/Umbraco.Infrastructure/Services/Implement/ExternalLoginService.cs
View File

@@ -72,16 +72,6 @@ namespace Umbraco.Cms.Core.Services.Implement
}
}
/// <inheritdoc />
public void Save(IIdentityUserLogin login)
{
using (var scope = ScopeProvider.CreateScope())
{
_externalLoginRepository.Save(login);
scope.Complete();
}
}
/// <inheritdoc />
public void DeleteUserLogins(int userId)
{

62
src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ExternalLoginServiceTests.cs
View File

@@ -2,14 +2,13 @@
// See LICENSE for more details.
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using NUnit.Framework;
using Umbraco.Cms.Core.Models.Identity;
using Umbraco.Cms.Core.Models.Membership;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Infrastructure.Persistence.Dtos;
using Umbraco.Cms.Tests.Common.Builders;
using Umbraco.Cms.Tests.Common.Testing;
using Umbraco.Cms.Tests.Integration.Testing;
@@ -22,13 +21,13 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
{
private IUserService UserService => GetRequiredService<IUserService>();
private IExternalLoginService ExternalLoginService => GetRequiredService<IExternalLoginService>();
private IExternalLoginService ExternalLoginService => (IExternalLoginService)GetRequiredService<IExternalLoginService>();
[Test]
[Ignore("We don't support duplicates anymore, this removing on save was a breaking change work around, this needs to be ported to a migration")]
public void Removes_Existing_Duplicates_On_Save()
{
var user = new User(GlobalSettings, "Test", "test@test.com", "test", "helloworldtest");
var user = new UserBuilder().Build();
UserService.Save(user);
string providerKey = Guid.NewGuid().ToString("N");
@@ -76,7 +75,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
[Test]
public void Does_Not_Persist_Duplicates()
{
var user = new User(GlobalSettings, "Test", "test@test.com", "test", "helloworldtest");
var user = new UserBuilder().Build();
UserService.Save(user);
string providerKey = Guid.NewGuid().ToString("N");
@@ -92,49 +91,10 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
Assert.AreEqual(1, logins.Count);
}
[Test]
public void Single_Create()
{
var user = new User(GlobalSettings, "Test", "test@test.com", "test", "helloworldtest");
UserService.Save(user);
var extLogin = new IdentityUserLogin("test1", Guid.NewGuid().ToString("N"), user.Id.ToString())
{
UserData = "hello"
};
ExternalLoginService.Save(extLogin);
IEnumerable<IIdentityUserLogin> found = ExternalLoginService.GetExternalLogins(user.Id);
Assert.AreEqual(1, found.Count());
Assert.IsTrue(extLogin.HasIdentity);
Assert.IsTrue(extLogin.Id > 0);
}
[Test]
public void Single_Update()
{
var user = new User(GlobalSettings, "Test", "test@test.com", "test", "helloworldtest");
UserService.Save(user);
var extLogin = new IdentityUserLogin("test1", Guid.NewGuid().ToString("N"), user.Id.ToString())
{
UserData = "hello"
};
ExternalLoginService.Save(extLogin);
extLogin.UserData = "world";
ExternalLoginService.Save(extLogin);
var found = ExternalLoginService.GetExternalLogins(user.Id).ToList();
Assert.AreEqual(1, found.Count);
Assert.AreEqual("world", found[0].UserData);
}
[Test]
public void Multiple_Update()
{
var user = new User(GlobalSettings, "Test", "test@test.com", "test", "helloworldtest");
var user = new UserBuilder().Build();
UserService.Save(user);
string providerKey1 = Guid.NewGuid().ToString("N");
@@ -162,7 +122,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
[Test]
public void Can_Find_As_Extended_Type()
{
var user = new User(GlobalSettings, "Test", "test@test.com", "test", "helloworldtest");
var user = new UserBuilder().Build();
UserService.Save(user);
string providerKey1 = Guid.NewGuid().ToString("N");
@@ -183,7 +143,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
[Test]
public void Add_Logins()
{
var user = new User(GlobalSettings, "Test", "test@test.com", "test", "helloworldtest");
var user = new UserBuilder().Build();
UserService.Save(user);
ExternalLogin[] externalLogins = new[]
@@ -206,7 +166,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
[Test]
public void Add_Tokens()
{
var user = new User(GlobalSettings, "Test", "test@test.com", "test", "helloworldtest");
var user = new UserBuilder().Build();
UserService.Save(user);
ExternalLogin[] externalLogins = new[]
@@ -231,7 +191,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
[Test]
public void Add_Update_Delete_Logins()
{
var user = new User(GlobalSettings, "Test", "test@test.com", "test", "helloworldtest");
var user = new UserBuilder().Build();
UserService.Save(user);
ExternalLogin[] externalLogins = new[]
@@ -265,7 +225,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
[Test]
public void Add_Update_Delete_Tokens()
{
var user = new User(GlobalSettings, "Test", "test@test.com", "test", "helloworldtest");
var user = new UserBuilder().Build();
UserService.Save(user);
ExternalLogin[] externalLogins = new[]
@@ -308,7 +268,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
[Test]
public void Add_Retrieve_User_Data()
{
var user = new User(GlobalSettings, "Test", "test@test.com", "test", "helloworldtest");
var user = new UserBuilder().Build();
UserService.Save(user);
ExternalLogin[] externalLogins = new[]

2
src/Umbraco.Web.UI.NetCore/appsettings.json
View File

@@ -38,7 +38,7 @@
"ConvertUrlsToAscii": "try"
},
"RuntimeMinification": {
"dataFolder": "wmbraco/Data/TEMP/Smidge",
"dataFolder": "umbraco/Data/TEMP/Smidge",
"version": "637510451273675926"
},
"Security": {