From 3e0b1113b234ab3beb84567e0f052a3d980c8195 Mon Sep 17 00:00:00 2001 From: futa-ikeda <51409893+futa-ikeda@users.noreply.github.com> Date: Fri, 13 Mar 2026 10:28:06 -0400 Subject: [PATCH 1/6] feat(profile-settings): Add query-param to specify a tab (#906) --- .../profile-settings.component.spec.ts | 15 ++++++++++++++- .../profile-settings.component.ts | 19 +++++++++++++++++-- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/src/app/features/settings/profile-settings/profile-settings.component.spec.ts b/src/app/features/settings/profile-settings/profile-settings.component.spec.ts index 59ceb5b48..b9f18bf4a 100644 --- a/src/app/features/settings/profile-settings/profile-settings.component.spec.ts +++ b/src/app/features/settings/profile-settings/profile-settings.component.spec.ts @@ -5,6 +5,7 @@ import { BehaviorSubject } from 'rxjs'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { ActivatedRoute } from '@angular/router'; import { SelectComponent } from '@osf/shared/components/select/select.component'; import { SubHeaderComponent } from '@osf/shared/components/sub-header/sub-header.component'; @@ -34,7 +35,11 @@ describe('ProfileSettingsComponent', () => { SelectComponent ), ], - providers: [MockProvider(IS_MEDIUM, isMedium), MockProvider(TranslateService)], + providers: [ + MockProvider(IS_MEDIUM, isMedium), + MockProvider(TranslateService), + { provide: ActivatedRoute, useValue: { snapshot: { queryParams: {} } } }, + ], }).compileComponents(); fixture = TestBed.createComponent(ProfileSettingsComponent); @@ -46,6 +51,14 @@ describe('ProfileSettingsComponent', () => { expect(component).toBeTruthy(); }); + it('should update selected tab on init based on query param', () => { + const testTabValue = 2; + component['route'] = { snapshot: { queryParams: { tab: testTabValue } } } as any; + + component.ngOnInit(); + expect(component['selectedTab']).toBe(testTabValue); + }); + it('should update selected tab when onTabChange is called', () => { const newTabIndex = 2; component.onTabChange(newTabIndex); diff --git a/src/app/features/settings/profile-settings/profile-settings.component.ts b/src/app/features/settings/profile-settings/profile-settings.component.ts index c82e2f10d..de5541852 100644 --- a/src/app/features/settings/profile-settings/profile-settings.component.ts +++ b/src/app/features/settings/profile-settings/profile-settings.component.ts @@ -2,9 +2,10 @@ import { TranslatePipe } from '@ngx-translate/core'; import { Tab, TabList, TabPanel, TabPanels, Tabs } from 'primeng/tabs'; -import { ChangeDetectionStrategy, Component, inject } from '@angular/core'; +import { ChangeDetectionStrategy, Component, inject, OnInit } from '@angular/core'; import { toSignal } from '@angular/core/rxjs-interop'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { ActivatedRoute, Router } from '@angular/router'; import { SelectComponent } from '@osf/shared/components/select/select.component'; import { SubHeaderComponent } from '@osf/shared/components/sub-header/sub-header.component'; @@ -36,14 +37,28 @@ import { ProfileSettingsTabOption } from './enums'; styleUrl: './profile-settings.component.scss', changeDetection: ChangeDetectionStrategy.OnPush, }) -export class ProfileSettingsComponent { +export class ProfileSettingsComponent implements OnInit { readonly isMedium = toSignal(inject(IS_MEDIUM)); readonly tabOptions = PROFILE_SETTINGS_TAB_OPTIONS; readonly tabOption = ProfileSettingsTabOption; + private router = inject(Router); + private route = inject(ActivatedRoute); selectedTab = this.tabOption.Name; + ngOnInit(): void { + const tabParam = Number(this.route.snapshot.queryParams['tab']); + const selectedTab = tabParam && Object.values(this.tabOption).includes(tabParam) ? tabParam : this.tabOption.Name; + + this.selectedTab = selectedTab; + } + onTabChange(index: number): void { this.selectedTab = index; + this.router.navigate([], { + queryParams: { tab: index }, + queryParamsHandling: 'merge', + replaceUrl: true, + }); } } From 10716b9a171a305766ba3663945329330ff98fc8 Mon Sep 17 00:00:00 2001 From: futa-ikeda <51409893+futa-ikeda@users.noreply.github.com> Date: Fri, 20 Mar 2026 11:38:42 -0400 Subject: [PATCH 2/6] [ENG-10584][ENG-10585] Allow users to disconnect existing orcid in social tab (#912) * feat(settings): Allow users to disconnect orcid in social tab * feat(settings): Add dummy connect button when no orcid is associated with user * chore(settings): move authenticated identity to own component * refactor(settings): Implement CR suggestions; Update tests * refactor(settings): Update authenticated identity test * refactor(settings): Update authenticated identity test to use OSFTestingModule --- .../profile-information.component.ts | 3 +- .../authenticated-identity.component.html | 39 ++++++++++ .../authenticated-identity.component.scss | 0 .../authenticated-identity.component.spec.ts | 71 +++++++++++++++++ .../authenticated-identity.component.ts | 77 +++++++++++++++++++ .../components/social/social.component.html | 2 + .../social/social.component.spec.ts | 8 +- .../components/social/social.component.ts | 7 +- .../enums/external-identity-status.enum.ts | 5 ++ .../models/user/external-identity.model.ts | 4 +- src/assets/i18n/en.json | 4 + 11 files changed, 215 insertions(+), 5 deletions(-) create mode 100644 src/app/features/settings/profile-settings/components/authenticated-identity/authenticated-identity.component.html create mode 100644 src/app/features/settings/profile-settings/components/authenticated-identity/authenticated-identity.component.scss create mode 100644 src/app/features/settings/profile-settings/components/authenticated-identity/authenticated-identity.component.spec.ts create mode 100644 src/app/features/settings/profile-settings/components/authenticated-identity/authenticated-identity.component.ts create mode 100644 src/app/shared/enums/external-identity-status.enum.ts diff --git a/src/app/features/profile/components/profile-information/profile-information.component.ts b/src/app/features/profile/components/profile-information/profile-information.component.ts index 3304a8ce2..382282167 100644 --- a/src/app/features/profile/components/profile-information/profile-information.component.ts +++ b/src/app/features/profile/components/profile-information/profile-information.component.ts @@ -9,6 +9,7 @@ import { toSignal } from '@angular/core/rxjs-interop'; import { EducationHistoryComponent } from '@osf/shared/components/education-history/education-history.component'; import { EmploymentHistoryComponent } from '@osf/shared/components/employment-history/employment-history.component'; import { SOCIAL_LINKS } from '@osf/shared/constants/social-links.const'; +import { ExternalIdentityStatus } from '@osf/shared/enums/external-identity-status.enum'; import { IS_MEDIUM } from '@osf/shared/helpers/breakpoints.tokens'; import { UserModel } from '@osf/shared/models/user/user.models'; import { SortByDatePipe } from '@osf/shared/pipes/sort-by-date.pipe'; @@ -45,7 +46,7 @@ export class ProfileInformationComponent { orcidId = computed(() => { const orcid = this.currentUser()?.external_identity?.ORCID; - return orcid?.status?.toUpperCase() === 'VERIFIED' ? orcid.id : undefined; + return orcid?.status?.toUpperCase() === ExternalIdentityStatus.VERIFIED ? orcid.id : undefined; }); toProfileSettings() { diff --git a/src/app/features/settings/profile-settings/components/authenticated-identity/authenticated-identity.component.html b/src/app/features/settings/profile-settings/components/authenticated-identity/authenticated-identity.component.html new file mode 100644 index 000000000..0e10c22ea --- /dev/null +++ b/src/app/features/settings/profile-settings/components/authenticated-identity/authenticated-identity.component.html @@ -0,0 +1,39 @@ +
+
+

+ {{ 'settings.profileSettings.social.labels.authenticatedIdentity' | translate }} +

+
+
+
+ @if (existingOrcid()) { +
+ orcid + {{ orcidUrl() }} + + +
+ } @else { + + +

+ } +
+
+
diff --git a/src/app/features/settings/profile-settings/components/authenticated-identity/authenticated-identity.component.scss b/src/app/features/settings/profile-settings/components/authenticated-identity/authenticated-identity.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src/app/features/settings/profile-settings/components/authenticated-identity/authenticated-identity.component.spec.ts b/src/app/features/settings/profile-settings/components/authenticated-identity/authenticated-identity.component.spec.ts new file mode 100644 index 000000000..5f2583462 --- /dev/null +++ b/src/app/features/settings/profile-settings/components/authenticated-identity/authenticated-identity.component.spec.ts @@ -0,0 +1,71 @@ +import { MockProvider } from 'ng-mocks'; + +import { signal } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { AccountSettingsSelectors } from '@osf/features/settings/account-settings/store/account-settings.selectors'; +import { CustomConfirmationService } from '@osf/shared/services/custom-confirmation.service'; + +import { AuthenticatedIdentityComponent } from './authenticated-identity.component'; + +import { OSFTestingModule } from '@testing/osf.testing.module'; +import { + CustomConfirmationServiceMock, + CustomConfirmationServiceMockType, +} from '@testing/providers/custom-confirmation-provider.mock'; +import { provideMockStore } from '@testing/providers/store-provider.mock'; + +describe('AuthenticatedIdentityComponent', () => { + let component: AuthenticatedIdentityComponent; + let fixture: ComponentFixture; + let customConfirmationServiceMock: CustomConfirmationServiceMockType; + + const mockExternalIdentities = signal([ + { + id: 'ORCID', + externalId: '0001-0002-0003-0004', + status: 'VERIFIED', + }, + ]); + + beforeEach(async () => { + customConfirmationServiceMock = CustomConfirmationServiceMock.simple(); + await TestBed.configureTestingModule({ + imports: [AuthenticatedIdentityComponent, OSFTestingModule], + providers: [ + MockProvider(CustomConfirmationService, customConfirmationServiceMock), + provideMockStore({ + signals: [ + { + selector: AccountSettingsSelectors.getExternalIdentities, + value: mockExternalIdentities, + }, + ], + }), + ], + }).compileComponents(); + + fixture = TestBed.createComponent(AuthenticatedIdentityComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should show existing user ORCID when present in external identities', () => { + expect(component.existingOrcid()).toEqual('0001-0002-0003-0004'); + expect(component.orcidUrl()).toEqual('https://orcid.org/0001-0002-0003-0004'); + component.disconnectOrcid(); + expect(customConfirmationServiceMock.confirmDelete).toHaveBeenCalled(); + }); + + it('should show connect button when no existing ORCID is present in external identities', () => { + mockExternalIdentities.set([]); + fixture.detectChanges(); + + expect(component.existingOrcid()).toBeUndefined(); + expect(component.orcidUrl()).toBeNull(); + }); +}); diff --git a/src/app/features/settings/profile-settings/components/authenticated-identity/authenticated-identity.component.ts b/src/app/features/settings/profile-settings/components/authenticated-identity/authenticated-identity.component.ts new file mode 100644 index 000000000..ee32a80c6 --- /dev/null +++ b/src/app/features/settings/profile-settings/components/authenticated-identity/authenticated-identity.component.ts @@ -0,0 +1,77 @@ +import { createDispatchMap, select } from '@ngxs/store'; + +import { TranslatePipe } from '@ngx-translate/core'; + +import { Button } from 'primeng/button'; +import { Tooltip } from 'primeng/tooltip'; + +import { finalize } from 'rxjs'; + +import { NgOptimizedImage } from '@angular/common'; +import { ChangeDetectionStrategy, Component, computed, inject, OnInit } from '@angular/core'; + +import { ExternalIdentityStatus } from '@osf/shared/enums/external-identity-status.enum'; +import { CustomConfirmationService } from '@osf/shared/services/custom-confirmation.service'; +import { LoaderService } from '@osf/shared/services/loader.service'; +import { ToastService } from '@osf/shared/services/toast.service'; + +import { + AccountSettingsSelectors, + DeleteExternalIdentity, + GetExternalIdentities, +} from '../../../account-settings/store'; + +@Component({ + selector: 'osf-authenticated-identity', + imports: [NgOptimizedImage, Button, Tooltip, TranslatePipe], + templateUrl: './authenticated-identity.component.html', + styleUrl: './authenticated-identity.component.scss', + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class AuthenticatedIdentityComponent implements OnInit { + private readonly customConfirmationService = inject(CustomConfirmationService); + private readonly toastService = inject(ToastService); + private readonly loaderService = inject(LoaderService); + + private readonly ORCID_PROVIDER = 'ORCID'; + + ngOnInit() { + this.actions.getExternalIdentities(); + } + + readonly actions = createDispatchMap({ + deleteExternalIdentity: DeleteExternalIdentity, + getExternalIdentities: GetExternalIdentities, + }); + + readonly externalIdentities = select(AccountSettingsSelectors.getExternalIdentities); + + readonly orcidUrl = computed(() => { + return this.existingOrcid() ? `https://orcid.org/${this.existingOrcid()}` : null; + }); + + readonly existingOrcid = computed( + (): string | undefined => + this.externalIdentities()?.find((i) => i.id === 'ORCID' && i.status === ExternalIdentityStatus.VERIFIED) + ?.externalId + ); + + disconnectOrcid(): void { + this.customConfirmationService.confirmDelete({ + headerKey: 'settings.accountSettings.connectedIdentities.deleteDialog.header', + messageParams: { name: this.ORCID_PROVIDER }, + messageKey: 'settings.accountSettings.connectedIdentities.deleteDialog.message', + onConfirm: () => { + this.loaderService.show(); + this.actions + .deleteExternalIdentity(this.ORCID_PROVIDER) + .pipe(finalize(() => this.loaderService.hide())) + .subscribe(() => this.toastService.showSuccess('settings.accountSettings.connectedIdentities.successDelete')); + }, + }); + } + + connectOrcid(): void { + /* no-op for now*/ + } +} diff --git a/src/app/features/settings/profile-settings/components/social/social.component.html b/src/app/features/settings/profile-settings/components/social/social.component.html index e34553fe1..777d4fd88 100644 --- a/src/app/features/settings/profile-settings/components/social/social.component.html +++ b/src/app/features/settings/profile-settings/components/social/social.component.html @@ -1,3 +1,5 @@ + +
} @else { - - -

+ orcid +

+

{{ 'settings.profileSettings.social.orcidWarning' | translate }}

+
+ + +
} diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 42651e0ab..69ba8b3fe 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1851,6 +1851,7 @@ "connectOrcid": "Connect ORCID", "disconnectOrcid": "Disconnect ORCID", "orcidDescription": "Link your ORCID. ORCID is a free, unique, persistent identifier (PID) for individuals to use as they engage in research, scholarship, and innovation activities. Learn how ORCID can help you spend more time conducting your research and less time managing it. Learn more about ORCID.", + "orcidWarning": "NOTE: Your OSF account email and ORCID email need to match to correctly link your ORCID to your OSF profile.", "title": "Social Link {{index}}", "successUpdate": "Social successfully updated.", "labels": { diff --git a/src/assets/images/integrations/orcid-logotype.png b/src/assets/images/integrations/orcid-logotype.png new file mode 100644 index 0000000000000000000000000000000000000000..6957cc397c700655929da4f2636558f55137fdc1 GIT binary patch literal 14455 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

rzu@j%tt{hKi5Cn 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 Date: Wed, 1 Apr 2026 13:20:13 -0400 Subject: [PATCH 5/6] chore(settings): Update Authenticated identity section language (#930) --- src/assets/i18n/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 69ba8b3fe..8fae5d0a2 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1851,7 +1851,7 @@ "connectOrcid": "Connect ORCID", "disconnectOrcid": "Disconnect ORCID", "orcidDescription": "Link your ORCID. ORCID is a free, unique, persistent identifier (PID) for individuals to use as they engage in research, scholarship, and innovation activities. Learn how ORCID can help you spend more time conducting your research and less time managing it. Learn more about ORCID.", - "orcidWarning": "NOTE: Your OSF account email and ORCID email need to match to correctly link your ORCID to your OSF profile.", + "orcidWarning": "NOTE: This will log you out of your current OSF profile. Your OSF account email and ORCID email need to match to correctly link your ORCID to your OSF profile.", "title": "Social Link {{index}}", "successUpdate": "Social successfully updated.", "labels": { From 6b5bf7e0ba650ab1b1db3bdc4842d9f233da1da6 Mon Sep 17 00:00:00 2001 From: futa-ikeda <51409893+futa-ikeda@users.noreply.github.com> Date: Fri, 3 Apr 2026 12:34:00 -0400 Subject: [PATCH 6/6] fix(settings): Update connectOrcid to properly logging user out (#934) --- src/app/core/services/auth.service.ts | 4 ++-- .../authenticated-identity.component.ts | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/core/services/auth.service.ts b/src/app/core/services/auth.service.ts index b51cb58b9..074e4d732 100644 --- a/src/app/core/services/auth.service.ts +++ b/src/app/core/services/auth.service.ts @@ -73,13 +73,13 @@ export class AuthService { window.location.href = loginUrl; } - logout(): void { + logout(nextUrl?: string): void { this.loaderService.show(); this.actions.clearCurrentUser(); if (isPlatformBrowser(this.platformId)) { this.cookieService.deleteAll(); - window.location.href = `${this.webUrl}/logout/?next=${encodeURIComponent('/')}`; + window.location.href = `${this.webUrl}/logout/?next=${encodeURIComponent(nextUrl || '/')}`; } } diff --git a/src/app/features/settings/profile-settings/components/authenticated-identity/authenticated-identity.component.ts b/src/app/features/settings/profile-settings/components/authenticated-identity/authenticated-identity.component.ts index e3780f0e9..77619339e 100644 --- a/src/app/features/settings/profile-settings/components/authenticated-identity/authenticated-identity.component.ts +++ b/src/app/features/settings/profile-settings/components/authenticated-identity/authenticated-identity.component.ts @@ -11,6 +11,7 @@ import { NgOptimizedImage } from '@angular/common'; import { ChangeDetectionStrategy, Component, computed, inject, OnInit } from '@angular/core'; import { ENVIRONMENT } from '@core/provider/environment.provider'; +import { AuthService } from '@core/services/auth.service'; import { ExternalIdentityStatus } from '@osf/shared/enums/external-identity-status.enum'; import { CustomConfirmationService } from '@osf/shared/services/custom-confirmation.service'; import { LoaderService } from '@osf/shared/services/loader.service'; @@ -31,6 +32,7 @@ import { ProfileSettingsTabOption } from '../../enums'; changeDetection: ChangeDetectionStrategy.OnPush, }) export class AuthenticatedIdentityComponent implements OnInit { + private readonly authService = inject(AuthService); private readonly environment = inject(ENVIRONMENT); private readonly customConfirmationService = inject(CustomConfirmationService); private readonly toastService = inject(ToastService); @@ -85,8 +87,6 @@ export class AuthenticatedIdentityComponent implements OnInit { service: `${webUrl}/login`, next: encodeURIComponent(finalDestination.toString()), }).toString(); - const logoutUrl = new URL(`${webUrl}/logout/`); - logoutUrl.searchParams.set('next', casLoginUrl.toString()); - window.location.href = logoutUrl.toString(); + this.authService.logout(casLoginUrl.toString()); } }