Add requestOptions to DIMSE Server schema to fix authentication errors (OHIF-116)

This commit is contained in:
Erik Ziegler 2016-10-19 18:36:56 +02:00
parent 531d2e283c
commit 05d5b4007b
4 changed files with 17 additions and 58 deletions

View File

@ -117,6 +117,10 @@ export const DIMSEServer = new SimpleSchema({
name: serverNameDefinitions,
type: serverTypeDefinitions,
wadoUriRoot: wadoUriRootDefinitions,
requestOptions: {
type: DICOMWebRequestOptions,
label: 'Request Options'
},
peers: {
type: [DIMSEPeer],
label: 'Peer List',

View File

@ -13,11 +13,17 @@
"logRequests": true,
"logResponses": false,
"logTiming": true
}
}
}],
"dimse": [{
"name": "DCM4CHEE_DIMSE",
"wadoUriRoot": "http://localhost:8080/dcm4chee-arc/aets/DCM4CHEE/wado",
"requestOptions": {
"auth": "admin:admin",
"logRequests": true,
"logResponses": false,
"logTiming": true
},
"peers": [
{
"host": "localhost",

View File

@ -1,41 +0,0 @@
{
"servers": {
"dicomWeb": [
{
"name": "Orthanc",
"wadoUriRoot" : "http://52.87.58.190:8043/wado",
"qidoRoot": "http://localhost:8042/dicom-web",
"wadoRoot": "http://localhost:8042/dicom-web",
"qidoSupportsIncludeField": false,
"imageRendering" : "wadouri",
"requestOptions" : {
"auth": "orthanc:orthanc",
"logRequests" : true,
"logResponses" : false,
"logTiming" : true
}
}
],
"dimse": [{
"name": "OrthancDIMSE",
"wadoUriRoot" : "http://52.87.58.190:8043/wado",
"peers": [
{
"host" : "localhost",
"port" : 4242,
"aeTitle" : "ORTHANC",
"default": true,
"supportsInstanceRetrievalByStudyUid": true
},
{
"host" : "0.0.0.0",
"port" : 11112,
"aeTitle" : "OHIFDCM",
"default" : true,
"server" : true
}
]
}]
},
"defaultServiceType": "dimse"
}

View File

@ -1,24 +1,14 @@
{
"servers": {
"dicomWeb": [
{
"name": "Orthanc",
"wadoUriRoot": "http://localhost:8042/wado",
"qidoRoot": "http://localhost:8042/dicom-web",
"wadoRoot": "http://localhost:8042/dicom-web",
"qidoSupportsIncludeField": false,
"imageRendering": "wadouri",
"requestOptions": {
"auth": "orthanc:orthanc",
"logRequests": true,
"logResponses": false,
"logTiming": true
}
}
],
"dimse": [{
"name": "ORTHANC_DIMSE",
"wadoUriRoot": "http://localhost:8042/wado",
"requestOptions": {
"auth": "orthanc:orthanc",
"logRequests": true,
"logResponses": false,
"logTiming": true
},
"peers": [
{
"host": "localhost",