fix(auth): fix SQLite DateTimeOffset comparison crash in trusted-device checks

The sessions unit's live smoke test caught the same bug it fixed in
SessionsController also present in TrustedDeviceService and
TwoFactorController's device list: SQLite/Pomelo's EF Core provider
cannot translate DateTimeOffset relational comparisons or ORDER BY to
SQL, so IsDeviceTrustedAsync (the check that skips 2FA for a trusted
browser) and ListTrustedDevices would 500 on real SQLite despite
passing on EF's InMemory test provider. Same fix: equality-only in
the DB query, expiry comparison and sort after materializing.

Data/JobTrackerContext.cs

@@ -28,6 +28,9 @@ namespace JobTrackerApi.Data
     public DbSet<CvUploadArtifact> CvUploadArtifacts => Set<CvUploadArtifact>();
     public DbSet<CvExtractionRun> CvExtractionRuns => Set<CvExtractionRun>();
     public DbSet<TailoredCvDraft> TailoredCvDrafts => Set<TailoredCvDraft>();
+    public DbSet<TwoFactorRecoveryCode> TwoFactorRecoveryCodes => Set<TwoFactorRecoveryCode>();
+    public DbSet<TrustedDevice> TrustedDevices => Set<TrustedDevice>();
+    public DbSet<UserSession> UserSessions => Set<UserSession>();
 
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
@@ -141,6 +144,39 @@ namespace JobTrackerApi.Data
             .WithOne(j => j.TailoredCvDraft)
             .HasForeignKey<TailoredCvDraft>(x => x.JobApplicationId)
             .OnDelete(DeleteBehavior.Cascade);
+
+        // No FK to AspNetUsers: the login-time challenge endpoint reads these rows before a
+        // session (and thus CurrentUserId) exists, via IgnoreQueryFilters() -- same convention
+        // as AdminAuditController's cross-cutting queries.
+        modelBuilder.Entity<TwoFactorRecoveryCode>()
+            .HasQueryFilter(x => CurrentUserId != null && x.UserId == CurrentUserId);
+
+        modelBuilder.Entity<TwoFactorRecoveryCode>()
+            .HasIndex(x => new { x.UserId, x.UsedAtUtc });
+
+        // No FK to AspNetUsers: the login-time trusted-device check reads these rows before a
+        // session (and thus CurrentUserId) exists, via IgnoreQueryFilters() -- same convention
+        // as TwoFactorRecoveryCode above.
+        modelBuilder.Entity<TrustedDevice>()
+            .HasQueryFilter(x => CurrentUserId != null && x.UserId == CurrentUserId);
+
+        modelBuilder.Entity<TrustedDevice>()
+            .HasIndex(x => x.UserId);
+
+        modelBuilder.Entity<TrustedDevice>()
+            .HasIndex(x => x.TokenHash);
+
+        // No FK to AspNetUsers, same convention as TrustedDevice/TwoFactorRecoveryCode above: the
+        // OnTokenValidated auth check reads this table before CurrentUserId is meaningfully set
+        // for the request being validated, via IgnoreQueryFilters().
+        modelBuilder.Entity<UserSession>()
+            .HasKey(x => x.Id);
+
+        modelBuilder.Entity<UserSession>()
+            .HasQueryFilter(x => CurrentUserId != null && x.UserId == CurrentUserId);
+
+        modelBuilder.Entity<UserSession>()
+            .HasIndex(x => x.UserId);
     }
 }
 }

JobTrackerApi.Tests/AuthAndSystemControllerTests.cs

@@ -1,10 +1,12 @@
 using JobTrackerApi.Controllers;
+using JobTrackerApi.Data;
 using JobTrackerApi.Models;
 using JobTrackerApi.Services;
 using JobTrackerApi.Tests.TestSupport;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging.Abstractions;
