Diplomarbeit-Absolventenverein/oqtane.framework
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ensure Logins are site specific

Browse Source
This commit is contained in:
sbwalker
2025-10-29 20:04:35 -04:00
parent 670f3854fa
commit d5ad29be34
4 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Server/Controllers/UserController.cs
View File

@ -504,7 +504,7 @@ namespace Oqtane.Controllers
[Authorize]
public async Task<IEnumerable<UserLogin>> GetLogins()
{
return await _userManager.GetLogins(_userPermissions.GetUser(User).UserId);
return await _userManager.GetLogins(_userPermissions.GetUser(User).UserId, _tenantManager.GetAlias().SiteId);
}
// DELETE api/<controller>/login?provider=x&key=y

10
Oqtane.Server/Managers/UserManager.cs
View File

@ -4,6 +4,7 @@ using System.Globalization;
using System.IO;
using System.Linq;
using System.Net;
using System.Security.Policy;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Identity;
using Microsoft.EntityFrameworkCore;
@ -39,7 +40,7 @@ namespace Oqtane.Managers
Task<List<UserPasskey>> GetPasskeys(int userId);
Task UpdatePasskey(UserPasskey passkey);
Task DeletePasskey(int userId, byte[] credentialId);
Task<List<UserLogin>> GetLogins(int userId);
Task<List<UserLogin>> GetLogins(int userId, int siteId);
Task DeleteLogin(int userId, string provider, string key);
}
@ -875,7 +876,7 @@ namespace Oqtane.Managers
}
}
public async Task<List<UserLogin>> GetLogins(int userId)
public async Task<List<UserLogin>> GetLogins(int userId, int siteId)
{
var logins = new List<UserLogin>();
var user = _users.GetUser(userId);
@ -887,7 +888,10 @@ namespace Oqtane.Managers
var userlogins = await _identityUserManager.GetLoginsAsync(identityuser);
foreach (var userlogin in userlogins)
{
logins.Add(new UserLogin { Provider = userlogin.LoginProvider, Key = userlogin.ProviderKey, Name = userlogin.ProviderDisplayName });
if (userlogin.LoginProvider.EndsWith(":" + siteId.ToString()))
{
logins.Add(new UserLogin { Provider = userlogin.LoginProvider, Key = userlogin.ProviderKey, Name = userlogin.ProviderDisplayName });
}
}
}
}