carta-controller 4.0.0-beta.1 → 4.0.0

package/README.md

@@ -1,7 +1,7 @@
 # CARTA Controller
 
-[![carta version](https://img.shields.io/badge/CARTA%20Version-3.0.0--beta.3-brightgreen)](https://github.com/CARTAvis/carta-backend/releases/tag/v3.0.0-beta.3)
-[![npm version](https://img.shields.io/npm/v/carta-controller/beta.svg?style=flat)](https://npmjs.org/package/carta-controller "View this project on npm")
+[![carta version](https://img.shields.io/badge/CARTA%20Version-4.0.0-brightgreen)](https://github.com/CARTAvis/carta-backend/releases/tag/v4.0.0-rc.0)
+[![npm version](https://img.shields.io/npm/v/carta-controller?style=flat)](https://npmjs.org/package/carta-controller "View this project on npm")
 ![last commit](https://img.shields.io/github/last-commit/CARTAvis/carta-controller)
 ![commit activity](https://img.shields.io/github/commit-activity/m/CARTAvis/carta-controller)
 

package/dist/auth/oidc.js

@@ -147,7 +147,17 @@ function callIdpTokenEndpoint(usp, req, res, authConf, scriptingToken = false, i
             }
             // After login redirect to the dashboard, but otherwise return a bearer token
             if (isLogin) {
-                return res.redirect(`${new URL(`${config_1.RuntimeConfig.dashboardAddress}`, config_1.ServerConfig.serverAddress).href}?${new URLSearchParams(`oidcuser=${username}`).toString()}`);
+                const loginUsp = new URLSearchParams();
+                loginUsp.set('oidcuser', `${username}`);
+                if (req.cookies['redirectParams']) {
+                    loginUsp.set('redirectParams', req.cookies['redirectParams']);
+                    res.cookie('redirectParams', '', {
+                        maxAge: 600000,
+                        httpOnly: true,
+                        secure: !config_1.ServerConfig.httpOnly,
+                    });
+                }
+                return res.redirect(`${new URL(`${config_1.RuntimeConfig.dashboardAddress}`, config_1.ServerConfig.serverAddress).href}?${loginUsp.toString()}`);
             }
             else {
                 let newAccessToken = { username };
@@ -273,7 +283,6 @@ function oidcLoginStart(req, res, authConf) {
             // Create session key
             const sessionId = Array.from({ length: 32 }, (_, i) => urlSafeChars[Math.floor(Math.random() * urlSafeChars.length)]).join("");
             res.cookie('sessionId', sessionId, {
-                path: (new URL(config_1.RuntimeConfig.apiAddress + '/auth/oidcCallback', config_1.ServerConfig.serverAddress)).href,
                 maxAge: 600000,
                 httpOnly: true,
                 secure: !config_1.ServerConfig.httpOnly,
@@ -287,6 +296,14 @@ function oidcLoginStart(req, res, authConf) {
             for (const item of authConf.additionalAuthParams) {
                 usp.set(item[0], item[1]);
             }
+            // Store redirectParams to redirect post-login
+            if ('redirectParams' in req.query) {
+                res.cookie('redirectParams', req.query['redirectParams'], {
+                    maxAge: 600000,
+                    httpOnly: true,
+                    secure: !config_1.ServerConfig.httpOnly,
+                });
+            }
             // Return redirect
             return res.redirect(`${oidcAuthEndpoint}?${usp.toString()}`);
         }

package/dist/auth/oidc.js.map

@@ -1 +1 @@
-{"version":3,"file":"oidc.js","sourceRoot":"","sources":["../../src/auth/oidc.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"oidc.js","sourceRoot":"","sources":["../../src/auth/oidc.ts"],"names":[],"mappings":"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"}

package/dist/controllerTests.js

@@ -193,7 +193,8 @@ function testBackendStartup(username) {
             "--port",
             `${port}`,
             "--top_level_folder",
-            config_1.ServerConfig.rootFolderTemplate.replace("{username}", username)
+            config_1.ServerConfig.rootFolderTemplate.replace("{username}", username),
+            "--controller_deployment"
         ]);
         if (config_1.ServerConfig.logFileTemplate) {
             args.push("--no_log");

package/dist/database.js

@@ -395,7 +395,7 @@ function handleGetWorkspaceList(req, res, next) {
         }
     });
 }
-function handleGetWorkspace(req, res, next) {
+function handleGetWorkspaceByName(req, res, next) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
         if (!req.username) {
@@ -409,7 +409,43 @@ function handleGetWorkspace(req, res, next) {
         }
         try {
             const queryResult = yield workspacesCollection.findOne({ username: req.username, name: req.params.name }, { projection: { username: 0 } });
-            res.json({ success: !!(queryResult === null || queryResult === void 0 ? void 0 : queryResult.workspace), workspace: queryResult === null || queryResult === void 0 ? void 0 : queryResult.workspace });
+            if (!(queryResult === null || queryResult === void 0 ? void 0 : queryResult.workspace)) {
+                return next({ statusCode: 404, message: "Workspace not found" });
+            }
+            else {
+                res.json({ success: true, workspace: Object.assign({ id: queryResult._id, name: queryResult.name, editable: true }, queryResult.workspace) });
+            }
+        }
+        catch (err) {
+            (0, util_1.verboseError)(err);
+            return next({ statusCode: 500, message: "Problem retrieving workspace" });
+        }
+    });
+}
+function handleGetWorkspaceByKey(req, res, next) {
+    var _a;
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!req.username) {
+            return next({ statusCode: 403, message: "Invalid username" });
+        }
+        if (!((_a = req.params) === null || _a === void 0 ? void 0 : _a.key)) {
+            return next({ statusCode: 403, message: "Invalid workspace id" });
+        }
+        if (!workspacesCollection) {
+            return next({ statusCode: 501, message: "Database not configured" });
+        }
+        try {
+            const objectId = Buffer.from(req.params.key, "base64url").toString("hex");
+            const queryResult = yield workspacesCollection.findOne({ _id: new mongodb_1.ObjectId(objectId) });
+            if (!(queryResult === null || queryResult === void 0 ? void 0 : queryResult.workspace)) {
+                return next({ statusCode: 404, message: "Workspace not found" });
+            }
+            else if (queryResult.username !== req.username && !queryResult.shared) {
+                return next({ statusCode: 403, message: "Workspace not accessible" });
+            }
+            else {
+                res.json({ success: true, workspace: Object.assign({ id: queryResult._id, name: queryResult.name, editable: queryResult.username === req.username }, queryResult.workspace) });
+            }
         }
         catch (err) {
             (0, util_1.verboseError)(err);
@@ -438,16 +474,13 @@ function handleSetWorkspace(req, res, next) {
             return next({ statusCode: 400, message: "Malformed workspace update" });
         }
         try {
-            let updateResult;
-            const existingWorkspace = yield workspacesCollection.findOne({ username: req.username, name: workspaceName });
-            if (existingWorkspace) {
-                updateResult = yield workspacesCollection.updateOne({ _id: existingWorkspace._id }, { $set: { workspace } }, { upsert: false });
-            }
-            else {
-                updateResult = yield workspacesCollection.updateOne({ username: req.username, name: workspaceName, workspace }, { $set: { workspace } }, { upsert: true });
-            }
-            if (updateResult.acknowledged) {
-                res.json({ success: true });
+            const updateResult = yield workspacesCollection.findOneAndUpdate({ username: req.username, name: workspaceName }, { $set: { workspace } }, { upsert: true, returnDocument: "after" });
+            if (updateResult.ok && updateResult.value) {
+                res.json({
+                    success: true,
+                    workspace: Object.assign(Object.assign({}, workspace), { id: updateResult.value._id.toString(), editable: true, name: workspaceName })
+                });
+                return;
             }
             else {
                 return next({ statusCode: 500, message: "Problem updating workspace" });
@@ -474,7 +507,8 @@ function handleShareWorkspace(req, res, next) {
         try {
             const updateResult = yield workspacesCollection.findOneAndUpdate({ _id: new mongodb_1.ObjectId(id) }, { $set: { shared: true } });
             if (updateResult.ok) {
-                res.json({ success: true, id });
+                const shareKey = Buffer.from(id, "hex").toString("base64url");
+                res.json({ success: true, id, shareKey });
             }
             else {
                 return next({ statusCode: 500, message: "Problem sharing workspace" });
@@ -498,7 +532,8 @@ exports.databaseRouter.put("/snippet", auth_1.authGuard, util_1.noCache, handleS
 exports.databaseRouter.delete("/snippet", auth_1.authGuard, util_1.noCache, handleClearSnippet);
 exports.databaseRouter.post("/share/workspace/:id", auth_1.authGuard, util_1.noCache, handleShareWorkspace);
 exports.databaseRouter.get("/list/workspaces", auth_1.authGuard, util_1.noCache, handleGetWorkspaceList);
-exports.databaseRouter.get("/workspace/:name", auth_1.authGuard, util_1.noCache, handleGetWorkspace);
+exports.databaseRouter.get("/workspace/key/:key", auth_1.authGuard, util_1.noCache, handleGetWorkspaceByKey);
+exports.databaseRouter.get("/workspace/:name", auth_1.authGuard, util_1.noCache, handleGetWorkspaceByName);
 exports.databaseRouter.put("/workspace", auth_1.authGuard, util_1.noCache, handleSetWorkspace);
 exports.databaseRouter.delete("/workspace", auth_1.authGuard, util_1.noCache, handleClearWorkspace);
 //# sourceMappingURL=database.js.map

package/dist/serverHandlers.js

@@ -189,7 +189,8 @@ function startServer(username) {
                 "--port",
                 `${port}`,
                 "--top_level_folder",
-                config_1.ServerConfig.rootFolderTemplate.replace("{username}", username)
+                config_1.ServerConfig.rootFolderTemplate.replace("{username}", username),
+                "--controller_deployment"
             ]);
             if (config_1.ServerConfig.logFileTemplate) {
                 args.push("--no_log");

package/docs/_build/html/.buildinfo

@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 9508783e9cefe52dfded6e66ca5ab9d3
+config: 80ca7713e4b7333cb6b1a41695aacdb5
 tags: 645f666f9bcd5a90fca523b33c5a78b7

package/docs/{src/centos8_instructions.rst → _build/html/_sources/almalinux8_instructions.rst.txt}

@@ -1,17 +1,17 @@
-.. _centos8_instructions:
+.. _almalinux8_instructions:
 
-Step-by-step instructions for CentOS 8
-======================================
+Step-by-step instructions for AlmaLinux 8
+=========================================
 
 .. note::
 
-    These instructions should also work for RHEL 8, AlmaLinux, and Rocky Linux. Some changes may be necessary for RHEL 7 / CentOS 7.
+    These instructions should also work for RHEL 8 and Rocky Linux 8. Some changes may be necessary for RHEL 7 / CentOS 7.
 
 
 1. Install Node.js
 ~~~~~~~~~~~~~~~~~~
 
-The CARTA controller uses `Node.js <https://nodejs.org/>`_ and supports v12, v14, and v16. Node.js can easily be installed from the CentOS 8 AppStream repository. Here we install v14, as well as the ``npm`` package manager.
+The CARTA controller uses `Node.js <https://nodejs.org/>`_ and supports v12, v14, and v16. Node.js can easily be installed from the AlmaLinux 8 AppStream repository. Here we install v14, as well as the ``npm`` package manager.
 
 .. code-block:: shell
 
@@ -26,7 +26,7 @@ The CARTA controller uses `Node.js <https://nodejs.org/>`_ and supports v12, v14
 2. Install MongoDB
 ~~~~~~~~~~~~~~~~~~
 
-The CARTA controller uses `MongoDB <https://www.mongodb.com/>`_ to store user preferences, etc.. MongoDB is not available through the default CentOS 8 repositories, but we can add a custom repository to install it more easily.
+The CARTA controller uses `MongoDB <https://www.mongodb.com/>`_ to store user preferences, etc.. MongoDB is not available through the default AlmaLinux 8 repositories, but we can add a custom repository to install it more easily.
 
 .. code-block:: shell
     
@@ -65,7 +65,7 @@ The easiest way to install the CARTA controller is using ``npm``.
 .. code-block:: shell
 
     sudo dnf install -y python3 make gcc-c++
-    sudo npm install -g --unsafe-perm carta-controller@beta
+    sudo npm install -g --unsafe-perm carta-controller
 
 .. note::
 
@@ -87,7 +87,7 @@ The easiest way to install the CARTA controller is using ``npm``.
 4. Install the CARTA backend
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The easiest way may be to install the CARTA backend is from our cartavis RPM repository.
+The easiest way is to install the CARTA backend is from our `cartavis/carta Copr <https://copr.fedorainfracloud.org/coprs/cartavis/carta/>`_ repository.
 
 .. code-block:: shell
 
@@ -95,10 +95,11 @@ The easiest way may be to install the CARTA backend is from our cartavis RPM rep
     sudo dnf -y install 'dnf-command(copr)'
     sudo dnf -y copr enable cartavis/carta
     sudo dnf -y install epel-release
-    sudo dnf -y install carta-backend-beta
+    sudo dnf -y install carta-backend
 
-    # Check that the backend can run and matches the major version number of the controller
-    /usr/bin/carta_backend --version
+    # Check that the backend can run and matches the major version number of the controller.
+    # Please note, we currently install the version of carta_backend in a non-standard location.
+    /opt/carta/bin/carta_backend --version
 
 
 5. Install Nginx
@@ -161,6 +162,13 @@ An :ref:`example sudoers configuration<example_sudoers>` is provided in the conf
 .. note::
     The ``carta`` user should not be in the ``carta-users`` group. ``carta-users`` should only be assigned to the normal user accounts.
 
+.. note::
+    As we install the version of the carta_backend in a non-standard location, please remember to change the path to the carta_backend executable in the custom sudoers file:
+
+   .. code-block:: bash
+
+      carta ALL=(%carta-users) NOPASSWD:SETENV: /opt/carta/bin/carta_backend
+
 7. Set up the user authentication method
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

package/docs/_build/html/_sources/configuration.rst.txt

@@ -147,7 +147,7 @@ To test the configuration of the controller, you can use the built-in test featu
     [
     'running sudo --preserve-env=CARTA_AUTH_TOKEN -n -u alice /usr/bin/carta_backend --no_http --debug_no_auth --port 3499 --top_level_folder /usr/share/carta --no_log /usr/share/carta'
     ]
-    [2021-11-30 12:28:48.207] [info] /usr/bin/carta_backend: Version 4.0.0-beta.1
+    [2021-11-30 12:28:48.207] [info] /usr/bin/carta_backend: Version 4.0.0-rc.0
     [2021-11-30 12:28:48.209] [info] Listening on port 3499 with top level folder /usr/share/carta, starting folder /usr/share/carta. The number of OpenMP worker threads will be handled automatically.
     ✔ Backend process started successfully
     [2021-11-30 12:28:50.169] [info] Session 1 [127.0.0.1] Connected. Num sessions: 1

package/docs/_build/html/_sources/index.rst.txt

@@ -10,7 +10,7 @@ CARTA Controller
 
 CARTA is the Cube Analysis and Rendering Tool for Astronomy. This document describes the installation and configuration process for the controller component.
 
-Detailed step-by-step instructions are provided for :ref:`Ubuntu 20.04 (Focal Fossa)<focal_instructions>` and :ref:`CentOS 8<centos8_instructions>`. 
+Detailed step-by-step instructions are provided for :ref:`Ubuntu 20.04 (Focal Fossa)<focal_instructions>` and :ref:`AlmaLinux 8<almalinux8_instructions>`. 
 We officially support Ubuntu 18.04 and 20.04, and RHEL 7 and 8 (and their freely distributed binary-compatible alternatives, such as CentOS or AlmaLinux), with all available standard updates applied.
 
 .. toctree::
@@ -21,15 +21,15 @@ We officially support Ubuntu 18.04 and 20.04, and RHEL 7 and 8 (and their freely
    installation
    configuration
    ubuntu_focal_instructions
-   centos8_instructions   
+   almalinux8_instructions   
    schema
    schema_backend
 
-.. |backend-github| image:: https://img.shields.io/badge/CARTA%20Version-4.0.0--beta.1-brightgreen
+.. |backend-github| image:: https://img.shields.io/badge/CARTA%20Version-4.0.0--rc.0-brightgreen
         :alt: View this backend version on GitHub
-        :target: https://github.com/CARTAvis/carta-backend/releases/tag/v4.0.0-beta.1
+        :target: https://github.com/CARTAvis/carta-backend/releases/tag/v4.0.0-rc.0
 
-.. |npm-package| image:: https://img.shields.io/npm/v/carta-controller/beta.svg?style=flat
+.. |npm-package| image:: https://img.shields.io/npm/v/carta-controller/rc.svg?style=flat
         :alt: View this project on npm
         :target: https://npmjs.org/package/carta-controller
 

package/docs/_build/html/_sources/installation.rst.txt

@@ -8,7 +8,7 @@ Installation
 Installing the backend
 ----------------------
 
-We provide `binary Debian packages <https://launchpad.net/~cartavis-team/+archive/ubuntu/carta>`_ of the latest beta and release versions of the CARTA backend for Ubuntu 20.04 (Focal Fossa) and Ubuntu 18.04 (Bionic Beaver). You can install the beta version with all dependencies by adding our PPA to your system and running ``apt-get install carta-backend-beta``. Please refer to our :ref:`Ubuntu Focal instructions<focal_instructions>` for more details.
+We provide `binary Ubuntu packages <https://launchpad.net/~cartavis-team/+archive/ubuntu/carta>`_ of the latest beta and release versions of the CARTA backend. You can install the beta version with all dependencies by adding our PPA to your system and running ``apt-get install carta-backend-beta``. Please refer to our :ref:`Ubuntu Focal instructions<focal_instructions>` for more details.
 
 .. note::
 
@@ -28,7 +28,7 @@ If you install the controller from NPM, the corresponding packaged version of th
 Installing the controller
 -------------------------
 
-You can install the beta version of the CARTA controller from NPM by running ``npm install -g carta-controller@beta``, or from GitHub by cloning the `controller repository <https://github.com/CARTAvis/carta-controller/>`_ and running ``npm install``.
+You can install the latest release version of the CARTA controller from NPM by running ``npm install -g carta-controller``, or from GitHub by cloning the `controller repository <https://github.com/CARTAvis/carta-controller/>`_ and running ``npm install``.
 
 .. _run_controller:
 

package/docs/_build/html/_sources/introduction.rst.txt

@@ -10,7 +10,7 @@ The CARTA controller provides a simple dashboard which authenticates users and a
 Dependencies
 ------------
 
-To allow the controller to serve CARTA sessions, you must give it access to an executable CARTA backend, which can be either a compiled executable or a container. If you want to use a non-standard version of the CARTA frontend, you must also build it, and adjust the controller configuration to point to it. You should use the ``v4.0.0-beta.1`` tag of `the CARTA backend <https://github.com/CARTAvis/carta-backend>`_.
+To allow the controller to serve CARTA sessions, you must give it access to an executable CARTA backend, which can be either a compiled executable or a container. If you want to use a non-standard version of the CARTA frontend, you must also build it, and adjust the controller configuration to point to it. You should use the ``v4.0.0-rc.0`` tag of `the CARTA backend <https://github.com/CARTAvis/carta-backend>`_.
 
 By default, the controller runs on port 8000. It should be run behind a proxy, so that it can be accessed via HTTP and HTTPS. 
 

package/docs/_build/html/_sources/ubuntu_focal_instructions.rst.txt

@@ -19,8 +19,8 @@ Install the CARTA backend and other required packages
     sudo add-apt-repository ppa:cartavis-team/carta
     sudo apt-get update
 
-    # Install the beta backend package with all dependencies
-    sudo apt-get install carta-backend-beta
+    # Install the backend package with all dependencies
+    sudo apt-get install carta-backend
     
     # Install additional packages
     sudo apt-get install nginx g++ mongodb make curl
@@ -74,7 +74,7 @@ Install CARTA controller
     sudo apt-get install -y nodejs build-essential
 
     # Install carta-controller (includes frontend config)
-    sudo npm install -g --unsafe-perm carta-controller@beta
+    sudo npm install -g --unsafe-perm carta-controller
     
     # Install PM2 node service
     sudo npm install -g pm2

package/docs/_build/html/_static/documentation_options.js

@@ -1,6 +1,6 @@
 var DOCUMENTATION_OPTIONS = {
     URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
-    VERSION: '4.0.0-beta.1',
+    VERSION: '4.0.0',
     LANGUAGE: 'en',
     COLLAPSE_INDEX: false,
     BUILDER: 'html',