@@ -17,6 +19,388 @@ namespace JobTrackerApi.Tests;
 
 public sealed class AuthAndSystemControllerTests
 {
+    [Fact]
+    public async Task Login_locks_account_after_five_failed_attempts_and_rejects_sixth_even_with_correct_password()
+    {
+        var user = new ApplicationUser { Id = "user-1", Email = "person@example.com", UserName = "person@example.com" };
+        var userManager = CreateUserManager();
+        userManager.Setup(x => x.FindByEmailAsync("person@example.com")).ReturnsAsync(user);
+        userManager.Setup(x => x.FindByNameAsync("person@example.com")).ReturnsAsync((ApplicationUser?)null);
+
+        var failedCount = 0;
+        var lockedOut = false;
+        userManager.Setup(x => x.IsLockedOutAsync(user)).Returns(() => Task.FromResult(lockedOut));
+        userManager.Setup(x => x.AccessFailedAsync(user))
+            .Callback(() =>
+            {
+                failedCount++;
+                if (failedCount >= 5) lockedOut = true;
+            })
+            .ReturnsAsync(IdentityResult.Success);
+        userManager.Setup(x => x.CheckPasswordAsync(user, "wrong-password")).ReturnsAsync(false);
+        userManager.Setup(x => x.CheckPasswordAsync(user, "correct-password")).ReturnsAsync(true);
+
+        var controller = new AuthController(BuildConfig(), userManager.Object, Mock.Of<ITokenService>(), Mock.Of<IAppEmailSender>(), Mock.Of<IGoogleTokenValidator>(), Mock.Of<IMicrosoftTokenValidator>(), NullLogger<AuthController>.Instance, Mock.Of<ITwoFactorPendingTokenService>(), TestHostFactory.CreateInMemoryDb());
+
+        for (var i = 0; i < 5; i++)
+        {
+            var attempt = await controller.Login(new AuthController.LoginRequest("person@example.com", "wrong-password"), CancellationToken.None);
+            Assert.IsType<UnauthorizedResult>(attempt);
+        }
+
+        Assert.True(lockedOut);
+
+        var sixthAttempt = await controller.Login(new AuthController.LoginRequest("person@example.com", "correct-password"), CancellationToken.None);
+
+        Assert.IsType<UnauthorizedResult>(sixthAttempt);
+        userManager.Verify(x => x.CheckPasswordAsync(user, "correct-password"), Times.Never);
+    }
+
+    [Fact]
+    public async Task Login_skips_two_factor_when_trusted_device_cookie_matches_current_user()
+    {
+        var dbName = Guid.NewGuid().ToString();
+        var user = new ApplicationUser { Id = "user-1", Email = "person@example.com", UserName = "person@example.com", TwoFactorEnabled = true, TotpSecretEncrypted = "irrelevant" };
+        const string token = "trusted-device-token";
+
+        using (var seedDb = BuildDb(dbName, null))
+        {
+            seedDb.TrustedDevices.Add(new TrustedDevice
+            {
+                UserId = "user-1",
+                TokenHash = TrustedDeviceService.HashToken(token),
+                CreatedAtUtc = DateTimeOffset.UtcNow,
+                LastSeenAtUtc = DateTimeOffset.UtcNow,
+                ExpiresAtUtc = DateTimeOffset.UtcNow.AddDays(30),
+            });
+            seedDb.SaveChanges();
+        }
+
+        var controller = BuildLoginController(user, "correct-password", out var db, dbName, token);
+        using (db)
+        {
+            var result = await controller.Login(new AuthController.LoginRequest("person@example.com", "correct-password"), CancellationToken.None);
+
+            var ok = Assert.IsType<OkObjectResult>(result);
+            var session = Assert.IsType<AuthController.AuthSessionResult>(ok.Value);
+            Assert.True(session.Authenticated);
+        }
+    }
+
+    [Fact]
+    public async Task Login_does_not_skip_two_factor_when_trusted_device_belongs_to_different_user()
+    {
+        var dbName = Guid.NewGuid().ToString();
+        var user = new ApplicationUser { Id = "user-1", Email = "person@example.com", UserName = "person@example.com", TwoFactorEnabled = true, TotpSecretEncrypted = "irrelevant" };
+        const string token = "trusted-device-token";
+
+        using (var seedDb = BuildDb(dbName, null))
+        {
+            seedDb.TrustedDevices.Add(new TrustedDevice
+            {
+                UserId = "user-2", // a different account -- must not skip 2FA for user-1
+                TokenHash = TrustedDeviceService.HashToken(token),
+                CreatedAtUtc = DateTimeOffset.UtcNow,
+                LastSeenAtUtc = DateTimeOffset.UtcNow,
+                ExpiresAtUtc = DateTimeOffset.UtcNow.AddDays(30),
+            });
+            seedDb.SaveChanges();
+        }
+
+        var controller = BuildLoginController(user, "correct-password", out var db, dbName, token);
+        using (db)
+        {
+            var result = await controller.Login(new AuthController.LoginRequest("person@example.com", "correct-password"), CancellationToken.None);
+
+            var ok = Assert.IsType<OkObjectResult>(result);
+            Assert.IsType<AuthController.TwoFactorRequiredResult>(ok.Value);
+        }
+    }
+
+    [Fact]
+    public async Task Login_does_not_skip_two_factor_when_trusted_device_is_expired()
+    {
+        var dbName = Guid.NewGuid().ToString();
+        var user = new ApplicationUser { Id = "user-1", Email = "person@example.com", UserName = "person@example.com", TwoFactorEnabled = true, TotpSecretEncrypted = "irrelevant" };
+        const string token = "trusted-device-token";
+
+        using (var seedDb = BuildDb(dbName, null))
+        {
+            seedDb.TrustedDevices.Add(new TrustedDevice
+            {
+                UserId = "user-1",
+                TokenHash = TrustedDeviceService.HashToken(token),
+                CreatedAtUtc = DateTimeOffset.UtcNow.AddDays(-31),
+                LastSeenAtUtc = DateTimeOffset.UtcNow.AddDays(-31),
+                ExpiresAtUtc = DateTimeOffset.UtcNow.AddDays(-1), // expired yesterday
+            });
+            seedDb.SaveChanges();
+        }
+
+        var controller = BuildLoginController(user, "correct-password", out var db, dbName, token);
+        using (db)
+        {
+            var result = await controller.Login(new AuthController.LoginRequest("person@example.com", "correct-password"), CancellationToken.None);
+
+            var ok = Assert.IsType<OkObjectResult>(result);
+            Assert.IsType<AuthController.TwoFactorRequiredResult>(ok.Value);
+        }
+    }
+
+    [Fact]
+    public async Task Login_does_not_skip_two_factor_when_no_trusted_device_cookie_present()
+    {
+        var dbName = Guid.NewGuid().ToString();
+        var user = new ApplicationUser { Id = "user-1", Email = "person@example.com", UserName = "person@example.com", TwoFactorEnabled = true, TotpSecretEncrypted = "irrelevant" };
+
+        var controller = BuildLoginController(user, "correct-password", out var db, dbName, cookieToken: null);
+        using (db)
+        {
+            var result = await controller.Login(new AuthController.LoginRequest("person@example.com", "correct-password"), CancellationToken.None);
+
+            var ok = Assert.IsType<OkObjectResult>(result);
+            Assert.IsType<AuthController.TwoFactorRequiredResult>(ok.Value);
+        }
+    }
+
+    [Fact]
+    public async Task Register_sets_EmailConfirmed_false_and_sends_verification_email_when_flag_on()
+    {
+        var config = new ConfigurationBuilder()
+            .AddInMemoryCollection(new Dictionary<string, string?>
+            {
+                ["Auth:AllowRegistration"] = "true",
+                ["Auth:RequireEmailVerification"] = "true",
+            })
+            .Build();
+
+        var userManager = CreateUserManager();
+        userManager.Setup(x => x.FindByEmailAsync("new.user@example.com")).ReturnsAsync((ApplicationUser?)null);
+        ApplicationUser? created = null;
+        userManager
+            .Setup(x => x.CreateAsync(It.IsAny<ApplicationUser>(), "password123"))
+            .Callback<ApplicationUser, string>((u, _) => created = u)
+            .ReturnsAsync(IdentityResult.Success);
+        userManager.Setup(x => x.GenerateEmailConfirmationTokenAsync(It.IsAny<ApplicationUser>())).ReturnsAsync("confirm-token");
+
+        var tokenService = new Mock<ITokenService>();
+        tokenService.Setup(x => x.CreateAccessTokenAsync(It.IsAny<ApplicationUser>(), It.IsAny<string?>(), It.IsAny<CancellationToken>())).ReturnsAsync("app-token");
+
+        var emailSender = new Mock<IAppEmailSender>();
+
+        var controller = new AuthController(config, userManager.Object, tokenService.Object, emailSender.Object, Mock.Of<IGoogleTokenValidator>(), Mock.Of<IMicrosoftTokenValidator>(), NullLogger<AuthController>.Instance, Mock.Of<ITwoFactorPendingTokenService>(), TestHostFactory.CreateInMemoryDb())
+        {
+            ControllerContext = new ControllerContext { HttpContext = new DefaultHttpContext() }
+        };
+
+        var result = await controller.Register(new AuthController.RegisterRequest("new.user@example.com", "password123"), CancellationToken.None);
+
+        Assert.IsType<OkObjectResult>(result);
+        Assert.NotNull(created);
+        Assert.False(created!.EmailConfirmed);
+        emailSender.Verify(x => x.SendAsync("new.user@example.com", It.IsAny<string>(), It.Is<string>(b => b.Contains("verify-email")), It.IsAny<CancellationToken>()), Times.Once);
+    }
+
+    [Fact]
+    public async Task Register_is_unchanged_when_flag_off()
+    {
+        var config = new ConfigurationBuilder()
+            .AddInMemoryCollection(new Dictionary<string, string?> { ["Auth:AllowRegistration"] = "true" })
+            .Build();
+
+        var userManager = CreateUserManager();
+        userManager.Setup(x => x.FindByEmailAsync("new.user@example.com")).ReturnsAsync((ApplicationUser?)null);
+        ApplicationUser? created = null;
+        userManager
+            .Setup(x => x.CreateAsync(It.IsAny<ApplicationUser>(), "password123"))
+            .Callback<ApplicationUser, string>((u, _) => created = u)
+            .ReturnsAsync(IdentityResult.Success);
+
+        var tokenService = new Mock<ITokenService>();
+        tokenService.Setup(x => x.CreateAccessTokenAsync(It.IsAny<ApplicationUser>(), It.IsAny<string?>(), It.IsAny<CancellationToken>())).ReturnsAsync("app-token");
+
+        var emailSender = new Mock<IAppEmailSender>();
+
+        var controller = new AuthController(config, userManager.Object, tokenService.Object, emailSender.Object, Mock.Of<IGoogleTokenValidator>(), Mock.Of<IMicrosoftTokenValidator>(), NullLogger<AuthController>.Instance, Mock.Of<ITwoFactorPendingTokenService>(), TestHostFactory.CreateInMemoryDb())
+        {
+            ControllerContext = new ControllerContext { HttpContext = new DefaultHttpContext() }
+        };
+
+        var result = await controller.Register(new AuthController.RegisterRequest("new.user@example.com", "password123"), CancellationToken.None);
+
+        Assert.IsType<OkObjectResult>(result);
+        Assert.NotNull(created);
+        Assert.True(created!.EmailConfirmed);
+        emailSender.Verify(x => x.SendAsync(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>()), Times.Never);
+    }
+
+    [Fact]
+    public async Task Login_rejects_unconfirmed_local_account_when_flag_on()
+    {
+        var config = new ConfigurationBuilder()
+            .AddInMemoryCollection(new Dictionary<string, string?> { ["Auth:RequireEmailVerification"] = "true" })
+            .Build();
+
+        var user = new ApplicationUser { Id = "user-1", Email = "person@example.com", UserName = "person@example.com", EmailConfirmed = false };
+        var userManager = CreateUserManager();
+        userManager.Setup(x => x.FindByEmailAsync("person@example.com")).ReturnsAsync(user);
+        userManager.Setup(x => x.FindByNameAsync("person@example.com")).ReturnsAsync((ApplicationUser?)null);
+        userManager.Setup(x => x.IsLockedOutAsync(user)).ReturnsAsync(false);
+        userManager.Setup(x => x.CheckPasswordAsync(user, "correct-password")).ReturnsAsync(true);
+        userManager.Setup(x => x.ResetAccessFailedCountAsync(user)).ReturnsAsync(IdentityResult.Success);
+
+        var controller = new AuthController(config, userManager.Object, Mock.Of<ITokenService>(), Mock.Of<IAppEmailSender>(), Mock.Of<IGoogleTokenValidator>(), Mock.Of<IMicrosoftTokenValidator>(), NullLogger<AuthController>.Instance, Mock.Of<ITwoFactorPendingTokenService>(), TestHostFactory.CreateInMemoryDb())
+        {
+            ControllerContext = new ControllerContext { HttpContext = new DefaultHttpContext() }
+        };
+
+        var result = await controller.Login(new AuthController.LoginRequest("person@example.com", "correct-password"), CancellationToken.None);
+
+        var obj = Assert.IsType<ObjectResult>(result);
+        Assert.Equal(StatusCodes.Status403Forbidden, obj.StatusCode);
+    }
+
+    [Fact]
+    public async Task Login_allows_unconfirmed_local_account_when_flag_off()
+    {
+        var user = new ApplicationUser { Id = "user-1", Email = "person@example.com", UserName = "person@example.com", EmailConfirmed = false };
+        var userManager = CreateUserManager();
+        userManager.Setup(x => x.FindByEmailAsync("person@example.com")).ReturnsAsync(user);
+        userManager.Setup(x => x.FindByNameAsync("person@example.com")).ReturnsAsync((ApplicationUser?)null);
+        userManager.Setup(x => x.IsLockedOutAsync(user)).ReturnsAsync(false);
+        userManager.Setup(x => x.CheckPasswordAsync(user, "correct-password")).ReturnsAsync(true);
+        userManager.Setup(x => x.ResetAccessFailedCountAsync(user)).ReturnsAsync(IdentityResult.Success);
+
+        var tokenService = new Mock<ITokenService>();
+        tokenService.Setup(x => x.CreateAccessTokenAsync(user, It.IsAny<string?>(), It.IsAny<CancellationToken>())).ReturnsAsync("app-token");
+
+        var controller = new AuthController(BuildConfig(), userManager.Object, tokenService.Object, Mock.Of<IAppEmailSender>(), Mock.Of<IGoogleTokenValidator>(), Mock.Of<IMicrosoftTokenValidator>(), NullLogger<AuthController>.Instance, Mock.Of<ITwoFactorPendingTokenService>(), TestHostFactory.CreateInMemoryDb())
+        {
+            ControllerContext = new ControllerContext { HttpContext = new DefaultHttpContext() }
+        };
+
+        var result = await controller.Login(new AuthController.LoginRequest("person@example.com", "correct-password"), CancellationToken.None);
+
+        var ok = Assert.IsType<OkObjectResult>(result);
+        var session = Assert.IsType<AuthController.AuthSessionResult>(ok.Value);
+        Assert.True(session.Authenticated);
+    }
+
+    [Fact]
+    public async Task VerifyEmail_confirms_account_on_valid_token()
+    {
+        var user = new ApplicationUser { Id = "user-1", Email = "person@example.com", UserName = "person@example.com", EmailConfirmed = false };
+        var userManager = CreateUserManager();
+        userManager.Setup(x => x.FindByIdAsync("user-1")).ReturnsAsync(user);
+        userManager.Setup(x => x.ConfirmEmailAsync(user, "good-token")).ReturnsAsync(IdentityResult.Success);
+
+        var controller = new AuthController(BuildConfig(), userManager.Object, Mock.Of<ITokenService>(), Mock.Of<IAppEmailSender>(), Mock.Of<IGoogleTokenValidator>(), Mock.Of<IMicrosoftTokenValidator>(), NullLogger<AuthController>.Instance, Mock.Of<ITwoFactorPendingTokenService>(), TestHostFactory.CreateInMemoryDb());
+
+        var result = await controller.VerifyEmail(new AuthController.VerifyEmailRequest("user-1", "good-token"));
+
+        Assert.IsType<NoContentResult>(result);
+    }
+
+    [Fact]
+    public async Task ResendVerificationEmail_returns_identical_response_for_real_and_fake_accounts()
+    {
+        var user = new ApplicationUser { Id = "user-1", Email = "real@example.com", UserName = "real@example.com", EmailConfirmed = false };
+        var userManager = CreateUserManager();
+        userManager.Setup(x => x.FindByEmailAsync("real@example.com")).ReturnsAsync(user);
+        userManager.Setup(x => x.FindByEmailAsync("fake@example.com")).ReturnsAsync((ApplicationUser?)null);
+        userManager.Setup(x => x.HasPasswordAsync(user)).ReturnsAsync(true);
+        userManager.Setup(x => x.GenerateEmailConfirmationTokenAsync(user)).ReturnsAsync("confirm-token");
+
+        var emailSender = new Mock<IAppEmailSender>();
+
+        var controller = new AuthController(BuildConfig(), userManager.Object, Mock.Of<ITokenService>(), emailSender.Object, Mock.Of<IGoogleTokenValidator>(), Mock.Of<IMicrosoftTokenValidator>(), NullLogger<AuthController>.Instance, Mock.Of<ITwoFactorPendingTokenService>(), TestHostFactory.CreateInMemoryDb())
+        {
+            ControllerContext = new ControllerContext { HttpContext = new DefaultHttpContext() }
+        };
+
+        var realResult = await controller.ResendVerificationEmail(new AuthController.ResendVerificationEmailRequest("real@example.com"), CancellationToken.None);
+        var fakeResult = await controller.ResendVerificationEmail(new AuthController.ResendVerificationEmailRequest("fake@example.com"), CancellationToken.None);
+
+        Assert.IsType<NoContentResult>(realResult);
+        Assert.IsType<NoContentResult>(fakeResult);
+        emailSender.Verify(x => x.SendAsync("real@example.com", It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>()), Times.Once);
+    }
+
+    [Fact]
+    public async Task Exchange_google_token_new_user_stays_EmailConfirmed_true_even_when_verification_flag_is_on()
+    {
+        var config = new ConfigurationBuilder()
+            .AddInMemoryCollection(new Dictionary<string, string?>
+            {
+                ["Auth:AllowRegistration"] = "true",
+                ["Auth:RequireEmailVerification"] = "true",
+            })
+            .Build();
+
+        var userManager = CreateUserManager();
+        userManager.Setup(x => x.Users).Returns(new TestAsyncEnumerable<ApplicationUser>(new List<ApplicationUser>()));
+        userManager.Setup(x => x.FindByEmailAsync("new.hire@example.com")).ReturnsAsync((ApplicationUser?)null);
+        ApplicationUser? created = null;
+        userManager
+            .Setup(x => x.CreateAsync(It.IsAny<ApplicationUser>()))
+            .Callback<ApplicationUser>(u => created = u)
+            .ReturnsAsync(IdentityResult.Success);
+
+        var tokenService = new Mock<ITokenService>();
+        tokenService.Setup(x => x.CreateAccessTokenAsync(It.IsAny<ApplicationUser>(), It.IsAny<string?>(), It.IsAny<CancellationToken>())).ReturnsAsync("app-token");
+
+        var googleValidator = new Mock<IGoogleTokenValidator>();
+        googleValidator
+            .Setup(x => x.ValidateAsync("google-token", It.IsAny<CancellationToken>()))
+            .ReturnsAsync(new GoogleTokenPrincipal("google-subject", "new.hire@example.com", true, "New", "Hire", "New Hire"));
+
+        var controller = new AuthController(config, userManager.Object, tokenService.Object, Mock.Of<IAppEmailSender>(), googleValidator.Object, Mock.Of<IMicrosoftTokenValidator>(), NullLogger<AuthController>.Instance, Mock.Of<ITwoFactorPendingTokenService>(), TestHostFactory.CreateInMemoryDb())
+        {
+            ControllerContext = new ControllerContext { HttpContext = new DefaultHttpContext() }
+        };
+
+        var result = await controller.ExchangeGoogleToken(new AuthController.GoogleTokenRequest("google-token"), CancellationToken.None);
+
+        Assert.IsType<OkObjectResult>(result);
+        Assert.NotNull(created);
+        Assert.True(created!.EmailConfirmed);
+    }
+
+    private static JobTrackerContext BuildDb(string dbName, string? currentUserId)
+    {
+        var options = new DbContextOptionsBuilder<JobTrackerContext>().UseInMemoryDatabase(dbName).Options;
+        var currentUser = new Mock<ICurrentUserService>();
+        currentUser.SetupGet(x => x.UserId).Returns(currentUserId);
+        return new JobTrackerContext(options, currentUser.Object);
+    }
+
+    private static AuthController BuildLoginController(ApplicationUser user, string password, out JobTrackerContext db, string dbName, string? cookieToken)
+    {
+        var userManager = CreateUserManager();
+        userManager.Setup(x => x.FindByEmailAsync(user.Email!)).ReturnsAsync(user);
+        userManager.Setup(x => x.FindByNameAsync(user.Email!)).ReturnsAsync((ApplicationUser?)null);
+        userManager.Setup(x => x.IsLockedOutAsync(user)).ReturnsAsync(false);
+        userManager.Setup(x => x.CheckPasswordAsync(user, password)).ReturnsAsync(true);
+        userManager.Setup(x => x.ResetAccessFailedCountAsync(user)).ReturnsAsync(IdentityResult.Success);
+
+        var tokenService = new Mock<ITokenService>();
+        tokenService.Setup(x => x.CreateAccessTokenAsync(user, It.IsAny<string?>(), It.IsAny<CancellationToken>())).ReturnsAsync("app-token");
+
+        db = BuildDb(dbName, null);
+
+        var controller = new AuthController(BuildConfig(), userManager.Object, tokenService.Object, Mock.Of<IAppEmailSender>(), Mock.Of<IGoogleTokenValidator>(), Mock.Of<IMicrosoftTokenValidator>(), NullLogger<AuthController>.Instance, Mock.Of<ITwoFactorPendingTokenService>(), db)
+        {
+            ControllerContext = new ControllerContext { HttpContext = new DefaultHttpContext() }
+        };
+
+        if (cookieToken is not null)
+        {
+            controller.Request.Headers["Cookie"] = $"{AuthSessionOptions.TrustedDeviceCookieName}={cookieToken}";
+        }
+
+        return controller;
+    }
+
     [Fact]
     public async Task Update_profile_applies_trimmed_profile_fields()
     {
@@ -25,7 +409,7 @@ public sealed class AuthAndSystemControllerTests
         userManager.Setup(x => x.GetUserAsync(It.IsAny<System.Security.Claims.ClaimsPrincipal>())).ReturnsAsync(user);
         userManager.Setup(x => x.UpdateAsync(user)).ReturnsAsync(IdentityResult.Success);
 
-        var controller = new AuthController(BuildConfig(), userManager.Object, Mock.Of<ITokenService>(), Mock.Of<IAppEmailSender>(), Mock.Of<IGoogleTokenValidator>(), Mock.Of<IMicrosoftTokenValidator>(), NullLogger<AuthController>.Instance);
+        var controller = new AuthController(BuildConfig(), userManager.Object, Mock.Of<ITokenService>(), Mock.Of<IAppEmailSender>(), Mock.Of<IGoogleTokenValidator>(), Mock.Of<IMicrosoftTokenValidator>(), NullLogger<AuthController>.Instance, Mock.Of<ITwoFactorPendingTokenService>(), TestHostFactory.CreateInMemoryDb());
 
         var result = await controller.UpdateProfile(new AuthController.UpdateProfileRequest(" new@example.com ", " newuser ", " Ada ", " Lovelace ", " Ada L. ", null, null));
 
@@ -50,7 +434,7 @@ public sealed class AuthAndSystemControllerTests
             .Setup(x => x.SendAsync(user.Email!, It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>()))
             .ThrowsAsync(new InvalidOperationException("SMTP unavailable"));
 
-        var controller = new AuthController(BuildConfig(), userManager.Object, Mock.Of<ITokenService>(), emailSender.Object, Mock.Of<IGoogleTokenValidator>(), Mock.Of<IMicrosoftTokenValidator>(), NullLogger<AuthController>.Instance)
+        var controller = new AuthController(BuildConfig(), userManager.Object, Mock.Of<ITokenService>(), emailSender.Object, Mock.Of<IGoogleTokenValidator>(), Mock.Of<IMicrosoftTokenValidator>(), NullLogger<AuthController>.Instance, Mock.Of<ITwoFactorPendingTokenService>(), TestHostFactory.CreateInMemoryDb())
         {
             ControllerContext = new ControllerContext
             {
@@ -84,14 +468,14 @@ public sealed class AuthAndSystemControllerTests
         userManager.Setup(x => x.UpdateAsync(user)).ReturnsAsync(IdentityResult.Success);
 
         var tokenService = new Mock<ITokenService>();
-        tokenService.Setup(x => x.CreateAccessTokenAsync(user, It.IsAny<CancellationToken>())).ReturnsAsync("app-token");
+        tokenService.Setup(x => x.CreateAccessTokenAsync(user, It.IsAny<string?>(), It.IsAny<CancellationToken>())).ReturnsAsync("app-token");
 
         var googleValidator = new Mock<IGoogleTokenValidator>();
         googleValidator
             .Setup(x => x.ValidateAsync("google-token", It.IsAny<CancellationToken>()))
             .ReturnsAsync(new GoogleTokenPrincipal("google-subject", "dj@cesnimda.co.uk", true, "Dan", "Jones", "Dan Jones"));
 
-        var controller = new AuthController(BuildConfig(), userManager.Object, tokenService.Object, Mock.Of<IAppEmailSender>(), googleValidator.Object, Mock.Of<IMicrosoftTokenValidator>(), NullLogger<AuthController>.Instance)
+        var controller = new AuthController(BuildConfig(), userManager.Object, tokenService.Object, Mock.Of<IAppEmailSender>(), googleValidator.Object, Mock.Of<IMicrosoftTokenValidator>(), NullLogger<AuthController>.Instance, Mock.Of<ITwoFactorPendingTokenService>(), TestHostFactory.CreateInMemoryDb())
         {
             ControllerContext = new ControllerContext
             {
@@ -101,7 +485,7 @@ public sealed class AuthAndSystemControllerTests
 
         var result = await controller.ExchangeGoogleToken(new AuthController.GoogleTokenRequest("google-token"), CancellationToken.None);
 
-        var ok = Assert.IsType<OkObjectResult>(result.Result);
+        var ok = Assert.IsType<OkObjectResult>(result);
         var payload = Assert.IsType<AuthController.AuthSessionResult>(ok.Value);
         Assert.True(payload.Authenticated);
         Assert.Equal("google", payload.Provider);
@@ -124,7 +508,7 @@ public sealed class AuthAndSystemControllerTests
         userManager.Setup(x => x.UpdateAsync(It.IsAny<ApplicationUser>())).ReturnsAsync(IdentityResult.Success);
 
         var tokenService = new Mock<ITokenService>();
-        tokenService.Setup(x => x.CreateAccessTokenAsync(It.IsAny<ApplicationUser>(), It.IsAny<CancellationToken>())).ReturnsAsync("app-token");
+        tokenService.Setup(x => x.CreateAccessTokenAsync(It.IsAny<ApplicationUser>(), It.IsAny<string?>(), It.IsAny<CancellationToken>())).ReturnsAsync("app-token");
 
         var microsoftValidator = new Mock<IMicrosoftTokenValidator>();
         microsoftValidator
@@ -135,7 +519,7 @@ public sealed class AuthAndSystemControllerTests
             .AddInMemoryCollection(new Dictionary<string, string?> { ["Auth:AllowRegistration"] = "true" })
             .Build();
 
-        var controller = new AuthController(config, userManager.Object, tokenService.Object, Mock.Of<IAppEmailSender>(), Mock.Of<IGoogleTokenValidator>(), microsoftValidator.Object, NullLogger<AuthController>.Instance)
+        var controller = new AuthController(config, userManager.Object, tokenService.Object, Mock.Of<IAppEmailSender>(), Mock.Of<IGoogleTokenValidator>(), microsoftValidator.Object, NullLogger<AuthController>.Instance, Mock.Of<ITwoFactorPendingTokenService>(), TestHostFactory.CreateInMemoryDb())
         {
             ControllerContext = new ControllerContext
             {
@@ -145,7 +529,7 @@ public sealed class AuthAndSystemControllerTests
 
         var result = await controller.ExchangeMicrosoftToken(new AuthController.MicrosoftTokenRequest("microsoft-token"), CancellationToken.None);
 
-        var ok = Assert.IsType<OkObjectResult>(result.Result);
+        var ok = Assert.IsType<OkObjectResult>(result);
         var payload = Assert.IsType<AuthController.AuthSessionResult>(ok.Value);
         Assert.True(payload.Authenticated);
         Assert.Equal("microsoft", payload.Provider);
@@ -166,7 +550,7 @@ public sealed class AuthAndSystemControllerTests
             .Setup(x => x.ValidateAsync("microsoft-token", It.IsAny<CancellationToken>()))
             .ReturnsAsync(new MicrosoftTokenPrincipal("ms-subject", "nobody@example.com", true, null, null, null));
 
-        var controller = new AuthController(BuildConfig(), userManager.Object, Mock.Of<ITokenService>(), Mock.Of<IAppEmailSender>(), Mock.Of<IGoogleTokenValidator>(), microsoftValidator.Object, NullLogger<AuthController>.Instance)
+        var controller = new AuthController(BuildConfig(), userManager.Object, Mock.Of<ITokenService>(), Mock.Of<IAppEmailSender>(), Mock.Of<IGoogleTokenValidator>(), microsoftValidator.Object, NullLogger<AuthController>.Instance, Mock.Of<ITwoFactorPendingTokenService>(), TestHostFactory.CreateInMemoryDb())
         {
             ControllerContext = new ControllerContext
             {
@@ -176,7 +560,7 @@ public sealed class AuthAndSystemControllerTests
 
         var result = await controller.ExchangeMicrosoftToken(new AuthController.MicrosoftTokenRequest("microsoft-token"), CancellationToken.None);
 
-        Assert.IsType<UnauthorizedObjectResult>(result.Result);
+        Assert.IsType<UnauthorizedObjectResult>(result);
         userManager.Verify(x => x.CreateAsync(It.IsAny<ApplicationUser>()), Times.Never);
     }
 

JobTrackerApi.Tests/ClientErrorsControllerTests.cs

@@ -51,7 +51,7 @@ public sealed class ClientErrorsControllerTests
         var userManager = TestHostFactory.CreateUserManager();
         userManager.Setup(x => x.GetUserAsync(It.IsAny<ClaimsPrincipal>())).ReturnsAsync(user);
 
-        var controller = new AuthController(BuildConfig(), userManager.Object, Mock.Of<ITokenService>(), Mock.Of<IAppEmailSender>(), Mock.Of<IGoogleTokenValidator>(), Mock.Of<IMicrosoftTokenValidator>(), Mock.Of<ILogger<AuthController>>())
+        var controller = new AuthController(BuildConfig(), userManager.Object, Mock.Of<ITokenService>(), Mock.Of<IAppEmailSender>(), Mock.Of<IGoogleTokenValidator>(), Mock.Of<IMicrosoftTokenValidator>(), Mock.Of<ILogger<AuthController>>(), Mock.Of<ITwoFactorPendingTokenService>(), TestHostFactory.CreateInMemoryDb())
         {
             ControllerContext = new ControllerContext
             {

JobTrackerApi.Tests/SessionsControllerTests.cs

@@ -0,0 +1,242 @@
+using System.Security.Claims;
+using JobTrackerApi.Controllers;
+using JobTrackerApi.Data;
+using JobTrackerApi.Models;
+using JobTrackerApi.Services;
+using JobTrackerApi.Tests.TestSupport;
+using Microsoft.AspNetCore.DataProtection;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging.Abstractions;
+using Moq;
+using OtpNet;
+using Xunit;
+
+namespace JobTrackerApi.Tests;
+
+public sealed class SessionsControllerTests
+{
+    private static IConfiguration BuildConfig() =>
+        new ConfigurationBuilder().AddInMemoryCollection(new Dictionary<string, string?>()).Build();
+
+    private static SessionsController BuildController(JobTrackerContext db, ApplicationUser user, string? currentSid = null)
+    {
+        var userManager = TestHostFactory.CreateUserManager();
+        userManager.Setup(x => x.GetUserAsync(It.IsAny<ClaimsPrincipal>())).ReturnsAsync(user);
+
+        var claims = new List<Claim> { new(ClaimTypes.NameIdentifier, user.Id) };
+        if (currentSid is not null) claims.Add(new Claim("sid", currentSid));
+
+        return new SessionsController(userManager.Object, db)
+        {
+            ControllerContext = new ControllerContext
+            {
+                HttpContext = new DefaultHttpContext { User = new ClaimsPrincipal(new ClaimsIdentity(claims, "local")) }
+            }
+        };
+    }
+
+    private static UserSession NewSession(string id, string userId, DateTimeOffset? expiresAtUtc = null, DateTimeOffset? revokedAtUtc = null, DateTimeOffset? lastSeenAtUtc = null)
+    {
+        var now = DateTimeOffset.UtcNow;
+        return new UserSession
+        {
+            Id = id,
+            UserId = userId,
+            DeviceLabel = "Chrome on Windows",
+            CreatedAtUtc = now,
+            LastSeenAtUtc = lastSeenAtUtc ?? now,
+            ExpiresAtUtc = expiresAtUtc ?? now.AddHours(12),
+            RevokedAtUtc = revokedAtUtc,
+        };
+    }
+
+    // --- Session creation on every sign-in path -----------------------------------------------
+
+    [Fact]
+    public async Task Login_creates_a_user_session_row_and_threads_its_id_into_the_token()
+    {
+        var user = new ApplicationUser { Id = "user-1", Email = "person@example.com", UserName = "person@example.com" };
+        var userManager = TestHostFactory.CreateUserManager();
+        userManager.Setup(x => x.FindByEmailAsync("person@example.com")).ReturnsAsync(user);
+        userManager.Setup(x => x.FindByNameAsync("person@example.com")).ReturnsAsync((ApplicationUser?)null);
+        userManager.Setup(x => x.IsLockedOutAsync(user)).ReturnsAsync(false);
+        userManager.Setup(x => x.CheckPasswordAsync(user, "correct-password")).ReturnsAsync(true);
+        userManager.Setup(x => x.ResetAccessFailedCountAsync(user)).ReturnsAsync(IdentityResult.Success);
+
+        string? sessionIdPassedToToken = null;
+        var tokenService = new Mock<ITokenService>();
+        tokenService
+            .Setup(x => x.CreateAccessTokenAsync(user, It.IsAny<string?>(), It.IsAny<CancellationToken>()))
+            .Callback<ApplicationUser, string?, CancellationToken>((_, sid, _) => sessionIdPassedToToken = sid)
+            .ReturnsAsync("app-token");
+
+        using var db = TestHostFactory.CreateInMemoryDb(null);
+        var controller = new AuthController(BuildConfig(), userManager.Object, tokenService.Object, Mock.Of<IAppEmailSender>(), Mock.Of<IGoogleTokenValidator>(), Mock.Of<IMicrosoftTokenValidator>(), NullLogger<AuthController>.Instance, Mock.Of<ITwoFactorPendingTokenService>(), db)
+        {
+            ControllerContext = new ControllerContext { HttpContext = new DefaultHttpContext() }
+        };
+
+        await controller.Login(new AuthController.LoginRequest("person@example.com", "correct-password"), CancellationToken.None);
+
+        var sessions = await db.UserSessions.IgnoreQueryFilters().Where(x => x.UserId == "user-1").ToListAsync();
+        var created = Assert.Single(sessions);
+        Assert.False(string.IsNullOrWhiteSpace(created.Id));
+        Assert.Equal(created.Id, sessionIdPassedToToken);
+        Assert.Null(created.RevokedAtUtc);
+        Assert.True(created.ExpiresAtUtc > DateTimeOffset.UtcNow);
+    }
+
+    [Fact]
+    public async Task Register_creates_a_user_session_row_when_it_completes_sign_in()
+    {
+        var config = new ConfigurationBuilder()
+            .AddInMemoryCollection(new Dictionary<string, string?> { ["Auth:AllowRegistration"] = "true" })
+            .Build();
+
+        var userManager = TestHostFactory.CreateUserManager();
+        userManager.Setup(x => x.FindByEmailAsync("new.user@example.com")).ReturnsAsync((ApplicationUser?)null);
+        ApplicationUser? created = null;
+        userManager
+            .Setup(x => x.CreateAsync(It.IsAny<ApplicationUser>(), "password123"))
+            .Callback<ApplicationUser, string>((u, _) => { u.Id = "new-user-1"; created = u; })
+            .ReturnsAsync(IdentityResult.Success);
+
+        var tokenService = new Mock<ITokenService>();
+        tokenService.Setup(x => x.CreateAccessTokenAsync(It.IsAny<ApplicationUser>(), It.IsAny<string?>(), It.IsAny<CancellationToken>())).ReturnsAsync("app-token");
+
+        using var db = TestHostFactory.CreateInMemoryDb(null);
+        var controller = new AuthController(config, userManager.Object, tokenService.Object, Mock.Of<IAppEmailSender>(), Mock.Of<IGoogleTokenValidator>(), Mock.Of<IMicrosoftTokenValidator>(), NullLogger<AuthController>.Instance, Mock.Of<ITwoFactorPendingTokenService>(), db)
+        {
+            ControllerContext = new ControllerContext { HttpContext = new DefaultHttpContext() }
+        };
+
+        await controller.Register(new AuthController.RegisterRequest("new.user@example.com", "password123"), CancellationToken.None);
+
+        Assert.NotNull(created);
+        var sessions = await db.UserSessions.IgnoreQueryFilters().Where(x => x.UserId == created!.Id).ToListAsync();
+        Assert.Single(sessions);
+    }
+
+    [Fact]
+    public async Task TwoFactor_challenge_creates_a_user_session_row_on_completion()
+    {
+        var user = new ApplicationUser { Id = "user-1", Email = "person@example.com", UserName = "person@example.com" };
+        var userManager = TestHostFactory.CreateUserManager();
+        userManager.Setup(x => x.CheckPasswordAsync(user, "correct-password")).ReturnsAsync(true);
+        userManager.Setup(x => x.UpdateAsync(It.IsAny<ApplicationUser>())).ReturnsAsync(IdentityResult.Success);
+        userManager.Setup(x => x.FindByIdAsync("user-1")).ReturnsAsync(user);
+        userManager.Setup(x => x.GetUserAsync(It.IsAny<ClaimsPrincipal>())).ReturnsAsync(user);
+
+        var pending = new TwoFactorPendingTokenService(new Microsoft.Extensions.Caching.Memory.MemoryCache(new Microsoft.Extensions.Caching.Memory.MemoryCacheOptions()));
+        var protector = new EphemeralDataProtectionProvider();
+        var tokenService = new Mock<ITokenService>();
+        tokenService.Setup(x => x.CreateAccessTokenAsync(It.IsAny<ApplicationUser>(), It.IsAny<string?>(), It.IsAny<CancellationToken>())).ReturnsAsync("app-token");
+
+        using var db = TestHostFactory.CreateInMemoryDb("user-1");
+        var controller = new TwoFactorController(userManager.Object, tokenService.Object, db, pending, protector, BuildConfig())
+        {
+            ControllerContext = new ControllerContext { HttpContext = new DefaultHttpContext() }
+        };
+
+        var setupResult = Assert.IsType<OkObjectResult>(await controller.Setup(new TwoFactorController.PasswordConfirmRequest("correct-password"), CancellationToken.None));
+        var setup = Assert.IsType<TwoFactorController.SetupResult>(setupResult.Value);
+        var setupCode = new Totp(Base32Encoding.ToBytes(setup.ManualEntryKey)).ComputeTotp();
+        await controller.VerifySetup(new TwoFactorController.VerifySetupRequest(setupCode), CancellationToken.None);
+
+        var pendingToken = pending.IssuePendingToken("user-1", rememberMe: false);
+        var challengeCode = new Totp(Base32Encoding.ToBytes(setup.ManualEntryKey)).ComputeTotp();
+        Assert.IsType<OkObjectResult>(await controller.Challenge(new TwoFactorController.ChallengeRequest(pendingToken, challengeCode), CancellationToken.None));
+
+        var sessions = await db.UserSessions.IgnoreQueryFilters().Where(x => x.UserId == "user-1").ToListAsync();
+        Assert.Single(sessions);
+    }
+
+    // --- List/revoke ----------------------------------------------------------------------------
+
+    [Fact]
+    public async Task List_returns_only_the_callers_own_active_sessions()
+    {
+        using var db = TestHostFactory.CreateInMemoryDb("user-1");
+        db.UserSessions.Add(NewSession("sid-mine", "user-1"));
+        db.UserSessions.Add(NewSession("sid-other-user", "user-2"));
+        db.UserSessions.Add(NewSession("sid-mine-expired", "user-1", expiresAtUtc: DateTimeOffset.UtcNow.AddHours(-1)));
+        db.UserSessions.Add(NewSession("sid-mine-revoked", "user-1", revokedAtUtc: DateTimeOffset.UtcNow.AddMinutes(-1)));
+        await db.SaveChangesAsync();
+
+        var controller = BuildController(db, new ApplicationUser { Id = "user-1" }, currentSid: "sid-mine");
+
+        var ok = Assert.IsType<OkObjectResult>(await controller.List(CancellationToken.None));
+        var list = Assert.IsType<List<SessionsController.SessionDto>>(ok.Value);
+
+        var only = Assert.Single(list);
+        Assert.Equal("sid-mine", only.Id);
+        Assert.True(only.IsCurrentSession);
+    }
+
+    [Fact]
+    public async Task Revoke_enforces_ownership_and_blocks_a_subsequent_request_using_that_sessions_token()
+    {
+        using var db = TestHostFactory.CreateInMemoryDb("user-1");
+        db.UserSessions.Add(NewSession("sid-mine", "user-1"));
+        db.UserSessions.Add(NewSession("sid-not-mine", "user-2"));
+        await db.SaveChangesAsync();
+
+        var controller = BuildController(db, new ApplicationUser { Id = "user-1" }, currentSid: "sid-mine");
+
+        // Can't revoke someone else's session.
+        var forbidden = await controller.Revoke("sid-not-mine", CancellationToken.None);
+        Assert.IsType<NotFoundResult>(forbidden);
+        Assert.True(await LocalSessionValidator.IsValidAsync(db, PrincipalWithSid("sid-not-mine"), DateTimeOffset.UtcNow));
+
+        // Revoking your own session actually blocks it going forward.
+        Assert.True(await LocalSessionValidator.IsValidAsync(db, PrincipalWithSid("sid-mine"), DateTimeOffset.UtcNow));
+        var ownResult = await controller.Revoke("sid-mine", CancellationToken.None);
+        Assert.IsType<NoContentResult>(ownResult);
+        Assert.False(await LocalSessionValidator.IsValidAsync(db, PrincipalWithSid("sid-mine"), DateTimeOffset.UtcNow));
+    }
+
+    [Fact]
+    public async Task RevokeOthers_revokes_every_other_session_but_leaves_the_current_one_usable()
+    {
+        using var db = TestHostFactory.CreateInMemoryDb("user-1");
+        db.UserSessions.Add(NewSession("sid-current", "user-1"));
+        db.UserSessions.Add(NewSession("sid-other-device", "user-1"));
+        db.UserSessions.Add(NewSession("sid-not-mine", "user-2"));
+        await db.SaveChangesAsync();
+
+        var controller = BuildController(db, new ApplicationUser { Id = "user-1" }, currentSid: "sid-current");
+
+        Assert.IsType<NoContentResult>(await controller.RevokeOthers(CancellationToken.None));
+
+        Assert.True(await LocalSessionValidator.IsValidAsync(db, PrincipalWithSid("sid-current"), DateTimeOffset.UtcNow));
+        Assert.False(await LocalSessionValidator.IsValidAsync(db, PrincipalWithSid("sid-other-device"), DateTimeOffset.UtcNow));
+        // Untouched: revoke-others must never reach across users.
+        Assert.True(await LocalSessionValidator.IsValidAsync(db, PrincipalWithSid("sid-not-mine"), DateTimeOffset.UtcNow));
+    }
+
+    [Fact]
+    public async Task LocalSessionValidator_rejects_an_expired_session()
+    {
+        using var db = TestHostFactory.CreateInMemoryDb("user-1");
+        db.UserSessions.Add(NewSession("sid-expired", "user-1", expiresAtUtc: DateTimeOffset.UtcNow.AddSeconds(-1)));
+        await db.SaveChangesAsync();
+
+        Assert.False(await LocalSessionValidator.IsValidAsync(db, PrincipalWithSid("sid-expired"), DateTimeOffset.UtcNow));
+    }
+
+    [Fact]
+    public async Task LocalSessionValidator_rejects_a_token_with_no_sid_claim()
+    {
+        using var db = TestHostFactory.CreateInMemoryDb("user-1");
+
+        var principal = new ClaimsPrincipal(new ClaimsIdentity(new[] { new Claim(ClaimTypes.NameIdentifier, "user-1") }, "local"));
+        Assert.False(await LocalSessionValidator.IsValidAsync(db, principal, DateTimeOffset.UtcNow));
+    }
+
+    private static ClaimsPrincipal PrincipalWithSid(string sid) =>
+        new(new ClaimsIdentity(new[] { new Claim("sid", sid) }, "local"));
+}

JobTrackerApi.Tests/TwoFactorControllerTests.cs

@@ -0,0 +1,280 @@
+using JobTrackerApi.Controllers;
+using JobTrackerApi.Models;
+using JobTrackerApi.Services;
+using JobTrackerApi.Tests.TestSupport;
+using Microsoft.AspNetCore.DataProtection;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
+using Moq;
+using OtpNet;
+using Xunit;
+
+namespace JobTrackerApi.Tests;
+
+public sealed class TwoFactorControllerTests
+{
+    private static TwoFactorController BuildController(Mock<UserManager<ApplicationUser>> userManager, JobTrackerApi.Data.JobTrackerContext db, ITwoFactorPendingTokenService? pending = null, ApplicationUser? currentUser = null)
+    {
+        if (currentUser is not null)
+        {
+            userManager.Setup(x => x.GetUserAsync(It.IsAny<System.Security.Claims.ClaimsPrincipal>())).ReturnsAsync(currentUser);
+        }
+
+        var tokenService = new Mock<ITokenService>();
+        tokenService.Setup(x => x.CreateAccessTokenAsync(It.IsAny<ApplicationUser>(), It.IsAny<string?>(), It.IsAny<CancellationToken>())).ReturnsAsync("app-token");
+
+        var controller = new TwoFactorController(
+            userManager.Object,
+            tokenService.Object,
+            db,
+            pending ?? new TwoFactorPendingTokenService(new Microsoft.Extensions.Caching.Memory.MemoryCache(new Microsoft.Extensions.Caching.Memory.MemoryCacheOptions())),
+            new EphemeralDataProtectionProvider(),
+            new ConfigurationBuilder().AddInMemoryCollection(new Dictionary<string, string?>()).Build())
+        {
+            ControllerContext = new ControllerContext { HttpContext = new DefaultHttpContext() }
+        };
+        return controller;
+    }
+
+    [Fact]
+    public async Task Setup_then_verify_with_correct_code_enables_2fa_and_returns_recovery_codes()
+    {
+        var user = new ApplicationUser { Id = "user-1", Email = "person@example.com", UserName = "person@example.com" };
+        var userManager = TestHostFactory.CreateUserManager();
+        userManager.Setup(x => x.CheckPasswordAsync(user, "correct-password")).ReturnsAsync(true);
+        userManager.Setup(x => x.UpdateAsync(It.IsAny<ApplicationUser>())).ReturnsAsync(IdentityResult.Success);
+
+        using var db = TestHostFactory.CreateInMemoryDb("user-1");
+        var controller = BuildController(userManager, db, currentUser: user);
+
+        var setupResult = Assert.IsType<OkObjectResult>(await controller.Setup(new TwoFactorController.PasswordConfirmRequest("correct-password"), CancellationToken.None));
+        var setup = Assert.IsType<TwoFactorController.SetupResult>(setupResult.Value);
+        Assert.NotNull(user.TotpPendingSecretEncrypted);
+        Assert.False(user.TwoFactorEnabled);
+
+        var code = new Totp(Base32Encoding.ToBytes(setup.ManualEntryKey)).ComputeTotp();
+
+        var verifyResult = Assert.IsType<OkObjectResult>(await controller.VerifySetup(new TwoFactorController.VerifySetupRequest(code), CancellationToken.None));
+        var verify = Assert.IsType<TwoFactorController.VerifySetupResult>(verifyResult.Value);
+
+        Assert.True(verify.Enabled);
+        Assert.Equal(10, verify.RecoveryCodes.Count);
+        Assert.True(user.TwoFactorEnabled);
+        Assert.Null(user.TotpPendingSecretEncrypted);
+        Assert.NotNull(user.TotpSecretEncrypted);
+        Assert.NotNull(user.TotpEnabledAtUtc);
+    }
+
+    [Fact]
+    public async Task Verify_setup_with_wrong_code_is_rejected_and_does_not_enable_2fa()
+    {
+        var user = new ApplicationUser { Id = "user-1", Email = "person@example.com", UserName = "person@example.com" };
+        var userManager = TestHostFactory.CreateUserManager();
+        userManager.Setup(x => x.CheckPasswordAsync(user, "correct-password")).ReturnsAsync(true);
+        userManager.Setup(x => x.UpdateAsync(It.IsAny<ApplicationUser>())).ReturnsAsync(IdentityResult.Success);
+
+        using var db = TestHostFactory.CreateInMemoryDb("user-1");
+        var controller = BuildController(userManager, db, currentUser: user);
+
+        await controller.Setup(new TwoFactorController.PasswordConfirmRequest("correct-password"), CancellationToken.None);
+
+        var result = await controller.VerifySetup(new TwoFactorController.VerifySetupRequest("000000"), CancellationToken.None);
+
+        Assert.IsType<UnauthorizedResult>(result);
+        Assert.False(user.TwoFactorEnabled);
+    }
+
+    [Fact]
+    public async Task Disable_with_wrong_password_is_rejected()
+    {
+        var user = new ApplicationUser { Id = "user-1", Email = "person@example.com", UserName = "person@example.com", TwoFactorEnabled = true, TotpSecretEncrypted = "irrelevant" };
+        var userManager = TestHostFactory.CreateUserManager();
+        userManager.Setup(x => x.CheckPasswordAsync(user, "wrong-password")).ReturnsAsync(false);
+
+        using var db = TestHostFactory.CreateInMemoryDb("user-1");
+        var controller = BuildController(userManager, db, currentUser: user);
+
+        var result = await controller.Disable(new TwoFactorController.PasswordConfirmRequest("wrong-password"), CancellationToken.None);
+
+        Assert.IsType<BadRequestObjectResult>(result);
+        Assert.True(user.TwoFactorEnabled);
+        Assert.NotNull(user.TotpSecretEncrypted);
+    }
+
+    [Fact]
+    public async Task Challenge_with_valid_totp_code_completes_sign_in()
+    {
+        var user = new ApplicationUser { Id = "user-1", Email = "person@example.com", UserName = "person@example.com" };
+        var userManager = TestHostFactory.CreateUserManager();
+        userManager.Setup(x => x.CheckPasswordAsync(user, "correct-password")).ReturnsAsync(true);
+        userManager.Setup(x => x.UpdateAsync(It.IsAny<ApplicationUser>())).ReturnsAsync(IdentityResult.Success);
+        userManager.Setup(x => x.FindByIdAsync("user-1")).ReturnsAsync(user);
+
+        var pending = new TwoFactorPendingTokenService(new Microsoft.Extensions.Caching.Memory.MemoryCache(new Microsoft.Extensions.Caching.Memory.MemoryCacheOptions()));
+
+        using var db = TestHostFactory.CreateInMemoryDb("user-1");
+        var controller = BuildController(userManager, db, pending, currentUser: user);
+
+        var setupResult = Assert.IsType<OkObjectResult>(await controller.Setup(new TwoFactorController.PasswordConfirmRequest("correct-password"), CancellationToken.None));
+        var setup = Assert.IsType<TwoFactorController.SetupResult>(setupResult.Value);
+        var code = new Totp(Base32Encoding.ToBytes(setup.ManualEntryKey)).ComputeTotp();
+        await controller.VerifySetup(new TwoFactorController.VerifySetupRequest(code), CancellationToken.None);
+
+        var pendingToken = pending.IssuePendingToken("user-1", rememberMe: false);
+        var challengeCode = new Totp(Base32Encoding.ToBytes(setup.ManualEntryKey)).ComputeTotp();
+
+        var challengeResult = Assert.IsType<OkObjectResult>(await controller.Challenge(new TwoFactorController.ChallengeRequest(pendingToken, challengeCode), CancellationToken.None));
+        var session = Assert.IsType<AuthController.AuthSessionResult>(challengeResult.Value);
+        Assert.True(session.Authenticated);
+
+        // The pending token is single-use.
+        var reuse = await controller.Challenge(new TwoFactorController.ChallengeRequest(pendingToken, challengeCode), CancellationToken.None);
+        Assert.IsType<UnauthorizedResult>(reuse);
+    }
+
+    [Fact]
+    public async Task Challenge_with_recovery_code_consumes_it_and_rejects_reuse()
+    {
+        var user = new ApplicationUser { Id = "user-1", Email = "person@example.com", UserName = "person@example.com" };
+        var userManager = TestHostFactory.CreateUserManager();
+        userManager.Setup(x => x.CheckPasswordAsync(user, "correct-password")).ReturnsAsync(true);
+        userManager.Setup(x => x.UpdateAsync(It.IsAny<ApplicationUser>())).ReturnsAsync(IdentityResult.Success);
+        userManager.Setup(x => x.FindByIdAsync("user-1")).ReturnsAsync(user);
+
+        var pending = new TwoFactorPendingTokenService(new Microsoft.Extensions.Caching.Memory.MemoryCache(new Microsoft.Extensions.Caching.Memory.MemoryCacheOptions()));
+
+        using var db = TestHostFactory.CreateInMemoryDb("user-1");
+        var controller = BuildController(userManager, db, pending, currentUser: user);
+
+        var setupResult = Assert.IsType<OkObjectResult>(await controller.Setup(new TwoFactorController.PasswordConfirmRequest("correct-password"), CancellationToken.None));
+        var setup = Assert.IsType<TwoFactorController.SetupResult>(setupResult.Value);
+        var code = new Totp(Base32Encoding.ToBytes(setup.ManualEntryKey)).ComputeTotp();
+        var verifyResult = Assert.IsType<OkObjectResult>(await controller.VerifySetup(new TwoFactorController.VerifySetupRequest(code), CancellationToken.None));
+        var verify = Assert.IsType<TwoFactorController.VerifySetupResult>(verifyResult.Value);
+        var recoveryCode = verify.RecoveryCodes[0];
+
+        var pendingToken1 = pending.IssuePendingToken("user-1", rememberMe: false);
+        var challengeResult = Assert.IsType<OkObjectResult>(await controller.Challenge(new TwoFactorController.ChallengeRequest(pendingToken1, recoveryCode), CancellationToken.None));
+        Assert.True(Assert.IsType<AuthController.AuthSessionResult>(challengeResult.Value).Authenticated);
+
+        // Same recovery code can't be used a second time, even against a fresh pending token.
+        var pendingToken2 = pending.IssuePendingToken("user-1", rememberMe: false);
+        var reuse = await controller.Challenge(new TwoFactorController.ChallengeRequest(pendingToken2, recoveryCode), CancellationToken.None);
+        Assert.IsType<UnauthorizedResult>(reuse);
+    }
+
+    [Fact]
+    public async Task Challenge_with_trust_device_true_creates_trusted_device_and_sets_cookie()
+    {
+        var user = new ApplicationUser { Id = "user-1", Email = "person@example.com", UserName = "person@example.com" };
+        var userManager = TestHostFactory.CreateUserManager();
+        userManager.Setup(x => x.CheckPasswordAsync(user, "correct-password")).ReturnsAsync(true);
+        userManager.Setup(x => x.UpdateAsync(It.IsAny<ApplicationUser>())).ReturnsAsync(IdentityResult.Success);
+        userManager.Setup(x => x.FindByIdAsync("user-1")).ReturnsAsync(user);
+
+        var pending = new TwoFactorPendingTokenService(new Microsoft.Extensions.Caching.Memory.MemoryCache(new Microsoft.Extensions.Caching.Memory.MemoryCacheOptions()));
+
+        using var db = TestHostFactory.CreateInMemoryDb("user-1");
+        var controller = BuildController(userManager, db, pending, currentUser: user);
+
+        var setupResult = Assert.IsType<OkObjectResult>(await controller.Setup(new TwoFactorController.PasswordConfirmRequest("correct-password"), CancellationToken.None));
+        var setup = Assert.IsType<TwoFactorController.SetupResult>(setupResult.Value);
+        var code = new Totp(Base32Encoding.ToBytes(setup.ManualEntryKey)).ComputeTotp();
+        await controller.VerifySetup(new TwoFactorController.VerifySetupRequest(code), CancellationToken.None);
+
+        var pendingToken = pending.IssuePendingToken("user-1", rememberMe: false);
+        var challengeCode = new Totp(Base32Encoding.ToBytes(setup.ManualEntryKey)).ComputeTotp();
+
+        var challengeResult = Assert.IsType<OkObjectResult>(await controller.Challenge(new TwoFactorController.ChallengeRequest(pendingToken, challengeCode, TrustDevice: true), CancellationToken.None));
+        Assert.True(Assert.IsType<AuthController.AuthSessionResult>(challengeResult.Value).Authenticated);
+
+        var device = Assert.Single(db.TrustedDevices.IgnoreQueryFilters().Where(x => x.UserId == "user-1"));
+        Assert.NotNull(device.TokenHash);
+
+        var setCookieHeaders = controller.Response.Headers["Set-Cookie"];
+        var trustedDeviceCookie = Assert.Single(setCookieHeaders, h => h!.StartsWith($"{AuthSessionOptions.TrustedDeviceCookieName}=", StringComparison.Ordinal))!;
+        Assert.Contains("httponly", trustedDeviceCookie, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains("samesite=strict", trustedDeviceCookie, StringComparison.OrdinalIgnoreCase);
+    }
+
+    [Fact]
+    public async Task Challenge_without_trust_device_does_not_create_trusted_device()
+    {
+        var user = new ApplicationUser { Id = "user-1", Email = "person@example.com", UserName = "person@example.com" };
+        var userManager = TestHostFactory.CreateUserManager();
+        userManager.Setup(x => x.CheckPasswordAsync(user, "correct-password")).ReturnsAsync(true);
+        userManager.Setup(x => x.UpdateAsync(It.IsAny<ApplicationUser>())).ReturnsAsync(IdentityResult.Success);
+        userManager.Setup(x => x.FindByIdAsync("user-1")).ReturnsAsync(user);
+
+        var pending = new TwoFactorPendingTokenService(new Microsoft.Extensions.Caching.Memory.MemoryCache(new Microsoft.Extensions.Caching.Memory.MemoryCacheOptions()));
+
+        using var db = TestHostFactory.CreateInMemoryDb("user-1");
+        var controller = BuildController(userManager, db, pending, currentUser: user);
+
+        var setupResult = Assert.IsType<OkObjectResult>(await controller.Setup(new TwoFactorController.PasswordConfirmRequest("correct-password"), CancellationToken.None));
+        var setup = Assert.IsType<TwoFactorController.SetupResult>(setupResult.Value);
+        var code = new Totp(Base32Encoding.ToBytes(setup.ManualEntryKey)).ComputeTotp();
+        await controller.VerifySetup(new TwoFactorController.VerifySetupRequest(code), CancellationToken.None);
+
+        var pendingToken = pending.IssuePendingToken("user-1", rememberMe: false);
+        var challengeCode = new Totp(Base32Encoding.ToBytes(setup.ManualEntryKey)).ComputeTotp();
+
+        await controller.Challenge(new TwoFactorController.ChallengeRequest(pendingToken, challengeCode), CancellationToken.None);
+
+        Assert.Empty(db.TrustedDevices.IgnoreQueryFilters().Where(x => x.UserId == "user-1"));
+    }
+
+    [Fact]
+    public async Task Trusted_devices_can_be_listed_revoked_and_revoked_in_bulk_scoped_to_owner()
+    {
+        var user = new ApplicationUser { Id = "user-1", Email = "person@example.com", UserName = "person@example.com" };
+        var otherUser = new ApplicationUser { Id = "user-2", Email = "other@example.com", UserName = "other@example.com" };
+        var userManager = TestHostFactory.CreateUserManager();
+
+        using var db = TestHostFactory.CreateInMemoryDb("user-1");
+        db.TrustedDevices.Add(new TrustedDevice { UserId = "user-1", TokenHash = "hash-1", DeviceLabel = "Chrome on Windows", CreatedAtUtc = DateTimeOffset.UtcNow, LastSeenAtUtc = DateTimeOffset.UtcNow, ExpiresAtUtc = DateTimeOffset.UtcNow.AddDays(30) });
+        db.TrustedDevices.Add(new TrustedDevice { UserId = "user-1", TokenHash = "hash-2", DeviceLabel = "Safari on Mac", CreatedAtUtc = DateTimeOffset.UtcNow, LastSeenAtUtc = DateTimeOffset.UtcNow, ExpiresAtUtc = DateTimeOffset.UtcNow.AddDays(30) });
+        db.TrustedDevices.Add(new TrustedDevice { UserId = "user-2", TokenHash = "hash-3", DeviceLabel = "Someone else's device", CreatedAtUtc = DateTimeOffset.UtcNow, LastSeenAtUtc = DateTimeOffset.UtcNow, ExpiresAtUtc = DateTimeOffset.UtcNow.AddDays(30) });
+        db.SaveChanges();
+
+        var otherDeviceId = db.TrustedDevices.IgnoreQueryFilters().Single(x => x.UserId == "user-2").Id;
+
+        var controller = BuildController(userManager, db, currentUser: user);
+
+        var listResult = Assert.IsType<OkObjectResult>(await controller.ListTrustedDevices(CancellationToken.None));
+        var list = Assert.IsType<List<TwoFactorController.TrustedDeviceDto>>(listResult.Value);
+        Assert.Equal(2, list.Count);
+
+        // Can't revoke another user's device, even by guessing its id.
+        var revokeOther = await controller.RevokeTrustedDevice(otherDeviceId, CancellationToken.None);
+        Assert.IsType<NotFoundResult>(revokeOther);
+        Assert.NotNull(db.TrustedDevices.IgnoreQueryFilters().SingleOrDefault(x => x.Id == otherDeviceId));
+
+        var ownDeviceId = list[0].Id;
+        var revokeOwn = await controller.RevokeTrustedDevice(ownDeviceId, CancellationToken.None);
+        Assert.IsType<NoContentResult>(revokeOwn);
+        Assert.Null(db.TrustedDevices.IgnoreQueryFilters().SingleOrDefault(x => x.Id == ownDeviceId));
+
+        var revokeAll = await controller.RevokeAllTrustedDevices(CancellationToken.None);
+        Assert.IsType<NoContentResult>(revokeAll);
+        Assert.Empty(db.TrustedDevices.IgnoreQueryFilters().Where(x => x.UserId == "user-1"));
+        Assert.NotNull(db.TrustedDevices.IgnoreQueryFilters().SingleOrDefault(x => x.UserId == "user-2"));
+    }
+
+    [Fact]
+    public async Task Challenge_with_unknown_pending_token_is_rejected()
+    {
+        var user = new ApplicationUser { Id = "user-1", Email = "person@example.com", UserName = "person@example.com" };
+        var userManager = TestHostFactory.CreateUserManager();
+
+        using var db = TestHostFactory.CreateInMemoryDb("user-1");
+        var controller = BuildController(userManager, db, currentUser: user);
+
+        var result = await controller.Challenge(new TwoFactorController.ChallengeRequest("not-a-real-token", "123456"), CancellationToken.None);
+
+        Assert.IsType<UnauthorizedResult>(result);
+    }
+}

JobTrackerApi/Controllers/AuthController.cs

@@ -1,5 +1,6 @@
 using System.Text.Json;
 using System.Security.Claims;
+using JobTrackerApi.Data;
 using JobTrackerApi.Models;
 using JobTrackerApi.Services;
 using Microsoft.AspNetCore.Authorization;
@@ -21,8 +22,10 @@ public sealed class AuthController : ControllerBase
     private readonly IGoogleTokenValidator _googleTokens;
     private readonly IMicrosoftTokenValidator _microsoftTokens;
     private readonly ILogger<AuthController> _logger;
+    private readonly ITwoFactorPendingTokenService _twoFactorPending;
+    private readonly JobTrackerContext _db;
 
-    public AuthController(IConfiguration cfg, UserManager<ApplicationUser> users, ITokenService tokens, IAppEmailSender email, IGoogleTokenValidator googleTokens, IMicrosoftTokenValidator microsoftTokens, ILogger<AuthController> logger)
+    public AuthController(IConfiguration cfg, UserManager<ApplicationUser> users, ITokenService tokens, IAppEmailSender email, IGoogleTokenValidator googleTokens, IMicrosoftTokenValidator microsoftTokens, ILogger<AuthController> logger, ITwoFactorPendingTokenService twoFactorPending, JobTrackerContext db)
     {
         _cfg = cfg;
         _users = users;
@@ -31,6 +34,8 @@ public sealed class AuthController : ControllerBase
         _googleTokens = googleTokens;
         _microsoftTokens = microsoftTokens;
         _logger = logger;
+        _twoFactorPending = twoFactorPending;
+        _db = db;
     }
 
     [HttpGet("config")]
@@ -41,6 +46,7 @@ public sealed class AuthController : ControllerBase
         var googleEnabled = !string.IsNullOrWhiteSpace((_cfg["Auth:GoogleClientId"] ?? string.Empty).Trim());
         var microsoftEnabled = !string.IsNullOrWhiteSpace((_cfg["Auth:MicrosoftClientId"] ?? string.Empty).Trim());
         var allowRegistration = _cfg.GetValue("Auth:AllowRegistration", false);
+        var requireEmailVerification = _cfg.GetValue("Auth:RequireEmailVerification", false);
 
         return Ok(new
         {
@@ -49,12 +55,14 @@ public sealed class AuthController : ControllerBase
             microsoftEnabled,
             localEnabled = true,
             allowRegistration,
+            requireEmailVerification,
         });
     }
 
     public sealed record LoginRequest(string Email, string Password, bool RememberMe = true);
     public sealed record RegisterRequest(string Email, string Password, bool RememberMe = true);
     public sealed record AuthSessionResult(bool Authenticated, string Provider);
+    public sealed record TwoFactorRequiredResult(bool RequiresTwoFactor, string PendingToken);
     public sealed record GoogleLinkDto(bool Linked, string? Email, DateTimeOffset? LinkedAt);
     public sealed record MicrosoftLinkDto(bool Linked, string? Email, DateTimeOffset? LinkedAt);
     public sealed record MeResult(
@@ -83,7 +91,7 @@ public sealed class AuthController : ControllerBase
     [HttpPost("login")]
     [AllowAnonymous]
     [EnableRateLimiting("auth-login")]
-    public async Task<ActionResult<AuthSessionResult>> Login([FromBody] LoginRequest request, CancellationToken cancellationToken)
+    public async Task<IActionResult> Login([FromBody] LoginRequest request, CancellationToken cancellationToken)
     {
         var email = (request.Email ?? string.Empty).Trim();
         var password = request.Password ?? string.Empty;
@@ -94,17 +102,34 @@ public sealed class AuthController : ControllerBase
         var user = await _users.FindByEmailAsync(email) ?? await _users.FindByNameAsync(email);
         if (user is null) return Unauthorized();
 
-        var ok = await _users.CheckPasswordAsync(user, password);
-        if (!ok) return Unauthorized();
+        // Same generic 401 whether the account doesn't exist, is locked out, or the password is
+        // wrong -- don't let a client distinguish "locked" from "wrong password" (enumeration).
+        if (await _users.IsLockedOutAsync(user)) return Unauthorized();
 
-        await SignInWithAppSessionAsync(user, request.RememberMe, cancellationToken);
-        return Ok(new AuthSessionResult(true, "local"));
+        var ok = await _users.CheckPasswordAsync(user, password);
+        if (!ok)
+        {
+            await _users.AccessFailedAsync(user);
+            return Unauthorized();
+        }
+
+        await _users.ResetAccessFailedCountAsync(user);
+
+        // Same enumeration-avoidance discipline as the password-check branch above: this only
+        // runs once the password is already confirmed correct, so it can never be used to probe
+        // whether an email is registered.
+        if (_cfg.GetValue("Auth:RequireEmailVerification", false) && !user.EmailConfirmed)
+        {
+            return StatusCode(StatusCodes.Status403Forbidden, new { error = "email_not_verified" });
+        }
+
+        return await CompleteSignInAsync(user, request.RememberMe, "local", cancellationToken);
     }
 
     [HttpPost("register")]
     [AllowAnonymous]
     [EnableRateLimiting("auth-login")]
-    public async Task<ActionResult<AuthSessionResult>> Register([FromBody] RegisterRequest request, CancellationToken cancellationToken)
+    public async Task<IActionResult> Register([FromBody] RegisterRequest request, CancellationToken cancellationToken)
     {
         var allow = _cfg.GetValue("Auth:AllowRegistration", false);
         if (!allow) return StatusCode(403, "Registration is disabled.");
@@ -118,21 +143,35 @@ public sealed class AuthController : ControllerBase
         var existing = await _users.FindByEmailAsync(email);
         if (existing is not null) return BadRequest("User already exists.");
 
-        var user = new ApplicationUser { UserName = email, Email = email, EmailConfirmed = true };
+        var requireEmailVerification = _cfg.GetValue("Auth:RequireEmailVerification", false);
+        var user = new ApplicationUser { UserName = email, Email = email, EmailConfirmed = !requireEmailVerification };
         var res = await _users.CreateAsync(user, password);
         if (!res.Succeeded)
         {
             return BadRequest(string.Join("; ", res.Errors.Select(e => e.Description)));
         }
 
-        await SignInWithAppSessionAsync(user, request.RememberMe, cancellationToken);
-        return Ok(new AuthSessionResult(true, "local"));
+        if (requireEmailVerification)
+        {
+            try
+            {
+                await SendVerificationEmailAsync(user, cancellationToken);
+            }
+            catch (Exception ex)
+            {
+                // ponytail: don't fail registration over a flaky email send -- the account is
+                // created either way, the user can request a fresh link via resend-verification-email.
+                _logger.LogError(ex, "Failed to send verification email to {Email}", user.Email);
+            }
+        }
+
+        return await CompleteSignInAsync(user, request.RememberMe, "local", cancellationToken);
     }
 
     [HttpPost("google/exchange")]
     [AllowAnonymous]
     [EnableRateLimiting("auth-login")]
-    public async Task<ActionResult<AuthSessionResult>> ExchangeGoogleToken([FromBody] GoogleTokenRequest request, CancellationToken cancellationToken)
+    public async Task<IActionResult> ExchangeGoogleToken([FromBody] GoogleTokenRequest request, CancellationToken cancellationToken)
     {
         var token = (request.Token ?? string.Empty).Trim();
         if (token.Length == 0) return BadRequest("Google token is required.");
@@ -193,14 +232,13 @@ public sealed class AuthController : ControllerBase
             await _users.UpdateAsync(user);
         }
 
-        await SignInWithAppSessionAsync(user, request.RememberMe, cancellationToken);
-        return Ok(new AuthSessionResult(true, "google"));
+        return await CompleteSignInAsync(user, request.RememberMe, "google", cancellationToken);
     }
 
     [HttpPost("microsoft/exchange")]
     [AllowAnonymous]
     [EnableRateLimiting("auth-login")]
-    public async Task<ActionResult<AuthSessionResult>> ExchangeMicrosoftToken([FromBody] MicrosoftTokenRequest request, CancellationToken cancellationToken)
+    public async Task<IActionResult> ExchangeMicrosoftToken([FromBody] MicrosoftTokenRequest request, CancellationToken cancellationToken)
     {
         var token = (request.Token ?? string.Empty).Trim();
         if (token.Length == 0) return BadRequest("Microsoft token is required.");
@@ -261,8 +299,7 @@ public sealed class AuthController : ControllerBase
             await _users.UpdateAsync(user);
         }
 
-        await SignInWithAppSessionAsync(user, request.RememberMe, cancellationToken);
-        return Ok(new AuthSessionResult(true, "microsoft"));
+        return await CompleteSignInAsync(user, request.RememberMe, "microsoft", cancellationToken);
     }
 
     [HttpPost("logout")]
@@ -650,17 +687,112 @@ public sealed class AuthController : ControllerBase
         return NoContent();
     }
 
+    public sealed record VerifyEmailRequest(string UserId, string Token);
+
+    [HttpPost("verify-email")]
+    [AllowAnonymous]
+    [EnableRateLimiting("auth-email")]
+    public async Task<IActionResult> VerifyEmail([FromBody] VerifyEmailRequest request)
+    {
+        var userId = (request.UserId ?? string.Empty).Trim();
+        var token = request.Token ?? string.Empty;
+
+        if (userId.Length == 0) return BadRequest("UserId is required.");
+        if (token.Length == 0) return BadRequest("Token is required.");
+
+        var user = await _users.FindByIdAsync(userId);
+        if (user is null) return BadRequest("Invalid or expired link.");
+
+        var res = await _users.ConfirmEmailAsync(user, token);
+        if (!res.Succeeded)
+        {
+            return BadRequest("Invalid or expired link.");
+        }
+
+        return NoContent();
+    }
+
+    public sealed record ResendVerificationEmailRequest(string Email);
+
+    [HttpPost("resend-verification-email")]
+    [AllowAnonymous]
+    [EnableRateLimiting("auth-email")]
+    public async Task<IActionResult> ResendVerificationEmail([FromBody] ResendVerificationEmailRequest request, CancellationToken cancellationToken)
+    {
+        var email = (request.Email ?? string.Empty).Trim();
+        if (email.Length == 0) return NoContent();
+
+        // Mirrors request-password-reset's enumeration-avoidance: always NoContent, only actually
+        // send when there's a matching local account that still needs verifying.
+        var user = await _users.FindByEmailAsync(email);
+        if (user is null || user.EmailConfirmed || string.IsNullOrWhiteSpace(user.Email) || !await _users.HasPasswordAsync(user))
+        {
+            return NoContent();
+        }
+
+        try
+        {
+            await SendVerificationEmailAsync(user, cancellationToken);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Failed to send verification email to {Email}", user.Email);
+            return EmailDeliveryUnavailable("Verification email could not be sent right now. Please try again later.");
+        }
+
+        return NoContent();
+    }
+
+    private async Task SendVerificationEmailAsync(ApplicationUser user, CancellationToken cancellationToken)
+    {
+        var token = await _users.GenerateEmailConfirmationTokenAsync(user);
+
+        var baseUrl = (_cfg["App:PublicBaseUrl"] ?? string.Empty).Trim().TrimEnd('/');
+        if (string.IsNullOrWhiteSpace(baseUrl))
+        {
+            baseUrl = $"{Request.Scheme}://{Request.Host}";
+        }
+
+        var link = $"{baseUrl}/verify-email?userId={Uri.EscapeDataString(user.Id)}&token={Uri.EscapeDataString(token)}";
+
+        await _email.SendAsync(
+            user.Email!,
+            "Verify your email",
+            $"Welcome to Jobbjakt! Please verify your email address to finish setting up your account.\n\nVerification link:\n{link}\n\nIf you did not create this account, you can ignore this email.",
+            cancellationToken
+        );
+    }
+
     private IActionResult EmailDeliveryUnavailable(string detail)
     {
         return Problem(statusCode: StatusCodes.Status503ServiceUnavailable, title: "Email delivery unavailable", detail: detail);
     }
 
-    private async Task SignInWithAppSessionAsync(ApplicationUser user, bool rememberMe, CancellationToken cancellationToken)
+    // Shared by local/Google/Microsoft sign-in. If the account has TOTP 2FA enabled, this does
+    // NOT issue the real session -- it hands back a short-lived opaque pending token that only
+    // POST /api/auth/2fa/challenge can redeem, after the caller proves they hold the TOTP device
+    // (or a recovery code). This is the gate that makes 2FA actually mandatory rather than
+    // decorative: skipping straight to AppSessionIssuer here would defeat the whole feature.
+    private async Task<IActionResult> CompleteSignInAsync(ApplicationUser user, bool rememberMe, string provider, CancellationToken cancellationToken)
     {
-        var token = await _tokens.CreateAccessTokenAsync(user, cancellationToken);
-        var secure = Request.IsHttps || string.Equals(Request.Headers["X-Forwarded-Proto"], "https", StringComparison.OrdinalIgnoreCase);
-        Response.Cookies.Append(AuthSessionOptions.SessionCookieName, token, AuthSessionOptions.BuildSessionCookie(rememberMe, secure));
-        EnsureCsrfCookie(rememberMe, secure);
+        // "Trust this device" cookie check happens BEFORE the 2FA gate: if it matches a
+        // non-expired row for this exact user, skip straight to a real session, same as if 2FA
+        // weren't required at all. Falls through to the normal gate for any other outcome
+        // (no cookie, wrong user, expired, revoked) -- never errors, just doesn't skip.
+        if (user.TwoFactorEnabled && await TrustedDeviceService.IsDeviceTrustedAsync(_db, Request, user.Id, cancellationToken))
+        {
+            await AppSessionIssuer.IssueAsync(Request, Response, _tokens, _db, _cfg, user, rememberMe, cancellationToken);
+            return Ok(new AuthSessionResult(true, provider));
+        }
+
+        if (user.TwoFactorEnabled)
+        {
+            var pendingToken = _twoFactorPending.IssuePendingToken(user.Id, rememberMe);
+            return Ok(new TwoFactorRequiredResult(true, pendingToken));
+        }
+
+        await AppSessionIssuer.IssueAsync(Request, Response, _tokens, _db, _cfg, user, rememberMe, cancellationToken);
+        return Ok(new AuthSessionResult(true, provider));
     }
 
     private void EnsureCsrfCookie(bool persistent, bool? secureOverride = null)

JobTrackerApi/Controllers/SessionsController.cs

@@ -0,0 +1,104 @@
+using JobTrackerApi.Data;
+using JobTrackerApi.Models;
+using JobTrackerApi.Services;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+
+namespace JobTrackerApi.Controllers;
+
+// List/revoke the server-tracked UserSession rows behind the JWTs AppSessionIssuer hands out.
+// Not 2FA-specific (any local-auth user has sessions, 2FA or not), hence its own small controller
+// rather than folding into TwoFactorController.
+[ApiController]
+[Route("api/auth/sessions")]
+[Authorize(AuthenticationSchemes = "local")]
+public sealed class SessionsController : ControllerBase
+{
+    private readonly UserManager<ApplicationUser> _users;
+    private readonly JobTrackerContext _db;
+
+    public SessionsController(UserManager<ApplicationUser> users, JobTrackerContext db)
+    {
+        _users = users;
+        _db = db;
+    }
+
+    public sealed record SessionDto(string Id, string? DeviceLabel, DateTimeOffset CreatedAtUtc, DateTimeOffset LastSeenAtUtc, DateTimeOffset ExpiresAtUtc, bool IsCurrentSession);
+
+    private string? CurrentSid => User.FindFirst("sid")?.Value;
+
+    [HttpGet]
+    public async Task<IActionResult> List(CancellationToken cancellationToken)
+    {
+        var user = await _users.GetUserAsync(User);
+        if (user is null) return Unauthorized();
+
+        var now = DateTimeOffset.UtcNow;
+        var currentSid = CurrentSid;
+        // IgnoreQueryFilters + an explicit UserId filter, same convention as
+        // TrustedDeviceService/TwoFactorController's device-list queries.
+        // Equality-only in the DB query, then filter/sort DateTimeOffset client-side: SQLite's EF
+        // Core provider cannot translate ">" or ORDER BY over DateTimeOffset to SQL ("SQLite does
+        // not support expressions of type 'DateTimeOffset' in ORDER BY clauses"), so ExpiresAtUtc
+        // comparison and the LastSeenAtUtc sort have to happen after materializing the (small,
+        // per-user) row set.
+        var candidates = await _db.UserSessions.IgnoreQueryFilters()
+            .Where(x => x.UserId == user.Id && x.RevokedAtUtc == null)
+            .ToListAsync(cancellationToken);
+
+        var sessions = candidates
+            .Where(x => x.ExpiresAtUtc > now)
+            .OrderByDescending(x => x.LastSeenAtUtc)
+            .Select(x => new SessionDto(x.Id, x.DeviceLabel, x.CreatedAtUtc, x.LastSeenAtUtc, x.ExpiresAtUtc, x.Id == currentSid))
+            .ToList();
+
+        return Ok(sessions);
+    }
+
+    [HttpDelete("{id}")]
+    public async Task<IActionResult> Revoke(string id, CancellationToken cancellationToken)
+    {
+        var user = await _users.GetUserAsync(User);
+        if (user is null) return Unauthorized();
+
+        var session = await _db.UserSessions.IgnoreQueryFilters().FirstOrDefaultAsync(x => x.Id == id && x.UserId == user.Id, cancellationToken);
+        if (session is null) return NotFound();
+
+        session.RevokedAtUtc = DateTimeOffset.UtcNow;
+        await _db.SaveChangesAsync(cancellationToken);
+
+        if (string.Equals(id, CurrentSid, StringComparison.Ordinal))
+        {
+            var secure = Request.IsHttps || string.Equals(Request.Headers["X-Forwarded-Proto"], "https", StringComparison.OrdinalIgnoreCase);
+            Response.Cookies.Delete(AuthSessionOptions.SessionCookieName, AuthSessionOptions.BuildExpiredCookie(secure));
+        }
+
+        return NoContent();
+    }
+
+    [HttpPost("revoke-others")]
+    public async Task<IActionResult> RevokeOthers(CancellationToken cancellationToken)
+    {
+        var user = await _users.GetUserAsync(User);
+        if (user is null) return Unauthorized();
+
+        var currentSid = CurrentSid;
+        var now = DateTimeOffset.UtcNow;
+        var others = await _db.UserSessions.IgnoreQueryFilters()
+            .Where(x => x.UserId == user.Id && x.RevokedAtUtc == null && x.Id != currentSid)
+            .ToListAsync(cancellationToken);
+
+        foreach (var session in others)
+        {
+            session.RevokedAtUtc = now;
+        }
+        if (others.Count > 0)
+        {
+            await _db.SaveChangesAsync(cancellationToken);
+        }
+
+        return NoContent();
+    }
+}

JobTrackerApi/Controllers/TwoFactorController.cs

@@ -0,0 +1,341 @@
+using System.Security.Cryptography;
+using System.Text;
+using JobTrackerApi.Data;
+using JobTrackerApi.Models;
+using JobTrackerApi.Services;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.DataProtection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.RateLimiting;
+using Microsoft.EntityFrameworkCore;
+using OtpNet;
+using QRCoder;
+
+namespace JobTrackerApi.Controllers;
+
+// TOTP 2FA (RFC 6238) + recovery codes. Split out from AuthController (already 700+ lines)
+// rather than growing it further; shares the session cookie logic via AppSessionIssuer and the
+// pending-token handoff via ITwoFactorPendingTokenService.
+[ApiController]
+[Route("api/auth/2fa")]
+public sealed class TwoFactorController : ControllerBase
+{
+    private const int RecoveryCodeCount = 10;
+
+    private readonly UserManager<ApplicationUser> _users;
+    private readonly ITokenService _tokens;
+    private readonly JobTrackerContext _db;
+    private readonly ITwoFactorPendingTokenService _pending;
+    private readonly IDataProtector _protector;
+    private readonly IConfiguration _cfg;
+
+    public TwoFactorController(UserManager<ApplicationUser> users, ITokenService tokens, JobTrackerContext db, ITwoFactorPendingTokenService pending, IDataProtectionProvider protectionProvider, IConfiguration cfg)
+    {
+        _users = users;
+        _tokens = tokens;
+        _db = db;
+        _pending = pending;
+        _protector = protectionProvider.CreateProtector("totp-secret-v1");
+        _cfg = cfg;
+    }
+
+    public sealed record PasswordConfirmRequest(string CurrentPassword);
+    public sealed record SetupResult(string ManualEntryKey, string QrCodeDataUrl);
+    public sealed record VerifySetupRequest(string Code);
+    public sealed record VerifySetupResult(bool Enabled, IReadOnlyList<string> RecoveryCodes);
+    public sealed record StatusResult(bool Enabled, DateTimeOffset? EnabledAtUtc);
+    public sealed record RecoveryCodesResult(IReadOnlyList<string> RecoveryCodes);
+    public sealed record ChallengeRequest(string PendingToken, string Code, bool TrustDevice = false);
+    public sealed record TrustedDeviceDto(int Id, string? DeviceLabel, DateTimeOffset CreatedAtUtc, DateTimeOffset LastSeenAtUtc, DateTimeOffset ExpiresAtUtc, bool IsCurrentDevice);
+
+    [HttpPost("setup")]
+    [Authorize(AuthenticationSchemes = "local")]
+    [EnableRateLimiting("auth-login")]
+    public async Task<IActionResult> Setup([FromBody] PasswordConfirmRequest request, CancellationToken cancellationToken)
+    {
+        var user = await _users.GetUserAsync(User);
+        if (user is null) return Unauthorized();
+
+        if (!await _users.CheckPasswordAsync(user, request.CurrentPassword ?? string.Empty))
+        {
+            return BadRequest("Current password is incorrect.");
+        }
+
+        var secretBytes = KeyGeneration.GenerateRandomKey(20);
+        var base32Secret = Base32Encoding.ToString(secretBytes);
+
+        user.TotpPendingSecretEncrypted = _protector.Protect(base32Secret);
+        var result = await _users.UpdateAsync(user);
+        if (!result.Succeeded)
+        {
+            return BadRequest(string.Join("; ", result.Errors.Select(e => e.Description)));
+        }
+
+        var issuer = "JobTracker";
+        var label = Uri.EscapeDataString($"{issuer}:{user.Email}");
+        var otpauthUri = $"otpauth://totp/{label}?secret={base32Secret}&issuer={Uri.EscapeDataString(issuer)}&digits=6&period=30";
+
+        using var qrGenerator = new QRCodeGenerator();
+        using var qrData = qrGenerator.CreateQrCode(otpauthUri, QRCodeGenerator.ECCLevel.Q);
+        var pngQr = new PngByteQRCode(qrData);
+        var qrPngBytes = pngQr.GetGraphic(10);
+        var qrDataUrl = $"data:image/png;base64,{Convert.ToBase64String(qrPngBytes)}";
+
+        return Ok(new SetupResult(base32Secret, qrDataUrl));
+    }
+
+    [HttpPost("verify-setup")]
+    [Authorize(AuthenticationSchemes = "local")]
+    [EnableRateLimiting("auth-login")]
+    public async Task<IActionResult> VerifySetup([FromBody] VerifySetupRequest request, CancellationToken cancellationToken)
+    {
+        var user = await _users.GetUserAsync(User);
+        if (user is null) return Unauthorized();
+
+        if (string.IsNullOrWhiteSpace(user.TotpPendingSecretEncrypted))
+        {
+            return BadRequest("No pending 2FA setup. Call setup first.");
+        }
+
+        var base32Secret = _protector.Unprotect(user.TotpPendingSecretEncrypted);
+        if (!VerifyCode(base32Secret, request.Code))
+        {
+            return Unauthorized();
+        }
+
+        user.TotpSecretEncrypted = user.TotpPendingSecretEncrypted;
+        user.TotpPendingSecretEncrypted = null;
+        user.TwoFactorEnabled = true;
+        user.TotpEnabledAtUtc = DateTimeOffset.UtcNow;
+
+        var result = await _users.UpdateAsync(user);
+        if (!result.Succeeded)
+        {
+            return BadRequest(string.Join("; ", result.Errors.Select(e => e.Description)));
+        }
+
+        var codes = await RegenerateRecoveryCodesAsync(user.Id, cancellationToken);
+        return Ok(new VerifySetupResult(true, codes));
+    }
+
+    [HttpPost("disable")]
+    [Authorize(AuthenticationSchemes = "local")]
+    [EnableRateLimiting("auth-login")]
+    public async Task<IActionResult> Disable([FromBody] PasswordConfirmRequest request, CancellationToken cancellationToken)
+    {
+        var user = await _users.GetUserAsync(User);
+        if (user is null) return Unauthorized();
+
+        if (!await _users.CheckPasswordAsync(user, request.CurrentPassword ?? string.Empty))
+        {
+            return BadRequest("Current password is incorrect.");
+        }
+
+        user.TotpSecretEncrypted = null;
+        user.TotpPendingSecretEncrypted = null;
+        user.TwoFactorEnabled = false;
+        user.TotpEnabledAtUtc = null;
+
+        var result = await _users.UpdateAsync(user);
+        if (!result.Succeeded)
+        {
+            return BadRequest(string.Join("; ", result.Errors.Select(e => e.Description)));
+        }
+
+        await RemoveAllRecoveryCodesAsync(user.Id, cancellationToken);
+        return NoContent();
+    }
+
+    [HttpGet("status")]
+    [Authorize(AuthenticationSchemes = "local")]
+    public async Task<IActionResult> Status()
+    {
+        var user = await _users.GetUserAsync(User);
+        if (user is null) return Unauthorized();
+
+        return Ok(new StatusResult(user.TwoFactorEnabled, user.TotpEnabledAtUtc));
+    }
+
+    [HttpPost("recovery-codes/regenerate")]
+    [Authorize(AuthenticationSchemes = "local")]
+    [EnableRateLimiting("auth-login")]
+    public async Task<IActionResult> RegenerateRecoveryCodes([FromBody] PasswordConfirmRequest request, CancellationToken cancellationToken)
+    {
+        var user = await _users.GetUserAsync(User);
+        if (user is null) return Unauthorized();
+
+        if (!user.TwoFactorEnabled)
+        {
+            return BadRequest("Two-factor authentication is not enabled.");
+        }
+
+        if (!await _users.CheckPasswordAsync(user, request.CurrentPassword ?? string.Empty))
+        {
+            return BadRequest("Current password is incorrect.");
+        }
+
+        var codes = await RegenerateRecoveryCodesAsync(user.Id, cancellationToken);
+        return Ok(new RecoveryCodesResult(codes));
+    }
+
+    [HttpPost("challenge")]
+    [AllowAnonymous]
+    [EnableRateLimiting("auth-2fa-challenge")]
+    public async Task<IActionResult> Challenge([FromBody] ChallengeRequest request, CancellationToken cancellationToken)
+    {
+        var pendingToken = (request.PendingToken ?? string.Empty).Trim();
+        var code = (request.Code ?? string.Empty).Trim();
+        if (pendingToken.Length == 0 || code.Length == 0) return Unauthorized();
+
+        // Peek without consuming: only burn the pending token once the code actually checks out,
+        // so a mistyped code doesn't force the user back through password login.
+        var session = _pending.Resolve(pendingToken, consume: false);
+        if (session is null) return Unauthorized();
+
+        var user = await _users.FindByIdAsync(session.UserId);
+        if (user is null || !user.TwoFactorEnabled || string.IsNullOrWhiteSpace(user.TotpSecretEncrypted))
+        {
+            return Unauthorized();
+        }
+
+        var base32Secret = _protector.Unprotect(user.TotpSecretEncrypted);
+        var verified = VerifyCode(base32Secret, code) || await TryConsumeRecoveryCodeAsync(user.Id, code, cancellationToken);
+        if (!verified) return Unauthorized();
+
+        _pending.Resolve(pendingToken, consume: true);
+        await AppSessionIssuer.IssueAsync(Request, Response, _tokens, _db, _cfg, user, session.RememberMe, cancellationToken);
+
+        if (request.TrustDevice)
+        {
+            await TrustedDeviceService.IssueAsync(_db, Request, Response, user.Id, cancellationToken);
+        }
+
+        return Ok(new AuthController.AuthSessionResult(true, "local"));
+    }
+
+    [HttpGet("trusted-devices")]
+    [Authorize(AuthenticationSchemes = "local")]
+    public async Task<IActionResult> ListTrustedDevices(CancellationToken cancellationToken)
+    {
+        var user = await _users.GetUserAsync(User);
+        if (user is null) return Unauthorized();
+
+        var currentHash = TrustedDeviceService.CurrentDeviceTokenHash(Request);
+        // SQLite/Pomelo cannot translate DateTimeOffset ORDER BY to SQL (same issue as the
+        // expiry check in TrustedDeviceService), so sort after materializing.
+        var devices = await _db.TrustedDevices
+            .Where(x => x.UserId == user.Id)
+            .Select(x => new TrustedDeviceDto(x.Id, x.DeviceLabel, x.CreatedAtUtc, x.LastSeenAtUtc, x.ExpiresAtUtc, currentHash != null && x.TokenHash == currentHash))
+            .ToListAsync(cancellationToken);
+
+        return Ok(devices.OrderByDescending(x => x.LastSeenAtUtc).ToList());
+    }
+
+    [HttpDelete("trusted-devices/{id:int}")]
+    [Authorize(AuthenticationSchemes = "local")]
+    public async Task<IActionResult> RevokeTrustedDevice(int id, CancellationToken cancellationToken)
+    {
+        var user = await _users.GetUserAsync(User);
+        if (user is null) return Unauthorized();
+
+        var device = await _db.TrustedDevices.FirstOrDefaultAsync(x => x.Id == id && x.UserId == user.Id, cancellationToken);
+        if (device is null) return NotFound();
+
+        var currentHash = TrustedDeviceService.CurrentDeviceTokenHash(Request);
+        var isCurrentDevice = currentHash != null && string.Equals(device.TokenHash, currentHash, StringComparison.Ordinal);
+
+        _db.TrustedDevices.Remove(device);
+        await _db.SaveChangesAsync(cancellationToken);
+
+        if (isCurrentDevice)
+        {
+            TrustedDeviceService.ClearCookie(Request, Response);
+        }
+
+        return NoContent();
+    }
+
+    [HttpPost("trusted-devices/revoke-all")]
+    [Authorize(AuthenticationSchemes = "local")]
+    public async Task<IActionResult> RevokeAllTrustedDevices(CancellationToken cancellationToken)
+    {
+        var user = await _users.GetUserAsync(User);
+        if (user is null) return Unauthorized();
+
+        var devices = await _db.TrustedDevices.Where(x => x.UserId == user.Id).ToListAsync(cancellationToken);
+        if (devices.Count > 0)
+        {
+            _db.TrustedDevices.RemoveRange(devices);
+            await _db.SaveChangesAsync(cancellationToken);
+        }
+
+        TrustedDeviceService.ClearCookie(Request, Response);
+        return NoContent();
+    }
+
+    private static bool VerifyCode(string base32Secret, string? code)
+    {
+        code = (code ?? string.Empty).Trim();
+        if (code.Length == 0) return false;
+
+        var totp = new Totp(Base32Encoding.ToBytes(base32Secret));
+        // +-1 step (30s) of drift, the RFC 6238 standard tolerance for clock skew between the
+        // authenticator app and the server.
+        return totp.VerifyTotp(code, out _, new VerificationWindow(1, 1));
+    }
+
+    private async Task<bool> TryConsumeRecoveryCodeAsync(string userId, string code, CancellationToken cancellationToken)
+    {
+        var hash = HashRecoveryCode(code);
+        var match = await _db.TwoFactorRecoveryCodes
+            .IgnoreQueryFilters()
+            .FirstOrDefaultAsync(x => x.UserId == userId && x.CodeHash == hash && x.UsedAtUtc == null, cancellationToken);
+        if (match is null) return false;
+
+        match.UsedAtUtc = DateTimeOffset.UtcNow;
+        await _db.SaveChangesAsync(cancellationToken);
+        return true;
+    }
+
+    private async Task<IReadOnlyList<string>> RegenerateRecoveryCodesAsync(string userId, CancellationToken cancellationToken)
+    {
+        await RemoveAllRecoveryCodesAsync(userId, cancellationToken);
+
+        var now = DateTimeOffset.UtcNow;
+        var plainCodes = new List<string>(RecoveryCodeCount);
+        var rows = new List<TwoFactorRecoveryCode>(RecoveryCodeCount);
+        for (var i = 0; i < RecoveryCodeCount; i++)
+        {
+            var plain = GenerateRecoveryCode();
+            plainCodes.Add(plain);
+            rows.Add(new TwoFactorRecoveryCode { UserId = userId, CodeHash = HashRecoveryCode(plain), CreatedAtUtc = now });
+        }
+
+        _db.TwoFactorRecoveryCodes.AddRange(rows);
+        await _db.SaveChangesAsync(cancellationToken);
+        return plainCodes;
+    }
+
+    private async Task RemoveAllRecoveryCodesAsync(string userId, CancellationToken cancellationToken)
+    {
+        var existing = await _db.TwoFactorRecoveryCodes.IgnoreQueryFilters().Where(x => x.UserId == userId).ToListAsync(cancellationToken);
+        if (existing.Count == 0) return;
+        _db.TwoFactorRecoveryCodes.RemoveRange(existing);
+        await _db.SaveChangesAsync(cancellationToken);
+    }
+
+    private static string GenerateRecoveryCode()
+    {
+        var hex = Convert.ToHexString(RandomNumberGenerator.GetBytes(5)).ToLowerInvariant(); // 10 hex chars, 40 bits
+        return $"{hex[..5]}-{hex[5..]}";
+    }
+
+    // ponytail: recovery codes are already random high-entropy tokens (not user-chosen
+    // passwords), so a plain SHA-256 hash is sufficient -- no per-code salt or PBKDF2 needed.
+    private static string HashRecoveryCode(string code)
+    {
+        var normalized = code.Trim().ToLowerInvariant();
+        return Convert.ToHexString(SHA256.HashData(Encoding.UTF8.GetBytes(normalized))).ToLowerInvariant();
+    }
+}

JobTrackerApi/Program.cs

@@ -183,12 +183,16 @@ builder.Services.AddIdentityCore<ApplicationUser>(options =>
         options.Password.RequireUppercase = false;
         options.Password.RequireNonAlphanumeric = false;
         options.Password.RequiredLength = 8;
+        options.Lockout.DefaultLockoutTimeSpan = TimeSpan.FromMinutes(15);
+        options.Lockout.MaxFailedAccessAttempts = 5;
+        options.Lockout.AllowedForNewUsers = true;
     })
     .AddRoles<IdentityRole>()
     .AddEntityFrameworkStores<JobTrackerContext>()
     .AddSignInManager();
 
 builder.Services.AddScoped<ITokenService, TokenService>();
+builder.Services.AddSingleton<ITwoFactorPendingTokenService, TwoFactorPendingTokenService>();
 
 builder.Services.AddSingleton<UniversalJobParser>();
 builder.Services.AddSingleton<IHostAddressResolver, DnsHostAddressResolver>();
@@ -282,16 +286,29 @@ builder.Services.AddAuthentication(options =>
 
                 return Task.CompletedTask;
             },
-            OnTokenValidated = context =>
+            OnTokenValidated = async context =>
             {
                 var userId = LocalAuthIdentity.GetRequiredUserId(context.Principal);
-                if (userId is not null)
+                if (userId is null)
                 {
-                    return Task.CompletedTask;
+                    context.Fail("Local tokens must include a subject/nameidentifier claim.");
+                    return;
                 }
 
-                context.Fail("Local tokens must include a subject/nameidentifier claim.");
-                return Task.CompletedTask;
+                // Resolve a fresh scoped JobTrackerContext for this one lookup -- OnTokenValidated
+                // runs outside the request's normal DI-constructor scope, so RequestServices (the
+                // per-request scope) must be used directly rather than a captured/singleton one.
+                // Fail closed if the session row is missing/revoked/expired (including tokens
+                // with no "sid" claim at all -- see LocalSessionValidator for why: every JWT
+                // issued going forward carries one, so a token without it is either pre-deploy
+                // (forces a single re-login for anyone already signed in when this ships --
+                // acceptable, same additive-forward cost the 2FA/trusted-device features on this
+                // branch already paid) or forged, and either way isn't proof of a live session.
+                var db = context.HttpContext.RequestServices.GetRequiredService<JobTrackerContext>();
+                if (!await LocalSessionValidator.IsValidAsync(db, context.Principal, DateTimeOffset.UtcNow))
+                {
+                    context.Fail("Session has been revoked or expired.");
+                }
             }
         };
         options.TokenValidationParameters = new TokenValidationParameters
@@ -378,6 +395,19 @@ builder.Services.AddRateLimiter(options =>
                 QueueProcessingOrder = QueueProcessingOrder.OldestFirst,
                 QueueLimit = 0,
             }));
+
+    // Brute-forcing a 6-digit TOTP code (1e6 space) is far more feasible than a password, so
+    // this gets a tighter window than auth-login.
+    options.AddPolicy("auth-2fa-challenge", context =>
+        RateLimitPartition.GetFixedWindowLimiter(
+            partitionKey: $"2fa:{context.Connection.RemoteIpAddress?.ToString() ?? "unknown"}",
+            factory: _ => new FixedWindowRateLimiterOptions
+            {
+                PermitLimit = 5,
+                Window = TimeSpan.FromMinutes(5),
+                QueueProcessingOrder = QueueProcessingOrder.OldestFirst,
+                QueueLimit = 0,
+            }));
 });
 
 var app = builder.Build();

JobTrackerApi/Services/AppSessionIssuer.cs

@@ -0,0 +1,41 @@
+using System.Security.Cryptography;
+using JobTrackerApi.Data;
+using JobTrackerApi.Models;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Configuration;
+
+namespace JobTrackerApi.Services;
+
+// Shared by AuthController (local/Google/Microsoft sign-in) and TwoFactorController (the
+// post-challenge sign-in) so the httpOnly session cookie + readable CSRF cookie are always
+// issued the same way, from one place. Also the single place a UserSession row is created, so
+// every JWT this app ever hands out has a matching server-side row Program.cs can revoke.
+public static class AppSessionIssuer
+{
+    public static async Task IssueAsync(HttpRequest request, HttpResponse response, ITokenService tokens, JobTrackerContext db, IConfiguration cfg, ApplicationUser user, bool rememberMe, CancellationToken cancellationToken)
+    {
+        var minutes = cfg.GetValue("Auth:JwtExpiresMinutes", 60 * 12);
+        if (minutes < 5) minutes = 5;
+        if (minutes > 60 * 24 * 30) minutes = 60 * 24 * 30;
+
+        var now = DateTimeOffset.UtcNow;
+        var session = new UserSession
+        {
+            Id = Guid.NewGuid().ToString("N"),
+            UserId = user.Id,
+            DeviceLabel = TrustedDeviceService.DescribeUserAgent(request.Headers["User-Agent"].ToString()),
+            CreatedAtUtc = now,
+            LastSeenAtUtc = now,
+            ExpiresAtUtc = now.AddMinutes(minutes),
+        };
+        db.UserSessions.Add(session);
+        await db.SaveChangesAsync(cancellationToken);
+
+        var token = await tokens.CreateAccessTokenAsync(user, session.Id, cancellationToken);
+        var secure = request.IsHttps || string.Equals(request.Headers["X-Forwarded-Proto"], "https", StringComparison.OrdinalIgnoreCase);
+        response.Cookies.Append(AuthSessionOptions.SessionCookieName, token, AuthSessionOptions.BuildSessionCookie(rememberMe, secure));
+
+        var csrf = Convert.ToHexString(RandomNumberGenerator.GetBytes(32)).ToLowerInvariant();
+        response.Cookies.Append(AuthSessionOptions.CsrfCookieName, csrf, AuthSessionOptions.BuildCsrfCookie(rememberMe, secure));
+    }
+}

JobTrackerApi/Services/AuthSessionOptions.cs

@@ -7,6 +7,7 @@ public static class AuthSessionOptions
     public const string SessionCookieName = "jobtracker_auth";
     public const string CsrfCookieName = "XSRF-TOKEN";
     public const string CsrfHeaderName = "X-CSRF-TOKEN";
+    public const string TrustedDeviceCookieName = "jobtracker_td";
 
     public static CookieOptions BuildSessionCookie(bool persistent, bool secure)
     {
@@ -75,4 +76,35 @@ public static class AuthSessionOptions
             MaxAge = TimeSpan.Zero,
         };
     }
+
+    // Stricter than the session cookie (SameSite=Strict, never HttpOnly=false): this cookie's
+    // only job is "skip the 2FA prompt", so it must never be readable by JS and should not even
+    // be sent on cross-site navigations.
+    public static CookieOptions BuildTrustedDeviceCookie(bool secure)
+    {
+        return new CookieOptions
+        {
+            HttpOnly = true,
+            IsEssential = true,
+            SameSite = SameSiteMode.Strict,
+            Secure = secure,
+            Path = "/",
+            Expires = DateTimeOffset.UtcNow.AddDays(30),
+            MaxAge = TimeSpan.FromDays(30),
+        };
+    }
+
+    public static CookieOptions BuildExpiredTrustedDeviceCookie(bool secure)
+    {
+        return new CookieOptions
+        {
+            HttpOnly = true,
+            IsEssential = true,
+            SameSite = SameSiteMode.Strict,
+            Secure = secure,
+            Path = "/",
+            Expires = DateTimeOffset.UnixEpoch,
+            MaxAge = TimeSpan.Zero,
+        };
+    }
 }

JobTrackerApi/Services/LocalSessionValidator.cs

@@ -0,0 +1,30 @@
+using System.Security.Claims;
+using JobTrackerApi.Data;
+using Microsoft.EntityFrameworkCore;
+
+namespace JobTrackerApi.Services;
+
+// The actual revocation check behind Program.cs's "local" JwtBearer OnTokenValidated. Pulled out
+// of Program.cs so it's unit-testable without standing up a full TestServer/HTTP pipeline.
+public static class LocalSessionValidator
+{
+    public static async Task<bool> IsValidAsync(JobTrackerContext db, ClaimsPrincipal? principal, DateTimeOffset now, CancellationToken cancellationToken = default)
+    {
+        var sid = principal?.FindFirst("sid")?.Value;
+        // Fail closed: see the comment on the OnTokenValidated wiring in Program.cs for why a
+        // missing sid is rejected rather than grandfathered in.
+        if (string.IsNullOrWhiteSpace(sid)) return false;
+
+        var session = await db.UserSessions.IgnoreQueryFilters()
+            .FirstOrDefaultAsync(x => x.Id == sid, cancellationToken);
+        if (session is null || session.RevokedAtUtc is not null || session.ExpiresAtUtc <= now) return false;
+
+        if (now - session.LastSeenAtUtc > TimeSpan.FromMinutes(5))
+        {
+            session.LastSeenAtUtc = now;
+            await db.SaveChangesAsync(cancellationToken);
+        }
+
+        return true;
+    }
+}

JobTrackerApi/Services/StartupInitializationExtensions.cs

@@ -244,6 +244,9 @@ public static class StartupInitializationExtensions
             `MicrosoftSubject` longtext NULL,
             `MicrosoftEmail` longtext NULL,
             `MicrosoftLinkedAt` datetime(6) NULL,
+            `TotpSecretEncrypted` longtext NULL,
+            `TotpPendingSecretEncrypted` longtext NULL,
+            `TotpEnabledAtUtc` datetime(6) NULL,
             PRIMARY KEY (`Id`)
         ) CHARACTER SET=utf8mb4;
 
