Skip to content

Merge RC changes to Dev #224

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
merged 5 commits into from
Aug 5, 2025
Merged

Merge RC changes to Dev #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3193e5a
TD-5752: Issue showing 'Your password has been changed' when logged o…
swapnamol-abraham Jul 14, 2025
5a04fe5
Merge pull request #214 from TechnologyEnhancedLearning/Develop/Fixes…
swapnamol-abraham Jul 14, 2025
de78ea1
Added moodlemooc stanza to appsettings.json
ColinBeebyHEE Jul 16, 2025
162f4d4
Merge pull request #217 from TechnologyEnhancedLearning/Develop/Fixes…
AnjuJose011 Jul 17, 2025
24d6522
TD-5752: # Need to revert the code # Code to test the logout issue fr…
swapnamol-abraham Jul 23, 2025
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
2 changes: 1 addition & 1 deletion Auth/LearningHub.Nhs.Auth/Controllers/AccountController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ public async Task<IActionResult> Logout(LogoutInputModel model)
{
UserId = userId,
UserHistoryTypeId = (int)UserHistoryType.Logout,
Detail = @"User logged out",
Detail = @"User logged out" + this.webSettings.IsPasswordUpdate + " " + vm.TriggerExternalSignout,
};

await this.UserService.StoreUserHistoryAsync(userHistory);
Expand Down
10 changes: 5 additions & 5 deletions Auth/LearningHub.Nhs.Auth/Controllers/HomeController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,18 +83,18 @@ public async Task<IActionResult> Error()
/// <summary>
/// IsPasswordUpdateMethod.
/// </summary>
/// <param name="isLogout">The Logout.</param>
/// <param name="isPasswordUpdate">The PasswordUpdate.</param>
/// <returns>The <see cref="ActionResult"/>.</returns>
[HttpGet]
public IActionResult SetIsPasswordUpdate(bool isLogout)
public IActionResult SetIsPasswordUpdate(bool isPasswordUpdate)
{
if (isLogout)
if (isPasswordUpdate)
{
this.webSettings.IsPasswordUpdate = false;
this.webSettings.IsPasswordUpdate = true;
}
else
{
this.webSettings.IsPasswordUpdate = true;
this.webSettings.IsPasswordUpdate = false;
}

var redirectUri = $"{this.webSettings.LearningHubWebClient}Home/UserLogout";
Expand Down
17 changes: 17 additions & 0 deletions Auth/LearningHub.Nhs.Auth/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,23 @@
"RequireConsent": false,
"RequirePkce": false,
"AllowOfflineAccess": true
},
"moodlemooc": {
"BaseUrl": "",
"ClientName": "",
"ClientSecret": "",
"AllowedGrantTypes": [ "authorization_code" ],
"RedirectUris": [ "/auth/oidc/" ],
"PostLogoutUris": [ "/login/logout.php" ],
"AllowedScopes": [ "openid", "profile", "learninghubapi", "userapi", "roles", "learningcredentialsapi" ],
"BackChannelLogoutSessionRequired": true,
"BackChannelLogoutUri": "/login/logout.php",
"FrontChannelLogoutSessionRequired": true,
"FrontChannelLogoutUri": "/login/logout.php",
"UpdateAccessTokenClaimsOnRefresh": true,
"RequireConsent": false,
"RequirePkce": false,
"AllowOfflineAccess": true
}
},
"IdsClients": {
Expand Down
Loading