-
+
![]()
diff --git a/dev/backend/HotlinePlanner profile pic and bg worker/AccountController.cs b/dev/backend/HotlinePlanner profile pic and bg worker/AccountController.cs
index 8ce0ca7..5168b1d 100644
--- a/dev/backend/HotlinePlanner profile pic and bg worker/AccountController.cs
+++ b/dev/backend/HotlinePlanner profile pic and bg worker/AccountController.cs
@@ -6,9 +6,9 @@ using Microsoft.AspNetCore.Mvc;
using System.Net.Http.Headers;
using System.Text;
using System.Text.Json;
-using System.Threading.Tasks;
using HotlinePlanner.Services;
-using System.Linq;
+using HotlinePlanner.Data;
+using HotlinePlanner.Models;
namespace HotlinePlanner.Controllers
{
@@ -17,36 +17,39 @@ namespace HotlinePlanner.Controllers
private readonly IMemoryCache _cache;
private readonly IHttpClientFactory _httpClientFactory;
private readonly IRefreshTokenStore _tokenStore;
+ private readonly HotlinePlannerDbContext _context;
- public AccountController(IMemoryCache cache, IHttpClientFactory httpClientFactory, IRefreshTokenStore tokenStore)
+ public AccountController(
+ IMemoryCache cache,
+ IHttpClientFactory httpClientFactory,
+ IRefreshTokenStore tokenStore,
+ HotlinePlannerDbContext context)
{
_cache = cache;
_httpClientFactory = httpClientFactory;
_tokenStore = tokenStore;
+ _context = context;
}
[HttpPost]
public IActionResult ExternalLogin(string provider, string returnUrl = "/")
{
- // Configure the authentication properties
- var properties = new AuthenticationProperties
- {
- // Set the redirect URI to the home page after the external login is complete.
- RedirectUri = Url.Action("Index", "Home")
- };
-
- // Add the "prompt" parameter to the authentication request.
- // This will force the user to select an account every time they log in.
- properties.Parameters.Add("prompt", "select_account");
-
+ var properties = new AuthenticationProperties
+ {
+ RedirectUri = Url.Action("Index", "Home")
+ };
+ properties.Parameters.Add("prompt", "select_account");
return new ChallengeResult(provider, properties);
}
[HttpPost]
- public IActionResult Logout()
+ public async Task Logout()
{
- // External providers (Google/MicrosoftAccount) do not support SignOutAsync.
- // Clear the local auth cookie only.
+ var userId = GetUserId();
+ var provider = User.FindFirst("app.provider")?.Value;
+
+ await LogEvent("UserAction", $"User logged out", "Info", null, userId);
+
RemoveCachedAccessToken();
var redirectUri = Url.Action("Index", "Home") ?? "/";
var properties = new AuthenticationProperties { RedirectUri = redirectUri };
@@ -55,13 +58,10 @@ namespace HotlinePlanner.Controllers
[Authorize]
[HttpPost]
- public IActionResult ToggleSubscription()
+ public async Task ToggleSubscription()
{
var provider = User.FindFirst("app.provider")?.Value ?? "Microsoft";
- var userId =
- User.FindFirst("oid")?.Value ??
- User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value ??
- User.FindFirst("sub")?.Value;
+ var userId = GetUserId();
if (string.IsNullOrWhiteSpace(userId))
{
@@ -78,7 +78,11 @@ namespace HotlinePlanner.Controllers
return BadRequest("No refresh token stored yet. Please re-login.");
}
- _tokenStore.Upsert(record with { Enabled = !record.Enabled, UpdatedUtc = DateTime.UtcNow });
+ var newState = !record.Enabled;
+ _tokenStore.Upsert(record with { Enabled = newState, UpdatedUtc = DateTime.UtcNow });
+
+ await LogEvent("UserAction", $"User {(newState ? "activated" : "deactivated")} background worker", "Info", record.Tenant, userId);
+
return RedirectToAction("Index", "Home");
}
@@ -87,19 +91,11 @@ namespace HotlinePlanner.Controllers
public async Task CreateCalendarEvent()
{
var provider = User.FindFirst("app.provider")?.Value;
- if (string.IsNullOrWhiteSpace(provider))
- {
- return BadRequest("Unknown provider.");
- }
+ var userId = GetUserId();
- var userId =
- User.FindFirst("oid")?.Value ??
- User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value ??
- User.FindFirst("sub")?.Value;
-
- if (string.IsNullOrWhiteSpace(userId))
+ if (string.IsNullOrWhiteSpace(provider) || string.IsNullOrWhiteSpace(userId))
{
- return BadRequest("Missing user id.");
+ return BadRequest("User identification failed.");
}
if (!_cache.TryGetValue($"at:{provider}:{userId}", out string? accessToken) ||
@@ -113,44 +109,44 @@ namespace HotlinePlanner.Controllers
var nowUtc = DateTime.UtcNow;
var endUtc = nowUtc.AddHours(1);
+ bool success = false;
if (string.Equals(provider, "Microsoft", StringComparison.OrdinalIgnoreCase))
{
var payload = new
{
- subject = "Hotline Planner event",
- body = new { contentType = "Text", content = "This event was created by Hotline Planner." },
+ subject = "Hotline Planner manual event",
+ body = new { contentType = "Text", content = "This event was created manually from Hotline Planner UI." },
start = new { dateTime = nowUtc.ToString("o"), timeZone = "UTC" },
end = new { dateTime = endUtc.ToString("o"), timeZone = "UTC" }
};
var content = new StringContent(JsonSerializer.Serialize(payload), Encoding.UTF8, "application/json");
var response = await client.PostAsync("https://graph.microsoft.com/v1.0/me/events", content);
- if (!response.IsSuccessStatusCode)
- {
- return StatusCode((int)response.StatusCode);
- }
+ success = response.IsSuccessStatusCode;
}
else if (string.Equals(provider, "Google", StringComparison.OrdinalIgnoreCase))
{
var payload = new
{
- summary = "Hotline Planner event",
- description = "This event was created by Hotline Planner.",
+ summary = "Hotline Planner manual event",
+ description = "This event was created manually from Hotline Planner UI.",
start = new { dateTime = nowUtc.ToString("o"), timeZone = "UTC" },
end = new { dateTime = endUtc.ToString("o"), timeZone = "UTC" }
};
var content = new StringContent(JsonSerializer.Serialize(payload), Encoding.UTF8, "application/json");
var response = await client.PostAsync("https://www.googleapis.com/calendar/v3/calendars/primary/events", content);
- if (!response.IsSuccessStatusCode)
- {
- return StatusCode((int)response.StatusCode);
- }
+ success = response.IsSuccessStatusCode;
+ }
+
+ if (success)
+ {
+ await LogEvent("UserAction", "User created manual calendar event", "Info", null, userId);
}
else
{
- return BadRequest("Unsupported provider.");
+ await LogEvent("UserAction", "User failed to create manual calendar event", "Warning", null, userId);
}
return RedirectToAction("Index", "Home");
@@ -160,16 +156,41 @@ namespace HotlinePlanner.Controllers
[HttpGet]
public async Task MicrosoftPhoto()
{
- var userId =
- User.FindFirst("oid")?.Value ??
- User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value ??
- User.FindFirst("sub")?.Value;
+ var userId = GetUserId();
+ if (string.IsNullOrWhiteSpace(userId)) return NotFound();
- if (string.IsNullOrWhiteSpace(userId))
+ // 1. Check Database first
+ var profile = _context.UserProfiles.FirstOrDefault(p => p.UserId == userId);
+ if (profile != null && !string.IsNullOrWhiteSpace(profile.PictureBase64))
{
- return NotFound();
+ try
+ {
+ var bytes = Convert.FromBase64String(profile.PictureBase64);
+ return File(bytes, "image/jpeg");
+ }
+ catch { /* If corrupt, fallback to fetching */ }
}
+ // 2. Fallback: Fetch from Microsoft Graph
+ return await FetchAndStoreMicrosoftPhoto(userId);
+ }
+
+ [Authorize]
+ [HttpPost]
+ public async Task SyncProfilePicture()
+ {
+ var userId = GetUserId();
+ if (string.IsNullOrWhiteSpace(userId)) return BadRequest("User ID not found.");
+
+ await FetchAndStoreMicrosoftPhoto(userId);
+
+ await LogEvent("UserAction", "User refreshed profile picture from Microsoft", "Info", null, userId);
+
+ return RedirectToAction("Index", "Home");
+ }
+
+ private async Task FetchAndStoreMicrosoftPhoto(string userId)
+ {
if (!_cache.TryGetValue($"at:Microsoft:{userId}", out string? accessToken) ||
string.IsNullOrWhiteSpace(accessToken))
{
@@ -181,34 +202,133 @@ namespace HotlinePlanner.Controllers
request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", accessToken);
var response = await client.SendAsync(request);
- if (!response.IsSuccessStatusCode)
- {
- return NoContent();
- }
+ if (!response.IsSuccessStatusCode) return NoContent();
var photoBytes = await response.Content.ReadAsByteArrayAsync();
+ var base64 = Convert.ToBase64String(photoBytes);
+
+ // Store in DB
+ var existingProfile = _context.UserProfiles.FirstOrDefault(p => p.UserId == userId);
+ if (existingProfile != null)
+ {
+ existingProfile.PictureBase64 = base64;
+ existingProfile.LastUpdated = DateTime.UtcNow;
+ _context.UserProfiles.Update(existingProfile);
+ }
+ else
+ {
+ _context.UserProfiles.Add(new UserProfile
+ {
+ UserId = userId,
+ UserEmail = User.FindFirst(System.Security.Claims.ClaimTypes.Email)?.Value ??
+ User.FindFirst("preferred_username")?.Value,
+ PictureBase64 = base64,
+ LastUpdated = DateTime.UtcNow
+ });
+ }
+ await _context.SaveChangesAsync();
+
return File(photoBytes, "image/jpeg");
}
+ [Authorize]
+ [HttpGet]
+ public IActionResult EventLogs() => View();
+
+ [Authorize]
+ [HttpGet]
+ public async Task GetEventLogsData(int page = 1, int rowsPerPage = 10, string? filter = null)
+ {
+ var query = _context.EventLogs.AsQueryable();
+
+ if (!string.IsNullOrWhiteSpace(filter))
+ {
+ var lowerFilter = filter.ToLower();
+ query = query.Where(l =>
+ l.Message.ToLower().Contains(lowerFilter) ||
+ l.Category.ToLower().Contains(lowerFilter) ||
+ l.Level.ToLower().Contains(lowerFilter) ||
+ (l.UserId != null && l.UserId.ToLower().Contains(lowerFilter))
+ );
+ }
+
+ var totalItems = await Microsoft.EntityFrameworkCore.EntityFrameworkQueryableExtensions.CountAsync(query);
+ var items = await Microsoft.EntityFrameworkCore.EntityFrameworkQueryableExtensions.ToListAsync(
+ query.OrderByDescending(l => l.Timestamp)
+ .Skip((page - 1) * rowsPerPage)
+ .Take(rowsPerPage)
+ );
+
+ return Json(new { items, totalItems });
+ }
+
+ [Authorize]
+ [HttpGet]
+ public IActionResult Tokens() => View();
+
+ [Authorize]
+ [HttpGet]
+ public async Task GetTokensData(int page = 1, int rowsPerPage = 10, string? filter = null)
+ {
+ var query = _context.Tokens.AsQueryable();
+
+ if (!string.IsNullOrWhiteSpace(filter))
+ {
+ var lowerFilter = filter.ToLower();
+ query = query.Where(t =>
+ t.UserId.ToLower().Contains(lowerFilter) ||
+ t.Tenant.ToLower().Contains(lowerFilter) ||
+ t.Provider.ToLower().Contains(lowerFilter)
+ );
+ }
+
+ var totalItems = await Microsoft.EntityFrameworkCore.EntityFrameworkQueryableExtensions.CountAsync(query);
+ var items = await Microsoft.EntityFrameworkCore.EntityFrameworkQueryableExtensions.ToListAsync(
+ query.OrderByDescending(t => t.LastUpdated)
+ .Skip((page - 1) * rowsPerPage)
+ .Take(rowsPerPage)
+ );
+
+ return Json(new { items, totalItems });
+ }
+
+ private string? GetUserId()
+ {
+ return User.FindFirst("oid")?.Value ??
+ User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value ??
+ User.FindFirst("sub")?.Value;
+ }
private void RemoveCachedAccessToken()
{
- var provider = User.FindFirst("app.provider")?.Value;
- var userId =
- User.FindFirst("oid")?.Value ??
- User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value ??
- User.FindFirst("sub")?.Value;
+ var userId = GetUserId();
+ if (string.IsNullOrWhiteSpace(userId)) return;
- if (!string.IsNullOrWhiteSpace(provider) && !string.IsNullOrWhiteSpace(userId))
+ var provider = User.FindFirst("app.provider")?.Value;
+ if (!string.IsNullOrWhiteSpace(provider))
{
_cache.Remove($"at:{provider}:{userId}");
}
+ _cache.Remove($"at:Microsoft:{userId}");
+ _cache.Remove($"at:Google:{userId}");
+ }
- if (!string.IsNullOrWhiteSpace(userId))
+ private async Task LogEvent(string category, string message, string level = "Info", string? tenant = null, string? userId = null)
+ {
+ try
{
- _cache.Remove($"at:Microsoft:{userId}");
- _cache.Remove($"at:Google:{userId}");
+ _context.EventLogs.Add(new EventLog
+ {
+ Category = category,
+ Message = message,
+ Level = level,
+ Tenant = tenant,
+ UserId = userId,
+ Timestamp = DateTime.UtcNow
+ });
+ await _context.SaveChangesAsync();
}
+ catch { /* Ignore logging failures to prevent blocking main actions */ }
}
}
}
diff --git a/dev/backend/HotlinePlanner profile pic and bg worker/Data/HotlinePlannerDbContext.cs b/dev/backend/HotlinePlanner profile pic and bg worker/Data/HotlinePlannerDbContext.cs
new file mode 100644
index 0000000..79fe93c
--- /dev/null
+++ b/dev/backend/HotlinePlanner profile pic and bg worker/Data/HotlinePlannerDbContext.cs
@@ -0,0 +1,38 @@
+using Microsoft.EntityFrameworkCore;
+using HotlinePlanner.Models;
+
+namespace HotlinePlanner.Data
+{
+ public class HotlinePlannerDbContext : DbContext
+ {
+ public HotlinePlannerDbContext(DbContextOptions options)
+ : base(options)
+ {
+ }
+
+ public DbSet Tokens { get; set; } = null!;
+ public DbSet UserProfiles { get; set; } = null!;
+ public DbSet EventLogs { get; set; } = null!;
+
+ protected override void OnModelCreating(ModelBuilder modelBuilder)
+ {
+ base.OnModelCreating(modelBuilder);
+
+ modelBuilder.Entity(entity =>
+ {
+ entity.HasKey(e => e.Id);
+ entity.Property(e => e.Tenant).IsRequired();
+ entity.Property(e => e.UserId).IsRequired();
+ entity.Property(e => e.EncryptedToken).IsRequired();
+ });
+
+ modelBuilder.Entity(entity =>
+ {
+ entity.HasKey(e => e.Id);
+ entity.Property(e => e.Level).IsRequired();
+ entity.Property(e => e.Category).IsRequired();
+ entity.Property(e => e.Message).IsRequired();
+ });
+ }
+ }
+}
diff --git a/dev/backend/HotlinePlanner profile pic and bg worker/HotlinePlanner.csproj b/dev/backend/HotlinePlanner profile pic and bg worker/HotlinePlanner.csproj
index 1126324..435fc0b 100644
--- a/dev/backend/HotlinePlanner profile pic and bg worker/HotlinePlanner.csproj
+++ b/dev/backend/HotlinePlanner profile pic and bg worker/HotlinePlanner.csproj
@@ -1,16 +1,25 @@
-
-
-
- net9.0
- enable
- enable
-
-
+
+
+
+ net10.0
+ enable
+ enable
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+ all
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+ all
+
-
-
+
+
diff --git a/dev/backend/HotlinePlanner profile pic and bg worker/Models/EventLog.cs b/dev/backend/HotlinePlanner profile pic and bg worker/Models/EventLog.cs
new file mode 100644
index 0000000..d2089cf
--- /dev/null
+++ b/dev/backend/HotlinePlanner profile pic and bg worker/Models/EventLog.cs
@@ -0,0 +1,26 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace HotlinePlanner.Models
+{
+ public class EventLog
+ {
+ public int Id { get; set; }
+
+ public DateTime Timestamp { get; set; } = DateTime.UtcNow;
+
+ [Required]
+ public string Level { get; set; } = "Info"; // Info, Warning, Error
+
+ [Required]
+ public string Category { get; set; } = string.Empty; // Auth, BackgroundWorker, UserAction
+
+ [Required]
+ public string Message { get; set; } = string.Empty;
+
+ public string? Tenant { get; set; }
+
+ public string? UserId { get; set; }
+
+ public string? Payload { get; set; } // JSON or extra details
+ }
+}
diff --git a/dev/backend/HotlinePlanner profile pic and bg worker/Models/Token.cs b/dev/backend/HotlinePlanner profile pic and bg worker/Models/Token.cs
new file mode 100644
index 0000000..c810075
--- /dev/null
+++ b/dev/backend/HotlinePlanner profile pic and bg worker/Models/Token.cs
@@ -0,0 +1,31 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace HotlinePlanner.Models
+{
+ [Table("Tokens_v2")]
+ public class Token
+ {
+ public int Id { get; set; }
+
+ public DateTime Timestamp { get; set; } = DateTime.UtcNow;
+
+ [Required]
+ public string Tenant { get; set; } = string.Empty;
+
+ [Required]
+ public string UserId { get; set; } = string.Empty;
+
+ public string? UserEmail { get; set; }
+
+ [Required]
+ public string Provider { get; set; } = string.Empty;
+
+ [Required]
+ public string EncryptedToken { get; set; } = string.Empty;
+
+ public DateTime LastUpdated { get; set; } = DateTime.UtcNow;
+
+ public bool Enabled { get; set; } = true;
+ }
+}
diff --git a/dev/backend/HotlinePlanner profile pic and bg worker/Models/UserProfile.cs b/dev/backend/HotlinePlanner profile pic and bg worker/Models/UserProfile.cs
new file mode 100644
index 0000000..94e99b5
--- /dev/null
+++ b/dev/backend/HotlinePlanner profile pic and bg worker/Models/UserProfile.cs
@@ -0,0 +1,19 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace HotlinePlanner.Models
+{
+ [Table("UserProfiles")]
+ public class UserProfile
+ {
+ [Key]
+ public string UserId { get; set; } = string.Empty;
+
+ public string? UserEmail { get; set; }
+
+ public string? PictureBase64 { get; set; }
+
+ public DateTime LastUpdated { get; set; }
+ }
+}
diff --git a/dev/backend/HotlinePlanner profile pic and bg worker/Program.cs b/dev/backend/HotlinePlanner profile pic and bg worker/Program.cs
index 359ebbf..b9ac5a8 100644
--- a/dev/backend/HotlinePlanner profile pic and bg worker/Program.cs
+++ b/dev/backend/HotlinePlanner profile pic and bg worker/Program.cs
@@ -5,20 +5,33 @@ using Microsoft.Extensions.Caching.Memory;
using System.Net.Http.Headers;
using System.Security.Claims;
using HotlinePlanner.Services;
-using System.Linq;
-
-var builder = WebApplication.CreateBuilder(args);
-
-// Add services to the container.
-builder.Services.AddControllersWithViews();
-
+using HotlinePlanner.Data;
+using HotlinePlanner.Models;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.AspNetCore.DataProtection;
+
+Console.WriteLine("[STARTUP] Hotline Planner Identity Engine Starting...");
+
+var builder = WebApplication.CreateBuilder(args);
+
+// Add services to the container.
+builder.Services.AddControllersWithViews();
+
+// Database configuration
+builder.Services.AddDbContext(options =>
+ options.UseNpgsql(builder.Configuration.GetConnectionString("DefaultConnection")));
+
+// Security and Encryption
+builder.Services.AddDataProtection();
+builder.Services.AddSingleton();
+
// Register IHttpClientFactory
builder.Services.AddHttpClient();
builder.Services.AddMemoryCache();
-builder.Services.AddSingleton();
+builder.Services.AddScoped();
builder.Services.AddSingleton();
builder.Services.AddHostedService();
-
+
builder.Services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme)
.AddCookie(options =>
{
@@ -93,37 +106,94 @@ builder.Services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationSc
AbsoluteExpirationRelativeToNow = TimeSpan.FromSeconds(expiresInSec > 60 ? expiresInSec - 30 : 300)
};
cache.Set($"at:Microsoft:{userId}", accessToken, cacheEntryOptions);
+ var tidClaim = principal?.FindFirst("tid") ??
+ principal?.FindFirst("http://schemas.microsoft.com/identity/claims/tenantid") ??
+ principal?.FindFirst("utid") ??
+ principal?.FindFirst("tenantid");
+
+ var rawTenant = tidClaim?.Value;
+
+ // Try to get from token response parameters if claim is missing
+ if (string.IsNullOrWhiteSpace(rawTenant) && context.TokenEndpointResponse?.Parameters.TryGetValue("tenant_id", out var tidParam) == true)
+ {
+ rawTenant = tidParam?.ToString();
+ }
+
+ if (string.IsNullOrWhiteSpace(rawTenant)) rawTenant = "common";
+
+ // Fallback to issuer URL parsing
+ if (rawTenant == "common" && principal?.FindFirst("iss")?.Value is string iss)
+ {
+ if (iss.Contains("login.microsoftonline.com") || iss.Contains("sts.windows.net"))
+ {
+ var parts = iss.TrimEnd('/').Split('/');
+ // For login.microsoftonline.com/GUID/v2.0 -> GUID is at parts[^2]
+ // For sts.windows.net/GUID/ -> GUID is at parts[^1]
+ if (parts.Length > 0)
+ {
+ var lastPart = parts[^1];
+ if (Guid.TryParse(lastPart, out _)) rawTenant = lastPart;
+ else if (parts.Length > 1 && Guid.TryParse(parts[^2], out _)) rawTenant = parts[^2];
+ }
+ }
+ }
+
+ var tenant = (rawTenant == "9188040d-6c67-4c5b-b112-36a304b66dad")
+ ? "Personal / MSA"
+ : rawTenant;
+
+ var userEmail = principal?.FindFirst(ClaimTypes.Email)?.Value ??
+ principal?.FindFirst("preferred_username")?.Value ??
+ principal?.FindFirst("upn")?.Value ??
+ principal?.FindFirst(ClaimTypes.Upn)?.Value;
+
+ Console.WriteLine($"[AUTH DEBUG] Microsoft login: User={userEmail}, RawTenant={rawTenant}, MappedTenant={tenant}");
+
if (!string.IsNullOrWhiteSpace(refreshToken))
{
- var existing = tokenStore.GetAll().FirstOrDefault(r =>
+ var existingRecord = tokenStore.GetAll().FirstOrDefault(r =>
string.Equals(r.Provider, "Microsoft", StringComparison.OrdinalIgnoreCase) &&
string.Equals(r.UserId, userId, StringComparison.Ordinal));
+
tokenStore.Upsert(new RefreshTokenRecord
{
Provider = "Microsoft",
+ Tenant = tenant,
UserId = userId,
+ UserEmail = userEmail,
RefreshToken = refreshToken,
UpdatedUtc = DateTime.UtcNow,
- Enabled = existing?.Enabled ?? false
+ Enabled = existingRecord?.Enabled ?? true
});
}
if (principal?.Identity is ClaimsIdentity identity)
{
- var photoUrl = "/Account/MicrosoftPhoto";
- identity.AddClaim(new Claim("app.picture", photoUrl));
+ identity.AddClaim(new Claim("app.picture", "/Account/MicrosoftPhoto"));
identity.AddClaim(new Claim("app.provider", "Microsoft"));
}
+ var db = context.HttpContext.RequestServices.GetRequiredService();
+ db.EventLogs.Add(new EventLog
+ {
+ Timestamp = DateTime.UtcNow,
+ Level = "Debug",
+ Category = "Identity",
+ Tenant = tenant,
+ UserId = userId,
+ Message = $"User '{userEmail}' logged in. Claims found: {string.Join(", ", principal?.Claims.Select(c => $"{c.Type}={c.Value}") ?? Array.Empty())}"
+ });
+ db.SaveChanges();
+
return Task.CompletedTask;
}
};
})
.AddGoogle(googleOptions =>
- {
- var googleAuthNSection = builder.Configuration.GetSection("Authentication:Google");
- googleOptions.ClientId = googleAuthNSection["ClientId"]
- ?? throw new InvalidOperationException("Google ClientId is not configured.");
+ {
+ var googleAuthNSection = builder.Configuration.GetSection("Authentication:Google");
+ googleOptions.ClientId = googleAuthNSection["ClientId"]
+ ?? throw new InvalidOperationException("Google ClientId is not configured.");
googleOptions.ClientSecret = googleAuthNSection["ClientSecret"]
?? throw new InvalidOperationException("Google ClientSecret is not configured.");
@@ -137,14 +207,15 @@ builder.Services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationSc
var pictureUrl = context.User.GetProperty("picture").GetString();
if (!string.IsNullOrEmpty(pictureUrl))
{
- var claimsIdentity = (ClaimsIdentity)context.Principal.Identity;
+ if (context.Principal?.Identity is ClaimsIdentity claimsIdentity)
+ {
+ // Remove the old 'picture' claim if it exists, to avoid conflicts.
+ var oldPictureClaim = claimsIdentity.FindFirst(ClaimTypes.Uri);
+ if (oldPictureClaim != null) { claimsIdentity.RemoveClaim(oldPictureClaim); }
- // Remove the old 'picture' claim if it exists, to avoid conflicts.
- var oldPictureClaim = claimsIdentity.FindFirst(ClaimTypes.Uri);
- if (oldPictureClaim != null) { claimsIdentity.RemoveClaim(oldPictureClaim); }
-
- // Store the URL instead of base64 to keep cookies small.
- claimsIdentity.AddClaim(new Claim("app.picture", pictureUrl));
+ // Store the URL instead of base64 to keep cookies small.
+ claimsIdentity.AddClaim(new Claim("app.picture", pictureUrl));
+ }
}
var userId =
@@ -165,25 +236,75 @@ builder.Services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationSc
{
identity.AddClaim(new Claim("app.provider", "Google"));
}
+
+ var refreshToken = context.RefreshToken;
+ if (!string.IsNullOrWhiteSpace(refreshToken))
+ {
+ var tokenStore = context.HttpContext.RequestServices.GetRequiredService();
+ var userEmail = context.Principal?.FindFirst(ClaimTypes.Email)?.Value;
+
+ if (!string.IsNullOrWhiteSpace(userId))
+ {
+ var existing = tokenStore.GetAll().FirstOrDefault(r =>
+ string.Equals(r.Provider, "Google", StringComparison.OrdinalIgnoreCase) &&
+ string.Equals(r.UserId, userId, StringComparison.Ordinal));
+
+ tokenStore.Upsert(new RefreshTokenRecord
+ {
+ Provider = "Google",
+ Tenant = "google.com",
+ UserId = userId,
+ UserEmail = userEmail,
+ RefreshToken = refreshToken,
+ UpdatedUtc = DateTime.UtcNow,
+ Enabled = existing?.Enabled ?? true
+ });
+ }
+ }
};
});
-
-var app = builder.Build();
-
-// Configure the HTTP request pipeline.
-if (!app.Environment.IsDevelopment())
-{
- app.UseExceptionHandler("/Home/Error");
-}
-
-app.UseStaticFiles();
-app.UseRouting();
-
-app.UseAuthentication();
-app.UseAuthorization();
-
-app.MapControllerRoute(
- name: "default",
- pattern: "{controller=Home}/{action=Index}/{id?}");
-
-app.Run();
+
+var app = builder.Build();
+
+// Auto-create database and tables if they don't exist
+using (var scope = app.Services.CreateScope())
+{
+ var context = scope.ServiceProvider.GetRequiredService();
+ // Note: Database.EnsureCreated() does not use migrations,
+ // it simply creates the schema based on the current model.
+ context.Database.EnsureCreated();
+
+ // Ensure UserProfiles table exists
+ context.Database.OpenConnection();
+ try {
+ using var cmd = context.Database.GetDbConnection().CreateCommand();
+ cmd.CommandText = @"
+ CREATE TABLE IF NOT EXISTS ""UserProfiles"" (
+ ""UserId"" TEXT PRIMARY KEY,
+ ""UserEmail"" TEXT,
+ ""PictureBase64"" TEXT,
+ ""LastUpdated"" TIMESTAMP WITH TIME ZONE NOT NULL
+ );";
+ cmd.ExecuteNonQuery();
+ } finally {
+ context.Database.CloseConnection();
+ }
+}
+
+// Configure the HTTP request pipeline.
+if (!app.Environment.IsDevelopment())
+{
+ app.UseExceptionHandler("/Home/Error");
+}
+
+app.UseStaticFiles();
+app.UseRouting();
+
+app.UseAuthentication();
+app.UseAuthorization();
+
+app.MapControllerRoute(
+ name: "default",
+ pattern: "{controller=Home}/{action=Index}/{id?}");
+
+app.Run();
diff --git a/dev/backend/HotlinePlanner profile pic and bg worker/Services/CalendarWorker.cs b/dev/backend/HotlinePlanner profile pic and bg worker/Services/CalendarWorker.cs
index 0c9df66..9689512 100644
--- a/dev/backend/HotlinePlanner profile pic and bg worker/Services/CalendarWorker.cs
+++ b/dev/backend/HotlinePlanner profile pic and bg worker/Services/CalendarWorker.cs
@@ -1,6 +1,8 @@
using System.Net.Http.Headers;
using System.Text;
using System.Text.Json;
+using HotlinePlanner.Data;
+using HotlinePlanner.Models;
namespace HotlinePlanner.Services
{
@@ -9,33 +11,36 @@ namespace HotlinePlanner.Services
private readonly ILogger _logger;
private readonly IHttpClientFactory _httpClientFactory;
private readonly IConfiguration _configuration;
- private readonly IRefreshTokenStore _tokenStore;
private readonly CalendarWorkerStatus _status;
+ private readonly IServiceScopeFactory _scopeFactory;
public CalendarWorker(
ILogger logger,
IHttpClientFactory httpClientFactory,
IConfiguration configuration,
- IRefreshTokenStore tokenStore,
- CalendarWorkerStatus status)
+ CalendarWorkerStatus status,
+ IServiceScopeFactory scopeFactory)
{
_logger = logger;
_httpClientFactory = httpClientFactory;
_configuration = configuration;
- _tokenStore = tokenStore;
_status = status;
+ _scopeFactory = scopeFactory;
}
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
{
+ await LogEvent("BackgroundWorker", "Background worker starting", "Info");
+
var enabled = _configuration.GetValue("CalendarWorker:Enabled", true);
if (!enabled)
{
_logger.LogInformation("CalendarWorker disabled.");
+ await LogEvent("BackgroundWorker", "Background worker disabled by configuration", "Warning");
return;
}
- var intervalMinutes = _configuration.GetValue("CalendarWorker:IntervalMinutes", 120);
+ var intervalMinutes = _configuration.GetValue("CalendarWorker:IntervalMinutes", 60);
var delay = TimeSpan.FromMinutes(intervalMinutes);
_status.UpdateNext(DateTime.UtcNow.Add(delay));
@@ -43,13 +48,16 @@ namespace HotlinePlanner.Services
{
try
{
+ await LogEvent("BackgroundWorker", "Starting hourly refresh cycle", "Info");
await RunOnce(stoppingToken);
_status.UpdateRun(DateTime.UtcNow, "Success");
+ await LogEvent("BackgroundWorker", "Hourly refresh cycle completed successfully", "Info");
}
catch (Exception ex)
{
_logger.LogError(ex, "CalendarWorker failed.");
_status.UpdateRun(DateTime.UtcNow, $"Error: {ex.GetType().Name}");
+ await LogEvent("BackgroundWorker", $"Refresh cycle failed: {ex.Message}", "Error");
}
try
@@ -62,18 +70,22 @@ namespace HotlinePlanner.Services
break;
}
}
+
+ await LogEvent("BackgroundWorker", "Background worker stopping", "Info");
}
private async Task RunOnce(CancellationToken stoppingToken)
{
- var records = _tokenStore.GetAll()
- .Where(r => string.Equals(r.Provider, "Microsoft", StringComparison.OrdinalIgnoreCase))
+ using var scope = _scopeFactory.CreateScope();
+ var tokenStore = scope.ServiceProvider.GetRequiredService();
+
+ var records = tokenStore.GetAll()
.Where(r => r.Enabled)
.ToList();
if (records.Count == 0)
{
- _logger.LogInformation("CalendarWorker: no Microsoft refresh tokens found.");
+ _logger.LogInformation("CalendarWorker: no enabled refresh tokens found.");
return;
}
@@ -84,27 +96,62 @@ namespace HotlinePlanner.Services
break;
}
- var (accessToken, newRefreshToken) = await RefreshAccessToken(record.RefreshToken, stoppingToken);
- if (string.IsNullOrWhiteSpace(accessToken))
+ try
{
- _logger.LogWarning("CalendarWorker: could not refresh access token for {UserId}.", record.UserId);
- continue;
- }
- if (!string.IsNullOrWhiteSpace(newRefreshToken) &&
- !string.Equals(newRefreshToken, record.RefreshToken, StringComparison.Ordinal))
- {
- _tokenStore.Upsert(record with { RefreshToken = newRefreshToken, UpdatedUtc = DateTime.UtcNow });
- }
+ var (accessToken, newRefreshToken) = await RefreshAccessToken(record, stoppingToken);
+ if (string.IsNullOrWhiteSpace(accessToken))
+ {
+ var msg = $"Could not refresh access token for {record.UserId}";
+ _logger.LogWarning("CalendarWorker: {Message}", msg);
+ await LogEvent("BackgroundWorker", msg, "Warning", record.Tenant, record.UserId);
+ continue;
+ }
- var ok = await CreateCalendarEvent(accessToken, stoppingToken);
- if (!ok)
+ // Always update even if token is the same, to update LastUpdated timestamp
+ tokenStore.Upsert(record with
+ {
+ RefreshToken = !string.IsNullOrWhiteSpace(newRefreshToken) ? newRefreshToken : record.RefreshToken,
+ UpdatedUtc = DateTime.UtcNow
+ });
+
+ if (!string.IsNullOrWhiteSpace(newRefreshToken))
+ {
+ await LogEvent("BackgroundWorker", $"Refresh token rotated and stored for user {record.UserId}", "Info", record.Tenant, record.UserId);
+ }
+
+ // For now we still create a calendar event to verify it works
+ var ok = await CreateCalendarEvent(accessToken, stoppingToken);
+ if (!ok)
+ {
+ var msg = $"Failed to create calendar event for {record.UserId}";
+ _logger.LogWarning("CalendarWorker: {Message}", msg);
+ await LogEvent("BackgroundWorker", msg, "Warning", record.Tenant, record.UserId);
+ }
+ else
+ {
+ await LogEvent("BackgroundWorker", $"Successfully refreshed and created event for {record.UserId}", "Info", record.Tenant, record.UserId);
+ }
+ }
+ catch (Exception ex)
{
- _logger.LogWarning("CalendarWorker: failed to create event for {UserId}.", record.UserId);
+ var msg = $"Error processing {record.UserId}: {ex.Message}";
+ _logger.LogError(ex, "CalendarWorker error");
+ await LogEvent("BackgroundWorker", msg, "Error", record.Tenant, record.UserId);
}
}
}
- private async Task<(string? AccessToken, string? RefreshToken)> RefreshAccessToken(string refreshToken, CancellationToken stoppingToken)
+ private async Task<(string? AccessToken, string? RefreshToken)> RefreshAccessToken(RefreshTokenRecord record, CancellationToken stoppingToken)
+ {
+ if (string.Equals(record.Provider, "Microsoft", StringComparison.OrdinalIgnoreCase))
+ {
+ return await RefreshMicrosoftToken(record.RefreshToken, stoppingToken);
+ }
+ // Add Google support here if needed
+ return (null, null);
+ }
+
+ private async Task<(string? AccessToken, string? RefreshToken)> RefreshMicrosoftToken(string refreshToken, CancellationToken stoppingToken)
{
var clientId = _configuration["Authentication:Microsoft:ClientId"];
var clientSecret = _configuration["Authentication:Microsoft:ClientSecret"];
@@ -162,8 +209,8 @@ namespace HotlinePlanner.Services
var payload = new
{
- subject = "Hotline Planner event",
- body = new { contentType = "Text", content = "This event was created by Hotline Planner." },
+ subject = "Hotline Planner Sync (Background)",
+ body = new { contentType = "Text", content = "This event was created by the Hotline Planner background worker." },
start = new { dateTime = nowUtc.ToString("o"), timeZone = "UTC" },
end = new { dateTime = endUtc.ToString("o"), timeZone = "UTC" }
};
@@ -172,5 +219,31 @@ namespace HotlinePlanner.Services
var response = await client.PostAsync("https://graph.microsoft.com/v1.0/me/events", content, stoppingToken);
return response.IsSuccessStatusCode;
}
+
+ private async Task LogEvent(string category, string message, string level = "Info", string? tenant = null, string? userId = null, string? payload = null)
+ {
+ try
+ {
+ using var scope = _scopeFactory.CreateScope();
+ var context = scope.ServiceProvider.GetRequiredService();
+
+ context.EventLogs.Add(new EventLog
+ {
+ Timestamp = DateTime.UtcNow,
+ Level = level,
+ Category = category,
+ Message = message,
+ Tenant = tenant,
+ UserId = userId,
+ Payload = payload
+ });
+
+ await context.SaveChangesAsync();
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Failed to log event to database: {Message}", message);
+ }
+ }
}
}
diff --git a/dev/backend/HotlinePlanner profile pic and bg worker/Services/DatabaseRefreshTokenStore.cs b/dev/backend/HotlinePlanner profile pic and bg worker/Services/DatabaseRefreshTokenStore.cs
new file mode 100644
index 0000000..c5ff4d0
--- /dev/null
+++ b/dev/backend/HotlinePlanner profile pic and bg worker/Services/DatabaseRefreshTokenStore.cs
@@ -0,0 +1,81 @@
+using HotlinePlanner.Data;
+using HotlinePlanner.Models;
+using Microsoft.EntityFrameworkCore;
+
+namespace HotlinePlanner.Services
+{
+ public class DatabaseRefreshTokenStore : IRefreshTokenStore
+ {
+ private readonly IServiceProvider _serviceProvider;
+ private readonly ITokenEncryptionService _encryptionService;
+ private readonly ILogger _logger;
+
+ public DatabaseRefreshTokenStore(
+ IServiceProvider serviceProvider,
+ ITokenEncryptionService encryptionService,
+ ILogger logger)
+ {
+ _serviceProvider = serviceProvider;
+ _encryptionService = encryptionService;
+ _logger = logger;
+ }
+
+ public IReadOnlyList GetAll()
+ {
+ using var scope = _serviceProvider.CreateScope();
+ var context = scope.ServiceProvider.GetRequiredService();
+
+ return context.Tokens
+ .Select(t => new RefreshTokenRecord
+ {
+ Provider = t.Provider,
+ Tenant = t.Tenant,
+ UserId = t.UserId,
+ UserEmail = t.UserEmail,
+ RefreshToken = _encryptionService.Decrypt(t.EncryptedToken),
+ UpdatedUtc = t.LastUpdated,
+ Enabled = t.Enabled
+ })
+ .ToList();
+ }
+
+ public void Upsert(RefreshTokenRecord record)
+ {
+ using var scope = _serviceProvider.CreateScope();
+ var context = scope.ServiceProvider.GetRequiredService();
+
+ var existing = context.Tokens.FirstOrDefault(t =>
+ t.Provider == record.Provider &&
+ t.UserId == record.UserId);
+
+ if (existing != null)
+ {
+ existing.Tenant = record.Tenant;
+ existing.UserEmail = record.UserEmail;
+ existing.EncryptedToken = _encryptionService.Encrypt(record.RefreshToken);
+ existing.LastUpdated = record.UpdatedUtc;
+ existing.Enabled = record.Enabled;
+ context.Tokens.Update(existing);
+ }
+ else
+ {
+ context.Tokens.Add(new Token
+ {
+ Provider = record.Provider,
+ Tenant = record.Tenant,
+ UserId = record.UserId,
+ UserEmail = record.UserEmail,
+ EncryptedToken = _encryptionService.Encrypt(record.RefreshToken),
+ LastUpdated = record.UpdatedUtc,
+ Enabled = record.Enabled,
+ Timestamp = DateTime.UtcNow
+ });
+ }
+
+ context.SaveChanges();
+
+ _logger.LogInformation("Upserted token for user {UserId} (Provider: {Provider}, Tenant: {Tenant})",
+ record.UserId, record.Provider, record.Tenant);
+ }
+ }
+}
diff --git a/dev/backend/HotlinePlanner profile pic and bg worker/Services/ITokenEncryptionService.cs b/dev/backend/HotlinePlanner profile pic and bg worker/Services/ITokenEncryptionService.cs
new file mode 100644
index 0000000..ec52672
--- /dev/null
+++ b/dev/backend/HotlinePlanner profile pic and bg worker/Services/ITokenEncryptionService.cs
@@ -0,0 +1,8 @@
+namespace HotlinePlanner.Services
+{
+ public interface ITokenEncryptionService
+ {
+ string Encrypt(string plainText);
+ string Decrypt(string encryptedText);
+ }
+}
diff --git a/dev/backend/HotlinePlanner profile pic and bg worker/Services/RefreshTokenStore.cs b/dev/backend/HotlinePlanner profile pic and bg worker/Services/RefreshTokenStore.cs
index d730e98..ae91899 100644
--- a/dev/backend/HotlinePlanner profile pic and bg worker/Services/RefreshTokenStore.cs
+++ b/dev/backend/HotlinePlanner profile pic and bg worker/Services/RefreshTokenStore.cs
@@ -5,7 +5,9 @@ namespace HotlinePlanner.Services
public record RefreshTokenRecord
{
public string Provider { get; init; } = "";
+ public string Tenant { get; init; } = "default";
public string UserId { get; init; } = "";
+ public string? UserEmail { get; init; }
public string RefreshToken { get; init; } = "";
public DateTime UpdatedUtc { get; init; }
public bool Enabled { get; init; }
@@ -16,76 +18,5 @@ namespace HotlinePlanner.Services
void Upsert(RefreshTokenRecord record);
IReadOnlyList GetAll();
}
-
- public class FileRefreshTokenStore : IRefreshTokenStore
- {
- private readonly string _filePath;
- private readonly object _lock = new();
-
- public FileRefreshTokenStore(IConfiguration configuration)
- {
- var dataPath = configuration["CalendarWorker:TokenStorePath"] ?? "App_Data/refresh-tokens.json";
- _filePath = Path.IsPathRooted(dataPath)
- ? dataPath
- : Path.Combine(AppContext.BaseDirectory, dataPath);
- }
-
- public IReadOnlyList GetAll()
- {
- lock (_lock)
- {
- return LoadAllInternal();
- }
- }
-
- public void Upsert(RefreshTokenRecord record)
- {
- lock (_lock)
- {
- var all = LoadAllInternal();
- var existingIndex = all.FindIndex(r =>
- string.Equals(r.Provider, record.Provider, StringComparison.OrdinalIgnoreCase) &&
- string.Equals(r.UserId, record.UserId, StringComparison.Ordinal));
- if (existingIndex >= 0)
- {
- all[existingIndex] = record;
- }
- else
- {
- all.Add(record);
- }
-
- SaveAllInternal(all);
- }
- }
-
- private List LoadAllInternal()
- {
- if (!File.Exists(_filePath))
- {
- return new List();
- }
-
- var json = File.ReadAllText(_filePath);
- if (string.IsNullOrWhiteSpace(json))
- {
- return new List();
- }
-
- var records = JsonSerializer.Deserialize>(json);
- return records ?? new List();
- }
-
- private void SaveAllInternal(List records)
- {
- var dir = Path.GetDirectoryName(_filePath);
- if (!string.IsNullOrWhiteSpace(dir))
- {
- Directory.CreateDirectory(dir);
- }
-
- var json = JsonSerializer.Serialize(records, new JsonSerializerOptions { WriteIndented = true });
- File.WriteAllText(_filePath, json);
- }
- }
}
+
diff --git a/dev/backend/HotlinePlanner profile pic and bg worker/Services/TokenEncryptionService.cs b/dev/backend/HotlinePlanner profile pic and bg worker/Services/TokenEncryptionService.cs
new file mode 100644
index 0000000..9be025f
--- /dev/null
+++ b/dev/backend/HotlinePlanner profile pic and bg worker/Services/TokenEncryptionService.cs
@@ -0,0 +1,36 @@
+using Microsoft.AspNetCore.DataProtection;
+
+namespace HotlinePlanner.Services
+{
+ public class TokenEncryptionService : ITokenEncryptionService
+ {
+ private readonly IDataProtector _protector;
+ private const string Purpose = "HotlinePlanner.TokenStore.v1";
+
+ public TokenEncryptionService(IDataProtectionProvider provider)
+ {
+ _protector = provider.CreateProtector(Purpose);
+ }
+
+ public string Encrypt(string plainText)
+ {
+ if (string.IsNullOrEmpty(plainText)) return plainText;
+ return _protector.Protect(plainText);
+ }
+
+ public string Decrypt(string encryptedText)
+ {
+ if (string.IsNullOrEmpty(encryptedText)) return encryptedText;
+ try
+ {
+ return _protector.Unprotect(encryptedText);
+ }
+ catch (Exception)
+ {
+ // In case of decryption failure (e.g. key change without migration)
+ // we might want to log this or handle it gracefully.
+ return string.Empty;
+ }
+ }
+ }
+}
diff --git a/dev/backend/HotlinePlanner profile pic and bg worker/Views/Account/EventLogs.cshtml b/dev/backend/HotlinePlanner profile pic and bg worker/Views/Account/EventLogs.cshtml
new file mode 100644
index 0000000..f5db0e6
--- /dev/null
+++ b/dev/backend/HotlinePlanner profile pic and bg worker/Views/Account/EventLogs.cshtml
@@ -0,0 +1,138 @@
+@{
+ ViewData["Title"] = "Event Logs";
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ props.value }}
+
+
+
+
+
+
+ {{ formatDate(props.value) }}
+
+
+
+
+
+
+
+
+@section Scripts {
+
+}
diff --git a/dev/backend/HotlinePlanner profile pic and bg worker/Views/Account/Tokens.cshtml b/dev/backend/HotlinePlanner profile pic and bg worker/Views/Account/Tokens.cshtml
new file mode 100644
index 0000000..3db1a59
--- /dev/null
+++ b/dev/backend/HotlinePlanner profile pic and bg worker/Views/Account/Tokens.cshtml
@@ -0,0 +1,157 @@
+@{
+ ViewData["Title"] = "Token Store";
+}
+
+
+
+
+
+
+ System Audit Logs
+Internal Activity Tracking
+
+
+ Refresh Data
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ formatDate(props.value) }}
+
+
+
+
+
+
+
+
+@section Scripts {
+
+}
diff --git a/dev/backend/HotlinePlanner profile pic and bg worker/Views/Home/Index.cshtml b/dev/backend/HotlinePlanner profile pic and bg worker/Views/Home/Index.cshtml
index 2dec145..2f8d245 100644
--- a/dev/backend/HotlinePlanner profile pic and bg worker/Views/Home/Index.cshtml
+++ b/dev/backend/HotlinePlanner profile pic and bg worker/Views/Home/Index.cshtml
@@ -1,62 +1,182 @@
@{
- ViewData["Title"] = "Start Page";
- var pictureUrl = User.FindFirst("app.picture")?.Value
- ?? User.FindFirst(System.Security.Claims.ClaimTypes.Uri)?.Value;
- var isSubscribed = ViewData["IsSubscribed"] as bool? ?? false;
- var lastRun = ViewData["WorkerLastRun"] as string;
- var nextRun = ViewData["WorkerNextRun"] as string;
- var lastResult = ViewData["WorkerLastResult"] as string;
-}
+ ViewData["Title"] = "Dashboard";
+ var portraitUrl = User.FindFirst("app.picture")?.Value
+ ?? User.FindFirst(System.Security.Claims.ClaimTypes.Uri)?.Value;
+ var isSubscribed = ViewData["IsSubscribed"] as bool? ?? false;
+ var lastRun = ViewData["WorkerLastRun"] as string;
+ var nextRun = ViewData["WorkerNextRun"] as string;
+ var lastResult = ViewData["WorkerLastResult"] as string;
+}
-
+
+
+
+
+ Identity Store
+Refresh Token Management
+
+
+ Refresh Data
+
+
+
+
+
- 
- }
- else
- {
-
-
- }
-
-
Welcome to Hotline Planner
- - @if (User.Identity != null && User.Identity.IsAuthenticated) - { - @if (!string.IsNullOrEmpty(pictureUrl)) - { -Hello, @User.Identity.Name!
-You have successfully logged in.
-
-
- Status: @(isSubscribed ? "Active" : "Inactive")
-
-
-
-
-
- }
- else
- {
- Last run: @(lastRun ?? "n/a")
- Next run: @(nextRun ?? "n/a")
- Last result: @(lastResult ?? "n/a")
- Please sign in to continue.
-
-
-
+@ViewData["Title"] - HotlinePlanner
-
-
-
-
+ @ViewData["Title"] - Hotline Planner
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+@section Scripts {
+
+}
diff --git a/dev/backend/HotlinePlanner profile pic and bg worker/Views/Shared/_Layout.cshtml b/dev/backend/HotlinePlanner profile pic and bg worker/Views/Shared/_Layout.cshtml
index 01a8ef3..7153e61 100644
--- a/dev/backend/HotlinePlanner profile pic and bg worker/Views/Shared/_Layout.cshtml
+++ b/dev/backend/HotlinePlanner profile pic and bg worker/Views/Shared/_Layout.cshtml
@@ -3,48 +3,222 @@
-
+
+
+
+
- }
+
+
+ NextGen Dashboard
+Real-time enterprise calendar synchronization
+
+
+ @if (!string.IsNullOrEmpty(portraitUrl))
+ {
+
+ 
+
+ }
+ else
+ {
+
+
+
+
+
+
+
+
+
+
+
+
+ {{userName}}
+ Active Session
+
+
+ {{ isSubscribed ? 'Running' : 'Paused' }}
+
+
+
+ Engine Status
+
+
+
+
+
+
+ Last Sync
+ {{ lastRun || 'Waiting...' }}
+
+
+ Next Run
+ {{ nextRun || 'Scheduled' }}
+
+
+ Health
+
+
+ {{ lastResult }}
+
+ —
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Identity Portal
+ Please sign in with your enterprise credentials to access the NextGen synchronization platform.
+ +
+
+
+
+
+
+
+
+
+
+