othmane/ohif-viewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unnecessary CORS proxy scripts (LT-165). Update to Meteor 1.4.1.1

Browse Source
This commit is contained in:
Erik Ziegler 2016-09-02 09:53:32 +02:00
parent ed8bb26fa4
commit 8ec58015ce
14 changed files with 83 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
LesionTracker/.meteor/.finished-upgraders
View File

@ -13,3 +13,4 @@ notices-for-facebook-graph-api-2
1.3.0-split-minifiers-package 1.3.0-split-minifiers-package
1.3.5-remove-old-dev-bundle-link 1.3.5-remove-old-dev-bundle-link
1.4.0-remove-old-dev-bundle-link 1.4.0-remove-old-dev-bundle-link
1.4.1-add-shell-server-package

25
LesionTracker/.meteor/packages
View File

@ -4,18 +4,18 @@
# 'meteor add' and 'meteor remove' will edit this file for you, # 'meteor add' and 'meteor remove' will edit this file for you,
# but you can also edit it by hand. # but you can also edit it by hand.
npm-bcrypt@0.8.7 npm-bcrypt@0.9.1
meteor-base@1.0.4 # Packages every Meteor app needs to have meteor-base@1.0.4 # Packages every Meteor app needs to have
mobile-experience@1.0.4 # Packages for a great mobile UX mobile-experience@1.0.4 # Packages for a great mobile UX
mongo@1.1.10 # The database Meteor supports right now mongo@1.1.12 # The database Meteor supports right now
blaze-html-templates@1.0.4 # Compile .html files into Meteor Blaze views blaze-html-templates@1.0.4 # Compile .html files into Meteor Blaze views
session@1.1.6 # Client-side reactive dictionary for your app session@1.1.6 # Client-side reactive dictionary for your app
jquery@1.11.9 # Helpful client-side library jquery@1.11.9 # Helpful client-side library
tracker@1.1.0 # Meteor's client-side reactive programming library tracker@1.1.0 # Meteor's client-side reactive programming library
es5-shim@4.6.13 # ECMAScript 5 compatibility for older browsers. es5-shim@4.6.14 # ECMAScript 5 compatibility for older browsers.
ecmascript@0.5.7 # Enable ECMAScript2015+ syntax in app code ecmascript@0.5.8 # Enable ECMAScript2015+ syntax in app code
clinical:router clinical:router
clinical:extended-api clinical:extended-api
@ -36,15 +36,15 @@ cornerstone
worklist worklist
viewerbase viewerbase
dicomweb dicomweb
accounts-base@1.2.9 accounts-base@1.2.11
accounts-password@1.2.12 accounts-password@1.3.0
ian:accounts-ui-bootstrap-3 ian:accounts-ui-bootstrap-3
twbs:bootstrap twbs:bootstrap
http@1.2.8 http@1.2.9
arsnebula:reactive-promise arsnebula:reactive-promise
promise@0.8.3 promise@0.8.4
stylus@2.513.4 stylus@2.513.5
fortawesome:fontawesome fortawesome:fontawesome
random@1.0.10 random@1.0.10
reactive-var@1.0.10 reactive-var@1.0.10
@ -58,12 +58,13 @@ check@1.2.3
aldeed:template-extension@4.0.0 aldeed:template-extension@4.0.0
zuuk:stale-session zuuk:stale-session
gilbertwat:bootstrap3-daterangepicker gilbertwat:bootstrap3-daterangepicker
email@1.1.16 email@1.1.17
peppelg:bootstrap-3-modal peppelg:bootstrap-3-modal
simple:reactive-method simple:reactive-method
hangingprotocols hangingprotocols
fastclick@1.0.12 fastclick@1.0.12
standard-minifier-css@1.1.8 standard-minifier-css@1.2.0
standard-minifier-js@1.1.8 standard-minifier-js@1.2.0
johdirr:meteor-git-rev johdirr:meteor-git-rev
u2622:persistent-session u2622:persistent-session
shell-server

2
LesionTracker/.meteor/release
View File

@ -1 +1 @@
METEOR@1.4.0.1 METEOR@1.4.1.1

