diff --git a/env/development.env b/env/development.env index 1fdbd8d5..a77128b4 100644 --- a/env/development.env +++ b/env/development.env @@ -1,6 +1,5 @@ NODE_ENV=development LOG_TIMES=0 -DISABLE_SANDBOXES=1 DISABLE_BACKEND_SERVICES=0 FHIR_SERVER_R2="https://r2.smarthealthit.org" FHIR_SERVER_R3="https://r3.smarthealthit.org" diff --git a/env/test.env b/env/test.env index a2ccee9a..1d114d73 100644 --- a/env/test.env +++ b/env/test.env @@ -1,6 +1,5 @@ NODE_ENV = test LOG_TIMES = 0 -DISABLE_SANDBOXES = 1 DISABLE_BACKEND_SERVICES = 0 FHIR_SERVER_R2 = "https://r2.smarthealthit.org" FHIR_SERVER_R3 = "https://r3.smarthealthit.org" diff --git a/src/index.js b/src/index.js index 9a955e79..70cce23a 100644 --- a/src/index.js +++ b/src/index.js @@ -4,7 +4,6 @@ const bodyParser = require('body-parser'); const fs = require("fs"); const base64url = require("base64-url"); const smartAuth = require("./smart-auth"); -const reverseProxy = require("./reverse-proxy"); const simpleProxy = require("./simple-proxy"); const config = require("./config"); const generator = require("./generator"); @@ -97,8 +96,6 @@ app.get("/keys", (req, res) => { const buildRoutePermutations = (lastSegment) => { return [ - "/v/:fhir_release/sb/:sandbox/sim/:sim" + lastSegment, - "/v/:fhir_release/sb/:sandbox" + lastSegment, "/v/:fhir_release/sim/:sim" + lastSegment, "/v/:fhir_release" + lastSegment ]; @@ -147,17 +144,6 @@ app.post(buildRoutePermutations("/fhir/_services/smart/launch"), bodyParser.json }); }); -// fhir request using sandboxes (tags) -app.use( - [ - `/v/:fhir_release/sb/:sandbox/sim/:sim${config.fhirBaseUrl}`, - `/v/:fhir_release/sb/:sandbox${config.fhirBaseUrl}` - ], - bodyParser.text({ type: "*/*", limit: 1e6 }), - handleParseError, - reverseProxy -); - // fhir request - no sandboxes - fast streaming proxy app.use( [ @@ -174,17 +160,15 @@ app.use("/generator", generator); app.use("/env.js", (req, res) => { const out = { - DISABLE_SANDBOXES: true, // No sandbox support by default - PICKER_ORIGIN : "https://patient-browser.smarthealthit.org", - STU2_ENABLED : true, - STU3_ENABLED : true, - STU4_ENABLED : true + PICKER_ORIGIN: "https://patient-browser.smarthealthit.org", + STU2_ENABLED : true, + STU3_ENABLED : true, + STU4_ENABLED : true }; const whitelist = { "NODE_ENV" : String, "LOG_TIMES" : lib.bool, - "DISABLE_SANDBOXES" : lib.bool, "DISABLE_BACKEND_SERVICES": lib.bool, "GOOGLE_ANALYTICS_ID" : String, "CDS_SANDBOX_URL" : String, diff --git a/static/index.html b/static/index.html index 134dd639..b182750f 100644 --- a/static/index.html +++ b/static/index.html @@ -106,48 +106,6 @@
Private Key
'; - }).join("") : - 'No tags defined on the selected server'; - }).join("") - ); - } - if (ENV.CDS_SANDBOX_URL) { $(".visible-if-cds").removeClass("hidden"); } @@ -736,32 +649,13 @@

Standalone Launch Parameters

