diff --git a/app.js b/app.js index cb6e975..ffabe39 100644 --- a/app.js +++ b/app.js @@ -9,8 +9,10 @@ var streamsRouter = require('./routes/getStreams'); var getUserAccounts = require('./routes/getUserAccounts') var singleUserCheck = require('./routes/singleCheck') var addAccount = require('./routes/addAccount') +var readCookie = require('./routes/readCookie') +var login = require('./routes/login') var app = express(); -// const basicAuth = require('express-basic-auth') +const basicAuth = require('express-basic-auth') // view engine setup @@ -20,19 +22,26 @@ app.set('view engine', 'jade'); app.use(logger('dev')); app.use(express.json()); app.use(express.urlencoded({ extended: false })); -app.use(cookieParser()); +app.use(cookieParser('82e4e438a0705fabf61f9854e3b575af')); app.use(express.static(path.join(__dirname, 'public'))); +const users = { + users: { + 'Karl': 'TEST', + 'Darren': 'TEST', + 'Duly': 'TEST', + }, + challenge: true, + realm: 'foo', +} app.use('/', indexRouter); +app.use('/login', basicAuth(users), login) app.use('/getStreams', streamsRouter); app.use('/getUserAccounts', getUserAccounts); -app.use('/singleCheck', singleUserCheck) -app.use('/addAccount', addAccount) -// app.use(basicAuth({ -// users: { 'BBLBTV': 'BBLBTV' }, -// challenge: true, -// realm: 'foo', -// })) +app.use('/singleCheck', basicAuth(users), singleUserCheck) +app.use('/addAccount', basicAuth(users), addAccount) +app.use('/readCookie', readCookie) + // catch 404 and forward to error handler app.use(function (req, res, next) { diff --git a/client/src/App.js b/client/src/App.js index 4908cb3..5878159 100644 --- a/client/src/App.js +++ b/client/src/App.js @@ -1,6 +1,6 @@ import React from "react"; import { BrowserRouter as Router, Route, Switch } from "react-router-dom"; -import { Navigation, Footer, Home, About, ServerList } from "./components"; +import { Navigation, Footer, Home, Accounts, ServerList } from "./components"; function App() { return (
@@ -8,7 +8,7 @@ function App() { } /> - } /> + } /> } />