59
LesionTracker/.meteor/versions
View File

@ -1,5 +1,5 @@
accounts-base@1.2.9 accounts-base@1.2.11
accounts-password@1.2.12 accounts-password@1.3.0
aldeed:simple-schema@1.5.3 aldeed:simple-schema@1.5.3
aldeed:template-extension@4.0.0 aldeed:template-extension@4.0.0
allow-deny@1.0.5 allow-deny@1.0.5
@ -8,15 +8,15 @@ anti:gagarin@0.4.11
anti:i18n@0.4.3 anti:i18n@0.4.3
arsnebula:reactive-promise@0.9.1 arsnebula:reactive-promise@0.9.1
autoupdate@1.3.11 autoupdate@1.3.11
babel-compiler@6.9.0 babel-compiler@6.9.1
babel-runtime@0.1.10 babel-runtime@0.1.11
base64@1.0.9 base64@1.0.9
binary-heap@1.0.9 binary-heap@1.0.9
blaze@2.1.8 blaze@2.1.8
blaze-html-templates@1.0.4 blaze-html-templates@1.0.4
blaze-tools@1.0.9 blaze-tools@1.0.9
boilerplate-generator@1.0.9 boilerplate-generator@1.0.9
caching-compiler@1.1.6 caching-compiler@1.1.7
caching-html-compiler@1.0.6 caching-html-compiler@1.0.6
callback-hook@1.0.9 callback-hook@1.0.9
check@1.2.3 check@1.2.3
@ -32,23 +32,23 @@ clinical:router-location@2.1.0
clinical:router-middleware-stack@2.1.2 clinical:router-middleware-stack@2.1.2
clinical:router-url@2.1.0 clinical:router-url@2.1.0
clinical:theming@0.4.10 clinical:theming@0.4.10
coffeescript@1.2.3 coffeescript@1.2.4_1
cornerstone@0.0.1 cornerstone@0.0.1
ddp@1.2.5 ddp@1.2.5
ddp-client@1.3.0 ddp-client@1.3.1
ddp-common@1.2.6 ddp-common@1.2.6
ddp-rate-limiter@1.0.5 ddp-rate-limiter@1.0.5
ddp-server@1.3.9 ddp-server@1.3.10
deps@1.0.12 deps@1.0.12
design@0.0.1 design@0.0.1
dicomweb@0.0.1 dicomweb@0.0.1
diff-sequence@1.0.6 diff-sequence@1.0.6
dimseservice@0.0.1 dimseservice@0.0.1
ecmascript@0.5.7 ecmascript@0.5.8
ecmascript-runtime@0.3.12 ecmascript-runtime@0.3.14
ejson@1.0.12 ejson@1.0.12
email@1.1.16 email@1.1.17
es5-shim@4.6.13 es5-shim@4.6.14
fastclick@1.0.12 fastclick@1.0.12
fortawesome:fontawesome@4.5.0 fortawesome:fontawesome@4.5.0
geojson-utils@1.0.9 geojson-utils@1.0.9
@ -58,7 +58,7 @@ hangingprotocols@0.0.1
hot-code-push@1.0.4 hot-code-push@1.0.4
html-tools@1.0.10 html-tools@1.0.10
htmljs@1.0.10 htmljs@1.0.10
http@1.2.8 http@1.2.9
ian:accounts-ui-bootstrap-3@1.2.89 ian:accounts-ui-bootstrap-3@1.2.89
id-map@1.0.8 id-map@1.0.8
insecure@1.0.7 insecure@1.0.7
@ -72,25 +72,25 @@ launch-screen@1.0.12
lesiontracker@0.0.1 lesiontracker@0.0.1
livedata@1.0.18 livedata@1.0.18
localstorage@1.0.11 localstorage@1.0.11
logging@1.1.14 logging@1.1.15
mdg:validation-error@0.5.1 mdg:validation-error@0.5.1
meteor@1.2.16 meteor@1.2.17
meteor-base@1.0.4 meteor-base@1.0.4
meteor-platform@1.2.6 meteor-platform@1.2.6
minifier-css@1.2.13 minifier-css@1.2.14
minifier-js@1.2.13 minifier-js@1.2.14
minimongo@1.0.17 minimongo@1.0.17
mobile-experience@1.0.4 mobile-experience@1.0.4
mobile-status-bar@1.0.12 mobile-status-bar@1.0.12
modules@0.7.5 modules@0.7.6
modules-runtime@0.7.5 modules-runtime@0.7.6
momentjs:moment@2.14.4 momentjs:moment@2.14.4
mongo@1.1.10 mongo@1.1.12
mongo-id@1.0.5 mongo-id@1.0.5
mrt:moment@2.8.1 mrt:moment@2.8.1
natestrauser:select2@4.0.2 natestrauser:select2@4.0.3
npm-bcrypt@0.8.7 npm-bcrypt@0.9.1
npm-mongo@1.5.45 npm-mongo@1.5.49
observe-sequence@1.0.12 observe-sequence@1.0.12
ohif:core@0.0.1 ohif:core@0.0.1
ordered-dict@1.0.8 ordered-dict@1.0.8
@ -98,7 +98,7 @@ orthanc-remote@0.0.1
peppelg:bootstrap-3-modal@1.0.4 peppelg:bootstrap-3-modal@1.0.4
practicalmeteor:chai@2.1.0_1 practicalmeteor:chai@2.1.0_1
practicalmeteor:loglevel@1.2.0_2 practicalmeteor:loglevel@1.2.0_2
promise@0.8.3 promise@0.8.4
random@1.0.10 random@1.0.10
rate-limit@1.0.5 rate-limit@1.0.5
reactive-dict@1.1.8 reactive-dict@1.1.8
@ -110,16 +110,17 @@ rwatts:uuid@0.1.0
service-configuration@1.0.10 service-configuration@1.0.10
session@1.1.6 session@1.1.6
sha@1.0.8 sha@1.0.8
shell-server@0.2.1
silentcicero:jszip@0.0.4 silentcicero:jszip@0.0.4
simple:reactive-method@1.0.2 simple:reactive-method@1.0.2
spacebars@1.0.12 spacebars@1.0.12
spacebars-compiler@1.0.12 spacebars-compiler@1.0.12
srp@1.0.9 srp@1.0.9
standard-app-packages@1.0.9 standard-app-packages@1.0.9
standard-minifier-css@1.1.8 standard-minifier-css@1.2.0
standard-minifier-js@1.1.8 standard-minifier-js@1.2.0
stylus@2.513.4 stylus@2.513.5
templating@1.2.13 templating@1.2.14
templating-tools@1.0.4 templating-tools@1.0.4
tracker@1.1.0 tracker@1.1.0
twbs:bootstrap@3.3.6 twbs:bootstrap@3.3.6
@ -132,7 +133,7 @@ url@1.0.10
validatejs@0.0.1 validatejs@0.0.1
viewerbase@0.0.1 viewerbase@0.0.1
wadoproxy@0.0.1 wadoproxy@0.0.1
webapp@1.3.10 webapp@1.3.11
webapp-hashing@1.0.9 webapp-hashing@1.0.9
worklist@0.0.1 worklist@0.0.1
zuuk:stale-session@1.0.8 zuuk:stale-session@1.0.8

