openmrs 3.1.15-pre.813 → 3.1.15-pre.829

package/dist/cli.js

@@ -53,6 +53,9 @@ yargs.command("debug", "Starts a new debugging session of the OpenMRS app shell.
     .string("backend")
     .default("backend", "https://openmrs-spa.org/")
     .describe("backend", "The backend to proxy API requests to.")
+    .string("add-cookie")
+    .default("add-cookie", "")
+    .describe("add-cookie", "Additional cookies to provide when proxying.")
     .boolean("support-offline")
     .describe("support-offline", "Determines if a service worker should be installed for offline support.")
     .default("support-offline", true)
@@ -80,7 +83,7 @@ yargs.command("debug", "Starts a new debugging session of the OpenMRS app shell.
     .string("importmap")
     .default("importmap", "importmap.json")
     .describe("importmap", "The import map to use. Can be a path to a valid import map to be taken literally, an URL, or a fixed JSON object."), (args) => __awaiter(void 0, void 0, void 0, function* () {
-    return runCommand("runDebug", Object.assign(Object.assign({ apiUrl: args["api-url"], spaPath: args["spa-path"], configUrls: args["config-url"], pageTitle: args["page-title"], supportOffline: args["support-offline"] }, args), { importmap: (0, utils_1.proxyImportmap)(yield (0, utils_1.mergeImportmap)(yield (0, utils_1.getImportmap)(args.importmap, args.port), (args["run-project"] || args.runProject) &&
+    return runCommand("runDebug", Object.assign(Object.assign({ apiUrl: args["api-url"], spaPath: args["spa-path"], configUrls: args["config-url"], pageTitle: args["page-title"], supportOffline: args["support-offline"], addCookie: args["add-cookie"] }, args), { importmap: (0, utils_1.proxyImportmap)(yield (0, utils_1.mergeImportmap)(yield (0, utils_1.getImportmap)(args.importmap, args.port), (args["run-project"] || args.runProject) &&
             (yield (0, utils_1.runProject)(args.port, args["shared-dependencies"], args.sources))), args.backend, args.host, args.port) }));
 }));
 yargs.command("develop", "Starts a new frontend module development session with the OpenMRS app shell.", (argv) => argv
@@ -93,6 +96,9 @@ yargs.command("develop", "Starts a new frontend module development session with
     .string("backend")
     .default("backend", "https://openmrs-spa.org/")
     .describe("backend", "The backend to proxy API requests to.")
+    .string("add-cookie")
+    .default("add-cookie", "")
+    .describe("add-cookie", "Additional cookies to provide when proxying.")
     .string("spa-path")
     .default("spa-path", "/openmrs/spa/")
     .describe("spa-path", "The path of the application on the target server.")
@@ -114,7 +120,7 @@ yargs.command("develop", "Starts a new frontend module development session with
     .string("importmap")
     .default("importmap", "importmap.json")
     .describe("importmap", "The import map to use. Can be a path to a valid import map to be taken literally, an URL, or a fixed JSON object."), (args) => __awaiter(void 0, void 0, void 0, function* () {
-    return runCommand("runDevelop", Object.assign(Object.assign({ apiUrl: args["api-url"], spaPath: args["spa-path"], configUrls: args["config-url"] }, args), { importmap: (0, utils_1.proxyImportmap)(yield (0, utils_1.mergeImportmap)(yield (0, utils_1.getImportmap)(args.importmap, args.port), args.sources[0] !== false &&
+    return runCommand("runDevelop", Object.assign(Object.assign({ apiUrl: args["api-url"], spaPath: args["spa-path"], configUrls: args["config-url"], addCookie: args["add-cookie"] }, args), { importmap: (0, utils_1.proxyImportmap)(yield (0, utils_1.mergeImportmap)(yield (0, utils_1.getImportmap)(args.importmap, args.port), args.sources[0] !== false &&
             (yield (0, utils_1.runProject)(args.port, args["shared-dependencies"], args.sources))), args.backend, args.host, args.port) }));
 }));
 yargs.command("build", "Builds a new app shell.", (argv) => argv
@@ -180,9 +186,12 @@ yargs.command(["start", "$0"], "Starts the app shell using the provided configur
     .string("backend")
     .default("backend", "https://openmrs-spa.org/")
     .describe("backend", "The backend to proxy API requests to.")
+    .string("add-cookie")
+    .default("add-cookie", "")
+    .describe("add-cookie", "Additional cookies to provide when proxying.")
     .boolean("open")
     .default("open", false)
-    .describe("open", "Immediately opens the SPA page URL in the browser."), (args) => runCommand("runStart", Object.assign({}, args)));
+    .describe("open", "Immediately opens the SPA page URL in the browser."), (args) => runCommand("runStart", Object.assign({ addCookie: args["add-cookie"] }, args)));
 yargs
     .epilog("The SPA build config JSON is a JSON file, typically `frontend.json`, which defines parameters for the `build` and `assemble` " +
     "commands. The keys used by `build` are:\n" +

package/dist/commands/debug.js

@@ -12,6 +12,7 @@ function runDebug(args) {
         supportOffline: args.supportOffline,
         spaPath: args.spaPath,
         configUrls: args.configUrls,
+        addCookie: args.addCookie,
         env: "development",
     });
     (0, utils_1.logInfo)(`Starting the dev server ...`);

package/dist/commands/develop.js

@@ -10,7 +10,7 @@ const path_1 = require("path");
 const fs_1 = require("fs");
 const utils_1 = require("../utils");
 function runDevelop(args) {
-    const { backend, host, port, open, importmap, configUrls } = args;
+    const { backend, host, port, open, importmap, configUrls, addCookie } = args;
     const apiUrl = (0, utils_1.removeTrailingSlash)(args.apiUrl);
     const spaPath = (0, utils_1.removeTrailingSlash)(args.spaPath);
     const app = (0, express_1.default)();
@@ -64,6 +64,13 @@ function runDevelop(args) {
     }, {
         target: backend,
         changeOrigin: true,
+        onProxyReq(proxyReq) {
+            if (addCookie) {
+                const origCookie = proxyReq.getHeader("cookie");
+                const newCookie = `${origCookie};${addCookie}`;
+                proxyReq.setHeader("cookie", newCookie);
+            }
+        },
     }));
     app.listen(port, host, () => {
         (0, utils_1.logInfo)(`Listening at http://${host}:${port}`);

package/dist/commands/start.js

@@ -9,7 +9,7 @@ const http_proxy_middleware_1 = require("http-proxy-middleware");
 const path_1 = require("path");
 const utils_1 = require("../utils");
 function runStart(args) {
-    const { backend, host, port, open } = args;
+    const { backend, host, port, open, addCookie } = args;
     const app = (0, express_1.default)();
     const source = (0, path_1.resolve)(require.resolve("@openmrs/esm-app-shell/package.json"), "..", "dist");
     const index = (0, path_1.resolve)(source, "index.html");
@@ -19,6 +19,13 @@ function runStart(args) {
     app.use("/openmrs", (0, http_proxy_middleware_1.createProxyMiddleware)([`/openmrs/**`, `!${spaPath}/**`], {
         target: backend,
         changeOrigin: true,
+        onProxyReq(proxyReq) {
+            if (addCookie) {
+                const origCookie = proxyReq.getHeader("cookie");
+                const newCookie = `${origCookie};${addCookie}`;
+                proxyReq.setHeader("cookie", newCookie);
+            }
+        },
     }));
     app.get("/*", (_, res) => res.sendFile(index));
     app.listen(port, host, () => {

package/dist/utils/config.js

@@ -16,6 +16,9 @@ function loadWebpackConfig(options = {}) {
     if (typeof options.pageTitle === "string") {
         variables.OMRS_PAGE_TITLE = options.pageTitle;
     }
+    if (typeof options.addCookie === "string") {
+        variables.OMRS_ADD_COOKIE = options.addCookie;
+    }
     if (typeof options.supportOffline === "boolean") {
         variables.OMRS_OFFLINE = options.supportOffline ? "enable" : "disable";
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openmrs",
-  "version": "3.1.15-pre.813",
+  "version": "3.1.15-pre.829",
   "license": "MPL-2.0",
   "main": "dist/index.js",
   "bin": {
@@ -35,7 +35,7 @@
     "@babel/preset-env": "^7.11.0",
     "@babel/preset-react": "^7.10.4",
     "@babel/preset-typescript": "^7.10.4",
-    "@openmrs/esm-app-shell": "3.1.15-pre.813",
+    "@openmrs/esm-app-shell": "3.1.15-pre.829",
     "@types/react": "^16.9.46",
     "@types/systemjs": "^6.1.0",
     "autoprefixer": "^9.6.1",
@@ -78,5 +78,5 @@
     "@types/rimraf": "^2.0.2",
     "@types/tar": "^4.0.3"
   },
-  "gitHead": "722f53858beec76428e6f363b62005a42d858c4a"
+  "gitHead": "6e4d53c34706e20c2af0a6709845f050139d6979"
 }

package/src/cli.ts

@@ -47,6 +47,9 @@ yargs.command(
       .string("backend")
       .default("backend", "https://openmrs-spa.org/")
       .describe("backend", "The backend to proxy API requests to.")
+      .string("add-cookie")
+      .default("add-cookie", "")
+      .describe("add-cookie", "Additional cookies to provide when proxying.")
       .boolean("support-offline")
       .describe(
         "support-offline",
@@ -105,6 +108,7 @@ yargs.command(
       configUrls: args["config-url"],
       pageTitle: args["page-title"],
       supportOffline: args["support-offline"],
+      addCookie: args["add-cookie"],
       ...args,
       importmap: proxyImportmap(
         await mergeImportmap(
@@ -137,6 +141,9 @@ yargs.command(
       .string("backend")
       .default("backend", "https://openmrs-spa.org/")
       .describe("backend", "The backend to proxy API requests to.")
+      .string("add-cookie")
+      .default("add-cookie", "")
+      .describe("add-cookie", "Additional cookies to provide when proxying.")
       .string("spa-path")
       .default("spa-path", "/openmrs/spa/")
       .describe("spa-path", "The path of the application on the target server.")
@@ -178,6 +185,7 @@ yargs.command(
       apiUrl: args["api-url"],
       spaPath: args["spa-path"],
       configUrls: args["config-url"],
+      addCookie: args["add-cookie"],
       ...args,
       importmap: proxyImportmap(
         await mergeImportmap(
@@ -331,10 +339,17 @@ yargs.command(
       .string("backend")
       .default("backend", "https://openmrs-spa.org/")
       .describe("backend", "The backend to proxy API requests to.")
+      .string("add-cookie")
+      .default("add-cookie", "")
+      .describe("add-cookie", "Additional cookies to provide when proxying.")
       .boolean("open")
       .default("open", false)
       .describe("open", "Immediately opens the SPA page URL in the browser."),
-  (args) => runCommand("runStart", { ...args })
+  (args) =>
+    runCommand("runStart", {
+      addCookie: args["add-cookie"],
+      ...args,
+    })
 );
 
 yargs

package/src/commands/debug.ts

@@ -15,6 +15,7 @@ export interface DebugArgs {
   spaPath: string;
   apiUrl: string;
   configUrls: Array<string>;
+  addCookie: string;
 }
 
 export function runDebug(args: DebugArgs) {
@@ -28,6 +29,7 @@ export function runDebug(args: DebugArgs) {
     supportOffline: args.supportOffline,
     spaPath: args.spaPath,
     configUrls: args.configUrls,
+    addCookie: args.addCookie,
     env: "development",
   });
 

package/src/commands/develop.ts

@@ -20,10 +20,11 @@ export interface DevelopArgs {
   spaPath: string;
   apiUrl: string;
   configUrls: Array<string>;
+  addCookie: string;
 }
 
 export function runDevelop(args: DevelopArgs) {
-  const { backend, host, port, open, importmap, configUrls } = args;
+  const { backend, host, port, open, importmap, configUrls, addCookie } = args;
   const apiUrl = removeTrailingSlash(args.apiUrl);
   const spaPath = removeTrailingSlash(args.spaPath);
   const app = express();
@@ -100,6 +101,13 @@ export function runDevelop(args: DevelopArgs) {
       {
         target: backend,
         changeOrigin: true,
+        onProxyReq(proxyReq) {
+          if (addCookie) {
+            const origCookie = proxyReq.getHeader("cookie");
+            const newCookie = `${origCookie};${addCookie}`;
+            proxyReq.setHeader("cookie", newCookie);
+          }
+        },
       }
     )
   );

package/src/commands/start.ts

@@ -10,10 +10,11 @@ export interface StartArgs {
   host: string;
   open: boolean;
   backend: string;
+  addCookie: string;
 }
 
 export function runStart(args: StartArgs) {
-  const { backend, host, port, open } = args;
+  const { backend, host, port, open, addCookie } = args;
   const app = express();
   const source = resolve(
     require.resolve("@openmrs/esm-app-shell/package.json"),
@@ -30,6 +31,13 @@ export function runStart(args: StartArgs) {
     createProxyMiddleware([`/openmrs/**`, `!${spaPath}/**`], {
       target: backend,
       changeOrigin: true,
+      onProxyReq(proxyReq) {
+        if (addCookie) {
+          const origCookie = proxyReq.getHeader("cookie");
+          const newCookie = `${origCookie};${addCookie}`;
+          proxyReq.setHeader("cookie", newCookie);
+        }
+      },
     })
   );
   app.get("/*", (_, res) => res.sendFile(index));

package/src/utils/config.ts

@@ -11,6 +11,7 @@ export interface WebpackOptions {
   configUrls?: Array<string>;
   env?: string;
   coreAppsDir?: string;
+  addCookie?: string;
 }
 
 export function loadWebpackConfig(options: WebpackOptions = {}) {
@@ -32,6 +33,10 @@ export function loadWebpackConfig(options: WebpackOptions = {}) {
     variables.OMRS_PAGE_TITLE = options.pageTitle;
   }
 
+  if (typeof options.addCookie === "string") {
+    variables.OMRS_ADD_COOKIE = options.addCookie;
+  }
+
   if (typeof options.supportOffline === "boolean") {
     variables.OMRS_OFFLINE = options.supportOffline ? "enable" : "disable";
   }