View restricted access content #51
Conversation
| 'loadTilesWithAjax' => TRUE, | ||
| 'ajaxWithCredentials' => TRUE, | ||
| 'ajaxHeaders' => [ | ||
| "Authorization" => "Bearer " . $access_token, | ||
| 'token' => $access_token, | ||
| ], |
There was a problem hiding this comment.
Much the same as the previous PR, these tokens are generally expected to be valid for a limited length of time, so we would have to propagate cache headers preventing them from being used beyond their lifetime to prevent serving up responses with invalid tokens.
| 'loadTilesWithAjax' => TRUE, | ||
| 'ajaxWithCredentials' => TRUE, | ||
| 'ajaxHeaders' => [ | ||
| "Authorization" => "Bearer " . $access_token, | ||
| 'token' => $access_token, | ||
| ], |
There was a problem hiding this comment.
Much the same as the previous PR, these tokens are generally expected to be valid for a limited length of time, so we would have to propagate cache headers preventing them from being used beyond their lifetime to prevent serving up responses with invalid tokens.
| $variables['#attached']['drupalSettings']['openseadragon'][$openseadragon_viewer_id] = [ | ||
| 'basePath' => Url::fromUri($iiif_address), | ||
| 'fitToAspectRatio' => $viewer_settings['fit_to_aspect_ratio'], | ||
| 'options' => [ | ||
| 'id' => $openseadragon_viewer_id, | ||
| 'prefixUrl' => 'https://cdnjs.cloudflare.com/ajax/libs/openseadragon/2.4.2/images/', | ||
| 'tileSources' => $tile_sources, | ||
|
|
||
| // For dsu-utsc. |
There was a problem hiding this comment.
No longer quite true if this is to be pushed into the base code.
| @@ -148,6 +157,14 @@ function template_preprocess_openseadragon_iiif_manifest_block(&$variables) { | |||
| 'id' => $openseadragon_viewer_id, | |||
| 'prefixUrl' => 'https://cdnjs.cloudflare.com/ajax/libs/openseadragon/2.4.2/images/', | |||
| 'tileSources' => $tile_sources, | |||
|
|
|||
| // For dsu-utsc. | |||
There was a problem hiding this comment.
No longer quite true if this is to be pushed into the base code.
| @@ -85,7 +87,12 @@ public function getTileSources($manifest_url) { | |||
|
|
|||
| try { | |||
| // Request the manifest. | |||
| $manifest_response = $this->httpClient->get($manifest_url); | |||
| // $manifest_response = $this->httpClient->get($manifest_url); | |||
There was a problem hiding this comment.
Commented out code shouldn't be here.
| $manifest_response = $this->httpClient->request('GET', $manifest_url, [ | ||
| 'headers' => [ | ||
| 'Authorization' => 'Bearer ' . $access_token, | ||
| ], | ||
| ]); |
There was a problem hiding this comment.
Not sure that this makes sense in the case $access_token was not passed, as we would generate an Authorization header of just Bearer (or possibly Bearer null?).
Really, if we want to be sure to always have a token here, why not just generate it here?
|
|
||
| // For dsu-utsc. | ||
| 'loadTilesWithAjax' => TRUE, | ||
| 'ajaxWithCredentials' => TRUE, | ||
| 'ajaxHeaders' => [ | ||
| "Authorization" => "Bearer " . $access_token, | ||
| 'token' => $access_token, | ||
| ], |
There was a problem hiding this comment.
This is feedback from a Slack conversation.
Testing this on our instance, if we leave this two blocks in (kylehuynh205@9ceb5d4#diff-6d693de3726ed28241d0e4b5045e66eff4e2e82da162a08975768d342ec2ed7eR161-R167 and kylehuynh205@9ceb5d4#diff-6d693de3726ed28241d0e4b5045e66eff4e2e82da162a08975768d342ec2ed7eR101-R107), images are not displayed in the viewer, and we get CORS errors.
If I remove the two blocks, everything works fine, including the original issue I had with the viewer not working on paged objects that used OSD.
There was a problem hiding this comment.
Maybe a good compromise here would be to add these values loadTilesWithAjax, ajaxWithCredentials, ajaxHeaders, but do not set them by default, and make them configurable in the settings page for the OSD module? So something like:
'loadTilesWithAjax' => FALSE,
'ajaxWithCredentials' => FALSE,
...then if the above is set to TRUE, add the ajaxHeaders section.
- Alternate implementation of Islandora#51 - Resolves yorkulibraries/yudl_drupal_theme#78
- Alternate implementation of Islandora#51 - Resolves yorkulibraries/yudl_drupal_theme#78
|
@ruebot , could your alternate solution -- yorkulibraries@ce29240 -- be turned into a PR so we can get a solution to this merged? Or is there something else we would still need from this PR for the full solution? |
|
@ruebot happy to do a PR. |
- Alternate implementation of Islandora#51 - Resolves yorkulibraries/yudl_drupal_theme#78
What does this Pull Request do?
What's new?
A in-depth description of the changes made by this PR. Technical details and
possible side effects.
/node/nid/book-manifestin the manifest parser if the node is restricted access.How should this be tested?
A description of what steps someone could take to:
Interested parties
Tag (@ mention) interested parties or, if unsure, @Islandora/committers