1
OHIFViewer/.meteor/.finished-upgraders
View File

@ -13,3 +13,4 @@ notices-for-facebook-graph-api-2
1.3.0-split-minifiers-package 1.3.0-split-minifiers-package
1.3.5-remove-old-dev-bundle-link 1.3.5-remove-old-dev-bundle-link
1.4.0-remove-old-dev-bundle-link 1.4.0-remove-old-dev-bundle-link
1.4.1-add-shell-server-package

17
OHIFViewer/.meteor/packages Executable file → Normal file
View File

@ -5,20 +5,20 @@
# but you can also edit it by hand. # but you can also edit it by hand.
twbs:bootstrap twbs:bootstrap
http@1.2.8 http@1.2.9
arsnebula:reactive-promise arsnebula:reactive-promise
promise@0.8.3 promise@0.8.4
stylus@2.513.4 stylus@2.513.5
fortawesome:fontawesome fortawesome:fontawesome
mrt:moment mrt:moment
meteor-base@1.0.4 meteor-base@1.0.4
mobile-experience@1.0.4 mobile-experience@1.0.4
mongo@1.1.10 mongo@1.1.12
blaze-html-templates@1.0.4 blaze-html-templates@1.0.4
session@1.1.6 session@1.1.6
jquery@1.11.9 jquery@1.11.9
tracker@1.1.0 tracker@1.1.0
logging@1.1.14 logging@1.1.15
reload@1.1.10 reload@1.1.10
random@1.0.10 random@1.0.10
ejson@1.0.12 ejson@1.0.12
@ -29,7 +29,7 @@ dicomweb
aldeed:simple-schema # Third party package to deal with schemas aldeed:simple-schema # Third party package to deal with schemas
design design
ohif:core ohif:core
ecmascript@0.5.7 ecmascript@0.5.8
viewerbase viewerbase
worklist worklist
reactive-var@1.0.10 reactive-var@1.0.10
@ -38,9 +38,10 @@ hangingprotocols
reactive-dict@1.1.8 reactive-dict@1.1.8
clinical:router clinical:router
fastclick@1.0.12 fastclick@1.0.12
standard-minifier-css@1.1.8 standard-minifier-css@1.2.0
standard-minifier-js@1.1.8 standard-minifier-js@1.2.0
johdirr:meteor-git-rev johdirr:meteor-git-rev
wadoproxy wadoproxy
aldeed:template-extension aldeed:template-extension
peppelg:bootstrap-3-modal peppelg:bootstrap-3-modal
shell-server

