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

feat(openid-connect): Switch to generic OIDC Client library instead of using Keycloak.js (#273)

Browse Source
This commit is contained in:
Erik Ziegler 2018-09-19 14:50:12 +02:00 committed by GitHub
parent 2f05ed5961
commit 18bcf83805
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
70 changed files with 572 additions and 655 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LesionTracker/.meteor/packages
View File

@ -47,8 +47,8 @@ ohif:metadata
# Necessary for Lesion Trakcer # Necessary for Lesion Trakcer
ohif:lesiontracker ohif:lesiontracker
ohif:user
ohif:user-management ohif:user-management
ohif:user-meteor-accounts
ohif:select-tree ohif:select-tree
accounts-base@1.4.2 accounts-base@1.4.2

2
LesionTracker/.meteor/versions
View File

@ -108,8 +108,8 @@ ohif:studies@0.0.1
ohif:study-list@0.0.1 ohif:study-list@0.0.1
ohif:themes@0.0.1 ohif:themes@0.0.1
ohif:themes-common@0.0.1 ohif:themes-common@0.0.1
ohif:user@0.0.1
ohif:user-management@0.0.1 ohif:user-management@0.0.1
ohif:user-meteor-accounts@0.0.1
ohif:viewerbase@0.0.1 ohif:viewerbase@0.0.1
ohif:wadoproxy@0.0.1 ohif:wadoproxy@0.0.1
ordered-dict@1.1.0 ordered-dict@1.1.0

6
OHIFViewer/.meteor/packages
View File

@ -25,9 +25,6 @@ reactive-var@1.0.11
reactive-dict@1.2.0 reactive-dict@1.2.0
standard-minifier-css@1.4.1 standard-minifier-css@1.4.1
standard-minifier-js@2.3.4 standard-minifier-js@2.3.4
accounts-base
accounts-oauth
oauth-encryption
# OHIF Packages # OHIF Packages
ohif:polyfill ohif:polyfill
@ -44,8 +41,7 @@ ohif:dicom-services
ohif:dicomweb-client ohif:dicomweb-client
ohif:hanging-protocols ohif:hanging-protocols
ohif:metadata ohif:metadata
ohif:user ohif:user-oidc
ohif:user-keycloak
ohif:measurement-table ohif:measurement-table
fortawesome:fontawesome fortawesome:fontawesome

20
OHIFViewer/.meteor/versions
View File

@ -1,6 +1,3 @@
accounts-base@1.4.2
accounts-oauth@1.1.15
accounts-password@1.5.1
aldeed:collection2@2.10.0 aldeed:collection2@2.10.0
aldeed:collection2-core@1.2.0 aldeed:collection2-core@1.2.0
aldeed:schema-deny@1.1.0 aldeed:schema-deny@1.1.0
@ -30,7 +27,6 @@ cultofcoders:persistent-session@0.4.5
ddp@1.4.0 ddp@1.4.0
ddp-client@2.3.3 ddp-client@2.3.3
ddp-common@1.4.0 ddp-common@1.4.0
ddp-rate-limiter@1.0.7
ddp-server@2.2.0 ddp-server@2.2.0
deps@1.0.12 deps@1.0.12
diff-sequence@1.1.0 diff-sequence@1.1.0
@ -40,7 +36,6 @@ ecmascript-runtime@0.7.0
ecmascript-runtime-client@0.7.1 ecmascript-runtime-client@0.7.1
ecmascript-runtime-server@0.7.0 ecmascript-runtime-server@0.7.0
ejson@1.1.0 ejson@1.1.0
email@1.2.3
es5-shim@4.8.0 es5-shim@4.8.0
fastclick@1.0.13 fastclick@1.0.13
fortawesome:fontawesome@4.7.0 fortawesome:fontawesome@4.7.0
@ -59,7 +54,6 @@ jquery@1.11.11
launch-screen@1.1.1 launch-screen@1.1.1
livedata@1.0.18 livedata@1.0.18
lmieulet:meteor-coverage@1.1.4 lmieulet:meteor-coverage@1.1.4
localstorage@1.2.0
logging@1.1.20 logging@1.1.20
mdg:validation-error@0.5.1 mdg:validation-error@0.5.1
meteor@1.9.2 meteor@1.9.2
@ -80,15 +74,8 @@ momentjs:moment@2.22.2
mongo@1.5.1 mongo@1.5.1
mongo-dev-server@1.1.0 mongo-dev-server@1.1.0
mongo-id@1.0.7 mongo-id@1.0.7
mxab:accounts-keycloak@0.0.2
mxab:keycloak-loader@0.0.2
mxab:keycloak-oauth@0.0.2
natestrauser:select2@4.0.3 natestrauser:select2@4.0.3
npm-bcrypt@0.9.3
npm-mongo@3.0.7 npm-mongo@3.0.7
oauth@1.2.3
oauth-encryption@1.3.0
oauth2@1.2.0
observe-sequence@1.0.16 observe-sequence@1.0.16
ohif:commands@0.0.1 ohif:commands@0.0.1
ohif:core@0.0.1 ohif:core@0.0.1
@ -111,8 +98,7 @@ ohif:studies@0.0.1
ohif:study-list@0.0.1 ohif:study-list@0.0.1
ohif:themes@0.0.1 ohif:themes@0.0.1
ohif:themes-common@0.0.1 ohif:themes-common@0.0.1
ohif:user@0.0.1 ohif:user-oidc@0.0.1
ohif:user-keycloak@0.0.1
ohif:viewerbase@0.0.1 ohif:viewerbase@0.0.1
ohif:wadoproxy@0.0.1 ohif:wadoproxy@0.0.1
ordered-dict@1.1.0 ordered-dict@1.1.0
@ -120,21 +106,17 @@ practicalmeteor:mocha-core@1.0.1
promise@0.11.1 promise@0.11.1
raix:eventemitter@0.1.3 raix:eventemitter@0.1.3
random@1.1.0 random@1.1.0
rate-limit@1.0.9
reactive-dict@1.2.0 reactive-dict@1.2.0
reactive-var@1.0.11 reactive-var@1.0.11
reload@1.2.0 reload@1.2.0
retry@1.1.0 retry@1.1.0
routepolicy@1.0.13 routepolicy@1.0.13
service-configuration@1.0.11
session@1.1.7 session@1.1.7
sha@1.0.9
shell-server@0.3.1 shell-server@0.3.1
silentcicero:jszip@0.0.4 silentcicero:jszip@0.0.4
socket-stream-client@0.2.2 socket-stream-client@0.2.2
spacebars@1.0.15 spacebars@1.0.15
spacebars-compiler@1.1.3 spacebars-compiler@1.1.3
srp@1.0.10
standard-app-packages@1.0.9 standard-app-packages@1.0.9
standard-minifier-css@1.4.1 standard-minifier-css@1.4.1
standard-minifier-js@2.3.4 standard-minifier-js@2.3.4

2
OHIFViewer/client/components/ohifViewer/ohifViewer.js
View File

@ -31,7 +31,7 @@ Template.ohifViewer.onCreated(() => {
icon: 'fa fa-info' icon: 'fa fa-info'
}]; }];
if (Meteor.user()) { if (OHIF.user.userLoggedIn() === true) {
headerItems.push({ headerItems.push({
action: OHIF.user.logout, action: OHIF.user.logout,
text: 'Logout', text: 'Logout',

1
OHIFViewer/client/components/ohifViewer/ohifViewer.styl
View File

@ -62,7 +62,6 @@ body>.header
.brand .brand
height: 100% height: 100%
width: 80%
line-height: $topBarExpandedHeight - 10px line-height: $topBarExpandedHeight - 10px
.logo-image .logo-image

8
OHIFViewer/client/config.js
View File

@ -1,7 +1,6 @@
import { Meteor } from 'meteor/meteor'; import { Meteor } from 'meteor/meteor';
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
import { cornerstoneWADOImageLoader } from 'meteor/ohif:cornerstone'; import { cornerstoneWADOImageLoader } from 'meteor/ohif:cornerstone';
import { Accounts } from "meteor/accounts-base";
Meteor.startup(function() { Meteor.startup(function() {
const maxWebWorkers = Math.max(navigator.hardwareConcurrency - 1, 1); const maxWebWorkers = Math.max(navigator.hardwareConcurrency - 1, 1);
@ -23,17 +22,10 @@ Meteor.startup(function() {
cornerstoneWADOImageLoader.configure({ cornerstoneWADOImageLoader.configure({
beforeSend: function(xhr) { beforeSend: function(xhr) {
const userId = Meteor.userId();
const accessToken = OHIF.user.getAccessToken(); const accessToken = OHIF.user.getAccessToken();
if (accessToken) { if (accessToken) {
xhr.setRequestHeader("Authorization", `Bearer ${accessToken}`); xhr.setRequestHeader("Authorization", `Bearer ${accessToken}`);
} else {
const loginToken = Accounts._storedLoginToken();
if (userId && loginToken) {
xhr.setRequestHeader("x-user-id", userId);
xhr.setRequestHeader("x-auth-token", loginToken);
}
} }
} }
}); });

9
OHIFViewer/client/routes.js
View File

@ -5,12 +5,21 @@ Router.configure({
layoutTemplate: 'layout', layoutTemplate: 'layout',
}); });
// If we are running a disconnect client similar to the StandaloneViewer
// (see https://docs.ohif.org/standalone-viewer/usage.html) we don't want
// our routes to get stuck while waiting for Pub / Sub.
//
// In this case, the developer is required to add Servers and specify
// a CurrentServer with some other approach (e.g. a separate script).
if (Meteor.status().connected === true) {
Router.waitOn(function() { Router.waitOn(function() {
return [ return [
Meteor.subscribe('servers'), Meteor.subscribe('servers'),
Meteor.subscribe('currentServer') Meteor.subscribe('currentServer')
]; ];
}); });
}
Router.onBeforeAction('loading'); Router.onBeforeAction('loading');

383
OHIFViewer/package-lock.json generated
View File

@ -13,11 +13,6 @@
"regenerator-runtime": "^0.11.1" "regenerator-runtime": "^0.11.1"
} }
}, },
"abbrev": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
},
"agent-base": { "agent-base": {
"version": "4.2.1", "version": "4.2.1",
"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz",
@ -27,25 +22,6 @@
"es6-promisify": "^5.0.0" "es6-promisify": "^5.0.0"
} }
}, },
"ansi-regex": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
},
"aproba": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
"integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
},
"are-we-there-yet": {
"version": "1.1.5",
"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
"integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
"requires": {
"delegates": "^1.0.0",
"readable-stream": "^2.0.6"
}
},
"async-limiter": { "async-limiter": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz", "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
@ -55,21 +31,14 @@
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
}, "dev": true
"bcrypt": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-2.0.0.tgz",
"integrity": "sha512-KL3nXU8H6QR/dgSUWHkjId5xIOJn8DTl4idFl720nsBwoq5ArAqIVmZ5BbD8LiCH+wjS7NX9hBvp30rGMmU0LA==",
"requires": {
"nan": "2.10.0",
"node-pre-gyp": "0.9.0"
}
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
"dev": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
@ -81,20 +50,11 @@
"integrity": "sha512-c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ==", "integrity": "sha512-c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ==",
"dev": true "dev": true
}, },
"chownr": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz",
"integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE="
},
"code-point-at": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
},
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
"dev": true
}, },
"concat-stream": { "concat-stream": {
"version": "1.6.2", "version": "1.6.2",
@ -108,11 +68,6 @@
"typedarray": "^0.0.6" "typedarray": "^0.0.6"
} }
}, },
"console-control-strings": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
},
"core-js": { "core-js": {
"version": "2.5.7", "version": "2.5.7",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz", "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz",
@ -121,7 +76,8 @@
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
"dev": true
}, },
"debug": { "debug": {
"version": "3.1.0", "version": "3.1.0",
@ -132,21 +88,6 @@
"ms": "2.0.0" "ms": "2.0.0"
} }
}, },
"deep-extend": {
"version": "0.6.0",
"resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
"integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="
},
"delegates": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
},
"detect-libc": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
"integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups="
},
"es6-promise": { "es6-promise": {
"version": "4.2.4", "version": "4.2.4",
"resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz", "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz",
@ -194,38 +135,17 @@
"pend": "~1.2.0" "pend": "~1.2.0"
} }
}, },
"fs-minipass": {
"version": "1.2.5",
"resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz",
"integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
"requires": {
"minipass": "^2.2.1"
}
},
"fs.realpath": { "fs.realpath": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
}, "dev": true
"gauge": {
"version": "2.7.4",
"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
"requires": {
"aproba": "^1.0.3",
"console-control-strings": "^1.0.0",
"has-unicode": "^2.0.0",
"object-assign": "^4.1.0",
"signal-exit": "^3.0.0",
"string-width": "^1.0.1",
"strip-ansi": "^3.0.1",
"wide-align": "^1.1.0"
}
}, },
"glob": { "glob": {
"version": "7.1.2", "version": "7.1.2",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
"integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
"dev": true,
"requires": { "requires": {
"fs.realpath": "^1.0.0", "fs.realpath": "^1.0.0",
"inflight": "^1.0.4", "inflight": "^1.0.4",
@ -235,11 +155,6 @@
"path-is-absolute": "^1.0.0" "path-is-absolute": "^1.0.0"
} }
}, },
"has-unicode": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
},
"https-proxy-agent": { "https-proxy-agent": {
"version": "2.2.1", "version": "2.2.1",
"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz",
@ -250,26 +165,11 @@
"debug": "^3.1.0" "debug": "^3.1.0"
} }
}, },
"iconv-lite": {
"version": "0.4.23",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
"integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
"requires": {
"safer-buffer": ">= 2.1.2 < 3"
}
},
"ignore-walk": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz",
"integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
"requires": {
"minimatch": "^3.0.4"
}
},
"inflight": { "inflight": {
"version": "1.0.6", "version": "1.0.6",
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
"dev": true,
"requires": { "requires": {
"once": "^1.3.0", "once": "^1.3.0",
"wrappy": "1" "wrappy": "1"
@ -278,25 +178,14 @@
"inherits": { "inherits": {
"version": "2.0.3", "version": "2.0.3",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
}, "dev": true
"ini": {
"version": "1.3.5",
"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
"integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
},
"is-fullwidth-code-point": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
"requires": {
"number-is-nan": "^1.0.0"
}
}, },
"isarray": { "isarray": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
"dev": true
}, },
"loglevel": { "loglevel": {
"version": "1.6.1", "version": "1.6.1",
@ -313,6 +202,7 @@
"version": "3.0.4", "version": "3.0.4",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
"dev": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
@ -320,29 +210,14 @@
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
}, "dev": true
"minipass": {
"version": "2.3.3",
"resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.3.tgz",
"integrity": "sha512-/jAn9/tEX4gnpyRATxgHEOV6xbcyxgT7iUnxo9Y3+OB0zX00TgKIv/2FZCf5brBbICcwbLqVv2ImjvWWrQMSYw==",
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
}
},
"minizlib": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz",
"integrity": "sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==",
"requires": {
"minipass": "^2.2.1"
}
}, },
"mkdirp": { "mkdirp": {
"version": "0.5.1", "version": "0.5.1",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
"dev": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
@ -350,125 +225,23 @@
"ms": { "ms": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
}, "dev": true
"nan": {
"version": "2.10.0",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
"integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA=="
},
"needle": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/needle/-/needle-2.2.1.tgz",
"integrity": "sha512-t/ZswCM9JTWjAdXS9VpvqhI2Ct2sL2MdY4fUXqGJaGBk13ge99ObqRksRTbBE56K+wxUXwwfZYOuZHifFW9q+Q==",
"requires": {
"debug": "^2.1.2",
"iconv-lite": "^0.4.4",
"sax": "^1.2.4"
},
"dependencies": {
"debug": {
"version": "2.6.9",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
"requires": {
"ms": "2.0.0"
}
}
}
},
"node-pre-gyp": {
"version": "0.9.0",
"resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.9.0.tgz",
"integrity": "sha1-vdTDr6ybGx6/8Kn/M2KFnrZ4G7g=",
"requires": {
"detect-libc": "^1.0.2",
"mkdirp": "^0.5.1",
"needle": "^2.2.0",
"nopt": "^4.0.1",
"npm-packlist": "^1.1.6",
"npmlog": "^4.0.2",
"rc": "^1.1.7",
"rimraf": "^2.6.1",
"semver": "^5.3.0",
"tar": "^4"
}
},
"nopt": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
"requires": {
"abbrev": "1",
"osenv": "^0.1.4"
}
},
"npm-bundled": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz",
"integrity": "sha512-ByQ3oJ/5ETLyglU2+8dBObvhfWXX8dtPZDMePCahptliFX2iIuhyEszyFk401PZUNQH20vvdW5MLjJxkwU80Ow=="
},
"npm-packlist": {
"version": "1.1.11",
"resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.11.tgz",
"integrity": "sha512-CxKlZ24urLkJk+9kCm48RTQ7L4hsmgSVzEk0TLGPzzyuFxD7VNgy5Sl24tOLMzQv773a/NeJ1ce1DKeacqffEA==",
"requires": {
"ignore-walk": "^3.0.1",
"npm-bundled": "^1.0.1"
}
},
"npmlog": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
"requires": {
"are-we-there-yet": "~1.1.2",
"console-control-strings": "~1.1.0",
"gauge": "~2.7.3",
"set-blocking": "~2.0.0"
}
},
"number-is-nan": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
},
"object-assign": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
}, },
"once": { "once": {
"version": "1.4.0", "version": "1.4.0",
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
"dev": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
}, },
"os-homedir": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
},
"os-tmpdir": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
},
"osenv": {
"version": "0.1.5",
"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
"integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
"requires": {
"os-homedir": "^1.0.0",
"os-tmpdir": "^1.0.0"
}
},
"path-is-absolute": { "path-is-absolute": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
"dev": true
}, },
"pend": { "pend": {
"version": "1.2.0", "version": "1.2.0",
@ -479,7 +252,8 @@
"process-nextick-args": { "process-nextick-args": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
"integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
"dev": true
}, },
"progress": { "progress": {
"version": "2.0.0", "version": "2.0.0",
@ -509,28 +283,11 @@
"ws": "^5.1.1" "ws": "^5.1.1"
} }
}, },
"rc": {
"version": "1.2.8",
"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
"integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
"requires": {
"deep-extend": "^0.6.0",
"ini": "~1.3.0",
"minimist": "^1.2.0",
"strip-json-comments": "~2.0.1"
},
"dependencies": {
"minimist": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
}
}
},
"readable-stream": { "readable-stream": {
"version": "2.3.6", "version": "2.3.6",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
"dev": true,
"requires": { "requires": {
"core-util-is": "~1.0.0", "core-util-is": "~1.0.0",
"inherits": "~2.0.3", "inherits": "~2.0.3",
@ -550,6 +307,7 @@
"version": "2.6.2", "version": "2.6.2",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
"integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
"dev": true,
"requires": { "requires": {
"glob": "^7.0.5" "glob": "^7.0.5"
} }
@ -557,78 +315,18 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
}, "dev": true
"safer-buffer": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
},
"sax": {
"version": "1.2.4",
"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
},
"semver": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
"integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="
},
"set-blocking": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
},
"signal-exit": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
},
"string-width": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
"strip-ansi": "^3.0.0"
}
}, },
"string_decoder": { "string_decoder": {
"version": "1.1.1", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"dev": true,
"requires": { "requires": {
"safe-buffer": "~5.1.0" "safe-buffer": "~5.1.0"
} }
}, },
"strip-ansi": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"requires": {
"ansi-regex": "^2.0.0"
}
},
"strip-json-comments": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
},
"tar": {
"version": "4.4.6",
"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.6.tgz",
"integrity": "sha512-tMkTnh9EdzxyfW+6GK6fCahagXsnYk6kE6S9Gr9pjVdys769+laCTbodXDhPAjzVtEBazRgP0gYqOjnk9dQzLg==",
"requires": {
"chownr": "^1.0.1",
"fs-minipass": "^1.2.5",
"minipass": "^2.3.3",
"minizlib": "^1.1.0",
"mkdirp": "^0.5.0",
"safe-buffer": "^5.1.2",
"yallist": "^3.0.2"
}
},
"typedarray": { "typedarray": {
"version": "0.0.6", "version": "0.0.6",
"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
@ -638,20 +336,14 @@
"util-deprecate": { "util-deprecate": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
}, "dev": true
"wide-align": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
"integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
"requires": {
"string-width": "^1.0.2 || 2"
}
}, },
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
"dev": true
}, },
"ws": { "ws": {
"version": "5.2.2", "version": "5.2.2",
@ -662,11 +354,6 @@
"async-limiter": "~1.0.0" "async-limiter": "~1.0.0"
} }
}, },
"yallist": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz",
"integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k="
},
"yauzl": { "yauzl": {
"version": "2.4.1", "version": "2.4.1",
"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz", "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",

1
OHIFViewer/package.json
View File

@ -5,7 +5,6 @@
"main": "index.js", "main": "index.js",
"dependencies": { "dependencies": {
"@babel/runtime": "7.0.0-beta.51", "@babel/runtime": "7.0.0-beta.51",
"bcrypt": "^2.0.0",
"loglevel": "^1.6.1" "loglevel": "^1.6.1"
}, },
"devDependencies": { "devDependencies": {

1
Packages/ohif-core/client/lib/index.js
View File

@ -4,3 +4,4 @@ import './string.js';
import './ui.js'; import './ui.js';
import './utils.js'; import './utils.js';
import './viewer.js'; import './viewer.js';
import './user.js';

16
Packages/ohif-core/client/lib/user.js Normal file
View File

@ -0,0 +1,16 @@
import { Meteor } from 'meteor/meteor';
import { OHIF } from 'meteor/ohif:core';
OHIF.user = OHIF.user || {};
// These should be overridden by the implementation
OHIF.user.schema = null;
OHIF.user.userLoggedIn = () => false;
OHIF.user.getUserId = () => null;
OHIF.user.getName = () => null;
OHIF.user.getAccessToken = () => null;
OHIF.user.login = () => new Promise((resolve, reject) => reject());
OHIF.user.logout = () => new Promise((resolve, reject) => reject());
OHIF.user.getData = (key) => null;
OHIF.user.setData = (key, value) => null;
OHIF.user.validate = () => null;

3
Packages/ohif-core/main.js
View File

@ -9,7 +9,8 @@ const OHIF = {
ui: {}, ui: {},
utils: {}, utils: {},
viewer: {}, viewer: {},
cornerstone: {} cornerstone: {},
user: {},
}; };
// Expose the OHIF object to the client if it is on development mode // Expose the OHIF object to the client if it is on development mode

3
Packages/ohif-core/package.js
View File

@ -42,9 +42,6 @@ Package.onUse(function(api) {
// Client imports and routes // Client imports and routes
api.addFiles('client/index.js', 'client'); api.addFiles('client/index.js', 'client');
// Server imports and methods
api.addFiles('server/index.js', 'server');
// Client and server imports // Client and server imports
api.addFiles('both/index.js', ['client', 'server']); api.addFiles('both/index.js', ['client', 'server']);

1
Packages/ohif-core/server/index.js
View File

@ -1 +0,0 @@
import './mongo.js';

7
Packages/ohif-dicomweb-client/src/getAccessToken.js
View File

@ -1,7 +1,14 @@
import { OHIF } from 'meteor/ohif:core';
export default function getAccessToken() { export default function getAccessToken() {
if (!global.window || !window.sessionStorage || !sessionStorage) { if (!global.window || !window.sessionStorage || !sessionStorage) {
return; return;
} }
const userAccessToken = OHIF.user.getAccessToken();
if (userAccessToken) {
return userAccessToken;
}
return sessionStorage.token; return sessionStorage.token;
} }

11
Packages/ohif-hanging-protocols/both/classes/Protocol.js
View File

@ -1,5 +1,6 @@
import { Meteor } from 'meteor/meteor'; import { Meteor } from 'meteor/meteor';
import { Random } from 'meteor/random'; import { Random } from 'meteor/random';
import { OHIF } from 'meteor/ohif:core';
// Local imports // Local imports
import { removeFromArray } from '../lib/removeFromArray'; import { removeFromArray } from '../lib/removeFromArray';
@ -39,9 +40,9 @@ HP.Protocol = class Protocol {
// If we are logged in while creating this Protocol, // If we are logged in while creating this Protocol,
// store this information as well // store this information as well
if (Meteor.users && Meteor.userId) { if (OHIF.user && OHIF.user.userLoggedIn && OHIF.user.userLoggedIn()) {
this.createdBy = Meteor.userId; this.createdBy = OHIF.user.getUserId();
this.modifiedBy = Meteor.userId; this.modifiedBy = OHIF.user.getUserId();
} }
// Create two empty Sets specifying which roles // Create two empty Sets specifying which roles
@ -107,8 +108,8 @@ HP.Protocol = class Protocol {
protocolWasModified() { protocolWasModified() {
// If we are logged in while modifying this Protocol, // If we are logged in while modifying this Protocol,
// store this information as well // store this information as well
if (Meteor.users && Meteor.userId) { if (OHIF.user && OHIF.user.userLoggedIn && OHIF.user.userLoggedIn()) {
this.modifiedBy = Meteor.userId; this.modifiedBy = OHIF.user.getUserId();
} }
// Protocol has been modified, so mark priors information // Protocol has been modified, so mark priors information

151
Packages/ohif-hanging-protocols/client/protocolStore/defaultStrategy.js
View File

@ -157,4 +157,155 @@ var defaultStrategy = (function () {
})(); })();
var clientOnlyStrategy = (function () {
const HangingProtocols = new Mongo.Collection(null);
let defaultsAdded = false;
function addDefaultProtocols() {
console.log('Inserting default protocols');
addProtocol(HP.defaultProtocol);
defaultsAdded = true;
}
function getDatabaseIdByProtocolId(protocolId) {
const filteredProtocol = HangingProtocols.findOne({
id: protocolId
}, {
fields: {
_id: true
}
});
if (!filteredProtocol) {
return;
}
return filteredProtocol._id;
}
/**
* Registers a function to be called when the hangingprotocols collection is subscribed
* The callback is called only one time when the subscription is ready
*
* @param callback The function to be called as a callback
*/
function onReady(callback) {
if (!defaultsAdded) {
addDefaultProtocols();
}
callback();
}
/**
* Gets the hanging protocol by protocolId if defined, otherwise all stored hanging protocols
*
* @param protocolId The protocol ID used to find the hanging protocol
* @returns {object|array} The hanging protocol by protocolId or array of the stored hanging protocols
*/
function getProtocol(protocolId) {
// Return the hanging protocol by protocolId if defined
if (protocolId) {
return HangingProtocols.findOne({
id: protocolId
});
}
// Otherwise, return all protocols
return HangingProtocols.find().fetch();
}
/**
* Stores the hanging protocol
*
* @param protocol The hanging protocol to be stored
*/
function addProtocol(protocol) {
// Collections can only be updated by database ID (_id) on client, so
// get the database ID (_id) by the hanging protocol ID firstly
const databaseId = getDatabaseIdByProtocolId(protocol.id);
// Remove any MongoDB ID the protocol may have had
delete protocol._id;
// Update the protocol with the same id if exists instead of inserting this protocol
if (databaseId) {
// Update the hanging protocol by the database ID
HangingProtocols.update(databaseId, {
$set: protocol
});
return;
}
// Insert the protocol
HangingProtocols.insert(protocol);
}
/**
* Updates the hanging protocol by protocolId
*
* @param protocolId The protocol ID used to find the hanging protocol to update
* @param protocol The updated hanging protocol
*/
function updateProtocol(protocolId, protocol) {
// Collections can only be updated by database ID (_id) on client, so
// get the database ID (_id) by the hanging protocol ID firstly
const databaseId = getDatabaseIdByProtocolId(protocolId);
// Skip if it does not exist in database
if (!databaseId) {
return;
}
// Remove any MongoDB ID the protocol may have had
delete protocol._id;
// Update the hanging protocol by the database ID
HangingProtocols.update(databaseId, {
$set: protocol
});
}
/**
* Removes the hanging protocol
*
* @param protocolId The protocol ID used to remove the hanging protocol
*/
function removeProtocol(protocolId) {
// Collections can only be removed by database ID (_id) on client, so
// get the database ID (_id) by the hanging protocol ID firstly
const databaseId = getDatabaseIdByProtocolId(protocolId);
// Skip if it does not exist in database
if (!databaseId) {
return;
}
// Remove the hanging protocol by the database ID
HangingProtocols.remove(databaseId);
}
// Module Exports
return {
onReady: onReady,
getProtocol: getProtocol,
addProtocol: addProtocol,
updateProtocol: updateProtocol,
removeProtocol: removeProtocol
};
})();
// If we are running a disconnect client similar to the StandaloneViewer
// (see https://docs.ohif.org/standalone-viewer/usage.html) we don't want
// our HangingProtocol strategy to try to use Meteor methods or Pub / Sub
if (Meteor.status().connected === true) {
HP.ProtocolStore.setStrategy(defaultStrategy); HP.ProtocolStore.setStrategy(defaultStrategy);
} else {
HP.ProtocolStore.setStrategy(clientOnlyStrategy);
}

1
Packages/ohif-hanging-protocols/package.js
View File

@ -19,6 +19,7 @@ Package.onUse(function(api) {
api.use('validatejs'); api.use('validatejs');
// Our custom packages // Our custom packages
api.use('ohif:core');
api.use('ohif:viewerbase'); api.use('ohif:viewerbase');
api.addAssets('assets/dots.svg', 'client'); api.addAssets('assets/dots.svg', 'client');

4
Packages/ohif-measurements/client/components/association/associationModal/associationModal.js
View File

@ -130,8 +130,8 @@ Template.dialogStudyAssociation.onCreated(() => {
// Log // Log
hipaaEvent = { hipaaEvent = {
eventType: hipaaEventType, eventType: hipaaEventType,
userId: Meteor.userId(), userId: OHIF.user.getUserId(),
userName: Meteor.user().profile.fullName, userName: OHIF.user.getName(),
collectionName: 'Timepoints', collectionName: 'Timepoints',
recordId: timepointId, recordId: timepointId,
patientId: relatedStudies[0].patientId, patientId: relatedStudies[0].patientId,

4
Packages/ohif-measurements/client/lib/MeasurementHandlers/handleChildMeasurementAdded.js
View File

@ -22,13 +22,13 @@ export default function ({ instance, eventData, tool, toolGroupId, toolGroup })
const measurement = { const measurement = {
toolType: tool.parentTool, toolType: tool.parentTool,
measurementNumber: measurementData.measurementNumber, measurementNumber: measurementData.measurementNumber,
userId: Meteor.userId(), userId: OHIF.user.getUserId(),
patientId: imageAttributes.patientId, patientId: imageAttributes.patientId,
studyInstanceUid: imageAttributes.studyInstanceUid studyInstanceUid: imageAttributes.studyInstanceUid
}; };
const additionalProperties = _.extend(imageAttributes, { const additionalProperties = _.extend(imageAttributes, {
userId: Meteor.userId() userId: OHIF.user.getUserId()
}); });
const childMeasurement = _.extend({}, measurementData, additionalProperties); const childMeasurement = _.extend({}, measurementData, additionalProperties);

2
Packages/ohif-measurements/client/lib/MeasurementHandlers/handleSingleMeasurementAdded.js
View File

@ -21,7 +21,7 @@ export default function ({ instance, eventData, tool }) {
const imageAttributes = getImageAttributes(eventData.element); const imageAttributes = getImageAttributes(eventData.element);
const measurement = _.extend({}, measurementData, imageAttributes, { const measurement = _.extend({}, measurementData, imageAttributes, {
measurementNumber: measurementData.measurementNumber, measurementNumber: measurementData.measurementNumber,
userId: Meteor.userId() userId: OHIF.user.getUserId()
}); });
// Get the related timepoint by the measurement number and use its location if defined // Get the related timepoint by the measurement number and use its location if defined

9
Packages/ohif-studies/imports/client/lib/loadStudy.js
View File

@ -32,11 +32,14 @@ OHIF.studies.loadStudy = studyInstanceUid => new Promise((resolve, reject) => {
} }
return OHIF.studies.retrieveStudyMetadata(studyInstanceUid).then(study => { return OHIF.studies.retrieveStudyMetadata(studyInstanceUid).then(study => {
if (window.HipaaLogger && Meteor.user && Meteor.user()) { if (window.HipaaLogger &&
OHIF.user &&
OHIF.user.userLoggedIn &&
OHIF.user.userLoggedIn()) {
window.HipaaLogger.logEvent({ window.HipaaLogger.logEvent({
eventType: 'viewed', eventType: 'viewed',
userId: Meteor.userId(), userId: OHIF.user.getUserId(),
userName: Meteor.user().profile.fullName, userName: OHIF.user.getName(),
collectionName: 'Study', collectionName: 'Study',
recordId: studyInstanceUid, recordId: studyInstanceUid,
patientId: study.patientId, patientId: study.patientId,

13
Packages/ohif-study-list/package.js
View File

@ -14,17 +14,16 @@ Package.onUse(function(api) {
api.use('ecmascript'); api.use('ecmascript');
api.use('standard-app-packages'); api.use('standard-app-packages');
api.use('jquery'); api.use('jquery', 'client');
api.use('stylus'); api.use('stylus', 'client');
api.use('http'); api.use('http', 'client');
api.use('random'); api.use('random', 'client');
api.use('silentcicero:jszip'); api.use('silentcicero:jszip', 'client');
api.use('aldeed:simple-schema'); api.use('aldeed:simple-schema');
api.use('accounts-base');
api.use('aldeed:collection2'); api.use('aldeed:collection2');
// Note: MomentJS appears to be required for Bootstrap3 Datepicker, but not a dependency for some reason // Note: MomentJS appears to be required for Bootstrap3 Datepicker, but not a dependency for some reason
api.use('momentjs:moment'); api.use('momentjs:moment', 'client');
// Our custom packages // Our custom packages
api.use('ohif:design'); api.use('ohif:design');

10
Packages/ohif-user-keycloak/client/main.js
View File

@ -1,10 +0,0 @@
import { Meteor } from 'meteor/meteor';
if (!Meteor.settings.public ||
!Meteor.settings.public.custom ||
!Meteor.settings.public.custom.keycloak) {
console.log('To use the ohif-user-keycloak package, you must add relevant Keycloak settings to Meteor.settings.public.custom.keycloak (client-side).');
} else {
require('../imports/client/index.js')
}

4
Packages/ohif-user-keycloak/imports/client/components/keycloakLoginButton.html
View File

@ -1,4 +0,0 @@
<template name="keycloakLoginButton">
<hr/>
<button class="form-control btn js-login-keycloak">Login with Keycloak</button>
</template>

18
Packages/ohif-user-keycloak/imports/client/components/keycloakLoginButton.js
View File

@ -1,18 +0,0 @@
import { Meteor } from 'meteor/meteor';
import { Template } from 'meteor/templating';
import { Router } from 'meteor/clinical:router';
import { OHIF } from 'meteor/ohif:core';
import './keycloakLoginButton.html';
Template.keycloakLoginButton.events({
'click .js-login-keycloak'() {
Meteor.loginWithMeteorKeycloak({}, function(error) {
if (error) {
throw new Error(error);
}
Router.go('/studylist');
});
}
});

25
Packages/ohif-user-keycloak/imports/client/handlers.js
View File

@ -1,25 +0,0 @@
import { Accounts } from 'meteor/accounts-base';
import { Meteor } from "meteor/meteor";
OHIF.user.getAccessToken = () => {
const user = Meteor.user();
if (!user) {
return;
}
return user.services.keycloak.accessToken;
};
Accounts.onLogin(() => {
Meteor.subscribe('user.services.keycloak', () => {
sessionStorage.token = OHIF.user.getAccessToken();
});
});
Accounts.onLogout(() => {
const authServerUrl = Meteor.settings.public.custom.keycloak.authServerUrl;
const realm = Meteor.settings.public.custom.keycloak.realmName;
const redirectUri = Meteor.absoluteUrl('login');
const logoutUrl = `${authServerUrl}/realms/${realm}/protocol/openid-connect/logout?redirect_uri=${redirectUri}`;
window.location = logoutUrl;
});

3
Packages/ohif-user-keycloak/imports/client/index.js
View File

@ -1,3 +0,0 @@
import './handlers';
import './setup.js';
import './components/keycloakLoginButton.js';

30
Packages/ohif-user-keycloak/imports/client/setup.js
View File

@ -1,30 +0,0 @@
import { Meteor } from 'meteor/meteor';
import { Router } from 'meteor/clinical:router';
import { OHIF } from 'meteor/ohif:core';
Router.waitOn(function() {
return [
Meteor.subscribe('user.services.keycloak'),
];
}, { except: ['userLogin'] });
Router.onBeforeAction(function() {
// Check if user is signed in
if (!Meteor.userId() && !Meteor.loggingIn()) {
this.redirect('userLogin');
} else {
this.next();
}
}, {
except: ['userLogin', 'entrySignUp', 'forgotPassword', 'resetPassword']
});
OHIF.user.additionalLoginButtons = OHIF.user.additionalLoginButtons || [];
OHIF.user.additionalLoginButtons.push({
template: 'keycloakLoginButton'
});
if (!Meteor.settings.public.userAuthenticationRoutesEnabled) {
OHIF.log.error('Please set Meteor.settings.public.userAuthenticationRoutesEnabled=true');
}

51
Packages/ohif-user-keycloak/imports/server/setup.js
View File

@ -1,51 +0,0 @@
import { Meteor } from 'meteor/meteor';
import { ServiceConfiguration } from 'meteor/service-configuration';
import { Accounts } from "meteor/accounts-base";
console.log('Keycloak settings were found! Enabling Keycloak integration.');
ServiceConfiguration.configurations.upsert(
{ service: 'keycloak' },
{
$set: {
"realm": Meteor.settings.public.custom.keycloak.realmName,
"auth-server-url": Meteor.settings.public.custom.keycloak.authServerUrl,
"auth_redirect_uri": Meteor.settings.keycloak.authRedirectUri,
"ssl-required": Meteor.settings.keycloak.sslRequired,
"resource": Meteor.settings.keycloak.clientId,
"client_id": Meteor.settings.keycloak.clientId,
"loginStyle": Meteor.settings.keycloak.loginStyle,
"secret": Meteor.settings.keycloak.clientSecret,
"realm-public-key": Meteor.settings.keycloak.realmPublicKey,
"public-client": false,
"use-resource-role-mappings": false,
"bearer-only": false,
}
}
);
Meteor.publish('user.services.keycloak', function() {
const userId = this.userId;
if (!userId) {
return [];
}
return Meteor.users.find(userId, {
fields: {
'services.keycloak': 1
}
});
});
Accounts.onLogout(({ user }) => {
if (!user) {
return;
}
// Erase any Keycloak token that exists
Meteor.users.update(user._id, {
$unset: {
'services.keycloak': 1
}
});
});

11
Packages/ohif-user-keycloak/server/main.js
View File

@ -1,11 +0,0 @@
import { Meteor } from 'meteor/meteor';
if (!Meteor.settings.public ||
!Meteor.settings.public.custom ||
!Meteor.settings.public.custom.keycloak ||
!Meteor.settings.keycloak) {
console.log('To use the ohif-user-keycloak package, you must add relevant Keycloak settings to Meteor.settings.keycloak (server-side).');
} else {
require('../imports/server/setup.js')
}

1
Packages/ohif-user-management/package.js
View File

@ -23,7 +23,6 @@ Package.onUse(function(api) {
// Our custom packages // Our custom packages
api.use('ohif:design'); api.use('ohif:design');
api.use('ohif:core'); api.use('ohif:core');
api.use('ohif:user');
api.use('ohif:study-list'); api.use('ohif:study-list');
// Client imports // Client imports

1
Packages/ohif-user-management/server/createDemoUser.js
View File

@ -41,4 +41,3 @@ Meteor.startup(function() {
createDemoUser(); createDemoUser();
}); });

1
Packages/ohif-user-meteor-accounts/client/main.js Normal file
View File

@ -0,0 +1 @@
require('../imports/client/index.js');

2
Packages/ohif-user/client/lib/data.js → Packages/ohif-user-meteor-accounts/imports/client/data.js
View File

@ -3,7 +3,7 @@ import { OHIF } from 'meteor/ohif:core';
// Throw error if there is no user logged in // Throw error if there is no user logged in
OHIF.user.validate = () => { OHIF.user.validate = () => {
if (!Meteor.userId()) { if (!OHIF.user.userLoggedIn()) {
throw new Meteor.Error('not-authorized'); throw new Meteor.Error('not-authorized');
} }
}; };

0
Packages/ohif-user/client/lib/getAccessToken.js → Packages/ohif-user-meteor-accounts/imports/client/getAccessToken.js
View File

2
Packages/ohif-user/client/lib/getName.js → Packages/ohif-user-meteor-accounts/imports/client/getName.js
View File

@ -4,7 +4,7 @@ import { OHIF } from 'meteor/ohif:core';
OHIF.user.getName = () => { OHIF.user.getName = () => {
const user = Meteor.user(); const user = Meteor.user();
if (!user) return ''; if (!user) return '';
const nameSplit = Meteor.user().profile.fullName.split(' '); const nameSplit = user.profile.fullName.split(' ');
const lastName = nameSplit[nameSplit.length - 1]; const lastName = nameSplit[nameSplit.length - 1];
nameSplit[nameSplit.length - 1] = lastName.substr(0, 1) + '.'; nameSplit[nameSplit.length - 1] = lastName.substr(0, 1) + '.';
return nameSplit.join(' '); return nameSplit.join(' ');

4
Packages/ohif-user-meteor-accounts/imports/client/getUserId.js Normal file
View File

@ -0,0 +1,4 @@
import { Meteor } from 'meteor/meteor';
import { OHIF } from 'meteor/ohif:core';
OHIF.user.getUserId = () => Meteor.userId();

4
Packages/ohif-user/client/lib/index.js → Packages/ohif-user-meteor-accounts/imports/client/index.js
View File

@ -1,6 +1,10 @@
import './data'; import './data';
import './getName'; import './getName';
import './getUserId';
import './getAccessToken'; import './getAccessToken';
import './login'; import './login';
import './logout'; import './logout';
import './schema'; import './schema';
import './userLoggedIn';
import './userLogin'

0
Packages/ohif-user/client/lib/login.js → Packages/ohif-user-meteor-accounts/imports/client/login.js
View File

0
Packages/ohif-user/client/lib/logout.js → Packages/ohif-user-meteor-accounts/imports/client/logout.js
View File

1
Packages/ohif-user/client/routes.js → Packages/ohif-user-meteor-accounts/imports/client/routes.js
View File

@ -1,3 +1,4 @@
import { Meteor } from "meteor/meteor";
import { Router } from 'meteor/clinical:router'; import { Router } from 'meteor/clinical:router';
if (Meteor.settings.public.userAuthenticationRoutesEnabled === true) { if (Meteor.settings.public.userAuthenticationRoutesEnabled === true) {

0
Packages/ohif-user/client/lib/schema.js → Packages/ohif-user-meteor-accounts/imports/client/schema.js
View File

4
Packages/ohif-user-meteor-accounts/imports/client/userLoggedIn.js Normal file
View File

@ -0,0 +1,4 @@
import { Meteor } from 'meteor/meteor';
import { OHIF } from 'meteor/ohif:core';
OHIF.user.userLoggedIn = () => !!Meteor.userId();

3
Packages/ohif-user-meteor-accounts/imports/client/userLogin/index.js Normal file
View File

@ -0,0 +1,3 @@
import './userLogin.html';
import './userLogin.js';
import './userLogin.styl';

0
Packages/ohif-user/client/components/login/userLogin.html → Packages/ohif-user-meteor-accounts/imports/client/userLogin/userLogin.html
View File

0
Packages/ohif-user/client/components/login/userLogin.js → Packages/ohif-user-meteor-accounts/imports/client/userLogin/userLogin.js
View File

0
Packages/ohif-user/client/components/login/userLogin.styl → Packages/ohif-user-meteor-accounts/imports/client/userLogin/userLogin.styl
View File

3
Packages/ohif-user-meteor-accounts/imports/server/index.js Normal file
View File

@ -0,0 +1,3 @@
import './mongo.js';
import './user.js';
import './wadoProxy.js';

0
Packages/ohif-core/server/mongo.js → Packages/ohif-user-meteor-accounts/imports/server/mongo.js
View File

0
Packages/ohif-user/server/user.js → Packages/ohif-user-meteor-accounts/imports/server/user.js
View File

21
Packages/ohif-user-meteor-accounts/imports/server/wadoProxy.js Normal file
View File

@ -0,0 +1,21 @@
import { Meteor } from "meteor/meteor";
import { Accounts } from "meteor/accounts-base";
import { OHIF } from "meteor/ohif:core";
const doAuth = Meteor.users.find().count() ? true : false;
OHIF.user.authenticateUser = request => {
// Only allow logged-in users to access this route
const userId = request.headers['x-user-id'];
const loginToken = request.headers['x-auth-token'];
if (!userId || !loginToken) {
return;
}
const hashedToken = Accounts._hashLoginToken(loginToken);
return !!Meteor.users.findOne({
_id: userId,
'services.resume.loginTokens.hashedToken': hashedToken
});
};

15
Packages/ohif-user-keycloak/package.js → Packages/ohif-user-meteor-accounts/package.js
View File

@ -1,26 +1,23 @@
Package.describe({ Package.describe({
name: 'ohif:user-keycloak', name: 'ohif:user-meteor-accounts',
summary: 'OHIF Integration with Keycloak for Identity and Access Management', summary: 'OHIF Integration with Meteor Accounts',
version: '0.0.1' version: '0.0.1'
}); });
Package.onUse(function(api) { Package.onUse(function(api) {
api.versionsFrom('1.6'); api.versionsFrom('1.6');
api.use('templating');
api.use('ecmascript'); api.use('ecmascript');
api.use('service-configuration');
api.use('accounts-base'); api.use('accounts-base');
api.use('accounts-password');
// Our custom packages // Our custom packages
api.use('ohif:core'); api.use('ohif:core');
api.use('ohif:user');
api.use('mxab:keycloak-oauth@0.0.2');
api.use('mxab:keycloak-loader@0.0.2');
api.use('mxab:accounts-keycloak');
// Client imports // Client imports
api.mainModule('client/main.js', 'client'); api.mainModule('client/main.js', 'client');
// Server imports
api.mainModule('server/main.js', 'server'); api.mainModule('server/main.js', 'server');
}); });

1
Packages/ohif-user-meteor-accounts/server/main.js Normal file
View File

@ -0,0 +1 @@
require('../imports/server/index.js');

10
Packages/ohif-user-oidc/client/main.js Normal file
View File

@ -0,0 +1,10 @@
import { Meteor } from 'meteor/meteor';
if (!Meteor.settings.public ||
!Meteor.settings.public.custom ||
!Meteor.settings.public.custom.oidc) {
console.log('To use the ohif-user-oidc package, you must add relevant OpenID Connect settings to Meteor.settings.public.custom.oidc (client-side).');
} else {
require('../imports/client/index.js')
}

2
Packages/ohif-user-oidc/imports/client/index.js Normal file
View File

@ -0,0 +1,2 @@
import './oidcUserManager.js';
import './routes.js';

78
Packages/ohif-user-oidc/imports/client/oidcUserManager.js Normal file
View File

@ -0,0 +1,78 @@
import { Meteor } from "meteor/meteor";
import { OHIF } from 'meteor/ohif:core';
import Oidc from 'oidc-client';
Oidc.Log.logger = console;
Oidc.Log.level = Oidc.Log.DEBUG;
const { oidc } = Meteor.settings.public.custom;
if (oidc.length > 1) {
OHIF.log.warn("Only one OpenID Connect provider is currently supported. Using the first item in the Meteor.settings.public.custom.oidc array.")
}
const oidcClient = oidc[0];
const redirect_uri = Meteor.absoluteUrl(oidcClient.authRedirectUri);
const silent_redirect_uri = Meteor.absoluteUrl('/packages/ohif_user-oidc/public/silent-refresh.html');
const settings = {
authority: oidcClient.authServerUrl,
client_id: oidcClient.clientId,
redirect_uri,
silent_redirect_uri,
post_logout_redirect_uri: Meteor.absoluteUrl(oidcClient.postLogoutRedirectUri),
response_type: oidcClient.responseType || 'id_token token',
scope: oidc.scope || 'email profile openid', // Note: Request must have scope 'openid' to be considered an OpenID Connect request
automaticSilentRenew: true,
revokeAccessTokenOnSignout: true,
};
const itemName = `oidc.user:${oidcClient.authServerUrl}:${oidcClient.clientId}`;
function getTokenFromStorage() {
const userDataJSON = sessionStorage.getItem(itemName);
const user = JSON.parse(userDataJSON);
if (!user) {
return;
}
return user.access_token;
}
OHIF.user.getAccessToken = function oidcGetAccessToken() {
if (!OHIF.user.userLoggedIn) {
throw new Error('User is not logged in.');
}
return getTokenFromStorage();
};
OHIF.user.logout = function oidcLogout() {
oidcUserManager.signoutRedirect();
}
OHIF.user.userLoggedIn = () => !!getTokenFromStorage();
// See https://github.com/IdentityModel/oidc-client-js/wiki for more information
const oidcUserManager = new Oidc.UserManager(settings);
const LOGIN_REQUIRED = 'login_required'
function handleSilentRenewError(error) {
console.error(error);
if (error.error === LOGIN_REQUIRED) {
OHIF.user.logout();
}
}
oidcUserManager.events.addSilentRenewError(handleSilentRenewError);
oidcUserManager.events.addAccessTokenExpired(function(){
OHIF.user.logout();
});
export default oidcUserManager;

79
Packages/ohif-user-oidc/imports/client/routes.js Normal file
View File

@ -0,0 +1,79 @@
import { Meteor } from 'meteor/meteor';
import { Router } from 'meteor/clinical:router';
import { OHIF } from 'meteor/ohif:core';
import oidcUserManager from './oidcUserManager.js';
/**
* Trigger a redirect to the OpenID Connect client Sign In page.
*
* @param {Object} args Arguments to UserManager.signinRedirect
* @return {Promise}
*/
function signIn(args) {
return oidcUserManager.signinRedirect(args);
}
/**
*
*/
function removeHash () {
history.pushState("", document.title, window.location.pathname
+ window.location.search);
}
/**
* Handle the response from an OpenID Connect client Sign In page.
*
* Upon completion, store the user access token in Session Storage
* for easy access from the rest of the application.
*
* @return {Promise}
*/
function processSignInResponse(redirect_uri) {
return oidcUserManager.signinRedirectCallback().then(() => {
removeHash();
});
}
/**
* Retrieve the current User from the oidc-client-js UserManager.
*
* @return {Promise}
*/
function getUser() {
return oidcUserManager.getUser();
}
/**
* Check if the current window location contains an OAuth
* sign-in response.
*
* @return {boolean} True if the URL contains an OAuth
* sign-in response (e.g. &state=...)
*/
function urlHasSignInResponse() {
const hash = window.location.hash.substring(1);
const params = {};
hash.split('&').map(hk => {
const temp = hk.split('=');
params[temp[0]] = temp[1]
});
return !!params.state;
}
Router.onRun(function() {
const next = this.next;
const redirect_uri = Meteor.absoluteUrl(this.request.url);
if (OHIF.user.userLoggedIn()) {
next()
} else if (urlHasSignInResponse() === true) {
processSignInResponse().then(next);
} else {
signIn({ redirect_uri });
}
});

25
Packages/ohif-user-oidc/package.js Normal file
View File

@ -0,0 +1,25 @@
Package.describe({
name: 'ohif:user-oidc',
summary: 'OHIF Integration with OpenID Connect',
version: '0.0.1'
});
Npm.depends({
'oidc-client': '1.5.2'
});
Package.onUse(function(api) {
api.versionsFrom('1.6');
api.use('ecmascript', 'client');
// Our custom packages
api.use('ohif:core', 'client');
// Client imports
api.mainModule('client/main.js', 'client');
api.addAssets('public/js/oidc-client.min.js', 'client');
api.addAssets('public/js/silentRefresh.js', 'client');
api.addAssets('public/silent-refresh.html', 'client');
});

46
Packages/ohif-user-oidc/public/js/oidc-client.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
Packages/ohif-user-oidc/public/js/silentRefresh.js Normal file
View File

@ -0,0 +1 @@
new UserManager().signinSilentCallback().catch(console.error);

11
Packages/ohif-user-oidc/public/silent-refresh.html Normal file
View File

@ -0,0 +1,11 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Silent OpenID Connect Token Refresh Page</title>
</head>
<body>
<script type="text/javascript" src="js/oidc-client.min.js"></script>
<script type="text/javascript" src="js/silentRefresh.js"></script>
</body>
</html>

3
Packages/ohif-user/client/components/index.js
View File

@ -1,3 +0,0 @@
import './login/userLogin.html';
import './login/userLogin.js';
import './login/userLogin.styl';

3
Packages/ohif-user/client/index.js
View File

@ -1,3 +0,0 @@
import './components';
import './lib';
import './routes';

10
Packages/ohif-user/main.js
View File

@ -1,10 +0,0 @@
import { OHIF } from 'meteor/ohif:core';
/*
* Defines the base OHIF user object
*/
const user = {};
OHIF.user = user;
export { user };

36
Packages/ohif-user/package.js
View File

@ -1,36 +0,0 @@
Package.describe({
name: 'ohif:user',
summary: 'OHIF User Authentication Handling',
version: '0.0.1'
});
Package.onUse(function(api) {
api.versionsFrom('1.4');
// Meteor client and server packages
api.use([
'ecmascript',
'accounts-base',
'accounts-password'
]);
// Meteor client-only packages
api.use([
'templating',
'stylus',
'clinical:router'
], 'client');
// OHIF dependencies
api.use('ohif:design');
api.use('ohif:core');
// Main module
api.mainModule('main.js', ['client', 'server']);
// Server imports
api.addFiles('server/index.js', 'server');
// Client imports
api.addFiles('client/index.js', 'client');
});

1
Packages/ohif-user/server/index.js
View File

@ -1 +0,0 @@
import './user.js';

2
Packages/ohif-viewerbase/client/lib/WLPresets.js
View File

@ -140,7 +140,7 @@ class WindowLevelPresetsManager {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (this.storeFunction) { if (this.storeFunction) {
this.storeFunction.call(this, WL_STORAGE_KEY, wlPresets).then(resolve).catch(reject); this.storeFunction.call(this, WL_STORAGE_KEY, wlPresets).then(resolve).catch(reject);
} else if (Meteor.userId()) { } else if (OHIF.user.userLoggedIn()) {
OHIF.user.setData(WL_STORAGE_KEY, wlPresets).then(resolve).catch(reject); OHIF.user.setData(WL_STORAGE_KEY, wlPresets).then(resolve).catch(reject);
} else { } else {
Session.setPersistent(WL_STORAGE_KEY, wlPresets); Session.setPersistent(WL_STORAGE_KEY, wlPresets);

25
Packages/ohif-wadoproxy/server/routes.js
View File

@ -1,6 +1,5 @@
import { Meteor } from 'meteor/meteor'; import { Meteor } from 'meteor/meteor';
import { Router } from 'meteor/clinical:router'; import { Router } from 'meteor/clinical:router';
import { Accounts } from 'meteor/accounts-base';
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
import { Servers } from 'meteor/ohif:servers/both/collections'; import { Servers } from 'meteor/ohif:servers/both/collections';
@ -9,24 +8,18 @@ const http = require('http');
const https = require('https'); const https = require('https');
const now = require('performance-now'); const now = require('performance-now');
const doAuth = Meteor.users.find().count() ? true : false; // The WADO Proxy can perform user authentication if desired.
// In order to use this, create a function to override
// OHIF.user.authenticateUser(request), which returns a Boolean.
let doAuth = false;
let authenticateUser = null;
const authenticateUser = request => { if (OHIF.user &&
// Only allow logged-in users to access this route OHIF.user.authenticateUser) {
const userId = request.headers['x-user-id']; doAuth = true;
const loginToken = request.headers['x-auth-token']; authenticateUser = OHIF.user.authenticateUser;
if (!userId || !loginToken) {
return;
} }
const hashedToken = Accounts._hashLoginToken(loginToken);
return Meteor.users.findOne({
_id: userId,
'services.resume.loginTokens.hashedToken': hashedToken
});
};
const handleRequest = function() { const handleRequest = function() {
const request = this.request; const request = this.request;
const response = this.response; const response = this.response;