Merge changes from main

.dockerignore

@@ -1,2 +1 @@
 node_modules
-credentials.ts

.gitignore

@@ -14,10 +14,7 @@ v1/npm-debug.log
 v1/utilities/scripts/credentials.py
 .idea
 venv
-.env
 
-!v2/credentials.ts
-credentials.ts
 !v1/credentials.ts
 v2/utilities/scripts/credentials.py
 

README.md

@@ -47,6 +47,9 @@ NOTE: Postgres connections are completely broken in node v14 and v15 (as of
 This will also run the script `postinstall.sh` which copies credentials files
 into place.
 
+
+
+**Old config below. We now use env variables specifying which db and environment to connect to.**
 For `credentials.ts` fill in your MariaDB and PostgreSQL user information,
 update the port for Redis if necessary, and follow the inline instructions for
 generating a cache refresh key. The cache refresh key is used as a secret

package.json

@@ -43,6 +43,7 @@
     "brute-force-equal-area": "git+https://github.com/UW-Macrostrat/brute-force-equal-area.git",
     "csv-express": "^1.1.0",
     "dbgeo": "^1.0.1",
+    "dotenv": "^16.4.5",
     "express": "4.x.x",
     "filesize-parser": "^1.3.0",
     "geojson-precision": "^0.4.0",

v2/column-cache-refresh.ts

@@ -1,11 +1,10 @@
 const larkin = require("./larkin");
-const credentials = require("./credentials");
 
 module.exports = (req, res, next) => {
   if (
     req.query &&
     req.query.cacheRefreshKey &&
-    req.query.cacheRefreshKey === credentials.cacheRefreshKey
+    req.query.cacheRefreshKey === process.env.CACHE_REFRESH_KEY
   ) {
     larkin.setupCache();
     res.json({ success: "cache refreshed" });

v2/definitions/sources.ts

@@ -4,7 +4,6 @@ var api = require("../api"),
   dbgeo = require("dbgeo"),
   gp = require("geojson-precision");
 
-const credentials = require("../credentials");
 
 module.exports = function (req, res, next, cb) {
   if (Object.keys(req.query).length < 1) {
@@ -80,7 +79,7 @@ module.exports = function (req, res, next, cb) {
    ${"sample" in req.query ? "LIMIT 5" : ""}
   `;
   larkin.queryPg(
-    credentials.pg_macrostrat_database,
+    "burwell",
     sql,
     params,
     function (error, result) {