2
OHIFViewer/.meteor/release
View File

@ -1 +1 @@
METEOR@1.4.0.1 METEOR@1.4.1.1

51
OHIFViewer/.meteor/versions Executable file → Normal file
View File

@ -3,15 +3,15 @@ aldeed:template-extension@4.0.0
allow-deny@1.0.5 allow-deny@1.0.5
arsnebula:reactive-promise@0.9.1 arsnebula:reactive-promise@0.9.1
autoupdate@1.3.11 autoupdate@1.3.11
babel-compiler@6.9.0 babel-compiler@6.9.1
babel-runtime@0.1.10 babel-runtime@0.1.11
base64@1.0.9 base64@1.0.9
binary-heap@1.0.9 binary-heap@1.0.9
blaze@2.1.8 blaze@2.1.8
blaze-html-templates@1.0.4 blaze-html-templates@1.0.4
blaze-tools@1.0.9 blaze-tools@1.0.9
boilerplate-generator@1.0.9 boilerplate-generator@1.0.9
caching-compiler@1.1.6 caching-compiler@1.1.7
caching-html-compiler@1.0.6 caching-html-compiler@1.0.6
callback-hook@1.0.9 callback-hook@1.0.9
check@1.2.3 check@1.2.3
@ -19,19 +19,19 @@ clinical:router@2.0.19
clinical:router-location@2.1.0 clinical:router-location@2.1.0
clinical:router-middleware-stack@2.1.2 clinical:router-middleware-stack@2.1.2
clinical:router-url@2.1.0 clinical:router-url@2.1.0
coffeescript@1.2.3 coffeescript@1.2.4_1
cornerstone@0.0.1 cornerstone@0.0.1
ddp@1.2.5 ddp@1.2.5
ddp-client@1.3.0 ddp-client@1.3.1
ddp-common@1.2.6 ddp-common@1.2.6
ddp-server@1.3.9 ddp-server@1.3.10
deps@1.0.12 deps@1.0.12
design@0.0.1 design@0.0.1
dicomweb@0.0.1 dicomweb@0.0.1
diff-sequence@1.0.6 diff-sequence@1.0.6
dimseservice@0.0.1 dimseservice@0.0.1
ecmascript@0.5.7 ecmascript@0.5.8
ecmascript-runtime@0.3.12 ecmascript-runtime@0.3.14
ejson@1.0.12 ejson@1.0.12
fastclick@1.0.12 fastclick@1.0.12
fortawesome:fontawesome@4.5.0 fortawesome:fontawesome@4.5.0
@ -41,7 +41,7 @@ hangingprotocols@0.0.1
hot-code-push@1.0.4 hot-code-push@1.0.4
html-tools@1.0.10 html-tools@1.0.10
htmljs@1.0.10 htmljs@1.0.10
http@1.2.8 http@1.2.9
id-map@1.0.8 id-map@1.0.8
iron:controller@1.0.12 iron:controller@1.0.12
iron:core@1.0.11 iron:core@1.0.11
@ -51,24 +51,24 @@ johdirr:meteor-git-rev@0.0.4
jquery@1.11.9 jquery@1.11.9
launch-screen@1.0.12 launch-screen@1.0.12
livedata@1.0.18 livedata@1.0.18
logging@1.1.14 logging@1.1.15
mdg:validation-error@0.2.0 mdg:validation-error@0.5.1
meteor@1.2.16 meteor@1.2.17
meteor-base@1.0.4 meteor-base@1.0.4
meteor-platform@1.2.6 meteor-platform@1.2.6
minifier-css@1.2.13 minifier-css@1.2.14
minifier-js@1.2.13 minifier-js@1.2.14
minimongo@1.0.17 minimongo@1.0.17
mobile-experience@1.0.4 mobile-experience@1.0.4
mobile-status-bar@1.0.12 mobile-status-bar@1.0.12
modules@0.7.5 modules@0.7.6
modules-runtime@0.7.5 modules-runtime@0.7.6
momentjs:moment@2.14.4 momentjs:moment@2.14.4
mongo@1.1.10 mongo@1.1.12
mongo-id@1.0.5 mongo-id@1.0.5
mrt:moment@2.8.1 mrt:moment@2.8.1
natestrauser:select2@4.0.2 natestrauser:select2@4.0.3
npm-mongo@1.5.45 npm-mongo@1.5.49
observe-sequence@1.0.12 observe-sequence@1.0.12
ohif:core@0.0.1 ohif:core@0.0.1
ordered-dict@1.0.8 ordered-dict@1.0.8
@ -76,7 +76,7 @@ orthanc-remote@0.0.1
peppelg:bootstrap-3-modal@1.0.4 peppelg:bootstrap-3-modal@1.0.4
practicalmeteor:chai@2.1.0_1 practicalmeteor:chai@2.1.0_1
practicalmeteor:loglevel@1.2.0_2 practicalmeteor:loglevel@1.2.0_2
promise@0.8.3 promise@0.8.4
random@1.0.10 random@1.0.10
reactive-dict@1.1.8 reactive-dict@1.1.8
reactive-var@1.0.10 reactive-var@1.0.10
@ -85,14 +85,15 @@ retry@1.0.8
routepolicy@1.0.11 routepolicy@1.0.11
rwatts:uuid@0.1.0 rwatts:uuid@0.1.0
session@1.1.6 session@1.1.6
shell-server@0.2.1
silentcicero:jszip@0.0.4 silentcicero:jszip@0.0.4
spacebars@1.0.12 spacebars@1.0.12
spacebars-compiler@1.0.12 spacebars-compiler@1.0.12
standard-app-packages@1.0.9 standard-app-packages@1.0.9
standard-minifier-css@1.1.8 standard-minifier-css@1.2.0
standard-minifier-js@1.1.8 standard-minifier-js@1.2.0
stylus@2.513.4 stylus@2.513.5
templating@1.2.13 templating@1.2.14
templating-tools@1.0.4 templating-tools@1.0.4
tracker@1.1.0 tracker@1.1.0
twbs:bootstrap@3.3.6 twbs:bootstrap@3.3.6
@ -102,6 +103,6 @@ url@1.0.10
validatejs@0.0.1 validatejs@0.0.1
viewerbase@0.0.1 viewerbase@0.0.1
wadoproxy@0.0.1 wadoproxy@0.0.1
webapp@1.3.10 webapp@1.3.11
webapp-hashing@1.0.9 webapp-hashing@1.0.9
worklist@0.0.1 worklist@0.0.1

