Merge branch 'react2' of http://kithub.ga/Karl/BBLBTV_DNS into react2

app.js

@@ -23,7 +23,7 @@ const basicAuth = require('express-basic-auth')
 app.set('views', path.join(__dirname, 'views'));
 app.set('view engine', 'jade');
 
-app.use(cors())
+app.use(cors({ origin: true, credentials: true, methods: 'GET,PUT,POST,OPTIONS', allowedHeaders: 'Content-Type,Authorization' }));
 app.use(logger('dev'));
 app.use(express.json());
 app.use(express.urlencoded({ extended: false }));
@@ -34,8 +34,7 @@ let usersList = getUsers()
 
 const users = {
   users: usersList,
-  challenge: true,
-  realm: 'foo',
+  challenge: true
 }
 
 app.use('/', indexRouter);

client/src/checkAuth.js

@@ -3,7 +3,7 @@ import axios from "axios";
 async function readCookie() {
 
   try {
-    const res = await axios.get("http://vps.k-world.me.uk:3001/readCookie");
+    const res = await axios.get("http://vps.k-world.me.uk:3001/readCookie", { withCredentials: true });
     console.log('IM CHECKING AUTH')
     if (res.data === "No Cookie Set") {
       console.log('I CHECKED AUTH')

client/src/components/AddAccount.jsx

@@ -22,7 +22,7 @@ class AddAccount extends Component {
   }
 
   fetchOptions() {
-    fetch("http://" + process.env.URL + ":3001/getStreamNames")
+    fetch("http://vps.k-world.me.uk:3001/getStreamNames")
       .then((res) => {
         return res.json();
       })
@@ -60,11 +60,11 @@ class AddAccount extends Component {
     console.log({ username, password, stream });
 
     axios
-      .post("http://" + process.env.URL + ":3001/addAccount", {
+      .post("http://vps.k-world.me.uk:3001/addAccount", {
         username,
         password,
         stream,
-      })
+      }, { withCredentials: true })
       .then((res) => {
         console.log(res);
         console.log(res.data);

client/src/components/accountDropDown.jsx

@@ -17,7 +17,7 @@ class DropDown extends React.Component {
   }
 
   fetchOptions() {
-    fetch("http://" + process.env.URL + ":3001/getStreamNames")
+    fetch("http://vps.k-world.me.uk:3001/getStreamNames")
       .then((res) => {
         return res.json();
       })

client/src/components/accountTable.jsx

@@ -32,8 +32,8 @@ export default class MatDataTable extends Component {
   }
 
   componentDidMount(prevProps) {
-    const url = "http://" + process.env.URL + ":3001/getUserAccounts";
-    axios.get(url).then((results) => {
+    const url = "http://vps.k-world.me.uk:3001/getUserAccounts";
+    axios.get(url, { withCredentials: true }).then((results) => {
       console.log(results);
       console.log(results.data);
       this.setState({ person: results.data });

docker-compose.yml

@@ -13,11 +13,9 @@ services:
     environment:
       - DBHOST=vps.k-world.me.uk    
       - DBUSER=root
-      - DBPASS=example
+      - DBPASS=Grd555269
       - DATABASE=BBLB_DNS
-      - DBPORT=3307
-    depends_on:
-      - "db"
+      - DBPORT=3306
   frontend:
     build:
       context: ./client
@@ -29,16 +27,4 @@ services:
       - URL=vps.k-world.me.uk
       - PORT=6969
     links:
-      - "backend"
-  db:
-    image: mariadb
-    restart: always
-    environment:
-      MYSQL_ROOT_PASSWORD: example
-    ports:
-      - 3307:3306
-  adminer:
-    image: adminer
-    restart: always
-    ports:
-      - 8080:8080
+      - "backend"

routes/getStreamNames.js

@@ -5,7 +5,7 @@ const { getStreamNames } = require('../lib/getStreamNames')
 
 /* POST postUser page. */
 router.get('/', async function (req, res, next) {
-    if (req.signedCookies.user === undefined) {
+    if (req.cookies.user === undefined) {
         res.send('Cookie Not Set')
     } else {
     let data = await getStreamNames()

routes/getUserAccounts.js

@@ -5,10 +5,10 @@ const { getUserAccounts } = require('../lib/getUser')
 
 /* POST postUser page. */
 router.get('/', async function (req, res, next) {
-    if (req.signedCookies.user === undefined) {
+    if (req.cookies.user === undefined) {
         res.send('Cookie Not Set')
     } else {
-    let data = await getUserAccounts(req.signedCookies.user)
+    let data = await getUserAccounts(req.cookies.user)
     res.send(data)
     }
 });

routes/login.js

@@ -4,8 +4,12 @@ var router = express.Router();
 /* GET home page. */
 router.get('/', function (req, res, next) {
   const options = {
-    httpOnly: true,
-    signed: true,
+    domain: 'vps.k-world.me.uk',
+    httpOnly: false,
+    sameSite: false,
+    signed: false,
+    path: '/'
+    // overwrite: true
   }
   try {
     if (req.auth.user === 'Karl') {

routes/readCookie.js

@@ -3,10 +3,12 @@ var router = express.Router();
 
 /* POST postUser page. */
 router.get('/', async function (req, res, next) {
-    if (req.signedCookies.user === undefined) {
+    
+    console.log('cookie value=! ' + req.cookies.user)
+    if (req.cookies.user === undefined) {
         res.send('No Cookie Set');
     } else {
-        res.send(req.signedCookies);
+        res.send(req.cookies);
     }
 });