Minor updates for API calls (#446)

NASA-AMMOS · Oct 24, 2023 · 386054b · 386054b
1 parent 27def3c
commit 386054b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/API/Backend/Geodatasets/routes/geodatasets.js b/API/Backend/Geodatasets/routes/geodatasets.js
@@ -311,6 +311,10 @@ router.post("/recreate", function (req, res, next) {
       body: {},
     });
   }
+  if (!features) {
+    //Must be a single feature from an append.  Make an array
+    features = [JSON.parse(req.body.geojson)];
+  }
 
   makeNewGeodatasetTable(
     req.body.name,
@@ -325,8 +329,13 @@ router.post("/recreate", function (req, res, next) {
         return;
       }
 
+      let drop_qry = "TRUNCATE TABLE " + result.table + " RESTART IDENTITY";
+      if (req.body.hasOwnProperty("action") && req.body.action=="append") {
+        drop_qry = "";
+      }
+
       sequelize
-        .query("TRUNCATE TABLE " + result.table + " RESTART IDENTITY")
+        .query(drop_qry)
         .then(() => {
           populateGeodatasetTable(
             result.tableObj,
@@ -343,7 +352,7 @@ router.post("/recreate", function (req, res, next) {
           return null;
         })
         .catch((err) => {
-          logger("error", "Recreation error.", req.originalUrl, req, err);
+          logger("error", "Recreation error.", req.originalUrl, req, err.stack);
           res.send(result);
         });
     },

diff --git a/scripts/server.js b/scripts/server.js
@@ -325,7 +325,7 @@ function ensureAdmin(toLoginPage, denyLongTermTokens) {
 }
 
 function validateLongTermToken(token, successCallback, failureCallback) {
-  token = token.replace("Bearer ", "");
+  token = token.replace(/Bearer:?\s+/g, "");
 
   sequelize
     .query('SELECT * FROM "long_term_tokens" WHERE "token"=:token', {