Skip to content

Commit 76a349c

Browse files
committed
Merge branch 'orcidIntegrationNotificationUI' of https://github.com/ORCID/orcid-angular into orcidIntegrationNotificationUI
2 parents 80774a0 + f74c902 commit 76a349c

3 files changed

Lines changed: 10 additions & 5 deletions

File tree

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## v2.115.11 - 2025-06-06
2+
3+
[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.115.10...v2.115.11)
4+
5+
- [#2538](https://github.com/ORCID/orcid-angular/pull/2538): Leo/fix oauth automation
6+
17
## v2.115.10 - 2025-06-05
28

39
[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.115.9...v2.115.10)

src/app/authorize/pages/authorize/authorize.component.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ export class AuthorizeComponent {
6363
private userService: UserService,
6464
private platformInfoService: PlatformInfoService,
6565
@Inject(WINDOW) private window: Window,
66-
private googleTagManagerService: GoogleTagManagerService,
67-
private errorHandlerService: ErrorHandlerService,
6866
private recordService: RecordService,
6967
private loginMainInterstitialsManagerService: LoginMainInterstitialsManagerService
7068
) {}
@@ -221,8 +219,9 @@ export class AuthorizeComponent {
221219
session: UserSession
222220
): Observable<UserSession> {
223221
return this.recordService.getRecord({}).pipe(
224-
// Only proceed if the record has userInfo, emails, and at least one affiliation
225-
filter((rec: UserRecord) => !!rec && !!rec.userInfo),
222+
filter((rec: UserRecord) =>
223+
this.loginMainInterstitialsManagerService.isValidUserRecord(rec)
224+
),
226225
take(1),
227226
switchMap((validRecord) =>
228227
this.loginMainInterstitialsManagerService

src/app/core/login-interstitials-manager/login-main-interstitials-manager.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ export class LoginMainInterstitialsManagerService {
162162
/**
163163
* Valid user check & ensures not impersonating
164164
*/
165-
private isValidUserRecord(userRecord: UserRecord): boolean {
165+
isValidUserRecord(userRecord: UserRecord): boolean {
166166
if (
167167
!userRecord?.userInfo ||
168168
!userRecord?.emails ||

0 commit comments

Comments
 (0)