Skip to content

Releases/lh taurus #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: Merge RC changes to CI
merged 3 commits into from
Jun 27, 2024
Merged

Releases/lh taurus #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f80593a
TD-4111: Log table flooded with error has been handled
sarathlal-sarangadharan May 21, 2024
385081d
TD-4111: appsettings changes reverted since this will be updated in p…
sarathlal-sarangadharan May 21, 2024
7200f65
Merge pull request #35 from TechnologyEnhancedLearning/Develop/Featur…
sarathlal-sarangadharan May 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 17 additions & 29 deletions Auth/LearningHub.Nhs.Auth/Controllers/OpenAthensController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,6 @@ public IActionResult Index()
/// </exception>
public async Task Login(string clientId, string origin, string returnUrl)
{
if (string.IsNullOrWhiteSpace(clientId) || string.IsNullOrWhiteSpace(origin))
{
throw new Exception("ClientId or origin are empty.");
}

string oalhClient;
try
{
Expand All @@ -140,33 +135,26 @@ public async Task Login(string clientId, string origin, string returnUrl)
oalhClient = string.Empty;
}

if (string.IsNullOrWhiteSpace(oalhClient))
if (!string.IsNullOrWhiteSpace(clientId) && !string.IsNullOrWhiteSpace(origin) && !string.IsNullOrWhiteSpace(oalhClient) && $"https://{oalhClient}".StartsWith(origin, StringComparison.InvariantCultureIgnoreCase))
{
throw new Exception("No OA LH client found.");
}

if (!$"https://{oalhClient}".StartsWith(origin, StringComparison.InvariantCultureIgnoreCase))
{
throw new Exception("Invalid origin");
}

if (!string.IsNullOrWhiteSpace(returnUrl))
{
this.Response.Cookies.Append(
ClientReturnUrlKey,
returnUrl,
new CookieOptions
if (!string.IsNullOrWhiteSpace(returnUrl))
{
Expires = DateTimeOffset.Now.AddMinutes(5),
SameSite = SameSiteMode.None,
HttpOnly = true,
Secure = true,
});
}
this.Response.Cookies.Append(
ClientReturnUrlKey,
returnUrl,
new CookieOptions
{
Expires = DateTimeOffset.Now.AddMinutes(5),
SameSite = SameSiteMode.None,
HttpOnly = true,
Secure = true,
});
}

var internalReturnUrl = $"/openathens/oacallback?clientId={clientId}";
var authProps = new AuthenticationProperties { RedirectUri = internalReturnUrl };
await this.HttpContext.ChallengeAsync("oidc_oa", authProps);
var internalReturnUrl = $"/openathens/oacallback?clientId={clientId}";
var authProps = new AuthenticationProperties { RedirectUri = internalReturnUrl };
await this.HttpContext.ChallengeAsync("oidc_oa", authProps);
}

// return Content("Route is working");
}
Expand Down
2 changes: 1 addition & 1 deletion Auth/LearningHub.Nhs.Auth/ServiceCollectionExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ public static void ConfigureServices(this IServiceCollection services, IConfigur
services.AddDistributedCache(opt =>
{
opt.RedisConnectionString = configuration.GetConnectionString("Redis");
opt.KeyPrefix = $"{envPrefix}_WebUI";
opt.KeyPrefix = $"{envPrefix}_Auth";
opt.DefaultExpiryInMinutes = 60;
});
}
Expand Down