Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevent overwriting services #15

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Prevent overwriting services #15

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a813de9
Added jest
stephenwf Mar 10, 2021
7c9e4e3
Fixed type error
stephenwf Mar 10, 2021
fcc4ed4
Added method to bootstrap without network request
stephenwf Mar 10, 2021
e578e34
Fixed case where services would be overwritten if they exist after pr…
stephenwf Mar 10, 2021
0e08e5e
Fixed building by removing type reference
stephenwf Mar 11, 2021
b0809a1
Added github action
stephenwf Mar 11, 2021
f08711d
Udpated lock
stephenwf Mar 11, 2021
a004cd1
Remove EOL node
stephenwf Mar 11, 2021
bd9a2c8
Merge remote-tracking branch 'origin/master' into feature/overwriting…
demiankatz Oct 24, 2024
0f0cdfd
Style tweak.
demiankatz Oct 24, 2024
32f18ac
Bring configs in line.
demiankatz Oct 24, 2024
aebef80
Resolve merge issues.
demiankatz Oct 24, 2024
8b474bd
Merge branch 'master' into feature/overwriting-services
demiankatz Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 50 additions & 21 deletions src/ExternalResource.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,11 @@ export class ExternalResource implements IExternalResource {
if (!id.endsWith("/")) {
id += "/";
}

const profile = service.getProfile();
if (
service.getProfile() &&
(Utils.isImageProfile(service.getProfile()) ||
profile &&
(Utils.isImageProfile(profile) ||
Utils.isImageServiceType(service.getIIIFResourceType()))
) {
infoUri = id + "info.json";
Expand Down Expand Up @@ -175,22 +177,41 @@ export class ExternalResource implements IExternalResource {
}
}

this.clickThroughService = Utils.getService(
const clickThroughService = Utils.getService(
resource,
ServiceProfile.AUTH_1_CLICK_THROUGH
);
this.loginService = Utils.getService(
if (clickThroughService) {
this.clickThroughService = clickThroughService;
}
const loginService = Utils.getService(
resource,
ServiceProfile.AUTH_1_LOGIN
);
this.externalService = Utils.getService(
if (loginService) {
this.loginService = loginService;
}
const externalService = Utils.getService(
resource,
ServiceProfile.AUTH_1_EXTERNAL
);
this.kioskService = Utils.getService(
if (externalService) {
this.externalService = externalService;
}
const kioskService = Utils.getService(
resource,
ServiceProfile.AUTH_1_KIOSK
);
if (kioskService) {
this.kioskService = kioskService;
}
const probeService = Utils.getService(
resource,
ServiceProfile.AUTH_1_PROBE
);
if (probeService) {
this.probeService = probeService;
}

if (this.clickThroughService) {
this.logoutService = this.clickThroughService.getService(
Expand All @@ -199,9 +220,11 @@ export class ExternalResource implements IExternalResource {
this.tokenService = this.clickThroughService.getService(
ServiceProfile.AUTH_1_TOKEN
);
this.probeService = this.clickThroughService.getService(
ServiceProfile.AUTH_1_PROBE
);
if (!this.probeService) {
this.probeService = this.clickThroughService.getService(
ServiceProfile.AUTH_1_PROBE
);
}
} else if (this.loginService) {
this.logoutService = this.loginService.getService(
ServiceProfile.AUTH_1_LOGOUT
Expand All @@ -210,10 +233,12 @@ export class ExternalResource implements IExternalResource {
ServiceProfile.AUTH_1_TOKEN
);

this.probeService = Utils.getService(
resource,
ServiceProfile.AUTH_1_PROBE
);
if (!this.probeService) {
this.probeService = Utils.getService(
resource,
ServiceProfile.AUTH_1_PROBE
);
}

// @deprecated - the probe should be on the resource.
if (!this.probeService) {
Expand All @@ -228,10 +253,12 @@ export class ExternalResource implements IExternalResource {
this.tokenService = this.externalService.getService(
ServiceProfile.AUTH_1_TOKEN
);
this.probeService = Utils.getService(
resource,
ServiceProfile.AUTH_1_PROBE
);
if (!this.probeService) {
this.probeService = Utils.getService(
resource,
ServiceProfile.AUTH_1_PROBE
);
}

// @deprecated - the probe should be on the resource.
if (!this.probeService) {
Expand All @@ -246,10 +273,12 @@ export class ExternalResource implements IExternalResource {
this.tokenService = this.kioskService.getService(
ServiceProfile.AUTH_1_TOKEN
);
this.probeService = Utils.getService(
resource,
ServiceProfile.AUTH_1_PROBE
);
if (!this.probeService) {
this.probeService = Utils.getService(
resource,
ServiceProfile.AUTH_1_PROBE
);
}

// @deprecated - the probe should be on the resource.
if (!this.probeService) {
Expand Down