diff --git a/src/AdminConsole/AdminConsole.csproj b/src/AdminConsole/AdminConsole.csproj index 6dbbcbc1e..7fea149ef 100644 --- a/src/AdminConsole/AdminConsole.csproj +++ b/src/AdminConsole/AdminConsole.csproj @@ -23,7 +23,7 @@ - + diff --git a/src/AdminConsole/Components/Shared/Credentials.razor b/src/AdminConsole/Components/Shared/Credentials.razor index d3b5b0d13..973d76f2d 100644 --- a/src/AdminConsole/Components/Shared/Credentials.razor +++ b/src/AdminConsole/Components/Shared/Credentials.razor @@ -23,7 +23,7 @@
- + @if (!HideDetails) {
@@ -53,7 +53,8 @@ - + ")" class="sm:col-span-1" /> + diff --git a/src/AdminConsole/Components/Shared/Credentials.razor.cs b/src/AdminConsole/Components/Shared/Credentials.razor.cs index bdc861aef..e7371e372 100644 --- a/src/AdminConsole/Components/Shared/Credentials.razor.cs +++ b/src/AdminConsole/Components/Shared/Credentials.razor.cs @@ -10,31 +10,26 @@ public partial class Credentials : ComponentBase { public const string ManageCredentialFormName = "manage-credential-form"; - public required IReadOnlyCollection Items { get; set; } - - public IReadOnlyCollection GetItems() - { - return Items.Select(x => - { - var viewModel = new CredentialModel( - x.Descriptor.Id, - x.PublicKey, - x.SignatureCounter, - x.AttestationFmt, - x.CreatedAt, - x.AaGuid, - x.LastUsedAt, - x.RpId, - x.Origin, - x.Device, - x.Nickname, - x.BackupState, - x.IsBackupEligible, - x.IsDiscoverable, - AuthenticatorDataProvider.GetName(x.AaGuid)); - return viewModel; - }).ToList(); - } + public required IReadOnlyCollection? Items { get; set; } + + public IReadOnlyCollection GetItems() => + Items?.Select(x => new CredentialModel( + x.Descriptor.Id, + x.PublicKey, + x.SignatureCounter, + x.AttestationFmt, + x.CreatedAt, + x.AaGuid, + x.LastUsedAt, + x.RpId, + x.Origin, + x.Device, + x.Nickname, + x.BackupState, + x.IsBackupEligible, + x.IsDiscoverable, + x.AuthenticatorDisplayName ?? AuthenticatorDataProvider.GetName(x.AaGuid)) + ).ToArray() ?? []; /// /// Determines whether the details of the credentials should be hidden. @@ -102,7 +97,7 @@ public record CredentialModel public bool? IsDiscoverable { get; } - public string AuthenticatorName { get; set; } + public string? AuthenticatorName { get; set; } public bool IsNew() { @@ -112,54 +107,18 @@ public bool IsNew() /// /// The title of the credential card. /// - public string Title - { - get - { - if (IsAuthenticatorKnown) - { - return AuthenticatorName; - } - return string.IsNullOrEmpty(Device) ? "Passkey" : Device; - } - } + public string Title => AuthenticatorName?.NullIfEmpty() ?? Device.NullIfEmpty() ?? "Passkey"; private string? _subtitle; /// - /// The sub title of the credential card. + /// The subtitle of the credential card. /// - public string? SubTitle + public string SubTitle => _subtitle ??= AuthenticatorName switch { - get - { - if (_subtitle != null) - { - return _subtitle; - } - - if (IsAuthenticatorKnown) - { - if (string.IsNullOrEmpty(Nickname)) - { - _subtitle = Device; - } - else - { - var nickname = string.IsNullOrEmpty(Nickname) ? "No nickname" : Nickname; - _subtitle = $"{nickname} on {Device}"; - } - } - else - { - _subtitle = Nickname; - } - - return _subtitle; - } - } - - public bool IsAuthenticatorKnown => AaGuid != Guid.Empty; + null => Nickname, + _ => !string.IsNullOrEmpty(Nickname) ? $"{Nickname} on {Device}" : Device + }; public CredentialModel( byte[] descriptorId, @@ -176,7 +135,7 @@ public CredentialModel( bool? backupState, bool? isBackupEligible, bool? isDiscoverable, - string authenticatorName) + string? authenticatorName) { DescriptorId = descriptorId.ToBase64Url(); PublicKey = publicKey; diff --git a/src/AdminConsole/Helpers/StringExtensions.cs b/src/AdminConsole/Helpers/StringExtensions.cs new file mode 100644 index 000000000..ba6ccb75c --- /dev/null +++ b/src/AdminConsole/Helpers/StringExtensions.cs @@ -0,0 +1,7 @@ +namespace Passwordless.AdminConsole.Helpers; + +internal static class StringExtensions +{ + public static string? NullIfEmpty(this string? value) => + !string.IsNullOrEmpty(value) ? value : null; +} \ No newline at end of file diff --git a/src/Service/Fido2Service.cs b/src/Service/Fido2Service.cs index 6ea62733f..075fad8a7 100644 --- a/src/Service/Fido2Service.cs +++ b/src/Service/Fido2Service.cs @@ -16,53 +16,32 @@ namespace Passwordless.Service; -public class Fido2Service : IFido2Service +public class Fido2Service( + ITenantProvider tenantProvider, + ILogger log, + ITenantStorage storage, + ITokenService tokenService, + IEventLogger eventLogger, + IFeatureContextProvider featureContextProvider, + IMetadataService metadataService, + TimeProvider timeProvider, + IAuthenticationConfigurationService authenticationConfigurationService) + : IFido2Service { - private readonly ITenantStorage _storage; - private readonly ITenantProvider _tenantProvider; - private readonly ILogger _log; - private readonly ITokenService _tokenService; - private readonly IEventLogger _eventLogger; - private readonly IFeatureContextProvider _featureContextProvider; - private readonly IMetadataService _metadataService; - private readonly IAuthenticationConfigurationService _authenticationConfigurationService; - private readonly TimeProvider _timeProvider; - - public Fido2Service(ITenantProvider tenantProvider, - ILogger log, - ITenantStorage storage, - ITokenService tokenService, - IEventLogger eventLogger, - IFeatureContextProvider featureContextProvider, - IMetadataService metadataService, - TimeProvider timeProvider, - IAuthenticationConfigurationService authenticationConfigurationService) - { - _storage = storage; - _tenantProvider = tenantProvider; - _log = log; - _tokenService = tokenService; - _eventLogger = eventLogger; - _featureContextProvider = featureContextProvider; - _metadataService = metadataService; - _authenticationConfigurationService = authenticationConfigurationService; - _timeProvider = timeProvider; - } - public async Task CreateRegisterTokenAsync(RegisterToken tokenProps) { if (tokenProps.ExpiresAt == default) { - tokenProps.ExpiresAt = _timeProvider.GetUtcNow().UtcDateTime.AddSeconds(120); + tokenProps.ExpiresAt = timeProvider.GetUtcNow().UtcDateTime.AddSeconds(120); } - var features = await _featureContextProvider.UseContext(); + var features = await featureContextProvider.UseContext(); if (features.MaxUsers.HasValue) { - var credentials = await _storage.GetCredentialsByUserIdAsync(tokenProps.UserId); + var credentials = await storage.GetCredentialsByUserIdAsync(tokenProps.UserId); if (!credentials.Any()) { - var users = await _storage.GetUsersCount(); + var users = await storage.GetUsersCount(); if (users >= features.MaxUsers) { throw new ApiException("max_users_reached", "Maximum number of users reached", 400); @@ -75,35 +54,35 @@ public async Task CreateRegisterTokenAsync(RegisterToken tokenProps) TokenValidator.ValidateAttestation(tokenProps, features); // Check if aliases is available - if (tokenProps.Aliases != null) + if (tokenProps.Aliases is not null) { - var hashedAliases = tokenProps.Aliases.Select(alias => HashAlias(alias, _tenantProvider.Tenant)); + var hashedAliases = tokenProps.Aliases.Select(alias => HashAlias(alias, tenantProvider.Tenant)); // todo: check if alias exists and belongs to different user. - var isAvailable = await _storage.CheckIfAliasIsAvailable(hashedAliases, tokenProps.UserId); + var isAvailable = await storage.CheckIfAliasIsAvailable(hashedAliases, tokenProps.UserId); if (!isAvailable) { throw new ApiException("alias_conflict", "Alias is already in use by another userid", 409); } } - var token = await _tokenService.EncodeTokenAsync(tokenProps, "register_"); + var token = await tokenService.EncodeTokenAsync(tokenProps, "register_"); - _eventLogger.LogRegistrationTokenCreatedEvent(tokenProps.UserId); + eventLogger.LogRegistrationTokenCreatedEvent(tokenProps.UserId); return token; } public async Task> RegisterBeginAsync(FidoRegistrationBeginDTO request) { - var features = await _featureContextProvider.UseContext(); + var features = await featureContextProvider.UseContext(); - var token = await _tokenService.DecodeTokenAsync(request.Token, "register_"); - token.Validate(_timeProvider.GetUtcNow()); + var token = await tokenService.DecodeTokenAsync(request.Token, "register_"); + token.Validate(timeProvider.GetUtcNow()); var userId = token.UserId; - var fido2 = GetFido2Instance(request, _metadataService); + var fido2 = GetFido2Instance(request, metadataService); if (string.IsNullOrEmpty(userId)) { @@ -118,7 +97,7 @@ public async Task> RegisterBeginAsync(F }; // Get user existing keys by userid - var existingKeys = await _storage.GetCredentialsByUserIdAsync(userId); //DemoStorage.GetCredentialsByUser(user).Select(c => c.Descriptor).ToList(); + var existingKeys = await storage.GetCredentialsByUserIdAsync(userId); //DemoStorage.GetCredentialsByUser(user).Select(c => c.Descriptor).ToList(); var keyIds = existingKeys.Select(k => k.Descriptor).ToList(); @@ -154,20 +133,20 @@ public async Task> RegisterBeginAsync(F options.Hints = token.Hints; - var session = await _tokenService.EncodeTokenAsync( + var session = await tokenService.EncodeTokenAsync( new RegisterSession { Options = options, - Aliases = token.Aliases, + Aliases = token.Aliases ?? [], AliasHashing = token.AliasHashing }, "session_", true ); - _eventLogger.LogRegistrationBeganEvent(userId); + eventLogger.LogRegistrationBeganEvent(userId); - // return options to client + // Return options to client return new SessionResponse { Data = options, Session = session }; } catch (ArgumentException e) @@ -178,9 +157,9 @@ public async Task> RegisterBeginAsync(F public async Task RegisterCompleteAsync(RegistrationCompleteDTO request, string deviceInfo, string country) { - var session = await _tokenService.DecodeTokenAsync(request.Session, "session_", true); + var session = await tokenService.DecodeTokenAsync(request.Session, "session_", true); - var fido2 = GetFido2Instance(request, _metadataService); + var fido2 = GetFido2Instance(request, metadataService); MakeNewCredentialResult success; @@ -188,25 +167,29 @@ public async Task RegisterCompleteAsync(RegistrationCompleteDTO r { success = await fido2.MakeNewCredentialAsync(request.Response, session.Options, async (args, _) => { - bool exists = await _storage.ExistsAsync(args.CredentialId); + var exists = await storage.ExistsAsync(args.CredentialId); return !exists; }); } catch (Fido2VerificationException e) { - _log.LogWarning(e, "Unable to create new credential due to wrong configuration or wrong parameters."); + log.LogWarning(e, "Unable to create new credential due to wrong configuration or wrong parameters."); throw new ApiException("fido2_invalid_registration", e.Message, 400); } // Check whether we're allowed to register credentials for this authenticator - var features = await _featureContextProvider.UseContext(); + var features = await featureContextProvider.UseContext(); if (features.AllowAttestation) { - var configuredAuthenticators = await _storage.GetAuthenticatorsAsync(); + var configuredAuthenticators = await storage.GetAuthenticatorsAsync(); var blacklist = configuredAuthenticators.Where(x => !x.IsAllowed).ToImmutableList(); if (blacklist.Any() && blacklist.Any(x => x.AaGuid == success.Result!.AaGuid)) { - throw new ApiException("authenticator_not_allowed", "The authenticator is on the blocklist and is not allowed to be used for registration.", 400); + throw new ApiException( + "authenticator_not_allowed", + "The authenticator is on the blocklist and is not allowed to be used for registration.", + 400 + ); } var whitelist = configuredAuthenticators.Where(x => x.IsAllowed).ToImmutableList(); @@ -214,32 +197,43 @@ public async Task RegisterCompleteAsync(RegistrationCompleteDTO r { if (session.Options.Attestation == AttestationConveyancePreference.None) { - throw new ApiException("attestation_required", "Attestation 'none' was used for registration, but an allowlist was configured. Please use a supported attestation method.", 400); + throw new ApiException( + "attestation_required", + "Attestation 'none' was used for registration, but an allowlist was configured. " + + "Please use a supported attestation method.", + 400 + ); } - throw new ApiException("authenticator_not_allowed", "An allowlist was configured. The authenticator is not found on the allowlist and is not allowed to be used for registration.", 400); + + throw new ApiException( + "authenticator_not_allowed", + "An allowlist was configured. " + + "The authenticator is not found on the allowlist and is not allowed to be used for registration.", + 400 + ); } } - var userId = Encoding.UTF8.GetString(success.Result.User.Id); + var userId = Encoding.UTF8.GetString(success.Result!.User.Id); // Add aliases try { - if (session.Aliases != null && session.Aliases.Any()) + if (session.Aliases is not null && session.Aliases.Any()) { await SetAliasAsync(new AliasPayload(userId, session.Aliases, session.AliasHashing)); } } catch (Exception e) { - _log.LogError(e, "Error while saving alias during /register/complete"); + log.LogError(e, "Error while saving alias during /register/complete"); throw; } - var now = _timeProvider.GetUtcNow().UtcDateTime; + var now = timeProvider.GetUtcNow().UtcDateTime; var descriptor = new PublicKeyCredentialDescriptor(success.Result.Id); - await _storage.AddCredentialToUser(session.Options.User, new StoredCredential + await storage.AddCredentialToUser(session.Options.User, new StoredCredential { Descriptor = descriptor, PublicKey = success.Result.PublicKey, @@ -254,9 +248,10 @@ public async Task RegisterCompleteAsync(RegistrationCompleteDTO r RPID = request.RPID, Origin = request.Origin, Nickname = request.Nickname, + AuthenticatorDisplayName = request.Response.ClientExtensionResults?.CredProps?.AuthenticatorDisplayName, BackupState = success.Result.IsBackedUp, IsBackupEligible = success.Result.IsBackupEligible, - IsDiscoverable = request.Response.ClientExtensionResults?.CredProps?.Rk, + IsDiscoverable = request.Response.ClientExtensionResults?.CredProps?.Rk }); var tokenData = new VerifySignInToken @@ -265,19 +260,20 @@ public async Task RegisterCompleteAsync(RegistrationCompleteDTO r Success = true, Origin = request.Origin, RpId = session.Options.Rp.Id, - Timestamp = _timeProvider.GetUtcNow().UtcDateTime, + Timestamp = timeProvider.GetUtcNow().UtcDateTime, CredentialId = success.Result.Id, Device = deviceInfo, Country = country, Nickname = request.Nickname, - ExpiresAt = _timeProvider.GetUtcNow().UtcDateTime.AddSeconds(120), + AuthenticatorDisplayName = request.Response.ClientExtensionResults?.CredProps?.AuthenticatorDisplayName, + ExpiresAt = timeProvider.GetUtcNow().UtcDateTime.AddSeconds(120), TokenId = Guid.NewGuid(), Type = "passkey_register" }; - _eventLogger.LogRegistrationCompletedEvent(userId); + eventLogger.LogRegistrationCompletedEvent(userId); - var token = await _tokenService.EncodeTokenAsync(tokenData, "verify_"); + var token = await tokenService.EncodeTokenAsync(tokenData, "verify_"); return new TokenResponse(token); } @@ -288,8 +284,8 @@ public async Task CreateSigninTokenAsync(SigninTokenRequest request) { Success = true, UserId = request.UserId, - Timestamp = _timeProvider.GetUtcNow().UtcDateTime, - ExpiresAt = _timeProvider.GetUtcNow().UtcDateTime.Add(request.TimeToLive), + Timestamp = timeProvider.GetUtcNow().UtcDateTime, + ExpiresAt = timeProvider.GetUtcNow().UtcDateTime.Add(request.TimeToLive), TokenId = Guid.NewGuid(), Type = "generated_signin", RpId = request.RPID, @@ -297,7 +293,7 @@ public async Task CreateSigninTokenAsync(SigninTokenRequest request) Purpose = request.Purpose }; - return await _tokenService.EncodeTokenAsync(tokenProps, "verify_"); + return await tokenService.EncodeTokenAsync(tokenProps, "verify_"); } public async Task CreateMagicLinkTokenAsync(MagicLinkTokenRequest request) @@ -306,24 +302,24 @@ public async Task CreateMagicLinkTokenAsync(MagicLinkTokenRequest reques { Success = true, UserId = request.UserId, - Timestamp = _timeProvider.GetUtcNow().UtcDateTime, - ExpiresAt = _timeProvider.GetUtcNow().UtcDateTime.Add(request.TimeToLive), + Timestamp = timeProvider.GetUtcNow().UtcDateTime, + ExpiresAt = timeProvider.GetUtcNow().UtcDateTime.Add(request.TimeToLive), TokenId = Guid.NewGuid(), Type = "magic_link", RpId = request.RPID, Origin = request.Origin }; - return await _tokenService.EncodeTokenAsync(tokenProps, "verify_"); + return await tokenService.EncodeTokenAsync(tokenProps, "verify_"); } public async Task> SignInBeginAsync(SignInBeginDTO request) { - var fido2 = GetFido2Instance(request, _metadataService); + var fido2 = GetFido2Instance(request, metadataService); var existingCredentials = await GetExistingCredentialsAsync(request); - var signInConfiguration = await _authenticationConfigurationService.GetAuthenticationConfigurationOrDefaultAsync(request.Purpose); + var signInConfiguration = await authenticationConfigurationService.GetAuthenticationConfigurationOrDefaultAsync(request.Purpose); var options = fido2.GetAssertionOptions( existingCredentials.ToList(), @@ -338,7 +334,7 @@ public async Task> SignInBeginAsync(SignInBegi Purpose = signInConfiguration.Purpose }; - var session = await _tokenService.EncodeTokenAsync(sessionOptions, "session_", true); + var session = await tokenService.EncodeTokenAsync(sessionOptions, "session_", true); return new SessionResponse { Data = options, Session = session }; } @@ -347,32 +343,32 @@ private async Task> GetExistingCreden { if (!string.IsNullOrEmpty(request.UserId)) { - _log.LogInformation("event=signin/begin account={account} arg={arg}", _tenantProvider, "userid"); - return (await _storage.GetCredentialsByUserIdAsync(request.UserId)).Select(c => c.Descriptor); + log.LogInformation("event=signin/begin account={account} arg={arg}", tenantProvider, "userid"); + return (await storage.GetCredentialsByUserIdAsync(request.UserId)).Select(c => c.Descriptor); } if (!string.IsNullOrEmpty(request.Alias)) { - var hashedAlias = HashAlias(request.Alias, _tenantProvider.Tenant); + var hashedAlias = HashAlias(request.Alias, tenantProvider.Tenant); - var existingCredentials = await _storage.GetCredentialsByAliasAsync(hashedAlias); - _log.LogInformation("event=signin/begin account={account} arg={arg} foundCredentials={foundCredentials}", _tenantProvider, "alias", existingCredentials.Count); + var existingCredentials = await storage.GetCredentialsByAliasAsync(hashedAlias); + log.LogInformation("event=signin/begin account={account} arg={arg} foundCredentials={foundCredentials}", tenantProvider, "alias", existingCredentials.Count); return existingCredentials; } - _log.LogInformation("event=signin/begin account={account} arg={arg}", _tenantProvider, "empty"); - return Array.Empty(); + log.LogInformation("event=signin/begin account={account} arg={arg}", tenantProvider, "empty"); + return []; } public async Task SignInCompleteAsync(SignInCompleteDTO request, string device, string country) { - var fido2 = GetFido2Instance(request, _metadataService); + var fido2 = GetFido2Instance(request, metadataService); - var authenticationSessionConfiguration = await _tokenService.DecodeTokenAsync(request.Session, "session_", true); + var authenticationSessionConfiguration = await tokenService.DecodeTokenAsync(request.Session, "session_", true); // Get registered credential from database - var credential = await _storage.GetCredential(request.Response.Id); + var credential = await storage.GetCredential(request.Response.Id); if (credential == null) { throw new UnknownCredentialException(Base64Url.Encode(request.Response.Id)); @@ -382,7 +378,7 @@ public async Task SignInCompleteAsync(SignInCompleteDTO request, IsUserHandleOwnerOfCredentialIdAsync callback = (args, _) => Task.FromResult(credential.UserHandle.SequenceEqual(args.UserHandle)); // Make the assertion - var storedCredentials = (await _storage.GetCredentialsByUserIdAsync(request.Session)).Select(c => c.PublicKey).ToList(); + var storedCredentials = (await storage.GetCredentialsByUserIdAsync(request.Session)).Select(c => c.PublicKey).ToList(); var res = await fido2.MakeAssertionAsync( request.Response, authenticationSessionConfiguration.Options, @@ -392,9 +388,9 @@ public async Task SignInCompleteAsync(SignInCompleteDTO request, callback); // Store the updated counter - await _storage.UpdateCredential(res.CredentialId, res.SignCount, country, device); + await storage.UpdateCredential(res.CredentialId, res.SignCount, country, device); - var config = await _authenticationConfigurationService.GetAuthenticationConfigurationOrDefaultAsync(authenticationSessionConfiguration.Purpose); + var config = await authenticationConfigurationService.GetAuthenticationConfigurationOrDefaultAsync(authenticationSessionConfiguration.Purpose); var userId = Encoding.UTF8.GetString(credential.UserHandle); @@ -404,21 +400,21 @@ public async Task SignInCompleteAsync(SignInCompleteDTO request, Success = true, Origin = request.Origin, RpId = request.RPID, - Timestamp = _timeProvider.GetUtcNow().UtcDateTime, + Timestamp = timeProvider.GetUtcNow().UtcDateTime, Device = device, Country = country, Nickname = credential.Nickname, CredentialId = credential.Descriptor.Id, - ExpiresAt = _timeProvider.GetUtcNow().UtcDateTime.Add(config.TimeToLive), + ExpiresAt = timeProvider.GetUtcNow().UtcDateTime.Add(config.TimeToLive), TokenId = Guid.NewGuid(), Type = "passkey_signin", Purpose = config.Purpose.Value }; - _eventLogger.LogUserSignInCompletedEvent(userId); - await _authenticationConfigurationService.UpdateLastUsedOnAsync(config); + eventLogger.LogUserSignInCompletedEvent(userId); + await authenticationConfigurationService.UpdateLastUsedOnAsync(config); - var token = await _tokenService.EncodeTokenAsync(tokenData, "verify_"); + var token = await tokenService.EncodeTokenAsync(tokenData, "verify_"); // return OK to client return new TokenResponse(token); @@ -426,18 +422,18 @@ public async Task SignInCompleteAsync(SignInCompleteDTO request, public async Task SignInVerifyAsync(SignInVerifyDTO payload) { - var token = await _tokenService.DecodeTokenAsync(payload.Token, "verify_"); + var token = await tokenService.DecodeTokenAsync(payload.Token, "verify_"); - token.Validate(_timeProvider.GetUtcNow()); + token.Validate(timeProvider.GetUtcNow()); - _eventLogger.LogUserSignInTokenVerifiedEvent(token.UserId); + eventLogger.LogUserSignInTokenVerifiedEvent(token.UserId); return token; } public Task> GetAliases(string userId) { - return _storage.GetAliasesByUserId(userId); + return storage.GetAliasesByUserId(userId); } public async Task SetAliasAsync(AliasPayload data) @@ -450,12 +446,12 @@ public async Task SetAliasAsync(AliasPayload data) { plaintext = alias; } - values.Add(HashAlias(alias, _tenantProvider.Tenant), plaintext); + values.Add(HashAlias(alias, tenantProvider.Tenant), plaintext); } try { - await _storage.StoreAlias(data.UserId, values); + await storage.StoreAlias(data.UserId, values); } catch (DbUpdateException ex) { @@ -471,7 +467,7 @@ private string HashAlias(string username, string tenant) var sw = Stopwatch.StartNew(); var hashedUsername = Convert.ToBase64String(SHA256.HashData(Encoding.UTF8.GetBytes(tenant + username))); sw.Stop(); - _log.LogInformation("SHA256 Hashing username took {duration}ms", sw.ElapsedMilliseconds); + log.LogInformation("SHA256 Hashing username took {duration}ms", sw.ElapsedMilliseconds); return hashedUsername; } diff --git a/src/Service/Migrations/Mssql/20240909154123_AuthenticatorDisplayName.Designer.cs b/src/Service/Migrations/Mssql/20240909154123_AuthenticatorDisplayName.Designer.cs new file mode 100644 index 000000000..6fb73ea6b --- /dev/null +++ b/src/Service/Migrations/Mssql/20240909154123_AuthenticatorDisplayName.Designer.cs @@ -0,0 +1,507 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Passwordless.Service.Storage.Ef; + +#nullable disable + +namespace Passwordless.Service.Migrations.Mssql +{ + [DbContext(typeof(DbGlobalMsSqlContext))] + [Migration("20240909154123_AuthenticatorDisplayName")] + partial class AuthenticatorDisplayName + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "8.0.8") + .HasAnnotation("Relational:MaxIdentifierLength", 128); + + SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); + + modelBuilder.Entity("Passwordless.Service.EventLog.Models.ApplicationEvent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ApiKeyId") + .HasColumnType("nvarchar(max)"); + + b.Property("EventType") + .HasColumnType("int"); + + b.Property("Message") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("PerformedAt") + .HasColumnType("datetime2"); + + b.Property("PerformedBy") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Severity") + .HasColumnType("int"); + + b.Property("Subject") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("TenantId") + .IsRequired() + .HasColumnType("nvarchar(450)"); + + b.HasKey("Id"); + + b.HasIndex("TenantId"); + + b.ToTable("ApplicationEvents"); + }); + + modelBuilder.Entity("Passwordless.Service.Models.AccountMetaInformation", b => + { + b.Property("AcountName") + .HasColumnType("nvarchar(450)"); + + b.Property("AdminEmailsSerialized") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("CreatedAt") + .HasColumnType("datetime2"); + + b.Property("DeleteAt") + .HasColumnType("datetime2"); + + b.Property("Tenant") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("AcountName"); + + b.ToTable("AccountInfo"); + }); + + modelBuilder.Entity("Passwordless.Service.Models.AliasPointer", b => + { + b.Property("Tenant") + .HasColumnType("nvarchar(450)"); + + b.Property("Alias") + .HasColumnType("nvarchar(450)"); + + b.Property("Plaintext") + .HasColumnType("nvarchar(max)"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("Tenant", "Alias"); + + b.ToTable("Aliases"); + }); + + modelBuilder.Entity("Passwordless.Service.Models.ApiKeyDesc", b => + { + b.Property("Tenant") + .HasColumnType("nvarchar(450)"); + + b.Property("Id") + .HasColumnType("nvarchar(450)"); + + b.Property("ApiKey") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("CreatedAt") + .HasColumnType("datetime2"); + + b.Property("IsLocked") + .HasColumnType("bit"); + + b.Property("LastLockedAt") + .HasColumnType("datetime2"); + + b.Property("LastUnlockedAt") + .HasColumnType("datetime2"); + + b.Property("Scopes") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("Tenant", "Id"); + + b.ToTable("ApiKeys"); + }); + + modelBuilder.Entity("Passwordless.Service.Models.AppFeature", b => + { + b.Property("Tenant") + .HasColumnType("nvarchar(450)"); + + b.Property("AllowAttestation") + .HasColumnType("bit"); + + b.Property("DeveloperLoggingEndsAt") + .HasColumnType("datetime2"); + + b.Property("EventLoggingIsEnabled") + .HasColumnType("bit"); + + b.Property("EventLoggingRetentionPeriod") + .HasColumnType("int"); + + b.Property("IsGenerateSignInTokenEndpointEnabled") + .ValueGeneratedOnAdd() + .HasColumnType("bit") + .HasDefaultValue(true); + + b.Property("IsMagicLinksEnabled") + .ValueGeneratedOnAdd() + .HasColumnType("bit") + .HasDefaultValue(true); + + b.Property("MagicLinkEmailMonthlyQuota") + .HasColumnType("int"); + + b.Property("MaxUsers") + .HasColumnType("bigint"); + + b.HasKey("Tenant"); + + b.ToTable("AppFeatures"); + }); + + modelBuilder.Entity("Passwordless.Service.Models.AuthenticationConfiguration", b => + { + b.Property("Tenant") + .HasColumnType("nvarchar(450)"); + + b.Property("Purpose") + .HasMaxLength(255) + .HasColumnType("nvarchar(255)"); + + b.Property("CreatedBy") + .IsRequired() + .HasMaxLength(255) + .HasColumnType("nvarchar(255)"); + + b.Property("CreatedOn") + .HasColumnType("datetime2"); + + b.Property("EditedBy") + .HasMaxLength(255) + .HasColumnType("nvarchar(255)"); + + b.Property("EditedOn") + .HasColumnType("datetime2"); + + b.Property("Hints") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("LastUsedOn") + .HasColumnType("datetime2"); + + b.Property("TimeToLive") + .HasColumnType("float"); + + b.Property("UserVerificationRequirement") + .IsRequired() + .HasMaxLength(255) + .HasColumnType("nvarchar(255)"); + + b.HasKey("Tenant", "Purpose"); + + b.ToTable("AuthenticationConfigurations"); + }); + + modelBuilder.Entity("Passwordless.Service.Models.Authenticator", b => + { + b.Property("Tenant") + .HasColumnType("nvarchar(450)"); + + b.Property("AaGuid") + .HasColumnType("uniqueidentifier"); + + b.Property("CreatedAt") + .HasColumnType("datetime2"); + + b.Property("IsAllowed") + .HasColumnType("bit"); + + b.HasKey("Tenant", "AaGuid"); + + b.ToTable("Authenticators"); + }); + + modelBuilder.Entity("Passwordless.Service.Models.DispatchedEmail", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("CreatedAt") + .HasColumnType("datetime2"); + + b.Property("EmailAddress") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("LinkTemplate") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Tenant") + .IsRequired() + .HasColumnType("nvarchar(450)"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.HasIndex("CreatedAt"); + + b.HasIndex("Tenant"); + + b.ToTable("DispatchedEmails"); + }); + + modelBuilder.Entity("Passwordless.Service.Models.EFStoredCredential", b => + { + b.Property("Tenant") + .HasColumnType("nvarchar(450)"); + + b.Property("DescriptorId") + .HasColumnType("varbinary(900)"); + + b.Property("AaGuid") + .HasColumnType("uniqueidentifier"); + + b.Property("AttestationFmt") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("AuthenticatorDisplayName") + .HasColumnType("nvarchar(max)"); + + b.Property("BackupState") + .HasColumnType("bit"); + + b.Property("Country") + .HasColumnType("nvarchar(max)"); + + b.Property("CreatedAt") + .HasColumnType("datetime2"); + + b.Property("DescriptorTransports") + .HasColumnType("nvarchar(max)"); + + b.Property("DescriptorType") + .HasColumnType("int"); + + b.Property("Device") + .HasColumnType("nvarchar(max)"); + + b.Property("IsBackupEligible") + .HasColumnType("bit"); + + b.Property("IsDiscoverable") + .HasColumnType("bit"); + + b.Property("LastUsedAt") + .HasColumnType("datetime2"); + + b.Property("Nickname") + .HasColumnType("nvarchar(max)"); + + b.Property("Origin") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("PublicKey") + .IsRequired() + .HasColumnType("varbinary(max)"); + + b.Property("RPID") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("SignatureCounter") + .HasColumnType("bigint"); + + b.Property("UserHandle") + .IsRequired() + .HasColumnType("varbinary(max)"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("nvarchar(450)"); + + b.HasKey("Tenant", "DescriptorId"); + + b.HasIndex("Tenant", "UserId") + .HasDatabaseName("IX_EFStoredCredential_Tenant_UserId"); + + b.ToTable("Credentials"); + }); + + modelBuilder.Entity("Passwordless.Service.Models.PeriodicActiveUserReport", b => + { + b.Property("Tenant") + .HasColumnType("nvarchar(450)"); + + b.Property("CreatedAt") + .HasColumnType("date"); + + b.Property("DailyActiveUsersCount") + .HasColumnType("int"); + + b.Property("TotalUsersCount") + .HasColumnType("int"); + + b.Property("WeeklyActiveUsersCount") + .HasColumnType("int"); + + b.HasKey("Tenant", "CreatedAt"); + + b.ToTable("PeriodicActiveUserReports"); + }); + + modelBuilder.Entity("Passwordless.Service.Models.PeriodicCredentialReport", b => + { + b.Property("Tenant") + .HasColumnType("nvarchar(450)"); + + b.Property("CreatedAt") + .HasColumnType("date"); + + b.Property("CredentialsCount") + .HasColumnType("int"); + + b.Property("UsersCount") + .HasColumnType("int"); + + b.HasKey("Tenant", "CreatedAt"); + + b.ToTable("PeriodicCredentialReports"); + }); + + modelBuilder.Entity("Passwordless.Service.Models.TokenKey", b => + { + b.Property("Tenant") + .HasColumnType("nvarchar(450)"); + + b.Property("KeyId") + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime2"); + + b.Property("KeyMaterial") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("Tenant", "KeyId"); + + b.ToTable("TokenKeys"); + }); + + modelBuilder.Entity("Passwordless.Service.EventLog.Models.ApplicationEvent", b => + { + b.HasOne("Passwordless.Service.Models.AccountMetaInformation", "Application") + .WithMany("Events") + .HasForeignKey("TenantId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Application"); + }); + + modelBuilder.Entity("Passwordless.Service.Models.AppFeature", b => + { + b.HasOne("Passwordless.Service.Models.AccountMetaInformation", "Application") + .WithOne("Features") + .HasForeignKey("Passwordless.Service.Models.AppFeature", "Tenant") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Application"); + }); + + modelBuilder.Entity("Passwordless.Service.Models.Authenticator", b => + { + b.HasOne("Passwordless.Service.Models.AppFeature", "AppFeature") + .WithMany("Authenticators") + .HasForeignKey("Tenant") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppFeature"); + }); + + modelBuilder.Entity("Passwordless.Service.Models.DispatchedEmail", b => + { + b.HasOne("Passwordless.Service.Models.AccountMetaInformation", "Application") + .WithMany("DispatchedEmails") + .HasForeignKey("Tenant") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Application"); + }); + + modelBuilder.Entity("Passwordless.Service.Models.PeriodicActiveUserReport", b => + { + b.HasOne("Passwordless.Service.Models.AccountMetaInformation", "Application") + .WithMany("PeriodicActiveUserReports") + .HasForeignKey("Tenant") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Application"); + }); + + modelBuilder.Entity("Passwordless.Service.Models.PeriodicCredentialReport", b => + { + b.HasOne("Passwordless.Service.Models.AccountMetaInformation", "Application") + .WithMany("PeriodicCredentialReports") + .HasForeignKey("Tenant") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Application"); + }); + + modelBuilder.Entity("Passwordless.Service.Models.AccountMetaInformation", b => + { + b.Navigation("DispatchedEmails"); + + b.Navigation("Events"); + + b.Navigation("Features"); + + b.Navigation("PeriodicActiveUserReports"); + + b.Navigation("PeriodicCredentialReports"); + }); + + modelBuilder.Entity("Passwordless.Service.Models.AppFeature", b => + { + b.Navigation("Authenticators"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/src/Service/Migrations/Mssql/20240909154123_AuthenticatorDisplayName.cs b/src/Service/Migrations/Mssql/20240909154123_AuthenticatorDisplayName.cs new file mode 100644 index 000000000..908516caa --- /dev/null +++ b/src/Service/Migrations/Mssql/20240909154123_AuthenticatorDisplayName.cs @@ -0,0 +1,27 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Passwordless.Service.Migrations.Mssql; + +/// +public partial class AuthenticatorDisplayName : Migration +{ + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "AuthenticatorDisplayName", + table: "Credentials", + type: "nvarchar(max)", + nullable: true); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "AuthenticatorDisplayName", + table: "Credentials"); + } +} \ No newline at end of file diff --git a/src/Service/Migrations/Mssql/MsSqlContextModelSnapshot.cs b/src/Service/Migrations/Mssql/MsSqlContextModelSnapshot.cs index 0c9d42b63..d66a9ac15 100644 --- a/src/Service/Migrations/Mssql/MsSqlContextModelSnapshot.cs +++ b/src/Service/Migrations/Mssql/MsSqlContextModelSnapshot.cs @@ -17,7 +17,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "8.0.6") + .HasAnnotation("ProductVersion", "8.0.8") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); @@ -290,6 +290,9 @@ protected override void BuildModel(ModelBuilder modelBuilder) .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("AuthenticatorDisplayName") + .HasColumnType("nvarchar(max)"); + b.Property("BackupState") .HasColumnType("bit"); diff --git a/src/Service/Migrations/Sqlite/20240909154138_AuthenticatorDisplayName.Designer.cs b/src/Service/Migrations/Sqlite/20240909154138_AuthenticatorDisplayName.Designer.cs new file mode 100644 index 000000000..7b0a5d9d1 --- /dev/null +++ b/src/Service/Migrations/Sqlite/20240909154138_AuthenticatorDisplayName.Designer.cs @@ -0,0 +1,502 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Passwordless.Service.Storage.Ef; + +#nullable disable + +namespace Passwordless.Service.Migrations.Sqlite +{ + [DbContext(typeof(DbGlobalSqliteContext))] + [Migration("20240909154138_AuthenticatorDisplayName")] + partial class AuthenticatorDisplayName + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "8.0.8"); + + modelBuilder.Entity("Passwordless.Service.EventLog.Models.ApplicationEvent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("ApiKeyId") + .HasColumnType("TEXT"); + + b.Property("EventType") + .HasColumnType("INTEGER"); + + b.Property("Message") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("PerformedAt") + .HasColumnType("TEXT"); + + b.Property("PerformedBy") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Severity") + .HasColumnType("INTEGER"); + + b.Property("Subject") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("TenantId") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("TenantId"); + + b.ToTable("ApplicationEvents"); + }); + + modelBuilder.Entity("Passwordless.Service.Models.AccountMetaInformation", b => + { + b.Property("AcountName") + .HasColumnType("TEXT"); + + b.Property("AdminEmailsSerialized") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("CreatedAt") + .HasColumnType("TEXT"); + + b.Property("DeleteAt") + .HasColumnType("TEXT"); + + b.Property("Tenant") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("AcountName"); + + b.ToTable("AccountInfo"); + }); + + modelBuilder.Entity("Passwordless.Service.Models.AliasPointer", b => + { + b.Property("Tenant") + .HasColumnType("TEXT"); + + b.Property("Alias") + .HasColumnType("TEXT"); + + b.Property("Plaintext") + .HasColumnType("TEXT"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Tenant", "Alias"); + + b.ToTable("Aliases"); + }); + + modelBuilder.Entity("Passwordless.Service.Models.ApiKeyDesc", b => + { + b.Property("Tenant") + .HasColumnType("TEXT"); + + b.Property("Id") + .HasColumnType("TEXT"); + + b.Property("ApiKey") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("CreatedAt") + .HasColumnType("TEXT"); + + b.Property("IsLocked") + .HasColumnType("INTEGER"); + + b.Property("LastLockedAt") + .HasColumnType("TEXT"); + + b.Property("LastUnlockedAt") + .HasColumnType("TEXT"); + + b.Property("Scopes") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Tenant", "Id"); + + b.ToTable("ApiKeys"); + }); + + modelBuilder.Entity("Passwordless.Service.Models.AppFeature", b => + { + b.Property("Tenant") + .HasColumnType("TEXT"); + + b.Property("AllowAttestation") + .HasColumnType("INTEGER"); + + b.Property("DeveloperLoggingEndsAt") + .HasColumnType("TEXT"); + + b.Property("EventLoggingIsEnabled") + .HasColumnType("INTEGER"); + + b.Property("EventLoggingRetentionPeriod") + .HasColumnType("INTEGER"); + + b.Property("IsGenerateSignInTokenEndpointEnabled") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("IsMagicLinksEnabled") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("MagicLinkEmailMonthlyQuota") + .HasColumnType("INTEGER"); + + b.Property("MaxUsers") + .HasColumnType("INTEGER"); + + b.HasKey("Tenant"); + + b.ToTable("AppFeatures"); + }); + + modelBuilder.Entity("Passwordless.Service.Models.AuthenticationConfiguration", b => + { + b.Property("Tenant") + .HasColumnType("TEXT"); + + b.Property("Purpose") + .HasMaxLength(255) + .HasColumnType("TEXT"); + + b.Property("CreatedBy") + .IsRequired() + .HasMaxLength(255) + .HasColumnType("TEXT"); + + b.Property("CreatedOn") + .HasColumnType("TEXT"); + + b.Property("EditedBy") + .HasMaxLength(255) + .HasColumnType("TEXT"); + + b.Property("EditedOn") + .HasColumnType("TEXT"); + + b.Property("Hints") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("LastUsedOn") + .HasColumnType("TEXT"); + + b.Property("TimeToLive") + .HasColumnType("REAL"); + + b.Property("UserVerificationRequirement") + .IsRequired() + .HasMaxLength(255) + .HasColumnType("TEXT"); + + b.HasKey("Tenant", "Purpose"); + + b.ToTable("AuthenticationConfigurations"); + }); + + modelBuilder.Entity("Passwordless.Service.Models.Authenticator", b => + { + b.Property("Tenant") + .HasColumnType("TEXT"); + + b.Property("AaGuid") + .HasColumnType("TEXT"); + + b.Property("CreatedAt") + .HasColumnType("TEXT"); + + b.Property("IsAllowed") + .HasColumnType("INTEGER"); + + b.HasKey("Tenant", "AaGuid"); + + b.ToTable("Authenticators"); + }); + + modelBuilder.Entity("Passwordless.Service.Models.DispatchedEmail", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("CreatedAt") + .HasColumnType("TEXT"); + + b.Property("EmailAddress") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("LinkTemplate") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Tenant") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("CreatedAt"); + + b.HasIndex("Tenant"); + + b.ToTable("DispatchedEmails"); + }); + + modelBuilder.Entity("Passwordless.Service.Models.EFStoredCredential", b => + { + b.Property("Tenant") + .HasColumnType("TEXT"); + + b.Property("DescriptorId") + .HasColumnType("BLOB"); + + b.Property("AaGuid") + .HasColumnType("TEXT"); + + b.Property("AttestationFmt") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("AuthenticatorDisplayName") + .HasColumnType("TEXT"); + + b.Property("BackupState") + .HasColumnType("INTEGER"); + + b.Property("Country") + .HasColumnType("TEXT"); + + b.Property("CreatedAt") + .HasColumnType("TEXT"); + + b.Property("DescriptorTransports") + .HasColumnType("TEXT"); + + b.Property("DescriptorType") + .HasColumnType("INTEGER"); + + b.Property("Device") + .HasColumnType("TEXT"); + + b.Property("IsBackupEligible") + .HasColumnType("INTEGER"); + + b.Property("IsDiscoverable") + .HasColumnType("INTEGER"); + + b.Property("LastUsedAt") + .HasColumnType("TEXT"); + + b.Property("Nickname") + .HasColumnType("TEXT"); + + b.Property("Origin") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("PublicKey") + .IsRequired() + .HasColumnType("BLOB"); + + b.Property("RPID") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("SignatureCounter") + .HasColumnType("INTEGER"); + + b.Property("UserHandle") + .IsRequired() + .HasColumnType("BLOB"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Tenant", "DescriptorId"); + + b.HasIndex("Tenant", "UserId") + .HasDatabaseName("IX_EFStoredCredential_Tenant_UserId"); + + b.ToTable("Credentials"); + }); + + modelBuilder.Entity("Passwordless.Service.Models.PeriodicActiveUserReport", b => + { + b.Property("Tenant") + .HasColumnType("TEXT"); + + b.Property("CreatedAt") + .HasColumnType("TEXT"); + + b.Property("DailyActiveUsersCount") + .HasColumnType("INTEGER"); + + b.Property("TotalUsersCount") + .HasColumnType("INTEGER"); + + b.Property("WeeklyActiveUsersCount") + .HasColumnType("INTEGER"); + + b.HasKey("Tenant", "CreatedAt"); + + b.ToTable("PeriodicActiveUserReports"); + }); + + modelBuilder.Entity("Passwordless.Service.Models.PeriodicCredentialReport", b => + { + b.Property("Tenant") + .HasColumnType("TEXT"); + + b.Property("CreatedAt") + .HasColumnType("TEXT"); + + b.Property("CredentialsCount") + .HasColumnType("INTEGER"); + + b.Property("UsersCount") + .HasColumnType("INTEGER"); + + b.HasKey("Tenant", "CreatedAt"); + + b.ToTable("PeriodicCredentialReports"); + }); + + modelBuilder.Entity("Passwordless.Service.Models.TokenKey", b => + { + b.Property("Tenant") + .HasColumnType("TEXT"); + + b.Property("KeyId") + .HasColumnType("INTEGER"); + + b.Property("CreatedAt") + .HasColumnType("TEXT"); + + b.Property("KeyMaterial") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Tenant", "KeyId"); + + b.ToTable("TokenKeys"); + }); + + modelBuilder.Entity("Passwordless.Service.EventLog.Models.ApplicationEvent", b => + { + b.HasOne("Passwordless.Service.Models.AccountMetaInformation", "Application") + .WithMany("Events") + .HasForeignKey("TenantId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Application"); + }); + + modelBuilder.Entity("Passwordless.Service.Models.AppFeature", b => + { + b.HasOne("Passwordless.Service.Models.AccountMetaInformation", "Application") + .WithOne("Features") + .HasForeignKey("Passwordless.Service.Models.AppFeature", "Tenant") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Application"); + }); + + modelBuilder.Entity("Passwordless.Service.Models.Authenticator", b => + { + b.HasOne("Passwordless.Service.Models.AppFeature", "AppFeature") + .WithMany("Authenticators") + .HasForeignKey("Tenant") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppFeature"); + }); + + modelBuilder.Entity("Passwordless.Service.Models.DispatchedEmail", b => + { + b.HasOne("Passwordless.Service.Models.AccountMetaInformation", "Application") + .WithMany("DispatchedEmails") + .HasForeignKey("Tenant") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Application"); + }); + + modelBuilder.Entity("Passwordless.Service.Models.PeriodicActiveUserReport", b => + { + b.HasOne("Passwordless.Service.Models.AccountMetaInformation", "Application") + .WithMany("PeriodicActiveUserReports") + .HasForeignKey("Tenant") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Application"); + }); + + modelBuilder.Entity("Passwordless.Service.Models.PeriodicCredentialReport", b => + { + b.HasOne("Passwordless.Service.Models.AccountMetaInformation", "Application") + .WithMany("PeriodicCredentialReports") + .HasForeignKey("Tenant") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Application"); + }); + + modelBuilder.Entity("Passwordless.Service.Models.AccountMetaInformation", b => + { + b.Navigation("DispatchedEmails"); + + b.Navigation("Events"); + + b.Navigation("Features"); + + b.Navigation("PeriodicActiveUserReports"); + + b.Navigation("PeriodicCredentialReports"); + }); + + modelBuilder.Entity("Passwordless.Service.Models.AppFeature", b => + { + b.Navigation("Authenticators"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/src/Service/Migrations/Sqlite/20240909154138_AuthenticatorDisplayName.cs b/src/Service/Migrations/Sqlite/20240909154138_AuthenticatorDisplayName.cs new file mode 100644 index 000000000..c3a6d3e7d --- /dev/null +++ b/src/Service/Migrations/Sqlite/20240909154138_AuthenticatorDisplayName.cs @@ -0,0 +1,27 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Passwordless.Service.Migrations.Sqlite; + +/// +public partial class AuthenticatorDisplayName : Migration +{ + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "AuthenticatorDisplayName", + table: "Credentials", + type: "TEXT", + nullable: true); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "AuthenticatorDisplayName", + table: "Credentials"); + } +} \ No newline at end of file diff --git a/src/Service/Migrations/Sqlite/SqliteContextModelSnapshot.cs b/src/Service/Migrations/Sqlite/SqliteContextModelSnapshot.cs index 79c4aaf33..d2d3270e5 100644 --- a/src/Service/Migrations/Sqlite/SqliteContextModelSnapshot.cs +++ b/src/Service/Migrations/Sqlite/SqliteContextModelSnapshot.cs @@ -15,7 +15,7 @@ partial class SqliteContextModelSnapshot : ModelSnapshot protected override void BuildModel(ModelBuilder modelBuilder) { #pragma warning disable 612, 618 - modelBuilder.HasAnnotation("ProductVersion", "8.0.6"); + modelBuilder.HasAnnotation("ProductVersion", "8.0.8"); modelBuilder.Entity("Passwordless.Service.EventLog.Models.ApplicationEvent", b => { @@ -285,6 +285,9 @@ protected override void BuildModel(ModelBuilder modelBuilder) .IsRequired() .HasColumnType("TEXT"); + b.Property("AuthenticatorDisplayName") + .HasColumnType("TEXT"); + b.Property("BackupState") .HasColumnType("INTEGER"); diff --git a/src/Service/Models/EFStoredCredential.cs b/src/Service/Models/EFStoredCredential.cs index a510cdce1..fd9e6b56a 100644 --- a/src/Service/Models/EFStoredCredential.cs +++ b/src/Service/Models/EFStoredCredential.cs @@ -10,6 +10,17 @@ public class EFStoredCredential : PerTenant public AuthenticatorTransport[]? DescriptorTransports { get; set; } public required byte[] PublicKey { get; set; } public required byte[] UserHandle { get; set; } + + public string UserId + { + get => Encoding.UTF8.GetString(UserHandle); + // This setter is required by EF, but the value should already be + // set in UserHandle. Ideally, we'd remove this column and use a + // computed column or query filter instead, but it is what it is. + [Obsolete("This should only be used internally by EF.", true)] + private set { } + } + public required uint SignatureCounter { get; set; } public required string AttestationFmt { get; set; } public required DateTime CreatedAt { get; set; } @@ -20,68 +31,54 @@ public class EFStoredCredential : PerTenant public string? Country { get; set; } public string? Device { get; set; } public string? Nickname { get; set; } - public string UserId - { - get => Encoding.UTF8.GetString(UserHandle); - // This setter is required by EF, but the value should already be - // set in UserHandle. Ideally, we'd remove this column and use a - // computed column or query filter instead, but it is what it is. - [Obsolete("This should only be used internally by EF.", true)] - private set { } - } + public string? AuthenticatorDisplayName { get; set; } public bool? BackupState { get; set; } - public bool? IsBackupEligible { get; set; } - public bool? IsDiscoverable { get; set; } - internal StoredCredential ToStoredCredential() + internal StoredCredential ToStoredCredential() => new() { - return new StoredCredential - { - Descriptor = new PublicKeyCredentialDescriptor(DescriptorType.Value, DescriptorId, DescriptorTransports), - PublicKey = PublicKey, - UserHandle = UserHandle, - SignatureCounter = SignatureCounter, - AttestationFmt = AttestationFmt, - CreatedAt = CreatedAt, - AaGuid = AaGuid, - LastUsedAt = LastUsedAt, - RPID = RPID, - Origin = Origin, - Country = Country, - Device = Device, - Nickname = Nickname, - BackupState = BackupState, - IsBackupEligible = IsBackupEligible, - IsDiscoverable = IsDiscoverable - }; - } + Descriptor = new PublicKeyCredentialDescriptor(DescriptorType.Value, DescriptorId, DescriptorTransports), + PublicKey = PublicKey, + UserHandle = UserHandle, + SignatureCounter = SignatureCounter, + AttestationFmt = AttestationFmt, + CreatedAt = CreatedAt, + AaGuid = AaGuid, + LastUsedAt = LastUsedAt, + RPID = RPID, + Origin = Origin, + Country = Country, + Device = Device, + Nickname = Nickname, + AuthenticatorDisplayName = AuthenticatorDisplayName, + BackupState = BackupState, + IsBackupEligible = IsBackupEligible, + IsDiscoverable = IsDiscoverable + }; - internal static EFStoredCredential FromStoredCredential(StoredCredential s, string tenant) + internal static EFStoredCredential FromStoredCredential(StoredCredential credential, string tenant) => new() { - return new EFStoredCredential - { - Tenant = tenant, - PublicKey = s.PublicKey, - UserHandle = s.UserHandle, - SignatureCounter = s.SignatureCounter, - AttestationFmt = s.AttestationFmt, - CreatedAt = s.CreatedAt, - AaGuid = s.AaGuid, - LastUsedAt = s.LastUsedAt, - RPID = s.RPID, - Origin = s.Origin, - Country = s.Country, - Device = s.Device, - Nickname = s.Nickname, - DescriptorId = s.Descriptor.Id, - DescriptorTransports = s.Descriptor.Transports, - DescriptorType = s.Descriptor.Type, - BackupState = s.BackupState, - IsBackupEligible = s.IsBackupEligible, - IsDiscoverable = s.IsDiscoverable - }; - } + Tenant = tenant, + PublicKey = credential.PublicKey, + UserHandle = credential.UserHandle, + SignatureCounter = credential.SignatureCounter, + AttestationFmt = credential.AttestationFmt, + CreatedAt = credential.CreatedAt, + AaGuid = credential.AaGuid, + LastUsedAt = credential.LastUsedAt, + RPID = credential.RPID, + Origin = credential.Origin, + Country = credential.Country, + Device = credential.Device, + Nickname = credential.Nickname, + AuthenticatorDisplayName = credential.AuthenticatorDisplayName, + DescriptorId = credential.Descriptor.Id, + DescriptorTransports = credential.Descriptor.Transports, + DescriptorType = credential.Descriptor.Type, + BackupState = credential.BackupState, + IsBackupEligible = credential.IsBackupEligible, + IsDiscoverable = credential.IsDiscoverable + }; } \ No newline at end of file diff --git a/src/Service/Models/RegisterSession.cs b/src/Service/Models/RegisterSession.cs index 3f02a5240..3a672d718 100644 --- a/src/Service/Models/RegisterSession.cs +++ b/src/Service/Models/RegisterSession.cs @@ -5,6 +5,6 @@ namespace Passwordless.Service.Models; public class RegisterSession { public CredentialCreateOptions Options { get; set; } - public HashSet Aliases { get; set; } + public HashSet? Aliases { get; set; } public bool AliasHashing { get; set; } = true; } \ No newline at end of file diff --git a/src/Service/Models/RegisterToken.cs b/src/Service/Models/RegisterToken.cs index a527b7487..af9b1b57a 100644 --- a/src/Service/Models/RegisterToken.cs +++ b/src/Service/Models/RegisterToken.cs @@ -13,7 +13,7 @@ public class RegisterToken : Token public string UserId { get; set; } [MessagePack.Key(11)] - public string DisplayName { get; set; } + public string? DisplayName { get; set; } [MessagePack.Key(12)] [Required(AllowEmptyStrings = false)] @@ -23,7 +23,7 @@ public class RegisterToken : Token public string Attestation { get; set; } = "None"; [MessagePack.Key(14)] - public string AuthenticatorType { get; set; } + public string? AuthenticatorType { get; set; } [MessagePack.Key(15)] public bool Discoverable { get; set; } = true; @@ -68,13 +68,16 @@ public class VerifySignInToken : Token public string Country { get; set; } [MessagePack.Key(17)] - public string Nickname { get; set; } + public string? Nickname { get; set; } [MessagePack.Key(18)] public byte[] CredentialId { get; set; } [MessagePack.Key(19)] public string Purpose { get; set; } + + [MessagePack.Key(20)] + public string? AuthenticatorDisplayName { get; set; } } [MessagePackObject] diff --git a/src/Service/Models/RegistrationCompleteDTO.cs b/src/Service/Models/RegistrationCompleteDTO.cs index 7c06baeaa..f6a3c2884 100644 --- a/src/Service/Models/RegistrationCompleteDTO.cs +++ b/src/Service/Models/RegistrationCompleteDTO.cs @@ -10,5 +10,5 @@ public class RegistrationCompleteDTO : RequestBase public AuthenticatorAttestationRawResponse Response { get; set; } [MaxLength(64, ErrorMessage = "Nickname cannot be longer than 64 characters.")] - public string Nickname { get; set; } + public string? Nickname { get; set; } } \ No newline at end of file diff --git a/src/Service/Models/StoredCredential.cs b/src/Service/Models/StoredCredential.cs index 2ac940934..d2368f3a9 100644 --- a/src/Service/Models/StoredCredential.cs +++ b/src/Service/Models/StoredCredential.cs @@ -8,6 +8,7 @@ public class StoredCredential public required PublicKeyCredentialDescriptor Descriptor { get; set; } public required byte[] PublicKey { get; set; } public required byte[] UserHandle { get; set; } + public string UserId => Encoding.UTF8.GetString(UserHandle); public required uint SignatureCounter { get; set; } public required string AttestationFmt { get; set; } public required DateTime CreatedAt { get; set; } @@ -18,12 +19,8 @@ public class StoredCredential public string? Country { get; set; } public string? Device { get; set; } public string? Nickname { get; set; } - - public string UserId => Encoding.UTF8.GetString(UserHandle); - + public string? AuthenticatorDisplayName { get; set; } public bool? BackupState { get; set; } - public bool? IsBackupEligible { get; set; } - public bool? IsDiscoverable { get; set; } } \ No newline at end of file