[ENG-10712] Merge latest develop into feature branch#948
Merged
cslzchen merged 5 commits intoCenterForOpenScience:feature/osf4i-in-progress-ssofrom Apr 16, 2026
Conversation
* feat(profile-settings): Add query-param to specify a tab (CenterForOpenScience#906) * [ENG-10584][ENG-10585] Allow users to disconnect existing orcid in social tab (CenterForOpenScience#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 * feat(settings): Allow user to connect ORCID in profile settings page (CenterForOpenScience#918) * [ENG-10684] Update Authenticated Identity section (CenterForOpenScience#924) * feat(settings): update authenticated identity section * style(settings): Update styles * refactor(settings): Update Authenticated Identity section * chore(settings): Update Authenticated identity section language (CenterForOpenScience#930) * fix(settings): Update connectOrcid to properly logging user out (CenterForOpenScience#934)
ORCiD Integration Project - FE Part
…s-sso/merge_develop
cslzchen
approved these changes
Apr 16, 2026
| if (isPlatformBrowser(this.platformId)) { | ||
| this.cookieService.deleteAll(); | ||
| window.location.href = `${this.webUrl}/logout/?next=${encodeURIComponent(window.location.origin)}`; | ||
| window.location.href = `${this.webUrl}/logout/?next=${encodeURIComponent(nextUrl || window.location.origin)}`; |
Contributor
There was a problem hiding this comment.
Note for the record: ran into merge conflicts here and fixed
cslzchen
merged commit 95b7983
into
CenterForOpenScience:feature/osf4i-in-progress-sso
3 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Purpose
Merge latest
developinto feature branchSummary of Changes
Screenshot(s)
Side Effects
QA Notes