This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, main has been updated via f67fe8e6997c9c5a4602c852c7deaabad764d186 (commit) via 4fad5beefbed083a31a91b389bf9f2f80eef4b77 (commit) from e8489059c76aab4b2de8880fb5a9736aed090af8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f67fe8e6997c9c5a4602c852c7deaabad764d186 Author: Michele Morgan <mmorgan@noblenet.org> Date: Thu Mar 20 14:55:14 2025 -0400 LP#2100807: (follow-up) fix lint Signed-off-by: Michele Morgan <mmorgan@noblenet.org> diff --git a/Open-ILS/src/eg2/src/app/staff/login.component.ts b/Open-ILS/src/eg2/src/app/staff/login.component.ts index 073e9d2882..a86b8ec3f7 100644 --- a/Open-ILS/src/eg2/src/app/staff/login.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/login.component.ts @@ -53,12 +53,11 @@ export class StaffLoginComponent implements OnInit { console.warn( 'routeTo must contain only path information: ', this.routeTo); this.routeTo = null; - } - else { + } else { // Remove /eg2/:locale/ however many times it's been prepended, so it's added back only once in prepareExternalUrl() // Hopefully doesn't scrub locale back to en-US? - this.routeTo = this.routeTo.replace(/^(\/eg2\/([a-z]{2}-[A-Z]{2}))+/, ""); - } + this.routeTo = this.routeTo.replace(/^(\/eg2\/([a-z]{2}-[A-Z]{2}))+/, ''); + } } // clear out any stale auth data diff --git a/Open-ILS/src/eg2/src/app/staff/mfa.component.ts b/Open-ILS/src/eg2/src/app/staff/mfa.component.ts index a5ce404476..7b2ca219e3 100644 --- a/Open-ILS/src/eg2/src/app/staff/mfa.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/mfa.component.ts @@ -160,11 +160,10 @@ export class StaffMFAComponent implements OnInit { console.warn( 'routeTo must contain only path information: ', this.routeTo); this.routeTo = null; - } - else { + } else { // Remove /eg2/:locale/ however many times it's been prepended, so it's added back only once in prepareExternalUrl() - this.routeTo = this.routeTo.replace(/^(\/eg2\/([a-z]{2}-[A-Z]{2}))+/, ""); - } + this.routeTo = this.routeTo.replace(/^(\/eg2\/([a-z]{2}-[A-Z]{2}))+/, ''); + } } } commit 4fad5beefbed083a31a91b389bf9f2f80eef4b77 Author: Steven Mayo <smayo@georgialibraries.org> Date: Tue Mar 4 10:14:42 2025 -0500 lp2100807 Angular_Login_Bad_RouteTo Enforces /eg2/:locale only being in the URL once when logging back in. Release-note: Fixes blank screen when logging in after timeout. Signed-off-by: Steven Mayo <smayo@georgialibraries.org> Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org> Signed-off-by: Stephanie Leary <stephanie.leary@equinoxOLI.org> Signed-off-by: Michele Morgan <mmorgan@noblenet.org> diff --git a/Open-ILS/src/eg2/src/app/staff/login.component.ts b/Open-ILS/src/eg2/src/app/staff/login.component.ts index 5c697e0f10..073e9d2882 100644 --- a/Open-ILS/src/eg2/src/app/staff/login.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/login.component.ts @@ -54,6 +54,11 @@ export class StaffLoginComponent implements OnInit { 'routeTo must contain only path information: ', this.routeTo); this.routeTo = null; } + else { + // Remove /eg2/:locale/ however many times it's been prepended, so it's added back only once in prepareExternalUrl() + // Hopefully doesn't scrub locale back to en-US? + this.routeTo = this.routeTo.replace(/^(\/eg2\/([a-z]{2}-[A-Z]{2}))+/, ""); + } } // clear out any stale auth data diff --git a/Open-ILS/src/eg2/src/app/staff/mfa.component.ts b/Open-ILS/src/eg2/src/app/staff/mfa.component.ts index bd02d3f202..a5ce404476 100644 --- a/Open-ILS/src/eg2/src/app/staff/mfa.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/mfa.component.ts @@ -160,7 +160,11 @@ export class StaffMFAComponent implements OnInit { console.warn( 'routeTo must contain only path information: ', this.routeTo); this.routeTo = null; - } + } + else { + // Remove /eg2/:locale/ however many times it's been prepended, so it's added back only once in prepareExternalUrl() + this.routeTo = this.routeTo.replace(/^(\/eg2\/([a-z]{2}-[A-Z]{2}))+/, ""); + } } } diff --git a/Open-ILS/src/eg2/src/app/staff/staff.component.ts b/Open-ILS/src/eg2/src/app/staff/staff.component.ts index f999968c3b..0715946ad3 100644 --- a/Open-ILS/src/eg2/src/app/staff/staff.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/staff.component.ts @@ -49,7 +49,7 @@ export class StaffComponent implements OnInit { } console.debug('Auth session has expired. Redirecting to login'); - const url = this.ngLocation.prepareExternalUrl(this.router.url); + const url = this.router.url; // https://github.com/angular/angular/issues/18254 // When a tab redirects to a login page as a result of ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/src/app/staff/login.component.ts | 4 ++++ Open-ILS/src/eg2/src/app/staff/mfa.component.ts | 3 +++ Open-ILS/src/eg2/src/app/staff/staff.component.ts | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS