@iiif/manifold
Advanced tools
Comparing version
@@ -239,12 +239,14 @@ "use strict"; | ||
xhr_1.open("GET", that.probeService.id, true); | ||
xhr_1.withCredentials = true; | ||
// This has been disabled as the request should use the access token. | ||
xhr_1.withCredentials = false; | ||
if (accessToken) { | ||
xhr_1.setRequestHeader("Authorization", "Bearer " + accessToken.accessToken); | ||
} | ||
xhr_1.onload = function () { | ||
var data = JSON.parse(xhr_1.responseText); | ||
var contentLocation = unescape(data.contentLocation); | ||
that.status = xhr_1.status; | ||
if (contentLocation !== that.dataUri) { | ||
that.status = HTTPStatusCode.MOVED_TEMPORARILY; | ||
} | ||
else { | ||
that.status = HTTPStatusCode.OK; | ||
} | ||
resolve(that); | ||
@@ -323,3 +325,3 @@ }; | ||
xhr_2.open(type, that.dataUri, true); | ||
//xhr.withCredentials = true; | ||
xhr_2.withCredentials = false; | ||
if (accessToken) { | ||
@@ -332,3 +334,3 @@ xhr_2.setRequestHeader("Authorization", "Bearer " + accessToken.accessToken); | ||
if (!xhr_2.responseText) { | ||
that.status = HTTPStatusCode.OK; | ||
that.status = xhr_2.status || HTTPStatusCode.OK; | ||
resolve(that); | ||
@@ -338,3 +340,4 @@ } | ||
var data = JSON.parse(xhr_2.responseText); | ||
var uri = unescape(data["@id"]); | ||
var status_1 = xhr_2.status; | ||
var uri = unescape(data["@id"] || data.id); | ||
that.data = data; | ||
@@ -352,7 +355,9 @@ that._parseAuthServices(that.data); | ||
// if the request was redirected to a degraded version and there's a login service to get the full quality version | ||
if (uri !== dataUri && that.loginService) { | ||
if (status_1 === HTTPStatusCode.OK && | ||
uri !== dataUri && | ||
that.loginService) { | ||
that.status = HTTPStatusCode.MOVED_TEMPORARILY; | ||
} | ||
else { | ||
that.status = HTTPStatusCode.OK; | ||
that.status = status_1; | ||
} | ||
@@ -359,0 +364,0 @@ resolve(that); |
@@ -237,12 +237,14 @@ import { ServiceProfile } from "@iiif/vocabulary/dist-commonjs"; | ||
xhr_1.open("GET", that.probeService.id, true); | ||
xhr_1.withCredentials = true; | ||
// This has been disabled as the request should use the access token. | ||
xhr_1.withCredentials = false; | ||
if (accessToken) { | ||
xhr_1.setRequestHeader("Authorization", "Bearer " + accessToken.accessToken); | ||
} | ||
xhr_1.onload = function () { | ||
var data = JSON.parse(xhr_1.responseText); | ||
var contentLocation = unescape(data.contentLocation); | ||
that.status = xhr_1.status; | ||
if (contentLocation !== that.dataUri) { | ||
that.status = HTTPStatusCode.MOVED_TEMPORARILY; | ||
} | ||
else { | ||
that.status = HTTPStatusCode.OK; | ||
} | ||
resolve(that); | ||
@@ -321,3 +323,3 @@ }; | ||
xhr_2.open(type, that.dataUri, true); | ||
//xhr.withCredentials = true; | ||
xhr_2.withCredentials = false; | ||
if (accessToken) { | ||
@@ -330,3 +332,3 @@ xhr_2.setRequestHeader("Authorization", "Bearer " + accessToken.accessToken); | ||
if (!xhr_2.responseText) { | ||
that.status = HTTPStatusCode.OK; | ||
that.status = xhr_2.status || HTTPStatusCode.OK; | ||
resolve(that); | ||
@@ -336,3 +338,4 @@ } | ||
var data = JSON.parse(xhr_2.responseText); | ||
var uri = unescape(data["@id"]); | ||
var status_1 = xhr_2.status; | ||
var uri = unescape(data["@id"] || data.id); | ||
that.data = data; | ||
@@ -350,7 +353,9 @@ that._parseAuthServices(that.data); | ||
// if the request was redirected to a degraded version and there's a login service to get the full quality version | ||
if (uri !== dataUri && that.loginService) { | ||
if (status_1 === HTTPStatusCode.OK && | ||
uri !== dataUri && | ||
that.loginService) { | ||
that.status = HTTPStatusCode.MOVED_TEMPORARILY; | ||
} | ||
else { | ||
that.status = HTTPStatusCode.OK; | ||
that.status = status_1; | ||
} | ||
@@ -357,0 +362,0 @@ resolve(that); |
{ | ||
"name": "@iiif/manifold", | ||
"version": "2.0.17", | ||
"version": "2.0.18", | ||
"description": "", | ||
@@ -18,3 +18,4 @@ "main": "./dist-umd/manifold.js", | ||
"lint:all": "prettier --write \"./src/**/*.{js,jsx,json,css,ts,tsx}\"", | ||
"prepublishOnly": "npm run build" | ||
"prepublishOnly": "npm run build", | ||
"watch": "npm run build:esmodule -- --watch" | ||
}, | ||
@@ -48,4 +49,5 @@ "repository": { | ||
"@iiif/vocabulary": "^1.0.23", | ||
"manifesto.js": "^4.2.6" | ||
"manifesto": "0.0.4", | ||
"manifesto.js": "^4.2.14" | ||
} | ||
} |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
1772613
1.33%5635
0.18%4
33.33%+ Added
+ Added
Updated