Merge pull request #4127 from ProjectMirador/auth-regression

Fix auth regression from #4072

Author: jcoyne

__tests__/src/components/IIIFAuthentication.test.js

@@ -61,6 +61,16 @@ describe('IIIFAuthentication', () => {
       expect(handleAuthInteraction).toHaveBeenCalledWith('w', 'http://example.com/auth');
     });
   });
+  describe('with a failed external authentication', () => {
+    it('renders with an error message', async () => {
+      const handleAuthInteraction = vi.fn();
+      createWrapper({
+        accessTokenServiceId: null, handleAuthInteraction, isInteractive: false, status: 'failed',
+      });
+      expect(screen.getByText('Login failed')).toBeInTheDocument();
+      expect(screen.getByText('... and this is why.')).toBeInTheDocument();
+    });
+  });
   describe('in the middle of authenticating', () => {
     it('does the IIIF access cookie behavior', async () => {
       const mockWindow = { close: vi.fn(), closed: false };

src/components/IIIFAuthentication.jsx

@@ -17,8 +17,6 @@ export function IIIFAuthentication({
 }) {
   const { t } = useTranslation();
 
-  if (!accessTokenServiceId || !authServiceId) return null;
-
   /** */
   const onReceiveAccessTokenMessage = (payload) => {
     resolveAccessTokenRequest(authServiceId, accessTokenServiceId, payload);
@@ -98,6 +96,7 @@ export function IIIFAuthentication({
     );
   };
 
+  if (!authServiceId) return null;
   if (status === null) return renderLogin();
   if (status === 'cookie') return renderLoggingInCookie();
   if (status === 'token') return renderLoggingInToken();