auth state selector should check non-image resources

- IIIF Auth2 services will be members of a probe service
- #3789

Author: barmintor

__tests__/src/selectors/auth.test.js

@@ -1,5 +1,6 @@
 import manifestFixture001 from '../../fixtures/version-2/001.json';
 import manifestFixture019 from '../../fixtures/version-2/019.json';
+import manifestFixtureAuth2ActiveVideo from '../../fixtures/version-3/auth2-active.json';
 import settings from '../../../src/config/settings';
 import {
   getAccessTokens,
@@ -61,6 +62,9 @@ describe('selectCurrentAuthServices', () => {
       b: {
         json: manifestFixture019,
       },
+      c: {
+        json: manifestFixtureAuth2ActiveVideo,
+      },
     },
     windows: {
       noCanvas: {
@@ -84,6 +88,12 @@ describe('selectCurrentAuthServices', () => {
           'https://purl.stanford.edu/fr426cg9537/iiif/canvas/fr426cg9537_1',
         ],
       },
+      z: {
+        manifestId: 'c',
+        visibleCanvases: [
+          'https://auth.example.org/my-video1',
+        ],
+      },
     },
   };
 
@@ -93,6 +103,7 @@ describe('selectCurrentAuthServices', () => {
 
   it('returns the next auth service to try', () => {
     expect(selectCurrentAuthServices(state, { windowId: 'w' })[0].id).toEqual('external');
+    expect(selectCurrentAuthServices(state, { windowId: 'z' })[0].id).toEqual('https://auth.example.org/login');
   });
 
   it('returns the service if the next auth service is interactive', () => {

src/state/selectors/auth.js

@@ -1,6 +1,9 @@
 import { createSelector } from 'reselect';
 import { Utils } from 'manifesto.js';
 import flatten from 'lodash/flatten';
+import {
+  audioResourcesFrom, filterByTypes, textResourcesFrom, videoResourcesFrom,
+} from '../../lib/typeFilters';
 import MiradorCanvas from '../../lib/MiradorCanvas';
 import { miradorSlice } from './utils';
 import { getConfig } from './config';
@@ -48,15 +51,27 @@ export const selectCurrentAuthServices = createSelector(
       }));
     }
 
+    if (currentAuthResources.length === 0 && canvases) {
+      currentAuthResources = flatten(canvases.map(c => {
+        const miradorCanvas = new MiradorCanvas(c);
+        const canvasResources = miradorCanvas.imageResources;
+        return videoResourcesFrom(canvasResources)
+          .concat(audioResourcesFrom(canvasResources))
+          .concat(textResourcesFrom(canvasResources));
+      }));
+    }
+
     if (!currentAuthResources) return [];
     if (currentAuthResources.length === 0) return [];
 
     const currentAuthServices = currentAuthResources.map(resource => {
       let lastAttemptedService;
-      const services = Utils.getServices(resource);
+      const resourceServices = Utils.getServices(resource);
+      const probeServices = filterByTypes(resourceServices, 'AuthProbeService2');
+      const probeServiceServices = flatten(probeServices.map(p => Utils.getServices(p)));
 
       for (const authProfile of serviceProfiles) {
-        const profiledAuthServices = services.filter(
+        const profiledAuthServices = resourceServices.concat(probeServiceServices).filter(
           p => authProfile.profile === p.getProfile(),
         );