@@ -359,7 +362,10 @@ public static class StartupInitializationExtensions
             "GoogleLinkedAt" TEXT NULL,
             "MicrosoftSubject" TEXT NULL,
             "MicrosoftEmail" TEXT NULL,
-            "MicrosoftLinkedAt" TEXT NULL
+            "MicrosoftLinkedAt" TEXT NULL,
+            "TotpSecretEncrypted" TEXT NULL,
+            "TotpPendingSecretEncrypted" TEXT NULL,
+            "TotpEnabledAtUtc" TEXT NULL
         );
         """);
 
@@ -440,6 +446,9 @@ public static class StartupInitializationExtensions
                 EnsureColumn(conn, "AspNetUsers", "MicrosoftSubject", "ALTER TABLE AspNetUsers ADD COLUMN MicrosoftSubject TEXT NULL;");
                 EnsureColumn(conn, "AspNetUsers", "MicrosoftEmail", "ALTER TABLE AspNetUsers ADD COLUMN MicrosoftEmail TEXT NULL;");
                 EnsureColumn(conn, "AspNetUsers", "MicrosoftLinkedAt", "ALTER TABLE AspNetUsers ADD COLUMN MicrosoftLinkedAt TEXT NULL;");
+                EnsureColumn(conn, "AspNetUsers", "TotpSecretEncrypted", "ALTER TABLE AspNetUsers ADD COLUMN TotpSecretEncrypted TEXT NULL;");
+                EnsureColumn(conn, "AspNetUsers", "TotpPendingSecretEncrypted", "ALTER TABLE AspNetUsers ADD COLUMN TotpPendingSecretEncrypted TEXT NULL;");
+                EnsureColumn(conn, "AspNetUsers", "TotpEnabledAtUtc", "ALTER TABLE AspNetUsers ADD COLUMN TotpEnabledAtUtc TEXT NULL;");
 
                 static void EnsureUserRuleSettingsTable(DbConnection c)
                 {
@@ -623,10 +632,63 @@ public static class StartupInitializationExtensions
                     Exec(c, """CREATE INDEX IF NOT EXISTS "IX_TailoredCvDrafts_JobApplicationId" ON "TailoredCvDrafts" ("JobApplicationId");""");
                 }
 
+                static void EnsureTwoFactorRecoveryCodesTable(DbConnection c)
+                {
+                    Exec(c, """
+        CREATE TABLE IF NOT EXISTS "TwoFactorRecoveryCodes" (
+            "Id" INTEGER NOT NULL CONSTRAINT "PK_TwoFactorRecoveryCodes" PRIMARY KEY AUTOINCREMENT,
+            "UserId" TEXT NOT NULL,
+            "CodeHash" TEXT NOT NULL,
+            "CreatedAtUtc" TEXT NOT NULL,
+            "UsedAtUtc" TEXT NULL
+        );
+        """);
+
+                    Exec(c, """CREATE INDEX IF NOT EXISTS "IX_TwoFactorRecoveryCodes_UserId_UsedAtUtc" ON "TwoFactorRecoveryCodes" ("UserId", "UsedAtUtc");""");
+                }
+
+                static void EnsureTrustedDevicesTable(DbConnection c)
+                {
+                    Exec(c, """
+        CREATE TABLE IF NOT EXISTS "TrustedDevices" (
+            "Id" INTEGER NOT NULL CONSTRAINT "PK_TrustedDevices" PRIMARY KEY AUTOINCREMENT,
+            "UserId" TEXT NOT NULL,
+            "TokenHash" TEXT NOT NULL,
+            "DeviceLabel" TEXT NULL,
+            "CreatedAtUtc" TEXT NOT NULL,
+            "LastSeenAtUtc" TEXT NOT NULL,
+            "ExpiresAtUtc" TEXT NOT NULL
+        );
+        """);
+
+                    Exec(c, """CREATE INDEX IF NOT EXISTS "IX_TrustedDevices_UserId" ON "TrustedDevices" ("UserId");""");
+                    Exec(c, """CREATE INDEX IF NOT EXISTS "IX_TrustedDevices_TokenHash" ON "TrustedDevices" ("TokenHash");""");
+                }
+
+                static void EnsureUserSessionsTable(DbConnection c)
+                {
+                    Exec(c, """
+        CREATE TABLE IF NOT EXISTS "UserSessions" (
+            "Id" TEXT NOT NULL CONSTRAINT "PK_UserSessions" PRIMARY KEY,
+            "UserId" TEXT NOT NULL,
+            "DeviceLabel" TEXT NULL,
+            "CreatedAtUtc" TEXT NOT NULL,
+            "LastSeenAtUtc" TEXT NOT NULL,
+            "ExpiresAtUtc" TEXT NOT NULL,
+            "RevokedAtUtc" TEXT NULL
+        );
+        """);
+
+                    Exec(c, """CREATE INDEX IF NOT EXISTS "IX_UserSessions_UserId" ON "UserSessions" ("UserId");""");
+                }
+
                 EnsureGmailConnectionsTable(conn);
                 EnsureMicrosoftGraphConnectionsTable(conn);
                 EnsureImapConnectionsTable(conn);
                 EnsureCvTables(conn);
+                EnsureTwoFactorRecoveryCodesTable(conn);
+                EnsureTrustedDevicesTable(conn);
+                EnsureUserSessionsTable(conn);
 
                 // Legacy DB signature: migration history exists (AddCorrespondence applied), but 20260310195000 not recorded,
                 // and at least one of the new columns already exists.
@@ -769,6 +831,9 @@ public static class StartupInitializationExtensions
                     EnsureMySqlColumn(conn, "AspNetUsers", "MicrosoftSubject", "ALTER TABLE `AspNetUsers` ADD COLUMN `MicrosoftSubject` longtext NULL;");
                     EnsureMySqlColumn(conn, "AspNetUsers", "MicrosoftEmail", "ALTER TABLE `AspNetUsers` ADD COLUMN `MicrosoftEmail` longtext NULL;");
                     EnsureMySqlColumn(conn, "AspNetUsers", "MicrosoftLinkedAt", "ALTER TABLE `AspNetUsers` ADD COLUMN `MicrosoftLinkedAt` datetime NULL;");
+                    EnsureMySqlColumn(conn, "AspNetUsers", "TotpSecretEncrypted", "ALTER TABLE `AspNetUsers` ADD COLUMN `TotpSecretEncrypted` longtext NULL;");
+                    EnsureMySqlColumn(conn, "AspNetUsers", "TotpPendingSecretEncrypted", "ALTER TABLE `AspNetUsers` ADD COLUMN `TotpPendingSecretEncrypted` longtext NULL;");
+                    EnsureMySqlColumn(conn, "AspNetUsers", "TotpEnabledAtUtc", "ALTER TABLE `AspNetUsers` ADD COLUMN `TotpEnabledAtUtc` datetime NULL;");
 
                     if (!HasMySqlTable(conn, "RuleSettings"))
                     {
@@ -977,6 +1042,84 @@ public static class StartupInitializationExtensions
                         cmd.ExecuteNonQuery();
                     }
 
+                    if (!HasMySqlTable(conn, "TwoFactorRecoveryCodes"))
+                    {
+                        using var cmd = conn.CreateCommand();
+                        cmd.CommandText = @"CREATE TABLE IF NOT EXISTS `TwoFactorRecoveryCodes` (
+        `Id` int NOT NULL AUTO_INCREMENT,
+        `UserId` varchar(255) NOT NULL,
+        `CodeHash` varchar(255) NOT NULL,
+        `CreatedAtUtc` datetime(6) NOT NULL,
+        `UsedAtUtc` datetime(6) NULL,
+        PRIMARY KEY (`Id`)
+        );";
+                        cmd.ExecuteNonQuery();
+                    }
+
+                    EnsureMySqlAutoIncrementPrimaryKey(conn, "TwoFactorRecoveryCodes", "Id");
+
+                    if (!MySqlIndexExists(conn, "TwoFactorRecoveryCodes", "IX_TwoFactorRecoveryCodes_UserId_UsedAtUtc"))
+                    {
+                        using var cmd = conn.CreateCommand();
+                        cmd.CommandText = "CREATE INDEX `IX_TwoFactorRecoveryCodes_UserId_UsedAtUtc` ON `TwoFactorRecoveryCodes` (`UserId`, `UsedAtUtc`);";
+                        cmd.ExecuteNonQuery();
+                    }
+
+                    if (!HasMySqlTable(conn, "TrustedDevices"))
+                    {
+                        using var cmd = conn.CreateCommand();
+                        cmd.CommandText = @"CREATE TABLE IF NOT EXISTS `TrustedDevices` (
+        `Id` int NOT NULL AUTO_INCREMENT,
+        `UserId` varchar(255) NOT NULL,
+        `TokenHash` varchar(255) NOT NULL,
+        `DeviceLabel` varchar(255) NULL,
+        `CreatedAtUtc` datetime(6) NOT NULL,
+        `LastSeenAtUtc` datetime(6) NOT NULL,
+        `ExpiresAtUtc` datetime(6) NOT NULL,
+        PRIMARY KEY (`Id`)
+        );";
+                        cmd.ExecuteNonQuery();
+                    }
+
+                    EnsureMySqlAutoIncrementPrimaryKey(conn, "TrustedDevices", "Id");
+
+                    if (!MySqlIndexExists(conn, "TrustedDevices", "IX_TrustedDevices_UserId"))
+                    {
+                        using var cmd = conn.CreateCommand();
+                        cmd.CommandText = "CREATE INDEX `IX_TrustedDevices_UserId` ON `TrustedDevices` (`UserId`);";
+                        cmd.ExecuteNonQuery();
+                    }
+
+                    if (!MySqlIndexExists(conn, "TrustedDevices", "IX_TrustedDevices_TokenHash"))
+                    {
+                        using var cmd = conn.CreateCommand();
+                        cmd.CommandText = "CREATE INDEX `IX_TrustedDevices_TokenHash` ON `TrustedDevices` (`TokenHash`);";
+                        cmd.ExecuteNonQuery();
+                    }
+
+                    if (!HasMySqlTable(conn, "UserSessions"))
+                    {
+                        using var cmd = conn.CreateCommand();
+                        cmd.CommandText = @"CREATE TABLE IF NOT EXISTS `UserSessions` (
+        `Id` varchar(64) NOT NULL,
+        `UserId` varchar(255) NOT NULL,
+        `DeviceLabel` varchar(255) NULL,
+        `CreatedAtUtc` datetime(6) NOT NULL,
+        `LastSeenAtUtc` datetime(6) NOT NULL,
+        `ExpiresAtUtc` datetime(6) NOT NULL,
+        `RevokedAtUtc` datetime(6) NULL,
+        PRIMARY KEY (`Id`)
+        );";
+                        cmd.ExecuteNonQuery();
+                    }
+
+                    if (!MySqlIndexExists(conn, "UserSessions", "IX_UserSessions_UserId"))
+                    {
+                        using var cmd = conn.CreateCommand();
+                        cmd.CommandText = "CREATE INDEX `IX_UserSessions_UserId` ON `UserSessions` (`UserId`);";
+                        cmd.ExecuteNonQuery();
+                    }
+
                     if (!MySqlIndexExists(conn, "Companies", "IX_Companies_OwnerUserId"))
                     {
                         using var cmd = conn.CreateCommand();

JobTrackerApi/Services/TokenService.cs

@@ -10,7 +10,7 @@ namespace JobTrackerApi.Services;
 
 public interface ITokenService
 {
-    Task<string> CreateAccessTokenAsync(ApplicationUser user, CancellationToken cancellationToken = default);
+    Task<string> CreateAccessTokenAsync(ApplicationUser user, string? sessionId = null, CancellationToken cancellationToken = default);
 }
 
 public sealed class TokenService : ITokenService
@@ -24,7 +24,7 @@ public sealed class TokenService : ITokenService
         _users = users;
     }
 
-    public async Task<string> CreateAccessTokenAsync(ApplicationUser user, CancellationToken cancellationToken = default)
+    public async Task<string> CreateAccessTokenAsync(ApplicationUser user, string? sessionId = null, CancellationToken cancellationToken = default)
     {
         var jwtKey = (_cfg["Auth:JwtKey"] ?? "").Trim();
         if (string.IsNullOrWhiteSpace(jwtKey))
@@ -57,6 +57,9 @@ public sealed class TokenService : ITokenService
         foreach (var r in roles)
             claims.Add(new Claim(ClaimTypes.Role, r));
 
+        if (!string.IsNullOrWhiteSpace(sessionId))
+            claims.Add(new Claim("sid", sessionId));
+
         var now = DateTime.UtcNow;
 
         var token = new JwtSecurityToken(

JobTrackerApi/Services/TrustedDeviceService.cs

@@ -0,0 +1,115 @@
+using System.Security.Cryptography;
+using System.Text;
+using JobTrackerApi.Data;
+using JobTrackerApi.Models;
+using Microsoft.AspNetCore.Http;
+using Microsoft.EntityFrameworkCore;
+
+namespace JobTrackerApi.Services;
+
+// "Trust this device for 30 days" -- lets a 2FA challenge be skipped on the same browser for a
+// month. Shared by AuthController (checks the cookie before gating on 2FA) and
+// TwoFactorController (issues/lists/revokes the cookie's backing row). Never stores the
+// plaintext token, only its SHA-256 hash.
+public static class TrustedDeviceService
+{
+    private static readonly TimeSpan Lifetime = TimeSpan.FromDays(30);
+
+    // Only returns true (and thus skips 2FA) when the cookie's hash matches a non-expired row
+    // for THIS SPECIFIC user -- UserId is part of the DB query itself, not a check applied
+    // after the fact, so a trusted-device cookie minted for user A can never skip 2FA for user
+    // B even if somehow presented on their request.
+    public static async Task<bool> IsDeviceTrustedAsync(JobTrackerContext db, HttpRequest request, string userId, CancellationToken cancellationToken)
+    {
+        var token = request.Cookies[AuthSessionOptions.TrustedDeviceCookieName];
+        if (string.IsNullOrWhiteSpace(token)) return false;
+
+        var hash = HashToken(token);
+        var now = DateTimeOffset.UtcNow;
+        // SQLite/Pomelo cannot translate DateTimeOffset relational comparisons (>) to SQL, so the
+        // expiry check has to happen after materializing the row -- fine here since the equality
+        // filters (UserId, TokenHash) already narrow this to at most one row.
+        var match = await db.TrustedDevices
+            .IgnoreQueryFilters()
+            .FirstOrDefaultAsync(x => x.UserId == userId && x.TokenHash == hash, cancellationToken);
+        if (match is null || match.ExpiresAtUtc <= now) return false;
+
+        match.LastSeenAtUtc = now;
+        await db.SaveChangesAsync(cancellationToken);
+        return true;
+    }
+
+    public static async Task IssueAsync(JobTrackerContext db, HttpRequest request, HttpResponse response, string userId, CancellationToken cancellationToken)
+    {
+        var token = Convert.ToHexString(RandomNumberGenerator.GetBytes(32)).ToLowerInvariant();
+        var now = DateTimeOffset.UtcNow;
+
+        db.TrustedDevices.Add(new TrustedDevice
+        {
+            UserId = userId,
+            TokenHash = HashToken(token),
+            DeviceLabel = DescribeUserAgent(request.Headers["User-Agent"].ToString()),
+            CreatedAtUtc = now,
+            LastSeenAtUtc = now,
+            ExpiresAtUtc = now.Add(Lifetime),
+        });
+        await db.SaveChangesAsync(cancellationToken);
+
+        var secure = request.IsHttps || string.Equals(request.Headers["X-Forwarded-Proto"], "https", StringComparison.OrdinalIgnoreCase);
+        response.Cookies.Append(AuthSessionOptions.TrustedDeviceCookieName, token, AuthSessionOptions.BuildTrustedDeviceCookie(secure));
+    }
+
+    public static void ClearCookie(HttpRequest request, HttpResponse response)
+    {
+        var secure = request.IsHttps || string.Equals(request.Headers["X-Forwarded-Proto"], "https", StringComparison.OrdinalIgnoreCase);
+        response.Cookies.Delete(AuthSessionOptions.TrustedDeviceCookieName, AuthSessionOptions.BuildExpiredTrustedDeviceCookie(secure));
+    }
+
+    // Used to flag "this device" in the trusted-devices list without ever sending a token or
+    // hash to the client -- just a boolean per row.
+    public static string? CurrentDeviceTokenHash(HttpRequest request)
+    {
+        var token = request.Cookies[AuthSessionOptions.TrustedDeviceCookieName];
+        return string.IsNullOrWhiteSpace(token) ? null : HashToken(token);
+    }
+
+    public static string HashToken(string token)
+    {
+        return Convert.ToHexString(SHA256.HashData(Encoding.UTF8.GetBytes(token.Trim()))).ToLowerInvariant();
+    }
+
+    private static readonly (string Needle, string Label)[] BrowserMarkers =
+    {
+        ("Edg/", "Edge"),
+        ("OPR/", "Opera"),
+        ("Chrome/", "Chrome"),
+        ("Firefox/", "Firefox"),
+        ("Safari/", "Safari"),
+    };
+
+    private static readonly (string Needle, string Label)[] OsMarkers =
+    {
+        ("Windows", "Windows"),
+        ("Mac OS X", "Mac"),
+        ("iPhone", "iOS"),
+        ("iPad", "iOS"),
+        ("Android", "Android"),
+        ("Linux", "Linux"),
+    };
+
+    // ponytail: substring sniffing, not a real UA parser -- this only feeds a display label in
+    // a security-settings list ("Chrome on Windows"), nothing security-relevant depends on it.
+    // Public: also reused by AppSessionIssuer for UserSession device labels.
+    public static string? DescribeUserAgent(string? userAgent)
+    {
+        if (string.IsNullOrWhiteSpace(userAgent)) return null;
+
+        var browser = BrowserMarkers.FirstOrDefault(m => userAgent.Contains(m.Needle, StringComparison.Ordinal)).Label;
+        var os = OsMarkers.FirstOrDefault(m => userAgent.Contains(m.Needle, StringComparison.Ordinal)).Label;
+
+        if (browser is null && os is null) return userAgent.Length > 80 ? userAgent[..80] : userAgent;
+        if (browser is null) return os;
+        if (os is null) return browser;
+        return $"{browser} on {os}";
+    }
+}

JobTrackerApi/Services/TwoFactorPendingTokenService.cs

@@ -0,0 +1,47 @@
+using System.Security.Cryptography;
+using Microsoft.Extensions.Caching.Memory;
+
+namespace JobTrackerApi.Services;
+
+public sealed record PendingTwoFactorSession(string UserId, bool RememberMe);
+
+public interface ITwoFactorPendingTokenService
+{
+    string IssuePendingToken(string userId, bool rememberMe);
+    PendingTwoFactorSession? Resolve(string pendingToken, bool consume);
+}
+
+// ponytail: server-side opaque token in IMemoryCache, deliberately NOT a JWT. A JWT signed
+// with the app's normal signing key would be accepted by the "local" JWT bearer auth scheme
+// for every other endpoint unless its issuer/audience/claims were carefully kept out of that
+// scheme's validation -- an opaque cache-backed token can never be presented as a bearer
+// token, so it structurally cannot grant a real session by itself. Single instance is fine:
+// this is a short-lived (5 min), single-process dev/prod deployment, same as the rest of this
+// app's in-memory state (rate limiter, IMemoryCache already registered in Program.cs).
+public sealed class TwoFactorPendingTokenService : ITwoFactorPendingTokenService
+{
+    private static readonly TimeSpan Ttl = TimeSpan.FromMinutes(5);
+    private readonly IMemoryCache _cache;
+
+    public TwoFactorPendingTokenService(IMemoryCache cache)
+    {
+        _cache = cache;
+    }
+
+    public string IssuePendingToken(string userId, bool rememberMe)
+    {
+        var token = Convert.ToHexString(RandomNumberGenerator.GetBytes(32)).ToLowerInvariant();
+        _cache.Set(CacheKey(token), new PendingTwoFactorSession(userId, rememberMe), Ttl);
+        return token;
+    }
+
+    public PendingTwoFactorSession? Resolve(string pendingToken, bool consume)
+    {
+        var key = CacheKey(pendingToken);
+        if (!_cache.TryGetValue(key, out PendingTwoFactorSession? session)) return null;
+        if (consume) _cache.Remove(key);
+        return session;
+    }
+
+    private static string CacheKey(string token) => $"2fa-pending:{token}";
+}

JobTrackerApi/appsettings.Development.json

@@ -20,6 +20,7 @@
   "Auth": {
     "Require": true,
     "AllowRegistration": true,
+    "RequireEmailVerification": false,
     "JwtKey": "CHANGE_ME_DEV_ONLY_LONG_RANDOM_SECRET",
     "JwtIssuer": "JobTrackerApi",
     "JwtAudience": "job-tracker-ui",

JobTrackerBackend/JobTrackerBackend.csproj

@@ -27,6 +27,8 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.14" />
+    <PackageReference Include="Otp.NET" Version="1.4.1" />
+    <PackageReference Include="QRCoder" Version="1.8.0" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.14.0" />
     <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.14.0" />
     <PackageReference Include="MailKit" Version="4.17.0" />

Models/ApplicationUser.cs

@@ -19,4 +19,7 @@ public sealed class ApplicationUser : IdentityUser
     public string? MicrosoftSubject { get; set; }
     public string? MicrosoftEmail { get; set; }
     public DateTimeOffset? MicrosoftLinkedAt { get; set; }
+    public string? TotpSecretEncrypted { get; set; }
+    public string? TotpPendingSecretEncrypted { get; set; }
+    public DateTimeOffset? TotpEnabledAtUtc { get; set; }
 }

Models/TrustedDevice.cs

@@ -0,0 +1,16 @@
+namespace JobTrackerApi.Models;
+
+// "Trust this device for 30 days" -- lets a browser skip the 2FA code step after one successful
+// challenge. Never store the plaintext token, only its SHA-256 hash, same rationale as
+// TwoFactorRecoveryCode.CodeHash: a DB read (backup, replica, leaked snapshot) can't be turned
+// into a working cookie.
+public sealed class TrustedDevice
+{
+    public int Id { get; set; }
+    public string UserId { get; set; } = "";
+    public string TokenHash { get; set; } = "";
+    public string? DeviceLabel { get; set; }
+    public DateTimeOffset CreatedAtUtc { get; set; }
+    public DateTimeOffset LastSeenAtUtc { get; set; }
+    public DateTimeOffset ExpiresAtUtc { get; set; }
+}

Models/TwoFactorRecoveryCode.cs

@@ -0,0 +1,12 @@
+namespace JobTrackerApi.Models;
+
+// One-time-use 2FA recovery codes. Plaintext is shown once at generation time and never
+// persisted -- only the SHA-256 hash is stored so a DB read can't recover usable codes.
+public sealed class TwoFactorRecoveryCode
+{
+    public int Id { get; set; }
+    public string UserId { get; set; } = "";
+    public string CodeHash { get; set; } = "";
+    public DateTimeOffset CreatedAtUtc { get; set; }
+    public DateTimeOffset? UsedAtUtc { get; set; }
+}

Models/UserSession.cs

@@ -0,0 +1,17 @@
+namespace JobTrackerApi.Models;
+
+// Server-side record of a JWT issued via AppSessionIssuer. The JWT carries this row's Id as its
+// "sid" claim; Program.cs's "local" JwtBearer OnTokenValidated looks the row up on every request
+// so a session can actually be revoked before its JWT naturally expires (previously the JWT alone
+// was the credential -- see AppSessionIssuer). Same shape/rationale as TrustedDevice, but this
+// tracks the *session* itself rather than a "skip 2FA" cookie.
+public sealed class UserSession
+{
+    public string Id { get; set; } = "";
+    public string UserId { get; set; } = "";
+    public string? DeviceLabel { get; set; }
+    public DateTimeOffset CreatedAtUtc { get; set; }
+    public DateTimeOffset LastSeenAtUtc { get; set; }
+    public DateTimeOffset ExpiresAtUtc { get; set; }
+    public DateTimeOffset? RevokedAtUtc { get; set; }
+}

job-tracker-ui/src/App.tsx

@@ -31,6 +31,7 @@ import LoginPage from "./views/LoginPage";
 import LandingPage from "./views/LandingPage";
 import ForgotPasswordPage from "./views/ForgotPasswordPage";
 import ResetPasswordPage from "./views/ResetPasswordPage";
+import VerifyEmailPage from "./views/VerifyEmailPage";
 import RouteErrorPage from "./views/RouteErrorPage";
 import { api } from "./api";
 import { resolveCaptureUrl } from "./captureUrl";
@@ -366,6 +367,7 @@ export default function App() {
     { path: "/login", element: <LoginPage />, errorElement: <RouteErrorPage /> },
     { path: "/forgot-password", element: <ForgotPasswordPage />, errorElement: <RouteErrorPage /> },
     { path: "/reset-password", element: <ResetPasswordPage />, errorElement: <RouteErrorPage /> },
+    { path: "/verify-email", element: <VerifyEmailPage />, errorElement: <RouteErrorPage /> },
     { path: "/*", element: <Shell jobPageSize={jobPageSize} setJobPageSize={setJobPageSize} jobColumns={jobColumns} setJobColumns={setJobColumns} themeMode={themeMode} onThemeModeChange={onThemeModeChange} />, errorElement: <RouteErrorPage /> },
   ], { future: { v7_relativeSplatPath: true } }), [jobColumns, jobPageSize, themeMode]);
 

job-tracker-ui/src/components/GoogleAuthCard.tsx

@@ -4,6 +4,7 @@ import { Box, Button, Chip, Paper, Typography } from "@mui/material";
 
 import { api, getApiErrorMessage } from "../api";
 import { clearAuthClientState, getAuthPersistencePreference } from "../auth";
+import TwoFactorChallenge from "./TwoFactorChallenge";
 import { useToast } from "../toast";
 import { useI18n } from "../i18n/I18nProvider";
 
@@ -52,6 +53,7 @@ export default function GoogleAuthCard({ onSignedIn }: { onSignedIn?: () => void
   const [me, setMe] = useState<MeResponse | null>(null);
   const [working, setWorking] = useState(false);
   const [allowRegistration, setAllowRegistration] = useState(false);
+  const [pendingToken, setPendingToken] = useState<string | null>(null);
   const hostRef = useRef<HTMLDivElement | null>(null);
 
   const clientId = (process.env.NEXT_PUBLIC_GOOGLE_CLIENT_ID || "").trim();
@@ -109,10 +111,14 @@ export default function GoogleAuthCard({ onSignedIn }: { onSignedIn?: () => void
                 toast(res.data?.email ? t("googleLinkedSuccessWithEmail", { email: res.data.email }) : t("googleLinkedSuccess"), "success");
                 await refreshMe();
               } else {
-                await api.post("/auth/google/exchange", { token: credential, rememberMe: getAuthPersistencePreference() === "local" });
-                window.dispatchEvent(new Event("auth-changed"));
-                toast(t("googleSignedIn"), "success");
-                onSignedIn?.();
+                const res = await api.post<{ requiresTwoFactor?: boolean; pendingToken?: string }>("/auth/google/exchange", { token: credential, rememberMe: getAuthPersistencePreference() === "local" });
+                if (res.data?.requiresTwoFactor && res.data.pendingToken) {
+                  setPendingToken(res.data.pendingToken);
+                } else {
+                  window.dispatchEvent(new Event("auth-changed"));
+                  toast(t("googleSignedIn"), "success");
+                  onSignedIn?.();
+                }
               }
             } catch (e: any) {
               toast(getApiErrorMessage(e, t("googleAuthFailed")), "error");
@@ -151,7 +157,20 @@ export default function GoogleAuthCard({ onSignedIn }: { onSignedIn?: () => void
         </Typography>
       )}
 
-      {clientId && (
+      {clientId && pendingToken && (
+        <TwoFactorChallenge
+          pendingToken={pendingToken}
+          onCancel={() => setPendingToken(null)}
+          onSuccess={() => {
+            setPendingToken(null);
+            window.dispatchEvent(new Event("auth-changed"));
+            toast(t("googleSignedIn"), "success");
+            onSignedIn?.();
+          }}
+        />
+      )}
+
+      {clientId && !pendingToken && (
         <Box sx={{ display: "flex", flexDirection: "column", gap: 1.25 }}>
           <Box sx={{ display: "flex", gap: 1, flexWrap: "wrap" }}>
             <Chip size="small" label={me?.googleLink?.linked ? t("googleLinked") : t("googleAvailableToLink")} color={me?.googleLink?.linked ? "success" : "default"} variant={me?.googleLink?.linked ? "filled" : "outlined"} />

job-tracker-ui/src/components/MicrosoftAuthCard.tsx

@@ -5,6 +5,7 @@ import { PublicClientApplication } from "@azure/msal-browser";
 
 import { api, getApiErrorMessage } from "../api";
 import { clearAuthClientState, getAuthPersistencePreference } from "../auth";
+import TwoFactorChallenge from "./TwoFactorChallenge";
 import { useToast } from "../toast";
 import { useI18n } from "../i18n/I18nProvider";
 
@@ -35,6 +36,7 @@ export default function MicrosoftAuthCard({ onSignedIn }: { onSignedIn?: () => v
   const { t } = useI18n();
   const [me, setMe] = useState<MeResponse | null>(null);
   const [working, setWorking] = useState(false);
+  const [pendingToken, setPendingToken] = useState<string | null>(null);
 
   const clientId = (process.env.REACT_APP_MICROSOFT_CLIENT_ID || "").trim();
   const signedIn = Boolean(me?.provider);
@@ -78,10 +80,14 @@ export default function MicrosoftAuthCard({ onSignedIn }: { onSignedIn?: () => v
         toast(res.data?.email ? t("microsoftLinkedSuccessWithEmail", { email: res.data.email }) : t("microsoftLinkedSuccess"), "success");
         await refreshMe();
       } else {
-        await api.post("/auth/microsoft/exchange", { token: idToken, rememberMe: getAuthPersistencePreference() === "local" });
-        window.dispatchEvent(new Event("auth-changed"));
-        toast(t("microsoftSignedIn"), "success");
-        onSignedIn?.();
+        const res = await api.post<{ requiresTwoFactor?: boolean; pendingToken?: string }>("/auth/microsoft/exchange", { token: idToken, rememberMe: getAuthPersistencePreference() === "local" });
+        if (res.data?.requiresTwoFactor && res.data.pendingToken) {
+          setPendingToken(res.data.pendingToken);
+        } else {
+          window.dispatchEvent(new Event("auth-changed"));
+          toast(t("microsoftSignedIn"), "success");
+          onSignedIn?.();
+        }
       }
     } catch (e: any) {
       toast(getApiErrorMessage(e, t("microsoftAuthFailed")), "error");
@@ -104,7 +110,20 @@ export default function MicrosoftAuthCard({ onSignedIn }: { onSignedIn?: () => v
         </Typography>
       )}
 
-      {clientId && (
+      {clientId && pendingToken && (
+        <TwoFactorChallenge
+          pendingToken={pendingToken}
+          onCancel={() => setPendingToken(null)}
+          onSuccess={() => {
+            setPendingToken(null);
+            window.dispatchEvent(new Event("auth-changed"));
+            toast(t("microsoftSignedIn"), "success");
+            onSignedIn?.();
+          }}
+        />
+      )}
+
+      {clientId && !pendingToken && (
         <Box sx={{ display: "flex", flexDirection: "column", gap: 1.25 }}>
           <Box sx={{ display: "flex", gap: 1, flexWrap: "wrap" }}>
             <Chip size="small" label={me?.microsoftLink?.linked ? t("microsoftLinked") : t("microsoftAvailableToLink")} color={me?.microsoftLink?.linked ? "success" : "default"} variant={me?.microsoftLink?.linked ? "filled" : "outlined"} />

job-tracker-ui/src/components/SessionsSettingsCard.tsx

@@ -0,0 +1,148 @@
+import React, { useEffect, useState } from "react";
+
+import {
+  Alert,
+  Box,
+  Button,
+  Dialog,
+  DialogActions,
+  DialogContent,
+  DialogTitle,
+  IconButton,
+  List,
+  ListItem,
+  ListItemSecondaryAction,
+  ListItemText,
+  Paper,
+  Typography,
+} from "@mui/material";
+import DeleteIcon from "@mui/icons-material/Delete";
+
+import { api, getApiErrorMessage } from "../api";
+import { useToast } from "../toast";
+import { useI18n } from "../i18n/I18nProvider";
+import { clearAuthClientState } from "../auth";
+
+type Session = {
+  id: string;
+  deviceLabel: string | null;
+  createdAtUtc: string;
+  lastSeenAtUtc: string;
+  expiresAtUtc: string;
+  isCurrentSession: boolean;
+};
+
+function apiErrorMessage(e: any, t: (k: any) => string) {
+  return getApiErrorMessage(e, t("twoFactorGenericError"));
+}
+
+export default function SessionsSettingsCard() {
+  const { toast } = useToast();
+  const { t } = useI18n();
+  const [sessions, setSessions] = useState<Session[]>([]);
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+  const [confirmRevokeOthers, setConfirmRevokeOthers] = useState(false);
+
+  const loadSessions = () => {
+    setLoading(true);
+    setError(null);
+    api
+      .get<Session[]>("/auth/sessions")
+      .then((r) => setSessions(r.data))
+      .catch((e) => setError(apiErrorMessage(e, t)))
+      .finally(() => setLoading(false));
+  };
+
+  useEffect(() => { loadSessions(); }, []);
+
+  async function revokeSession(id: string, isCurrentSession: boolean) {
+    try {
+      await api.delete(`/auth/sessions/${id}`);
+      if (isCurrentSession) {
+        // Same pattern as AuthStatusCard's sign-out: clearing local auth state emits
+        // "auth-changed", which App.tsx's listener picks up to refetch /auth/me (now 401,
+        // since the server already deleted the session cookie) and redirect to /login.
+        clearAuthClientState();
+        return;
+      }
+      toast(t("sessionsRevoked"), "success");
+      loadSessions();
+    } catch (e: any) {
+      setError(apiErrorMessage(e, t));
+    }
+  }
+
+  async function revokeOthers() {
+    try {
+      await api.post("/auth/sessions/revoke-others");
+      toast(t("sessionsRevokedOthers"), "success");
+      setConfirmRevokeOthers(false);
+      loadSessions();
+    } catch (e: any) {
+      setError(apiErrorMessage(e, t));
+    }
+  }
+
+  return (
+    <Paper sx={{ mt: 2, p: 2 }}>
+      <Typography variant="h6" sx={{ mb: 1 }}>
+        {t("sessionsSectionTitle")}
+      </Typography>
+
+      {error ? <Alert severity="error" role="alert" sx={{ mb: 1 }}>{error}</Alert> : null}
+      {!loading && sessions.length === 0 && !error ? (
+        <Typography sx={{ color: "text.secondary", mb: 1 }}>{t("sessionsEmpty")}</Typography>
+      ) : null}
+
+      {sessions.length > 0 ? (
+        <List dense disablePadding>
+          {sessions.map((s) => (
+            <ListItem key={s.id} divider>
+              <ListItemText
+                primary={
+                  <>
+                    {s.deviceLabel || t("sessionsUnknownDevice")}
+                    {s.isCurrentSession ? (
+                      <Typography component="span" variant="caption" sx={{ ml: 1, color: "primary.main", fontWeight: 700 }}>
+                        {t("sessionsCurrentDevice")}
+                      </Typography>
+                    ) : null}
+                  </>
+                }
+                secondary={t("sessionsMeta", {
+                  lastSeen: new Date(s.lastSeenAtUtc).toLocaleString(),
+                  expires: new Date(s.expiresAtUtc).toLocaleDateString(),
+                })}
+              />
+              <ListItemSecondaryAction>
+                <IconButton edge="end" aria-label={t("sessionsRevoke")} onClick={() => revokeSession(s.id, s.isCurrentSession)}>
+                  <DeleteIcon fontSize="small" />
+                </IconButton>
+              </ListItemSecondaryAction>
+            </ListItem>
+          ))}
+        </List>
+      ) : null}
+
+      {sessions.length > 1 ? (
+        <Button variant="text" color="warning" size="small" sx={{ mt: 1 }} onClick={() => setConfirmRevokeOthers(true)}>
+          {t("sessionsRevokeOthers")}
+        </Button>
+      ) : null}
+
+      <Dialog open={confirmRevokeOthers} onClose={() => setConfirmRevokeOthers(false)} maxWidth="sm" fullWidth>
+        <DialogTitle>{t("sessionsRevokeOthersConfirmTitle")}</DialogTitle>
+        <DialogContent>
+          <Typography>{t("sessionsRevokeOthersConfirmBody")}</Typography>
+        </DialogContent>
+        <DialogActions>
+          <Button type="button" onClick={() => setConfirmRevokeOthers(false)}>{t("cancel")}</Button>
+          <Button variant="contained" color="warning" onClick={revokeOthers}>
+            {t("sessionsRevokeOthers")}
+          </Button>
+        </DialogActions>
+      </Dialog>
+    </Paper>
+  );
+}

job-tracker-ui/src/components/TwoFactorChallenge.tsx

@@ -0,0 +1,83 @@
+import React, { useState } from "react";
+
+import { Alert, Box, Button, Checkbox, FormControlLabel, TextField, Typography } from "@mui/material";
+
+import { api, getApiErrorMessage } from "../api";
+import { useI18n } from "../i18n/I18nProvider";
+
+type ChallengeResponse = { authenticated: true; provider: "local" };
+
+export default function TwoFactorChallenge({
+  pendingToken,
+  onSuccess,
+  onCancel,
+}: {
+  pendingToken: string;
+  onSuccess: (data: ChallengeResponse) => void;
+  onCancel: () => void;
+}) {
+  const { t } = useI18n();
+  const [code, setCode] = useState("");
+  const [trustDevice, setTrustDevice] = useState(false);
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+
+  async function submit() {
+    setLoading(true);
+    setError(null);
+    try {
+      const res = await api.post<ChallengeResponse>("/auth/2fa/challenge", { pendingToken, code, trustDevice });
+      onSuccess(res.data);
+    } catch (e: any) {
+      if (e?.response?.status === 429) {
+        setError(t("twoFactorRateLimited"));
+      } else {
+        setError(getApiErrorMessage(e, t("twoFactorInvalidCode")));
+      }
+    } finally {
+      setLoading(false);
+    }
+  }
+
+  return (
+    <Box
+      component="form"
+      onSubmit={(e) => { e.preventDefault(); void submit(); }}
+      sx={{ display: "flex", flexDirection: "column", gap: 1.5 }}
+      role="group"
+      aria-label={t("twoFactorTitle")}
+    >
+      <Typography variant="subtitle1" sx={{ fontWeight: 800 }}>
+        {t("twoFactorTitle")}
+      </Typography>
+      <Typography variant="body2" sx={{ color: "text.secondary" }}>
+        {t("twoFactorHint")}
+      </Typography>
+
+      {error ? <Alert severity="error" role="alert">{error}</Alert> : null}
+
+      <TextField
+        label={t("twoFactorCodeLabel")}
+        value={code}
+        onChange={(e) => setCode(e.target.value)}
+        autoComplete="one-time-code"
+        autoFocus
+        fullWidth
+      />
+
+      <FormControlLabel
+        control={<Checkbox checked={trustDevice} onChange={(e) => setTrustDevice(e.target.checked)} />}
+        label={t("twoFactorTrustDevice")}
+      />
+
+      <Box sx={{ display: "flex", gap: 1, justifyContent: "flex-end" }}>
+        <Button type="button" variant="text" disabled={loading} onClick={onCancel}>
+          {t("twoFactorBack")}
+        </Button>
+        <Button type="submit" variant="contained" disabled={loading || !code.trim()}>
+          {loading ? t("twoFactorVerifying") : t("twoFactorVerify")}
+        </Button>
+      </Box>
+    </Box>
+  );
+}

job-tracker-ui/src/components/TwoFactorSettingsCard.tsx

@@ -0,0 +1,390 @@
+import React, { useEffect, useState } from "react";
+
+import {
+  Alert,
+  Box,
+  Button,
+  Checkbox,
+  Dialog,
+  DialogActions,
+  DialogContent,
+  DialogTitle,
+  Divider,
+  FormControlLabel,
+  IconButton,
+  List,
+  ListItem,
+  ListItemSecondaryAction,
+  ListItemText,
+  Paper,
+  TextField,
+  Typography,
+} from "@mui/material";
+import DeleteIcon from "@mui/icons-material/Delete";
+
+import { api, getApiErrorMessage } from "../api";
+import { useToast } from "../toast";
+import { useI18n } from "../i18n/I18nProvider";
+
+type Status = { enabled: boolean; enabledAtUtc: string | null };
+type SetupResponse = { manualEntryKey: string; qrCodeDataUrl: string };
+type RecoveryCodesResponse = { recoveryCodes: string[] };
+type TrustedDevice = {
+  id: number;
+  deviceLabel: string | null;
+  createdAtUtc: string;
+  lastSeenAtUtc: string;
+  expiresAtUtc: string;
+  isCurrentDevice: boolean;
+};
+
+type Flow =
+  | "closed"
+  | "enable-password"
+  | "enable-qr"
+  | "enable-recovery"
+  | "disable-password"
+  | "regenerate-password"
+  | "regenerate-recovery"
+  | "revoke-all-confirm";
+
+function apiErrorMessage(e: any, t: (k: any) => string) {
+  if (e?.response?.status === 429) return t("twoFactorRateLimited");
+  return getApiErrorMessage(e, t("twoFactorGenericError"));
+}
+
+export default function TwoFactorSettingsCard() {
+  const { toast } = useToast();
+  const { t } = useI18n();
+  const [status, setStatus] = useState<Status | null>(null);
+  const [flow, setFlow] = useState<Flow>("closed");
+  const [password, setPassword] = useState("");
+  const [code, setCode] = useState("");
+  const [setup, setSetup] = useState<SetupResponse | null>(null);
+  const [recoveryCodes, setRecoveryCodes] = useState<string[]>([]);
+  const [savedConfirmed, setSavedConfirmed] = useState(false);
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+  const [devices, setDevices] = useState<TrustedDevice[]>([]);
+  const [devicesLoading, setDevicesLoading] = useState(false);
+  const [devicesError, setDevicesError] = useState<string | null>(null);
+
+  const loadStatus = () => {
+    api.get<Status>("/auth/2fa/status").then((r) => setStatus(r.data)).catch(() => setStatus(null));
+  };
+
+  const loadDevices = () => {
+    setDevicesLoading(true);
+    setDevicesError(null);
+    api
+      .get<TrustedDevice[]>("/auth/2fa/trusted-devices")
+      .then((r) => setDevices(r.data))
+      .catch((e) => setDevicesError(apiErrorMessage(e, t)))
+      .finally(() => setDevicesLoading(false));
+  };
+
+  useEffect(() => { loadStatus(); loadDevices(); }, []);
+
+  async function revokeDevice(id: number) {
+    try {
+      await api.delete(`/auth/2fa/trusted-devices/${id}`);
+      loadDevices();
+    } catch (e: any) {
+      setDevicesError(apiErrorMessage(e, t));
+    }
+  }
+
+  async function revokeAllDevices() {
+    try {
+      await api.post("/auth/2fa/trusted-devices/revoke-all");
+      toast(t("twoFactorTrustedDevicesRevokedAll"), "success");
+      closeFlow();
+      loadDevices();
+    } catch (e: any) {
+      setError(apiErrorMessage(e, t));
+    }
+  }
+
+  function closeFlow() {
+    setFlow("closed");
+    setPassword("");
+    setCode("");
+    setSetup(null);
+    setRecoveryCodes([]);
+    setSavedConfirmed(false);
+    setError(null);
+  }
+
+  async function submitPassword() {
+    setLoading(true);
+    setError(null);
+    try {
+      if (flow === "enable-password") {
+        const res = await api.post<SetupResponse>("/auth/2fa/setup", { currentPassword: password });
+        setSetup(res.data);
+        setPassword("");
+        setFlow("enable-qr");
+      } else if (flow === "disable-password") {
+        await api.post("/auth/2fa/disable", { currentPassword: password });
+        toast(t("twoFactorDisabledSuccess"), "success");
+        closeFlow();
+        loadStatus();
+      } else if (flow === "regenerate-password") {
+        const res = await api.post<RecoveryCodesResponse>("/auth/2fa/recovery-codes/regenerate", { currentPassword: password });
+        setRecoveryCodes(res.data.recoveryCodes);
+        setPassword("");
+        setFlow("regenerate-recovery");
+      }
+    } catch (e: any) {
+      setError(e?.response?.status === 400 || e?.response?.status === 401 ? t("twoFactorWrongPassword") : apiErrorMessage(e, t));
+    } finally {
+      setLoading(false);
+    }
+  }
+
+  async function submitCode() {
+    setLoading(true);
+    setError(null);
+    try {
+      const res = await api.post<RecoveryCodesResponse>("/auth/2fa/verify-setup", { code });
+      setRecoveryCodes(res.data.recoveryCodes);
+      setCode("");
+      setFlow("enable-recovery");
+    } catch (e: any) {
+      setError(e?.response?.status === 401 ? t("twoFactorInvalidCode") : apiErrorMessage(e, t));
+    } finally {
+      setLoading(false);
+    }
+  }
+
+  function finishRecovery() {
+    toast(flow === "enable-recovery" ? t("twoFactorEnabledSuccess") : t("twoFactorRegenerateSuccess"), "success");
+    closeFlow();
+    loadStatus();
+  }
+
+  function copyRecoveryCodes() {
+    void navigator.clipboard.writeText(recoveryCodes.join("\n"));
+    toast(t("twoFactorCodesCopied"), "info");
+  }
+
+  function downloadRecoveryCodes() {
+    const blob = new Blob([recoveryCodes.join("\n") + "\n"], { type: "text/plain" });
+    const url = window.URL.createObjectURL(blob);
+    const link = document.createElement("a");
+    link.href = url;
+    link.download = "jobbjakt-recovery-codes.txt";
+    document.body.appendChild(link);
+    link.click();
+    link.remove();
+    window.URL.revokeObjectURL(url);
+  }
+
+  const isPasswordStep = flow === "enable-password" || flow === "disable-password" || flow === "regenerate-password";
+  const isRecoveryStep = flow === "enable-recovery" || flow === "regenerate-recovery";
+
+  return (
+    <Paper sx={{ mt: 2, p: 2 }}>
+      <Typography variant="h6" sx={{ mb: 1 }}>
+        {t("twoFactorSectionTitle")}
+      </Typography>
+
+      {status ? (
+        <Typography sx={{ color: "text.secondary", mb: 1.5 }}>
+          {status.enabled
+            ? t("twoFactorStatusEnabled", { date: status.enabledAtUtc ? new Date(status.enabledAtUtc).toLocaleDateString() : "" })
+            : t("twoFactorStatusDisabled")}
+        </Typography>
+      ) : null}
+
+      <Box sx={{ display: "flex", gap: 1, flexWrap: "wrap" }}>
+        {!status?.enabled ? (
+          <Button variant="contained" onClick={() => setFlow("enable-password")}>
+            {t("twoFactorEnableButton")}
+          </Button>
+        ) : (
+          <>
+            <Button variant="outlined" color="warning" onClick={() => setFlow("disable-password")}>
+              {t("twoFactorDisableButton")}
+            </Button>
+            <Button variant="outlined" onClick={() => setFlow("regenerate-password")}>
+              {t("twoFactorRegenerateButton")}
+            </Button>
+          </>
+        )}
+      </Box>
+
+      {status?.enabled ? (
+        <Box sx={{ mt: 2 }}>
+          <Divider sx={{ mb: 1.5 }} />
+          <Typography variant="subtitle1" sx={{ fontWeight: 700, mb: 0.5 }}>
+            {t("twoFactorTrustedDevicesTitle")}
+          </Typography>
+          {devicesError ? <Alert severity="error" role="alert" sx={{ mb: 1 }}>{devicesError}</Alert> : null}
+          {!devicesLoading && devices.length === 0 && !devicesError ? (
+            <Typography sx={{ color: "text.secondary", mb: 1 }}>{t("twoFactorTrustedDevicesEmpty")}</Typography>
+          ) : null}
+          {devices.length > 0 ? (
+            <List dense disablePadding>
+              {devices.map((d) => (
+                <ListItem key={d.id} divider>
+                  <ListItemText
+                    primary={
+                      <>
+                        {d.deviceLabel || t("twoFactorTrustedDeviceUnknown")}
+                        {d.isCurrentDevice ? (
+                          <Typography component="span" variant="caption" sx={{ ml: 1, color: "primary.main", fontWeight: 700 }}>
+                            {t("twoFactorTrustedDeviceCurrent")}
+                          </Typography>
+                        ) : null}
+                      </>
+                    }
+                    secondary={t("twoFactorTrustedDeviceMeta", {
+                      lastSeen: new Date(d.lastSeenAtUtc).toLocaleDateString(),
+                      expires: new Date(d.expiresAtUtc).toLocaleDateString(),
+                    })}
+                  />
+                  <ListItemSecondaryAction>
+                    <IconButton edge="end" aria-label={t("twoFactorRevokeDevice")} onClick={() => revokeDevice(d.id)}>
+                      <DeleteIcon fontSize="small" />
+                    </IconButton>
+                  </ListItemSecondaryAction>
+                </ListItem>
+              ))}
+            </List>
+          ) : null}
+          {devices.length > 0 ? (
+            <Button variant="text" color="warning" size="small" sx={{ mt: 1 }} onClick={() => setFlow("revoke-all-confirm")}>
+              {t("twoFactorRevokeAllDevices")}
+            </Button>
+          ) : null}
+        </Box>
+      ) : null}
+
+      <Dialog open={flow !== "closed"} onClose={isRecoveryStep ? undefined : closeFlow} maxWidth="sm" fullWidth>
+        {isPasswordStep && (
+          <Box component="form" onSubmit={(e) => { e.preventDefault(); void submitPassword(); }}>
+            <DialogTitle>{t("twoFactorPasswordPrompt")}</DialogTitle>
+            <DialogContent>
+              {flow === "disable-password" ? <Alert severity="warning" sx={{ mb: 2 }}>{t("twoFactorDisableWarning")}</Alert> : null}
+              {flow === "regenerate-password" ? <Alert severity="warning" sx={{ mb: 2 }}>{t("twoFactorRegenerateWarning")}</Alert> : null}
+              {error ? <Alert severity="error" role="alert" sx={{ mb: 2 }}>{error}</Alert> : null}
+              <TextField
+                label={t("twoFactorPasswordLabel")}
+                type="password"
+                value={password}
+                onChange={(e) => setPassword(e.target.value)}
+                autoComplete="current-password"
+                autoFocus
+                fullWidth
+              />
+            </DialogContent>
+            <DialogActions>
+              <Button type="button" onClick={closeFlow} disabled={loading}>{t("cancel")}</Button>
+              <Button type="submit" variant="contained" disabled={loading || !password}>
+                {t("twoFactorContinue")}
+              </Button>
+            </DialogActions>
+          </Box>
+        )}
+
+        {flow === "enable-qr" && setup && (
+          <Box component="form" onSubmit={(e) => { e.preventDefault(); void submitCode(); }}>
+            <DialogTitle>{t("twoFactorSetupTitle")}</DialogTitle>
+            <DialogContent>
+              <Typography variant="body2" sx={{ color: "text.secondary", mb: 2 }}>
+                {t("twoFactorSetupHint")}
+              </Typography>
+              <Box sx={{ display: "flex", justifyContent: "center", mb: 2 }}>
+                <img src={setup.qrCodeDataUrl} alt={t("twoFactorSetupTitle")} width={200} height={200} />
+              </Box>
+              <TextField
+                label={t("twoFactorManualKeyLabel")}
+                value={setup.manualEntryKey}
+                fullWidth
+                sx={{ mb: 1 }}
+                InputProps={{
+                  readOnly: true,
+                  endAdornment: (
+                    <Button
+                      size="small"
+                      onClick={() => {
+                        void navigator.clipboard.writeText(setup.manualEntryKey);
+                        toast(t("twoFactorKeyCopied"), "info");
+                      }}
+                    >
+                      {t("twoFactorCopyKey")}
+                    </Button>
+                  ),
+                }}
+              />
+              <Typography variant="body2" sx={{ color: "text.secondary", mt: 2, mb: 1 }}>
+                {t("twoFactorConfirmCodeHint")}
+              </Typography>
+              {error ? <Alert severity="error" role="alert" sx={{ mb: 2 }}>{error}</Alert> : null}
+              <TextField
+                label={t("twoFactorConfirmCodeLabel")}
+                value={code}
+                onChange={(e) => setCode(e.target.value)}
+                autoComplete="one-time-code"
+                fullWidth
+              />
+            </DialogContent>
+            <DialogActions>
+              <Button type="button" onClick={closeFlow} disabled={loading}>{t("cancel")}</Button>
+              <Button type="submit" variant="contained" disabled={loading || !code.trim()}>
+                {t("twoFactorConfirmButton")}
+              </Button>
+            </DialogActions>
+          </Box>
+        )}
+
+        {isRecoveryStep && (
+          <>
+            <DialogTitle role="alert">{t("twoFactorRecoveryTitle")}</DialogTitle>
+            <DialogContent>
+              <Alert severity="warning" sx={{ mb: 2 }}>{t("twoFactorRecoveryHint")}</Alert>
+              <Box
+                component="ul"
+                sx={{ fontFamily: "monospace", fontSize: 16, p: 1.5, borderRadius: 2, backgroundColor: "background.default", border: "1px solid", borderColor: "divider", listStyle: "none", m: 0, mb: 2 }}
+              >
+                {recoveryCodes.map((rc) => (
+                  <li key={rc}>{rc}</li>
+                ))}
+              </Box>
+              <Box sx={{ display: "flex", gap: 1, flexWrap: "wrap", mb: 2 }}>
+                <Button variant="outlined" onClick={copyRecoveryCodes}>{t("twoFactorCopyAll")}</Button>
+                <Button variant="outlined" onClick={downloadRecoveryCodes}>{t("twoFactorDownload")}</Button>
+              </Box>
+              <FormControlLabel
+                control={<Checkbox checked={savedConfirmed} onChange={(e) => setSavedConfirmed(e.target.checked)} />}
+                label={t("twoFactorSavedConfirm")}
+              />
+            </DialogContent>
+            <DialogActions>
+              <Button variant="contained" disabled={!savedConfirmed} onClick={finishRecovery}>
+                {t("twoFactorDone")}
+              </Button>
+            </DialogActions>
+          </>
+        )}
+
+        {flow === "revoke-all-confirm" && (
+          <>
+            <DialogTitle>{t("twoFactorRevokeAllConfirmTitle")}</DialogTitle>
+            <DialogContent>
+              {error ? <Alert severity="error" role="alert" sx={{ mb: 2 }}>{error}</Alert> : null}
+              <Typography>{t("twoFactorRevokeAllConfirmBody")}</Typography>
+            </DialogContent>
+            <DialogActions>
+              <Button type="button" onClick={closeFlow}>{t("cancel")}</Button>
+              <Button variant="contained" color="warning" onClick={revokeAllDevices}>
+                {t("twoFactorRevokeAllDevices")}
+              </Button>
+            </DialogActions>
+          </>
+        )}
+      </Dialog>
+    </Paper>
+  );
+}

job-tracker-ui/src/i18n/translations.ts

@@ -306,6 +306,67 @@ export const translations = {
     profileUpdatePassword: "Update password",
     profilePasswordUpdated: "Password updated.",
     profilePasswordUpdateFailed: "Failed to change password.",
+    twoFactorTitle: "Two-factor verification",
+    twoFactorHint: "Enter the 6-digit code from your authenticator app, or a recovery code.",
+    twoFactorCodeLabel: "Code",
+    twoFactorVerify: "Verify",
+    twoFactorVerifying: "Verifying...",
+    twoFactorBack: "Back",
+    twoFactorInvalidCode: "Invalid code. Please try again.",
+    twoFactorRateLimited: "Too many attempts. Please wait a few minutes and try again.",
+    twoFactorGenericError: "Something went wrong. Please try again.",
+    twoFactorSectionTitle: "Two-factor authentication",
+    twoFactorStatusEnabled: "Enabled since {date}",
+    twoFactorStatusDisabled: "Not enabled",
+    twoFactorEnableButton: "Enable 2FA",
+    twoFactorDisableButton: "Disable 2FA",
+    twoFactorRegenerateButton: "Regenerate recovery codes",
+    twoFactorPasswordPrompt: "Confirm your password to continue",
+    twoFactorPasswordLabel: "Current password",
+    twoFactorContinue: "Continue",
+    twoFactorWrongPassword: "Incorrect password.",
+    twoFactorSetupTitle: "Scan this QR code",
+    twoFactorSetupHint: "Scan with your authenticator app, or enter the key manually.",
+    twoFactorManualKeyLabel: "Manual entry key",
+    twoFactorCopyKey: "Copy key",
+    twoFactorKeyCopied: "Key copied to clipboard.",
+    twoFactorConfirmCodeLabel: "6-digit code",
+    twoFactorConfirmCodeHint: "Enter the code shown by your authenticator app to confirm setup.",
+    twoFactorConfirmButton: "Confirm",
+    twoFactorRecoveryTitle: "Save your recovery codes",
+    twoFactorRecoveryHint: "Each code can be used once if you lose access to your authenticator app. This is the only time these codes will be shown.",
+    twoFactorCopyAll: "Copy all codes",
+    twoFactorCodesCopied: "Recovery codes copied.",
+    twoFactorDownload: "Download as .txt",
+    twoFactorSavedConfirm: "I've saved my recovery codes",
+    twoFactorDone: "Done",
+    twoFactorDisableWarning: "Disabling 2FA will also invalidate your recovery codes.",
+    twoFactorRegenerateWarning: "This will invalidate your existing recovery codes.",
+    twoFactorEnabledSuccess: "Two-factor authentication enabled.",
+    twoFactorDisabledSuccess: "Two-factor authentication disabled.",
+    twoFactorRegenerateSuccess: "Recovery codes regenerated.",
+    twoFactorTrustDevice: "Trust this device for 30 days",
+    twoFactorTrustedDevicesTitle: "Trusted devices",
+    twoFactorTrustedDevicesEmpty: "No trusted devices yet.",
+    twoFactorTrustedDeviceUnknown: "Unknown device",
+    twoFactorTrustedDeviceCurrent: "This device",
+    twoFactorTrustedDeviceMeta: "Last used {lastSeen} · Expires {expires}",
+    twoFactorRevokeDevice: "Revoke",
+    twoFactorRevokeAllDevices: "Sign out all other trusted devices",
+    twoFactorTrustedDevicesRevokedAll: "All trusted devices have been signed out.",
+    twoFactorRevokeAllConfirmTitle: "Sign out all trusted devices?",
+    twoFactorRevokeAllConfirmBody: "You'll be asked for a 2FA code the next time you sign in on any device, including this one.",
+    sessionsSectionTitle: "Sessions",
+    sessionsEmpty: "No active sessions.",
+    sessionsUnknownDevice: "Unknown device",
+    sessionsCurrentDevice: "This device",
+    sessionsMeta: "Last active {lastSeen} · Expires {expires}",
+    sessionsRevoke: "Sign out",
+    sessionsRevoked: "Session signed out.",
+    sessionsRevokeOthers: "Sign out all other devices",
+    sessionsRevokedOthers: "All other sessions have been signed out.",
+    sessionsRevokeOthersConfirmTitle: "Sign out all other devices?",
+    sessionsRevokeOthersConfirmBody: "Every other session for your account will be signed out immediately. This device stays signed in.",
     cropDialogTitle: "Crop profile image",
     cropDialogBody: "Position and zoom your image. The saved avatar will be exported as a 512×512 square.",
     cropDialogZoom: "Zoom",
@@ -714,6 +775,15 @@ export const translations = {
     resetFailed: "Reset failed.",
     backToLogin: "Back to login",
     updatePassword: "Update password",
+    emailNotVerified: "Please verify your email address before signing in.",
+    resendVerificationEmail: "Resend verification email",
+    verificationEmailResent: "Verification email sent. Check your inbox.",
+    registerCheckEmailForVerification: "Check your email to verify your account.",
+    verifyEmailTitle: "Verify your email",
+    verifyEmailVerifying: "Verifying your email...",
+    verifyEmailSuccess: "Your email has been verified. You can now sign in.",
+    verifyEmailFailed: "This verification link is invalid or has expired.",
+    missingVerifyLinkInfo: "Missing user/token in link.",
     jobTableSearch: "Search",
     jobTableSearchPlaceholder: "Title, company, notes, messages",
     jobTableStatus: "Status",
@@ -1284,6 +1354,67 @@ export const translations = {
     profileUpdatePassword: "Oppdater passord",
     profilePasswordUpdated: "Passord oppdatert.",
     profilePasswordUpdateFailed: "Kunne ikke endre passord.",
+    twoFactorTitle: "Topunkts bekreftelse",
+    twoFactorHint: "Skriv inn 6-sifret kode fra autentiseringsappen din, eller en gjenopprettingskode.",
+    twoFactorCodeLabel: "Kode",
+    twoFactorVerify: "Bekreft",
+    twoFactorVerifying: "Bekrefter...",
+    twoFactorBack: "Tilbake",
+    twoFactorInvalidCode: "Ugyldig kode. Prøv igjen.",
+    twoFactorRateLimited: "For mange forsøk. Vent noen minutter og prøv igjen.",
+    twoFactorGenericError: "Noe gikk galt. Prøv igjen.",
+    twoFactorSectionTitle: "Topunkts autentisering",
+    twoFactorStatusEnabled: "Aktivert siden {date}",
+    twoFactorStatusDisabled: "Ikke aktivert",
+    twoFactorEnableButton: "Aktiver 2FA",
+    twoFactorDisableButton: "Deaktiver 2FA",
+    twoFactorRegenerateButton: "Generer nye gjenopprettingskoder",
+    twoFactorPasswordPrompt: "Bekreft passordet ditt for å fortsette",
+    twoFactorPasswordLabel: "Nåværende passord",
+    twoFactorContinue: "Fortsett",
+    twoFactorWrongPassword: "Feil passord.",
+    twoFactorSetupTitle: "Skann denne QR-koden",
+    twoFactorSetupHint: "Skann med autentiseringsappen din, eller skriv inn nøkkelen manuelt.",
+    twoFactorManualKeyLabel: "Manuell registreringsnøkkel",
+    twoFactorCopyKey: "Kopier nøkkel",
+    twoFactorKeyCopied: "Nøkkel kopiert til utklippstavlen.",
+    twoFactorConfirmCodeLabel: "6-sifret kode",
+    twoFactorConfirmCodeHint: "Skriv inn koden som vises i autentiseringsappen din for å bekrefte oppsettet.",
+    twoFactorConfirmButton: "Bekreft",
+    twoFactorRecoveryTitle: "Lagre gjenopprettingskodene dine",
+    twoFactorRecoveryHint: "Hver kode kan brukes én gang hvis du mister tilgang til autentiseringsappen din. Dette er eneste gang disse kodene vises.",
+    twoFactorCopyAll: "Kopier alle koder",
+    twoFactorCodesCopied: "Gjenopprettingskoder kopiert.",
+    twoFactorDownload: "Last ned som .txt",
+    twoFactorSavedConfirm: "Jeg har lagret gjenopprettingskodene mine",
+    twoFactorDone: "Ferdig",
+    twoFactorDisableWarning: "Deaktivering av 2FA vil også ugyldiggjøre gjenopprettingskodene dine.",
+    twoFactorRegenerateWarning: "Dette vil ugyldiggjøre eksisterende gjenopprettingskoder.",
+    twoFactorEnabledSuccess: "Topunkts autentisering aktivert.",
+    twoFactorDisabledSuccess: "Topunkts autentisering deaktivert.",
+    twoFactorRegenerateSuccess: "Gjenopprettingskoder generert på nytt.",
+    twoFactorTrustDevice: "Stol på denne enheten i 30 dager",
+    twoFactorTrustedDevicesTitle: "Betrodde enheter",
+    twoFactorTrustedDevicesEmpty: "Ingen betrodde enheter ennå.",
+    twoFactorTrustedDeviceUnknown: "Ukjent enhet",
+    twoFactorTrustedDeviceCurrent: "Denne enheten",
+    twoFactorTrustedDeviceMeta: "Sist brukt {lastSeen} · Utløper {expires}",
+    twoFactorRevokeDevice: "Fjern tilgang",
+    twoFactorRevokeAllDevices: "Logg ut alle andre betrodde enheter",
+    twoFactorTrustedDevicesRevokedAll: "Alle betrodde enheter er logget ut.",
+    twoFactorRevokeAllConfirmTitle: "Logg ut alle betrodde enheter?",
+    twoFactorRevokeAllConfirmBody: "Du vil bli bedt om en 2FA-kode neste gang du logger inn på en enhet, inkludert denne.",
+    sessionsSectionTitle: "Økter",
+    sessionsEmpty: "Ingen aktive økter.",
+    sessionsUnknownDevice: "Ukjent enhet",
+    sessionsCurrentDevice: "Denne enheten",
+    sessionsMeta: "Sist aktiv {lastSeen} · Utløper {expires}",
+    sessionsRevoke: "Logg ut",
+    sessionsRevoked: "Økten er logget ut.",
+    sessionsRevokeOthers: "Logg ut alle andre enheter",
+    sessionsRevokedOthers: "Alle andre økter er logget ut.",
+    sessionsRevokeOthersConfirmTitle: "Logg ut alle andre enheter?",
+    sessionsRevokeOthersConfirmBody: "Alle andre økter for kontoen din blir umiddelbart logget ut. Denne enheten forblir innlogget.",
     cropDialogTitle: "Beskjær profilbilde",
     cropDialogBody: "Plasser og zoom bildet. Det lagrede avataren eksporteres som en kvadratisk 512×512-fil.",
     cropDialogZoom: "Zoom",
@@ -1692,6 +1823,15 @@ export const translations = {
     resetFailed: "Tilbakestilling mislyktes.",
     backToLogin: "Tilbake til innlogging",
     updatePassword: "Oppdater passord",
+    emailNotVerified: "Vennligst bekreft e-postadressen din før du logger inn.",
+    resendVerificationEmail: "Send bekreftelses-e-post på nytt",
+    verificationEmailResent: "Bekreftelses-e-post sendt. Sjekk innboksen din.",
+    registerCheckEmailForVerification: "Sjekk e-posten din for å bekrefte kontoen.",
+    verifyEmailTitle: "Bekreft e-posten din",
+    verifyEmailVerifying: "Bekrefter e-posten din...",
+    verifyEmailSuccess: "E-posten din er bekreftet. Du kan nå logge inn.",
+    verifyEmailFailed: "Denne bekreftelseslenken er ugyldig eller har utløpt.",
+    missingVerifyLinkInfo: "Mangler bruker/token i lenken.",
     jobTableSearch: "Søk",
     jobTableSearchPlaceholder: "Tittel, selskap, notater, meldinger",
     jobTableStatus: "Status",

job-tracker-ui/src/login-page.test.tsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import '@testing-library/jest-dom';
 import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { MemoryRouter } from 'react-router-dom';
@@ -81,4 +82,88 @@ describe('LoginPage', () => {
 
     expect(mockNavigate).toHaveBeenCalledWith('/forgot-password?email=person%40example.com');
   });
+
+  it('shows the 2FA code step when login requires two-factor, then proceeds like a normal login on success', async () => {
+    mockedApi.post.mockImplementation((url: string, payload?: any) => {
+      if (url === '/auth/login') {
+        return Promise.resolve({ data: { requiresTwoFactor: true, pendingToken: 'pending-abc' } } as any);
+      }
+      if (url === '/auth/2fa/challenge') {
+        expect(payload).toEqual({ pendingToken: 'pending-abc', code: '123456', trustDevice: false });
+        return Promise.resolve({ data: { authenticated: true, provider: 'local' } } as any);
+      }
+      return Promise.resolve({ data: {} } as any);
+    });
+    mockedApi.get.mockResolvedValueOnce({ data: { roles: [], email: 'person@example.com', userName: 'person' } } as any);
+
+    renderLoginPage();
+    await screen.findByLabelText('Email');
+
+    await userEvent.type(screen.getByLabelText('Email'), 'person@example.com');
+    await userEvent.type(screen.getByLabelText('Current password'), 'hunter2');
+    await userEvent.click(screen.getByRole('button', { name: 'Sign in' }));
+
+    await screen.findByText('Two-factor verification');
+    expect(screen.queryByLabelText('Email')).not.toBeInTheDocument();
+
+    await userEvent.type(screen.getByLabelText('Code'), '123456');
+    await userEvent.click(screen.getByRole('button', { name: 'Verify' }));
+
+    await waitFor(() => expect(mockedApi.post).toHaveBeenCalledWith('/auth/2fa/challenge', { pendingToken: 'pending-abc', code: '123456', trustDevice: false }));
+    await waitFor(() => expect(mockedApi.get).toHaveBeenCalledWith('/auth/me'));
+    await waitFor(() => expect(mockNavigate).toHaveBeenCalledWith('/dashboard', { replace: true }));
+  });
+
+  it('shows a clear message when the 2FA challenge is rate-limited', async () => {
+    mockedApi.post.mockImplementation((url: string) => {
+      if (url === '/auth/login') {
+        return Promise.resolve({ data: { requiresTwoFactor: true, pendingToken: 'pending-abc' } } as any);
+      }
+      if (url === '/auth/2fa/challenge') {
+        return Promise.reject({ response: { status: 429 } });
+      }
+      return Promise.resolve({ data: {} } as any);
+    });
+
+    renderLoginPage();
+    await screen.findByLabelText('Email');
+    await userEvent.type(screen.getByLabelText('Email'), 'person@example.com');
+    await userEvent.type(screen.getByLabelText('Current password'), 'hunter2');
+    await userEvent.click(screen.getByRole('button', { name: 'Sign in' }));
+
+    await screen.findByText('Two-factor verification');
+    await userEvent.type(screen.getByLabelText('Code'), '123456');
+    await userEvent.click(screen.getByRole('button', { name: 'Verify' }));
+
+    expect(await screen.findByRole('alert')).toHaveTextContent('Too many attempts. Please wait a few minutes and try again.');
+  });
+
+  it('offers a resend-verification action when login reports the account is not verified', async () => {
+    mockedApi.get.mockResolvedValueOnce({
+      data: { requireAuth: false, googleEnabled: false, microsoftEnabled: false, localEnabled: true, allowRegistration: false, requireEmailVerification: true },
+    } as any);
+    mockedApi.post.mockImplementation((url: string) => {
+      if (url === '/auth/login') {
+        return Promise.reject({ response: { status: 403, data: { error: 'email_not_verified' } } });
+      }
+      if (url === '/auth/resend-verification-email') {
+        return Promise.resolve({ data: {} } as any);
+      }
+      return Promise.resolve({ data: {} } as any);
+    });
+
+    renderLoginPage();
+    await screen.findByLabelText('Email');
+
+    await userEvent.type(screen.getByLabelText('Email'), 'unverified@example.com');
+    await userEvent.type(screen.getByLabelText('Current password'), 'hunter2');
+    await userEvent.click(screen.getByRole('button', { name: 'Sign in' }));
+
+    expect(await screen.findByText('Please verify your email address before signing in.')).toBeInTheDocument();
+
+    await userEvent.click(screen.getByRole('button', { name: 'Resend verification email' }));
+
+    await waitFor(() => expect(mockedApi.post).toHaveBeenCalledWith('/auth/resend-verification-email', { email: 'unverified@example.com' }));
+    await screen.findByText('Verification email sent. Check your inbox.');
+  });
 });

job-tracker-ui/src/two-factor-settings.test.tsx

@@ -0,0 +1,95 @@
+import React from 'react';
+import '@testing-library/jest-dom';
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { ToastProvider } from './toast';
+import { I18nProvider } from './i18n/I18nProvider';
+import TwoFactorSettingsCard from './components/TwoFactorSettingsCard';
+import { api } from './api';
+
+const mockedApi = api as jest.Mocked<typeof api>;
+
+const writeTextMock = jest.fn(() => Promise.resolve());
+Object.assign(navigator, { clipboard: { writeText: writeTextMock } });
+Object.defineProperty(window.URL, 'createObjectURL', { writable: true, value: jest.fn(() => 'blob:mock') });
+Object.defineProperty(window.URL, 'revokeObjectURL', { writable: true, value: jest.fn() });
+
+function renderCard() {
+  return render(
+    <ToastProvider>
+      <I18nProvider>
+        <TwoFactorSettingsCard />
+      </I18nProvider>
+    </ToastProvider>,
+  );
+}
+
+beforeEach(() => {
+  jest.clearAllMocks();
+  mockedApi.get.mockImplementation((url: string) => {
+    if (url === '/auth/2fa/status') {
+      return Promise.resolve({ data: { enabled: false, enabledAtUtc: null } } as any);
+    }
+    return Promise.resolve({ data: {} } as any);
+  });
+});
+
+test('shows not-enabled status and walks through the full enable flow to recovery codes', async () => {
+  mockedApi.post.mockImplementation((url: string) => {
+    if (url === '/auth/2fa/setup') {
+      return Promise.resolve({ data: { manualEntryKey: 'ABCD1234', qrCodeDataUrl: 'data:image/png;base64,abc' } } as any);
+    }
+    if (url === '/auth/2fa/verify-setup') {
+      return Promise.resolve({ data: { enabled: true, recoveryCodes: ['aaaaa-11111', 'bbbbb-22222'] } } as any);
+    }
+    return Promise.resolve({ data: {} } as any);
+  });
+
+  renderCard();
+  expect(await screen.findByText('Not enabled')).toBeInTheDocument();
+
+  await userEvent.click(screen.getByRole('button', { name: 'Enable 2FA' }));
+  await userEvent.type(await screen.findByLabelText('Current password'), 'hunter2');
+  await userEvent.click(screen.getByRole('button', { name: 'Continue' }));
+
+  await waitFor(() => expect(mockedApi.post).toHaveBeenCalledWith('/auth/2fa/setup', { currentPassword: 'hunter2' }));
+  expect(await screen.findByAltText('Scan this QR code')).toHaveAttribute('src', 'data:image/png;base64,abc');
+  expect(screen.getByDisplayValue('ABCD1234')).toBeInTheDocument();
+
+  await userEvent.type(screen.getByLabelText('6-digit code'), '654321');
+  await userEvent.click(screen.getByRole('button', { name: 'Confirm' }));
+
+  await waitFor(() => expect(mockedApi.post).toHaveBeenCalledWith('/auth/2fa/verify-setup', { code: '654321' }));
+  expect(await screen.findByText('Save your recovery codes')).toBeInTheDocument();
+  expect(screen.getByText('aaaaa-11111')).toBeInTheDocument();
+  expect(screen.getByText('bbbbb-22222')).toBeInTheDocument();
+
+  const doneButton = screen.getByRole('button', { name: 'Done' });
+  expect(doneButton).toBeDisabled();
+
+  await userEvent.click(screen.getByLabelText("I've saved my recovery codes"));
+  expect(doneButton).toBeEnabled();
+  await userEvent.click(doneButton);
+
+  await waitFor(() => expect(screen.queryByText('Save your recovery codes')).not.toBeInTheDocument());
+});
+
+test('shows wrong-password error on disable and lets the user retry', async () => {
+  mockedApi.get.mockImplementation((url: string) => {
+    if (url === '/auth/2fa/status') {
+      return Promise.resolve({ data: { enabled: true, enabledAtUtc: '2026-01-01T00:00:00Z' } } as any);
+    }
+    return Promise.resolve({ data: {} } as any);
+  });
+  mockedApi.post.mockRejectedValueOnce({ response: { status: 401 } });
+
+  renderCard();
+  expect(await screen.findByText(/enabled since/i)).toBeInTheDocument();
+
+  await userEvent.click(screen.getByRole('button', { name: 'Disable 2FA' }));
+  await userEvent.type(await screen.findByLabelText('Current password'), 'wrong');
+  await userEvent.click(screen.getByRole('button', { name: 'Continue' }));
+
+  expect(await screen.findByText('Incorrect password.')).toBeInTheDocument();
+  expect(screen.getByLabelText('Current password')).toBeInTheDocument();
+});

job-tracker-ui/src/verify-email-page.test.tsx

@@ -0,0 +1,58 @@
+import React from 'react';
+import '@testing-library/jest-dom';
+import { render, screen } from '@testing-library/react';
+import { MemoryRouter } from 'react-router-dom';
+
+import VerifyEmailPage from './views/VerifyEmailPage';
+import { I18nProvider } from './i18n/I18nProvider';
+import { api, getApiErrorMessage } from './api';
+
+const mockedApi = api as jest.Mocked<typeof api>;
+// CRA's jest config sets resetMocks: true, which wipes the initial implementation given to
+// jest.fn() in setupTests.ts before every test -- re-arm it here so error-derived text is testable.
+const mockedGetApiErrorMessage = getApiErrorMessage as jest.Mock;
+
+function renderVerifyEmailPage(search: string) {
+  window.history.pushState({}, '', `/verify-email${search}`);
+  return render(
+    <MemoryRouter initialEntries={[`/verify-email${search}`]} future={{ v7_startTransition: true, v7_relativeSplatPath: true }}>
+      <I18nProvider>
+        <VerifyEmailPage />
+      </I18nProvider>
+    </MemoryRouter>,
+  );
+}
+
+describe('VerifyEmailPage', () => {
+  beforeEach(() => {
+    mockedApi.post.mockReset();
+    mockedGetApiErrorMessage.mockImplementation((e: any, fallback?: string) => {
+      const data = e?.response?.data;
+      return typeof data === 'string' && data.trim() ? data.trim() : fallback;
+    });
+  });
+
+  it('confirms the account and shows success when the link is valid', async () => {
+    mockedApi.post.mockResolvedValueOnce({ data: {} } as any);
+
+    renderVerifyEmailPage('?userId=user-1&token=good-token');
+
+    expect(await screen.findByText('Your email has been verified. You can now sign in.')).toBeInTheDocument();
+    expect(mockedApi.post).toHaveBeenCalledWith('/auth/verify-email', { userId: 'user-1', token: 'good-token' });
+  });
+
+  it('shows an error when the link is invalid or expired', async () => {
+    mockedApi.post.mockRejectedValueOnce({ response: { status: 400, data: 'Invalid or expired link.' } });
+
+    renderVerifyEmailPage('?userId=user-1&token=bad-token');
+
+    expect(await screen.findByText('Invalid or expired link.')).toBeInTheDocument();
+  });
+
+  it('shows an error without calling the API when the link is missing userId/token', async () => {
+    renderVerifyEmailPage('');
+
+    expect(await screen.findByText('Missing user/token in link.')).toBeInTheDocument();
+    expect(mockedApi.post).not.toHaveBeenCalled();
+  });
+});

job-tracker-ui/src/views/LoginPage.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from "react";
 
-import { Box, Button, Checkbox, FormControlLabel, Paper, Tab, Tabs, TextField, Typography } from "@mui/material";
+import { Alert, Box, Button, Checkbox, FormControlLabel, Paper, Tab, Tabs, TextField, Typography } from "@mui/material";
 
 import { useLocation, useNavigate } from "react-router-dom";
 
@@ -8,6 +8,7 @@ import { api, getApiErrorMessage } from "../api";
 import { getRememberMePref, setAuthPersistencePreference } from "../auth";
 import GoogleAuthCard from "../components/GoogleAuthCard";
 import MicrosoftAuthCard from "../components/MicrosoftAuthCard";
+import TwoFactorChallenge from "../components/TwoFactorChallenge";
 import { useToast } from "../toast";
 import { useI18n } from "../i18n/I18nProvider";
 
@@ -17,6 +18,7 @@ type AuthConfig = {
   microsoftEnabled: boolean;
   localEnabled: boolean;
   allowRegistration: boolean;
+  requireEmailVerification: boolean;
 };
 
 export default function LoginPage() {
@@ -32,6 +34,10 @@ export default function LoginPage() {
   const [password, setPassword] = useState("");
   const [rememberMe, setRememberMe] = useState(() => getRememberMePref());
   const [loading, setLoading] = useState(false);
+  const [pendingToken, setPendingToken] = useState<string | null>(null);
+  const [emailNotVerified, setEmailNotVerified] = useState(false);
+  const [resendingVerification, setResendingVerification] = useState(false);
+  const [verificationResent, setVerificationResent] = useState(false);
 
   const nextPath = (location?.state?.from as string | undefined) ?? "/dashboard";
 
@@ -42,22 +48,52 @@ export default function LoginPage() {
       .catch(() => setCfg(null));
   }, []);
 
+  async function completeLogin() {
+    setAuthPersistencePreference(rememberMe ? "local" : "session");
+    await api.get("/auth/me");
+    toast(t("signedIn"), "success");
+    navigate(nextPath, { replace: true });
+  }
+
   async function submit(mode: "login" | "register") {
     setLoading(true);
+    setEmailNotVerified(false);
+    setVerificationResent(false);
     try {
       const url = mode === "register" ? "/auth/register" : "/auth/login";
-      await api.post(url, { email, password, rememberMe });
-      setAuthPersistencePreference(rememberMe ? "local" : "session");
-      await api.get("/auth/me");
-      toast(t("signedIn"), "success");
-      navigate(nextPath, { replace: true });
+      const res = await api.post<{ requiresTwoFactor?: boolean; pendingToken?: string }>(url, { email, password, rememberMe });
+      if (res.data?.requiresTwoFactor && res.data.pendingToken) {
+        setPendingToken(res.data.pendingToken);
+        return;
+      }
+      await completeLogin();
+      if (mode === "register" && cfg?.requireEmailVerification) {
+        toast(t("registerCheckEmailForVerification"), "info");
+      }
     } catch (e: any) {
-      toast(getApiErrorMessage(e, t("loginFailed")), "error");
+      if (mode === "login" && e?.response?.data?.error === "email_not_verified") {
+        setEmailNotVerified(true);
+      } else {
+        toast(getApiErrorMessage(e, t("loginFailed")), "error");
+      }
     } finally {
       setLoading(false);
     }
   }
 
+  async function resendVerification() {
+    setResendingVerification(true);
+    try {
+      await api.post("/auth/resend-verification-email", { email });
+      setVerificationResent(true);
+      toast(t("verificationEmailResent"), "success");
+    } catch (e: any) {
+      toast(getApiErrorMessage(e, t("verifyEmailFailed")), "error");
+    } finally {
+      setResendingVerification(false);
+    }
+  }
+
   const allowReg = cfg?.allowRegistration ?? false;
 
   return (
@@ -80,53 +116,75 @@ export default function LoginPage() {
           {cfg?.requireAuth ? t("authRequired") : t("authOptional")}
         </Typography>
 
-        <Tabs value={tab} onChange={(_, v) => setTab(v)} sx={{ mb: 2 }}>
-          <Tab label={t("emailAndPassword")} />
-          <Tab label={t("google")} />
-          <Tab label={t("microsoft")} />
-        </Tabs>
+        {pendingToken ? (
+          <TwoFactorChallenge
+            pendingToken={pendingToken}
+            onCancel={() => setPendingToken(null)}
+            onSuccess={() => { setPendingToken(null); void completeLogin(); }}
+          />
+        ) : (
+          <>
+            <Tabs value={tab} onChange={(_, v) => setTab(v)} sx={{ mb: 2 }}>
+              <Tab label={t("emailAndPassword")} />
+              <Tab label={t("google")} />
+              <Tab label={t("microsoft")} />
+            </Tabs>
 
-        {tab === 0 && (
-          <Box component="form" onSubmit={(e) => { e.preventDefault(); void submit("login"); }} sx={{ display: "flex", flexDirection: "column", gap: 1.5 }}>
-            <TextField label={t("profileEmail")} value={email} onChange={(e) => setEmail(e.target.value)} autoComplete="email" fullWidth />
-            <TextField label={t("profileCurrentPassword")} value={password} onChange={(e) => setPassword(e.target.value)} autoComplete={allowReg ? "new-password" : "current-password"} type="password" fullWidth />
+            {tab === 0 && (
+              <Box component="form" onSubmit={(e) => { e.preventDefault(); void submit("login"); }} sx={{ display: "flex", flexDirection: "column", gap: 1.5 }}>
+                {cfg?.requireEmailVerification && emailNotVerified && (
+                  <Alert
+                    severity="warning"
+                    action={
+                      <Button color="inherit" size="small" disabled={resendingVerification || verificationResent} onClick={() => void resendVerification()}>
+                        {verificationResent ? t("verificationEmailResent") : t("resendVerificationEmail")}
+                      </Button>
+                    }
+                  >
+                    {t("emailNotVerified")}
+                  </Alert>
+                )}
+                <TextField label={t("profileEmail")} value={email} onChange={(e) => setEmail(e.target.value)} autoComplete="email" fullWidth />
+                <TextField label={t("profileCurrentPassword")} value={password} onChange={(e) => setPassword(e.target.value)} autoComplete={allowReg ? "new-password" : "current-password"} type="password" fullWidth />
 
-            <Box sx={{ display: "flex", alignItems: { xs: "flex-start", sm: "center" }, justifyContent: "space-between", gap: 1, flexWrap: "wrap" }}>
-              <FormControlLabel
-                control={<Checkbox disableRipple checked={rememberMe} onChange={(e) => setRememberMe(e.target.checked)} />}
-                label={t("rememberMe")}
-              />
-              <Button
-                type="button"
-                variant="text"
-                size="small"
-                disableRipple
-                onClick={() => navigate(`/forgot-password${email.trim() ? `?email=${encodeURIComponent(email.trim())}` : ""}`)}
-                sx={{ px: 0, minWidth: 0, fontWeight: 700, alignSelf: { xs: "stretch", sm: "auto" } }}
-              >
-                {t("forgotPassword")}
-              </Button>
-            </Box>
+                <Box sx={{ display: "flex", alignItems: { xs: "flex-start", sm: "center" }, justifyContent: "space-between", gap: 1, flexWrap: "wrap" }}>
+                  <FormControlLabel
+                    control={<Checkbox disableRipple checked={rememberMe} onChange={(e) => setRememberMe(e.target.checked)} />}
+                    label={t("rememberMe")}
+                  />
+                  <Button
+                    type="button"
+                    variant="text"
+                    size="small"
+                    disableRipple
+                    onClick={() => navigate(`/forgot-password${email.trim() ? `?email=${encodeURIComponent(email.trim())}` : ""}`)}
+                    sx={{ px: 0, minWidth: 0, fontWeight: 700, alignSelf: { xs: "stretch", sm: "auto" } }}
+                  >
+                    {t("forgotPassword")}
+                  </Button>
+                </Box>
 
-            <Typography variant="body2" sx={{ color: "text.secondary", mt: -0.5 }}>
-              {rememberMe ? t("rememberMeHelpPersistent") : t("rememberMeHelpSession")}
-            </Typography>
+                <Typography variant="body2" sx={{ color: "text.secondary", mt: -0.5 }}>
+                  {rememberMe ? t("rememberMeHelpPersistent") : t("rememberMeHelpSession")}
+                </Typography>
 
-            <Box sx={{ display: "flex", gap: 1, justifyContent: "flex-end", mt: 1 }}>
-              {allowReg && (
-                <Button type="button" variant="outlined" disableRipple disabled={loading} onClick={() => void submit("register")}>
-                  {t("createAccount")}
-                </Button>
-              )}
-              <Button type="submit" variant="contained" disableRipple disabled={loading}>
-                {t("signInTitle")}
-              </Button>
-            </Box>
-          </Box>
+                <Box sx={{ display: "flex", gap: 1, justifyContent: "flex-end", mt: 1 }}>
+                  {allowReg && (
+                    <Button type="button" variant="outlined" disableRipple disabled={loading} onClick={() => void submit("register")}>
+                      {t("createAccount")}
+                    </Button>
+                  )}
+                  <Button type="submit" variant="contained" disableRipple disabled={loading}>
+                    {t("signInTitle")}
+                  </Button>
+                </Box>
+              </Box>
+            )}
+
+            {tab === 1 && <GoogleAuthCard onSignedIn={() => { navigate(nextPath, { replace: true }); }} />}
+            {tab === 2 && <MicrosoftAuthCard onSignedIn={() => { navigate(nextPath, { replace: true }); }} />}
+          </>
         )}
-
-        {tab === 1 && <GoogleAuthCard onSignedIn={() => { navigate(nextPath, { replace: true }); }} />}
-        {tab === 2 && <MicrosoftAuthCard onSignedIn={() => { navigate(nextPath, { replace: true }); }} />}
       </Paper>
     </Box>
   );

job-tracker-ui/src/views/ProfilePage.tsx

@@ -11,6 +11,8 @@ import { api, getApiErrorMessage } from "../api";
 import GoogleAuthCard from "../components/GoogleAuthCard";
 import MicrosoftAuthCard from "../components/MicrosoftAuthCard";
 import AuthStatusCard from "../components/AuthStatusCard";
+import TwoFactorSettingsCard from "../components/TwoFactorSettingsCard";
+import SessionsSettingsCard from "../components/SessionsSettingsCard";
 import EmailProviderConnections from "../components/EmailProviderConnections";
 import CropImageDialog from "../components/CropImageDialog";
 import { useToast } from "../toast";
@@ -1348,6 +1350,9 @@ export default function ProfilePage() {
           </Button>
         </Box>
       </Box>
+
+      {isLocal ? <TwoFactorSettingsCard /> : null}
+      {isLocal ? <SessionsSettingsCard /> : null}
     </Paper>
   );
 }

job-tracker-ui/src/views/VerifyEmailPage.tsx

@@ -0,0 +1,75 @@
+import React, { useEffect, useState } from "react";
+
+import { Alert, Box, Button, CircularProgress, Paper, Typography } from "@mui/material";
+
+import { useNavigate } from "react-router-dom";
+
+import { api, getApiErrorMessage } from "../api";
+import { useI18n } from "../i18n/I18nProvider";
+
+type Status = "verifying" | "success" | "error";
+
+export default function VerifyEmailPage() {
+  const { t } = useI18n();
+  const navigate = useNavigate();
+
+  const [status, setStatus] = useState<Status>("verifying");
+  const [errorMessage, setErrorMessage] = useState<string | null>(null);
+
+  useEffect(() => {
+    const params = new URLSearchParams(window.location.search);
+    const userId = params.get("userId") || "";
+    const token = params.get("token") || "";
+
+    if (!userId || !token) {
+      setStatus("error");
+      setErrorMessage(t("missingVerifyLinkInfo"));
+      return;
+    }
+
+    api
+      .post("/auth/verify-email", { userId, token })
+      .then(() => setStatus("success"))
+      .catch((e: any) => {
+        setStatus("error");
+        setErrorMessage(getApiErrorMessage(e, t("verifyEmailFailed")));
+      });
+  }, [t]);
+
+  return (
+    <Box
+      sx={{
+        minHeight: "100vh",
+        display: "flex",
+        alignItems: "center",
+        justifyContent: "center",
+        p: 2,
+        background:
+          "radial-gradient(1200px 700px at 20% 0%, rgba(79,140,255,0.14), transparent 55%), radial-gradient(900px 600px at 80% 20%, rgba(245,158,11,0.10), transparent 55%)",
+      }}
+    >
+      <Paper sx={{ width: "min(520px, 100%)", p: 3 }}>
+        <Typography variant="h5" sx={{ fontWeight: 900, mb: 0.5 }}>
+          {t("verifyEmailTitle")}
+        </Typography>
+
+        <Box sx={{ display: "flex", flexDirection: "column", gap: 1.5, mt: 2 }}>
+          {status === "verifying" && (
+            <Box sx={{ display: "flex", alignItems: "center", gap: 1.5 }}>
+              <CircularProgress size={20} />
+              <Typography sx={{ color: "text.secondary" }}>{t("verifyEmailVerifying")}</Typography>
+            </Box>
+          )}
+          {status === "success" && <Alert severity="success">{t("verifyEmailSuccess")}</Alert>}
+          {status === "error" && <Alert severity="error">{errorMessage}</Alert>}
+
+          <Box sx={{ display: "flex", justifyContent: "flex-end", mt: 1 }}>
+            <Button variant="contained" onClick={() => navigate("/login")}>
+              {t("backToLogin")}
+            </Button>
+          </Box>
+        </Box>
+      </Paper>
+    </Box>
+  );
+}