Merge branch 'cookies' into userauth

Author: kobudnik

config.js

@@ -0,0 +1,31 @@
+import dotenv from 'dotenv';
+dotenv.config();
+
+export const POSTGRES_HOST = process.env.POSTGRES_HOST
+  ? process.env.POSTGRES_HOST
+  : 'localhost';
+export const POSTGRES_NAME = process.env.POSTGRES_NAME
+  ? process.env.POSTGRES_NAME
+  : 'docketeer-db';
+export const POSTGRES_PORT = process.env.POSTGRES_PORT
+  ? Number(process.env.POSTGRES_PORT)
+  : 5432;
+export const POSTGRES_USER = process.env.POSTGRES_USER
+  ? process.env.POSTGRES_USER
+  : 'postgres';
+export const POSTGRES_PASS = process.env.POSTGRES_PASS
+  ? process.env.POSTGRES_PASS
+  : 'postgres';
+export const POSTGRES_SERVICE = process.env.POSTGRES_NAME
+  ? process.env.POSTGRES_NAME
+  : 'db';
+export const JWT_SECRET = process.env.JWT_SECRET
+  ? process.env.JWT_SECRET
+  : 'fced686ad3297c774a7c635cc3d7d33421ec0f557fda29510c6c8b7a95736dc36da9064e1fa6963f0069a29a9c1a62d799ce667dece4f3aafe9449aaed2b2302';
+
+export const DASHBOARD_PORT = process.env.REACT_DASHBOARD_PORT
+  ? Number(process.env.DASHBOARD_PORT)
+  : 2999;
+export const DASHBOARD_UID = process.env.REACT_REACT_DASHBOARD_ORG_ID
+  ? Number(process.env.DASHBOARD_ORG_ID)
+  : 1;

docker-compose.yml

@@ -5,14 +5,14 @@ services:
     image: docketeerx/postgres
     restart: always
     ports:
-      - '${POSTGRES_PORT}:5432'
+      - 5432:5432
     volumes:
       - ./imageConfigs/postgres/docketeerdb:/var/lib/postgresql/data/
 
     environment:
-      POSTGRES_DB: ${POSTGRES_NAME}
-      POSTGRES_USER: ${POSTGRES_USER}
-      POSTGRES_PASSWORD: ${POSTGRES_PASS}
+      POSTGRES_DB: docketeer-db
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
 
   cadvisor:
     image: gcr.io/cadvisor/cadvisor:v0.47.1
@@ -52,7 +52,8 @@ services:
     ports:
       - '9090:9090'
 
-    #can add volume here to persist the prometheus data.
+    volumes:
+      - ./imageConfigs/prometheus/promData:/prometheus
     depends_on:
       - node-exporter
     labels:
@@ -86,5 +87,8 @@ services:
       - 4000:4000
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-    # depends_on:
-    #   - grafana
+
+    environment:
+      POSTGRES_USER: 'postgres'
+    depends_on:
+      - db

imageConfigs/postgres/init.sql

@@ -61,3 +61,8 @@ INSERT INTO notification_settings (metric_name, triggering_value) VALUES
 ('memory', 80),
 ('cpu', 80),
 ('stopped', 0);
+
+INSERT INTO roles (role) VALUES 
+  ('system admin'),
+  ('admin'),
+  ('user');

package.json

@@ -22,8 +22,10 @@
     "@testing-library/user-event": "^14.4.3",
     "child_process": "^1.0.2",
     "colors": "^1.4.0",
+    "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
     "electron-squirrel-startup": "^1.0.0",
+    "jsonwebtoken": "^9.0.0",
     "os": "^0.1.2",
     "os-utils": "^0.0.14",
     "pg": "^8.8.0",

server/app.ts

@@ -1,8 +1,10 @@
 import express, { NextFunction, Request, Response } from 'express';
 import cors from 'cors';
+import cookieParser from 'cookie-parser';
+import { exec } from 'child_process';
 const app = express();
 app.use(cors());
-const { exec } = require('child_process');
+app.use(cookieParser());
 
 exec(
   'docker container ls -a --format "table {{.ID}}\t{{.Names}}" | grep docketeerx/docketeer | cut -d" " -f1 | cut -f1 | xargs -I{} docker container restart -t 0 {}',
@@ -16,7 +18,7 @@ exec(
       return;
     }
     console.log(`stdout: ${stdout}`);
-  }
+  },
 );
 // Importing routers...
 import accountRouter from './routes/accountRouter';
@@ -64,7 +66,7 @@ app.get(
     };
     const errorObj: ServerError = Object.assign(defaultErr, err);
     return res.status(errorObj.status).json(errorObj.message);
-  }
+  },
 );
 
 // Exporting app...

server/controllers/apiController.ts

@@ -8,7 +8,8 @@ import nodemailer from 'nodemailer';
 import email from '../../security/email';
 import { ApiController, ServerError } from '../../types';
 
-// create transporter object to make sure these values are filled out in email.js
+// *** Signup email not currently being used. ***
+
 const transporter = nodemailer.createTransport({
   host: email.host,
   port: email.port,