feat/Update_Controllers_to_Allow_for_Premium_Membership
This commit is contained in:
@@ -17,12 +17,12 @@ namespace JobTrackerApi.Controllers;
|
||||
public sealed class MicrosoftGraphController : ControllerBase
|
||||
{
|
||||
private readonly IMicrosoftGraphOAuthService _graph;
|
||||
private readonly IConfiguration _cfg;
|
||||
private readonly ExternalOrigin _externalOrigin;
|
||||
|
||||
public MicrosoftGraphController(IMicrosoftGraphOAuthService graph, IConfiguration cfg)
|
||||
public MicrosoftGraphController(IMicrosoftGraphOAuthService graph, IConfiguration cfg, ExternalOrigin? externalOrigin = null)
|
||||
{
|
||||
_graph = graph;
|
||||
_cfg = cfg;
|
||||
_externalOrigin = externalOrigin ?? ExternalOrigin.FromConfiguration(cfg);
|
||||
}
|
||||
|
||||
public sealed record MicrosoftGraphConnectionStatusDto(
|
||||
@@ -110,16 +110,7 @@ public sealed class MicrosoftGraphController : ControllerBase
|
||||
|
||||
private string GetRedirectUri()
|
||||
{
|
||||
var configured = (_cfg["Microsoft:RedirectUri"] ?? "").Trim();
|
||||
if (!string.IsNullOrWhiteSpace(configured)) return configured;
|
||||
|
||||
var publicBaseUrl = (_cfg["App:PublicBaseUrl"] ?? "").Trim().TrimEnd('/');
|
||||
if (!string.IsNullOrWhiteSpace(publicBaseUrl))
|
||||
{
|
||||
return $"{publicBaseUrl}/api/microsoft-graph/oauth/callback";
|
||||
}
|
||||
|
||||
return $"{Request.Scheme}://{Request.Host}/api/microsoft-graph/oauth/callback";
|
||||
return _externalOrigin.BuildPath("/api/microsoft-graph/oauth/callback");
|
||||
}
|
||||
|
||||
private static string BuildPopupHtml(bool success, string message)
|
||||
|
||||
Reference in New Issue
Block a user