2
config/orthancDICOMWeb.json
View File

@ -4,7 +4,7 @@
{ {
"name": "Orthanc", "name": "Orthanc",
"wadoUriRootNOTE": "either this uri is not correct for wado-uri or wado-uri is not configured on orthanc currently", "wadoUriRootNOTE": "either this uri is not correct for wado-uri or wado-uri is not configured on orthanc currently",
"wadoUriRoot": "http://localhost:8043/wado", "wadoUriRoot": "http://localhost:8042/wado",
"qidoRoot": "http://localhost:8042/dicom-web", "qidoRoot": "http://localhost:8042/dicom-web",
"wadoRoot": "http://localhost:8042/dicom-web", "wadoRoot": "http://localhost:8042/dicom-web",
"qidoSupportsIncludeField": false, "qidoSupportsIncludeField": false,

20
etc/OrthancProxy.js
View File

@ -1,20 +0,0 @@
// This sets up a proxy to work around CORS.
// See http://chafey.blogspot.be/2014/09/working-around-cors.html
// For more information
var http = require('http'),
httpProxy = require('http-proxy');
var proxy = httpProxy.createProxyServer({
target: 'http://localhost:8042',
auth: 'orthanc:orthanc'
}).listen(8043);
proxy.on('proxyRes', function(proxyReq, req, res, options) {
// add the CORS header to the response
res.setHeader('Access-Control-Allow-Origin', '*');
});
proxy.on('error', function(e) {
// suppress errors
console.log(e);
});

20
etc/dcm4cheCORSproxy.js
View File

@ -1,20 +0,0 @@
// This sets up a proxy to work around CORS.
// See http://chafey.blogspot.be/2014/09/working-around-cors.html
// For more information
var http = require('http'),
httpProxy = require('http-proxy');
var proxy = httpProxy.createProxyServer({
target: 'http://localhost:8080',
auth: 'user:user'
}).listen(8043);
proxy.on('proxyRes', function(proxyReq, req, res, options) {
// add the CORS header to the response
res.setHeader('Access-Control-Allow-Origin', '*');
});
proxy.on('error', function(e) {
// suppress errors
console.log(e);
});

20
etc/nodeCORSProxy.example
View File

@ -1,20 +0,0 @@
// This sets up a proxy to work around CORS.
// See http://chafey.blogspot.be/2014/09/working-around-cors.html
// For more information
var http = require('http'),
httpProxy = require('http-proxy');
var proxy = httpProxy.createProxyServer({
target: 'http://localhost:8042',
auth: 'orthanc:orthanc'
}).listen(8042);
proxy.on('proxyRes', function(proxyReq, req, res, options) {
// add the CORS header to the response
res.setHeader('Access-Control-Allow-Origin', '*');
});
proxy.on('error', function(e) {
// suppress errors
console.log(e);
});

20
etc/nodeCORSProxy.js
View File

@ -1,20 +0,0 @@
// This sets up a proxy to work around CORS.
// See http://chafey.blogspot.be/2014/09/working-around-cors.html
// For more information
var http = require('http'),
httpProxy = require('http-proxy');
var proxy = httpProxy.createProxyServer({
target: 'http://localhost:8042',
auth: 'orthanc:orthanc'
}).listen(8043);
proxy.on('proxyRes', function(proxyReq, req, res, options) {
// add the CORS header to the response
res.setHeader('Access-Control-Allow-Origin', '*');
});
proxy.on('error', function(e) {
// suppress errors
console.log(e);
});

11
etc/setupLocalOrthanc.sh
View File

@ -1,11 +0,0 @@
#!/bin/bash
echo "Retrieving docker default machine IP address..."
MACHINEIP=$(docker-machine ip default)
echo "Copying nodeCORSProxy.example to nodeCORSProxy.js"
cp nodeCORSProxy.example nodeCORSProxy.js
sed -i '' "s/localhost:8042/$MACHINEIP:8042/g" nodeCORSProxy.js
echo "Installing node http-proxy from npm..."
npm install http-proxy
echo "Running proxy server..."
echo "In a separate tab/terminal, go to /main and run ./bin/orthancDICOMWeb.sh to start the Meteor server"
node nodeCORSProxy.js