Merge pull request #3004 from ProjectMirador/3003-fix-issues-with-imageservice-v3

Fix #3003 - expect 'id' as keyword alias for '@id'

src/state/reducers/accessTokens.js

@@ -10,7 +10,7 @@ export function accessTokensReducer(state = {}, action) {
 
   switch (action.type) {
     case ActionTypes.RECEIVE_INFO_RESPONSE:
-      if (action.ok && normalizeUrl(action.infoId, { stripAuthentication: false }) === normalizeUrl(action.infoJson['@id'], { stripAuthentication: false })) return state;
+      if (action.ok && normalizeUrl(action.infoId, { stripAuthentication: false }) === normalizeUrl(action.infoJson.id || action.infoJson['@id'], { stripAuthentication: false })) return state;
 
       authService = Utils.getService({ ...action.infoJson, options: {} }, 'http://iiif.io/api/auth/1/external');
       if (!authService) return state;

src/state/reducers/auth.js

@@ -10,7 +10,7 @@ export const authReducer = (state = {}, action) => {
 
   switch (action.type) {
     case ActionTypes.RECEIVE_INFO_RESPONSE:
-      if (action.ok && normalizeUrl(action.infoId, { stripAuthentication: false }) === normalizeUrl(action.infoJson['@id'], { stripAuthentication: false })) return state;
+      if (action.ok && normalizeUrl(action.infoId, { stripAuthentication: false }) === normalizeUrl(action.infoJson.id || action.infoJson['@id'], { stripAuthentication: false })) return state;
 
       service = selectNextAuthService(
         { auth: state }, action.infoJson, { external: true, kiosk: true },

src/state/reducers/infoResponses.js

@@ -18,7 +18,7 @@ export const infoResponsesReducer = (state = {}, action) => {
       return {
         ...state,
         [action.infoId]: {
-          degraded: !action.ok || !(normalizeUrl(action.infoId, { stripAuthentication: false }) === normalizeUrl(action.infoJson['@id'], { stripAuthentication: false })),
+          degraded: !action.ok || !(normalizeUrl(action.infoId, { stripAuthentication: false }) === normalizeUrl(action.infoJson.id || action.infoJson['@id'], { stripAuthentication: false })),
           id: action.infoId,
           isFetching: false,
           json: action.infoJson,