CORE-489 support NIH account and RAS simultaneously (#5324)

Author: dvoet

src/profile/external-identities/ExternalIdentities.test.tsx

@@ -104,32 +104,7 @@ describe('ExternalIdentities', () => {
     });
   });
 
-  it('sorts providers based on desiredOrder without RAS', async () => {
-    // Arrange
-    asMockedFn(getConfig).mockReturnValue(
-      partial<AppConfigSettings>({
-        externalCreds: partial<AppConfigSettings['externalCreds']>({
-          providers: ['era-commons', 'fence', 'dcf-fence', 'kids-first', 'anvil'],
-        }),
-      })
-    );
-
-    // Act
-    render(<ExternalIdentities queryParams={{}} />);
-
-    // Assert
-    const providerElements = Array.from(screen.getByRole('main').querySelectorAll('div')).map((div) => div.textContent);
-    expect(providerElements).toStrictEqual([
-      'Nih Account',
-      'eRA Commons',
-      'NHLBI BioData Catalyst Framework Services',
-      'NCI CRDC Framework Services',
-      'Kids First DRC Framework Services',
-      'NHGRI AnVIL Data Commons Framework Services',
-    ]);
-  });
-
-  it('sorts providers based on desiredOrder with RAS', async () => {
+  it('sorts providers based on desiredOrder', async () => {
     // Arrange
     asMockedFn(getConfig).mockReturnValue(
       partial<AppConfigSettings>({
@@ -145,6 +120,7 @@ describe('ExternalIdentities', () => {
     // Assert
     const providerElements = Array.from(screen.getByRole('main').querySelectorAll('div')).map((div) => div.textContent);
     expect(providerElements).toStrictEqual([
+      'Nih Account',
       'NIH Researcher Auth Service (RAS)',
       'NHLBI BioData Catalyst Framework Services',
       'NCI CRDC Framework Services',

src/profile/external-identities/ExternalIdentities.tsx

@@ -15,7 +15,6 @@ type ExternalIdentitiesProps = {
 export const ExternalIdentities = (props: ExternalIdentitiesProps): ReactNode => {
   const { queryParams } = props;
   const providers = (getConfig().externalCreds?.providers || []) as OAuth2ProviderKey[];
-  const hasRas = providers.includes('ras');
   const filteredProviders = providers.filter(
     (p: any) =>
       (p !== 'github' && p !== 'sage') ||
@@ -25,7 +24,7 @@ export const ExternalIdentities = (props: ExternalIdentitiesProps): ReactNode =>
 
   return (
     <PageBox role='main' style={{ flexGrow: 1 }} variant={PageBoxVariants.light}>
-      {!hasRas && <NihAccount nihToken={queryParams?.['nih-username-token']} />}
+      <NihAccount nihToken={queryParams?.['nih-username-token']} />
       {filteredProviders.map((providerKey: OAuth2ProviderKey) => (
         <OAuth2Account
           key={`oauth2link-${providerKey}`}