diff --git a/index.js b/index.js index 64ecc0abd..526f61510 100644 --- a/index.js +++ b/index.js @@ -630,6 +630,19 @@ const server = new ApolloServer({ const app = express() app.use(cors()) + +//https://stackoverflow.com/questions/8605720/how-to-force-ssl-https-in-express-js/31144924#31144924 + +function requireHTTPS(req, res, next) { + // The 'x-forwarded-proto' check is for Heroku + if (!req.secure && req.get('x-forwarded-proto') !== 'https' && process.env.NODE_ENV !== "development") { + return res.redirect('https://' + req.get('host') + req.url) + } + next() +} + +app.use(requireHTTPS) + app.use(express.static('build')) //https://www.npmjs.com/package/express-session @@ -670,18 +683,6 @@ app.get('*', (req, res) => { res.sendFile(path.resolve(__dirname, 'build', 'index.html')) }) -//https://stackoverflow.com/questions/8605720/how-to-force-ssl-https-in-express-js/31144924#31144924 - -function requireHTTPS(req, res, next) { - // The 'x-forwarded-proto' check is for Heroku - if (!req.secure && req.get('x-forwarded-proto') !== 'https' && process.env.NODE_ENV !== "development") { - return res.redirect('https://' + req.get('host') + req.url) - } - next() -} - -app.use(requireHTTPS) - const PORT = process.env.PORT || 3001 app.listen({ port: PORT }, () => { console.log(`Server running on http://localhost:${PORT}${server.graphqlPath}`) diff --git a/react-ui/src/App.js b/react-ui/src/App.js index 5ffa085bf..d07c7581c 100644 --- a/react-ui/src/App.js +++ b/react-ui/src/App.js @@ -3,7 +3,7 @@ import { Container } from 'semantic-ui-react' import Footer from './components/Misc/Footer' import MainMenu from './components/Misc/MainMenu' import NotFound from './components/Misc/NotFound' -import { BrowserRouter as Router, Route, Switch, Redirect } from 'react-router-dom' +import { BrowserRouter as Router, Route, Switch } from 'react-router-dom' import WeaponLeaderboardSelector from './components/XLeaderboard/WeaponLeaderboardSelector' import XSearch from './components/XSearch/XSearch'