aud: - + diff --git a/test/api.js b/test/api.js index 85fe4952..65cc0be7 100644 --- a/test/api.js +++ b/test/api.js @@ -276,8 +276,6 @@ function buildRoutePermutations(suffix = "", fhirVersion) { if (ENABLE_FHIR_VERSION_3 && (!fhirVersion || fhirVersion == 3)) { out.push( - `/v/r3/sb/abc/sim/whatever/${suffix}`, - `/v/r3/sb/abc/${suffix}`, `/v/r3/sim/whatever/${suffix}`, `/v/r3/${suffix}` ); @@ -285,8 +283,6 @@ function buildRoutePermutations(suffix = "", fhirVersion) { if (ENABLE_FHIR_VERSION_2 && (!fhirVersion || fhirVersion == 2)) { out.push( - `/v/r2/sb/abc/sim/whatever/${suffix}`, - `/v/r2/sb/abc/${suffix}`, `/v/r2/sim/whatever/${suffix}`, `/v/r2/${suffix}` ); @@ -390,11 +386,10 @@ describe('Proxy', function() { .expect(401, done); }); - it ("Can simulate custom token errors", null); - it ("Keeps protected data-sets read-only", null); - it ("Inject sandbox tag into POST and PUT requests", null); - it ("Make urls conditional and if exists, change /id to ?_id=", null); - it ("Apply patient scope to GET requests", null); + it ("Can simulate custom token errors"); + it ("Keeps protected data-sets read-only"); + it ("Make urls conditional and if exists, change /id to ?_id="); + it ("Apply patient scope to GET requests"); it ("Adjust urls in the fhir response", done => { request(app) diff --git a/test/e2e/spec/login-screen.js b/test/e2e/spec/login-screen.js index bffed669..03489086 100644 --- a/test/e2e/spec/login-screen.js +++ b/test/e2e/spec/login-screen.js @@ -1,5 +1,5 @@ const CFG = require("../config.js"); -const BASE = `${CFG.PICKER_URL}/v/r3/sb/a6yzhl,smart-7-2017/login`; +const BASE = `${CFG.PICKER_URL}/v/r3/login`; // ?client_id=growth_chart // &response_type=code diff --git a/tests/api.js b/tests/api.js index 1efcee9f..427142b1 100644 --- a/tests/api.js +++ b/tests/api.js @@ -273,8 +273,6 @@ function buildRoutePermutations(suffix = "", fhirVersion) { if (ENABLE_FHIR_VERSION_3 && (!fhirVersion || fhirVersion == 3)) { out.push( - `/v/r3/sb/abc/sim/whatever/${suffix}`, - `/v/r3/sb/abc/${suffix}`, `/v/r3/sim/whatever/${suffix}`, `/v/r3/${suffix}` ); @@ -282,8 +280,6 @@ function buildRoutePermutations(suffix = "", fhirVersion) { if (ENABLE_FHIR_VERSION_2 && (!fhirVersion || fhirVersion == 2)) { out.push( - `/v/r2/sb/abc/sim/whatever/${suffix}`, - `/v/r2/sb/abc/${suffix}`, `/v/r2/sim/whatever/${suffix}`, `/v/r2/${suffix}` ); @@ -372,7 +368,6 @@ describe('Proxy', function() { it ("Can simulate custom token errors"); it ("Keeps protected data-sets read-only"); - it ("Inject sandbox tag into POST and PUT requests"); it ("Make urls conditional and if exists, change /id to ?_id="); it ("Apply patient scope to GET requests"); diff --git a/tests/e2e/spec/login-screen.js b/tests/e2e/spec/login-screen.js index bffed669..03489086 100644 --- a/tests/e2e/spec/login-screen.js +++ b/tests/e2e/spec/login-screen.js @@ -1,5 +1,5 @@ const CFG = require("../config.js"); -const BASE = `${CFG.PICKER_URL}/v/r3/sb/a6yzhl,smart-7-2017/login`; +const BASE = `${CFG.PICKER_URL}/v/r3/login`; // ?client_id=growth_chart // &response_type=code