-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #142 from samply/fix/NeotiatorConnection
Fix BBMRI neotiator connection
- Loading branch information
Showing
10 changed files
with
465 additions
and
443 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
packages/lib/src/components/results/TableItemComponent.svelte
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,176 @@ | ||
| import { queryStore } from "../stores/query"; | ||
|
|
||
| import { lensOptions } from "../stores/options"; | ||
| import { v4 as uuidv4 } from "uuid"; | ||
| import type { QueryItem, SendableQuery } from "../types/queryData"; | ||
| import type { | ||
| LensOptions, | ||
| NegotiateOptions, | ||
| NegotiateOptionsSiteMapping, | ||
| } from "../types/options"; | ||
| import { getHumanReadableQuery } from "../stores/datarequests"; | ||
|
|
||
| type NegotiatorResponse = Response & { | ||
| url?: string; | ||
| redirect_uri?: string; | ||
| id?: string; | ||
| status: number; | ||
| }; | ||
|
|
||
| let negotiateOptions: NegotiateOptions; | ||
| const siteCollectionMap: Map<string, NegotiateOptionsSiteMapping> = new Map(); | ||
|
|
||
| lensOptions.subscribe((options: LensOptions) => { | ||
| if (!options) return; | ||
|
|
||
| /** | ||
| * TODO: implement multiple collections per site | ||
| * need to know how multiple collections are returned from the backend | ||
| */ | ||
|
|
||
| negotiateOptions = options.negotiateOptions as NegotiateOptions; | ||
| negotiateOptions?.siteMappings?.forEach((site) => { | ||
| siteCollectionMap.set(site.site, site); | ||
| }); | ||
| }); | ||
|
|
||
| /** | ||
| * @param sitesToNegotiate the sites to negotiate with | ||
| * @returns an array of Collection objects | ||
| */ | ||
| export const getCollections = ( | ||
| sitesToNegotiate: string[], | ||
| ): NegotiateOptionsSiteMapping[] => { | ||
| const siteCollections: NegotiateOptionsSiteMapping[] = []; | ||
|
|
||
| sitesToNegotiate.forEach((site: string) => { | ||
| // TODO: Why is site id mapped to Uppercase? | ||
| if (siteCollectionMap.has(site) && siteCollectionMap.get(site) !== "") { | ||
| siteCollections.push(siteCollectionMap.get(site)); | ||
| } | ||
| }); | ||
|
|
||
| return siteCollections; | ||
| }; | ||
|
|
||
| /** | ||
| * builds a sendable query object from the current query | ||
| * sends query to negotiator | ||
| * redirects to negotiator | ||
| * @param sitesToNegotiate the sites to negotiate with | ||
| */ | ||
| export const negotiate = async (sitesToNegotiate: string[]): Promise<void> => { | ||
| let sendableQuery!: SendableQuery; | ||
| queryStore.subscribe((value: QueryItem[][]) => { | ||
| const uuid = uuidv4(); | ||
| sendableQuery = { | ||
| query: value, | ||
| id: `${uuid}__search__${uuid}`, | ||
| }; | ||
| }); | ||
|
|
||
| const humanReadable: string = getHumanReadableQuery(); | ||
| const collections: NegotiateOptionsSiteMapping[] = | ||
| getCollections(sitesToNegotiate); | ||
| const negotiatorResponse = await sendRequestToNegotiator( | ||
| sendableQuery, | ||
| humanReadable, | ||
| collections, | ||
| ); | ||
|
|
||
| switch (negotiatorResponse.status) { | ||
| case 201: { | ||
| if (!negotiatorResponse.url) { | ||
| console.error( | ||
| "Negotiator response does not contain redirect uri", | ||
| ); | ||
| return; | ||
| } else { | ||
| const data = await negotiatorResponse.json(); | ||
| window.location.href = data.redirectUrl; | ||
| } | ||
| break; | ||
| } | ||
| case 401: { | ||
| alert( | ||
| "An unexpected error has occurred. Please contact support if the issue persists.", | ||
| ); | ||
| break; | ||
| } | ||
| case 400: | ||
| case 500: { | ||
| alert( | ||
| "The service is temporarily unavailable. Please try again in a few minutes.", | ||
| ); | ||
| break; | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| interface BbmriCollectionResource { | ||
| id: string; | ||
| name: string; | ||
| organization: { | ||
| id: number; | ||
| externalId: string; | ||
| name: string; | ||
| }; | ||
| } | ||
|
|
||
| /** | ||
| * | ||
| * @param sendableQuery the query to be sent to the negotiator | ||
| * @param humanReadable a human readable query string to view in the negotiator project | ||
| * @param collections the collections to negotiate with | ||
| * @returns the redirect uri from the negotiator | ||
| */ | ||
| async function sendRequestToNegotiator( | ||
| sendableQuery: SendableQuery, | ||
| humanReadable: string, | ||
| collections: NegotiateOptionsSiteMapping[], | ||
| ): Promise<NegotiatorResponse> { | ||
| const base64Query: string = btoa(JSON.stringify(sendableQuery.query)); | ||
|
|
||
| /** | ||
| * handle redirect to negotiator url | ||
| */ | ||
| const returnURL: string = `${window.location.protocol}//${window.location.host}/?nToken=${sendableQuery.id}&query=${base64Query}`; | ||
|
|
||
| let response!: Response; | ||
|
|
||
| const BBMRI_collection_resource: BbmriCollectionResource[] = []; | ||
|
|
||
| collections.forEach(function (collection) { | ||
| BBMRI_collection_resource.push({ | ||
| id: collection.collection, | ||
| name: collection.collection, | ||
| organization: { | ||
| id: 0, | ||
| externalId: collection.site_id, | ||
| name: collection.site, | ||
| }, | ||
| }); | ||
| }); | ||
|
|
||
| try { | ||
| response = await fetch(`${negotiateOptions.newProjectUrl}`, { | ||
| method: "POST", | ||
| headers: { | ||
| Accept: "application/json; charset=utf-8", | ||
| "Content-Type": "application/json", | ||
| Authorization: | ||
| "Basic YmJtcmktZGlyZWN0b3J5Omw5RFJLVUROcTBTbDAySXhaUGQ2", | ||
| }, | ||
| body: JSON.stringify({ | ||
| humanReadable: humanReadable, | ||
| url: returnURL, | ||
| resources: BBMRI_collection_resource, | ||
| }), | ||
| }); | ||
|
|
||
| return response as NegotiatorResponse; | ||
| } catch (error) { | ||
| console.error(error); | ||
| return new Response() as NegotiatorResponse; | ||
| } | ||
| } |
Oops, something went wrong.