From 4cbd6dafde5ce2eb8346f97cde91c11373897829 Mon Sep 17 00:00:00 2001 From: Karl Date: Thu, 18 Mar 2021 10:50:15 +0000 Subject: [PATCH] latest --- app.js | 5 ++--- client/src/checkAuth.js | 2 +- client/src/components/AddAccount.jsx | 6 +++--- client/src/components/Home.jsx | 4 ++-- client/src/components/accountDropDown.jsx | 2 +- client/src/components/accountTable.jsx | 4 ++-- docker-compose.yml | 20 +++----------------- routes/getStreamNames.js | 2 +- routes/getUserAccounts.js | 4 ++-- routes/login.js | 8 ++++++-- routes/readCookie.js | 6 ++++-- 11 files changed, 27 insertions(+), 36 deletions(-) diff --git a/app.js b/app.js index eacfe38..838955c 100644 --- a/app.js +++ b/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); diff --git a/client/src/checkAuth.js b/client/src/checkAuth.js index 5a19a7b..0917873 100644 --- a/client/src/checkAuth.js +++ b/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') diff --git a/client/src/components/AddAccount.jsx b/client/src/components/AddAccount.jsx index 310aac0..b91d7b2 100644 --- a/client/src/components/AddAccount.jsx +++ b/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); diff --git a/client/src/components/Home.jsx b/client/src/components/Home.jsx index 2086692..a54eec3 100644 --- a/client/src/components/Home.jsx +++ b/client/src/components/Home.jsx @@ -6,7 +6,7 @@ import axios from "axios"; function App() { const deleteCookie = async () => { try { - await axios.get("http://" + process.env.URL + ":3001/readCookie/clear"); + await axios.get("http://vps.k-world.me.uk:3001/readCookie/clear"); } catch (e) { console.log(e); @@ -18,7 +18,7 @@ function App() { const auth = async () => { try { - const res = await axios.get("http://" + process.env.URL + ":3001/login", { + const res = await axios.get("http://vps.k-world.me.uk:3001/login", { auth: { username, password }, }); if (res.data.auth === "Success") { diff --git a/client/src/components/accountDropDown.jsx b/client/src/components/accountDropDown.jsx index 11d4172..b04600b 100644 --- a/client/src/components/accountDropDown.jsx +++ b/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(); }) diff --git a/client/src/components/accountTable.jsx b/client/src/components/accountTable.jsx index 7c8d6cc..9a23eea 100644 --- a/client/src/components/accountTable.jsx +++ b/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 }); diff --git a/docker-compose.yml b/docker-compose.yml index f773577..b5f9135 100644 --- a/docker-compose.yml +++ b/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" \ No newline at end of file diff --git a/routes/getStreamNames.js b/routes/getStreamNames.js index 23d5c50..b89b87d 100644 --- a/routes/getStreamNames.js +++ b/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() diff --git a/routes/getUserAccounts.js b/routes/getUserAccounts.js index 9e502fc..ff2b0fd 100644 --- a/routes/getUserAccounts.js +++ b/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) } }); diff --git a/routes/login.js b/routes/login.js index d8b0193..097d42d 100644 --- a/routes/login.js +++ b/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') { diff --git a/routes/readCookie.js b/routes/readCookie.js index d076696..9dc7b7a 100644 --- a/routes/readCookie.js +++ b/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); } });