From 9b5cf32314e89732a685f8f99a7afd7f217ddd7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Salgado?= Date: Tue, 6 Apr 2021 20:31:47 +0100 Subject: [PATCH] fix: app context and routing --- lib/new-admin/admin-server.js | 3 -- lib/new-admin/routes/authentication.js | 42 ------------------- new-lamassu-admin/src/lamassu/App.js | 4 +- .../src/pages/Authentication/Input2FAState.js | 2 +- .../pages/UserManagement/UserManagement.js | 2 +- new-lamassu-admin/src/routing/PrivateRoute.js | 2 +- new-lamassu-admin/src/routing/PublicRoute.js | 2 +- new-lamassu-admin/src/routing/routes.js | 2 +- 8 files changed, 7 insertions(+), 52 deletions(-) delete mode 100644 lib/new-admin/routes/authentication.js diff --git a/lib/new-admin/admin-server.js b/lib/new-admin/admin-server.js index 25c66e56..af91b673 100644 --- a/lib/new-admin/admin-server.js +++ b/lib/new-admin/admin-server.js @@ -13,9 +13,6 @@ const { ApolloServer, AuthenticationError } = require('apollo-server-express') const _ = require('lodash/fp') const pify = require('pify') -const login = require('./services/login') -const register = require('./routes/authentication') - const options = require('../options') const users = require('../users') diff --git a/lib/new-admin/routes/authentication.js b/lib/new-admin/routes/authentication.js deleted file mode 100644 index 889d5d8a..00000000 --- a/lib/new-admin/routes/authentication.js +++ /dev/null @@ -1,42 +0,0 @@ -const express = require('express') -const router = express.Router() - -const login = require('../services/login') -const options = require('../../options') -const T = require('../../time') - -const NEVER = new Date(Date.now() + 100 * T.years) -const hostname = options.hostname - -const register = (req, res, next) => { - const otp = req.query.otp - const ua = req.headers['user-agent'] - const ip = req.ip - - if (!otp) return next() - - return login.register(otp, ua, ip) - .then(r => { - if (r.expired) return res.status(401).send('OTP expired, generate new registration link') - - // Maybe user is using old registration key, attempt to authenticate - if (!r.success) return next() - - const cookieOpts = { - httpOnly: true, - secure: true, - domain: hostname, - sameSite: true, - expires: NEVER - } - - const token = r.token - req.token = token - res.cookie('token', token, cookieOpts) - res.sendStatus(200) - }) -} - -router.get('/register', register) - -module.exports = router diff --git a/new-lamassu-admin/src/lamassu/App.js b/new-lamassu-admin/src/lamassu/App.js index 95da796c..9ac13377 100644 --- a/new-lamassu-admin/src/lamassu/App.js +++ b/new-lamassu-admin/src/lamassu/App.js @@ -20,11 +20,11 @@ import AppContext from 'src/AppContext' import Header from 'src/components/layout/Header' import Sidebar from 'src/components/layout/Sidebar' import TitleSection from 'src/components/layout/TitleSection' -import ApolloProvider from 'src/pazuz/apollo/Provider' -import { tree, hasSidebar, Routes, getParent } from 'src/pazuz/routing/routes' +import { tree, hasSidebar, Routes, getParent } from 'src/routing/routes' import global from 'src/styling/global' import theme from 'src/styling/theme' import { backgroundColor, mainWidth } from 'src/styling/variables' +import ApolloProvider from 'src/utils/apollo' if (process.env.NODE_ENV !== 'production') { const whyDidYouRender = require('@welldone-software/why-did-you-render') diff --git a/new-lamassu-admin/src/pages/Authentication/Input2FAState.js b/new-lamassu-admin/src/pages/Authentication/Input2FAState.js index 1e653afb..8145b5ff 100644 --- a/new-lamassu-admin/src/pages/Authentication/Input2FAState.js +++ b/new-lamassu-admin/src/pages/Authentication/Input2FAState.js @@ -4,7 +4,7 @@ import gql from 'graphql-tag' import React, { useContext, useState } from 'react' import { useHistory } from 'react-router-dom' -import { AppContext } from 'src/App' +import AppContext from 'src/AppContext' import { Button } from 'src/components/buttons' import { CodeInput } from 'src/components/inputs/base' import { H2, P } from 'src/components/typography' diff --git a/new-lamassu-admin/src/pages/UserManagement/UserManagement.js b/new-lamassu-admin/src/pages/UserManagement/UserManagement.js index 9f9d163c..0eba2487 100644 --- a/new-lamassu-admin/src/pages/UserManagement/UserManagement.js +++ b/new-lamassu-admin/src/pages/UserManagement/UserManagement.js @@ -4,7 +4,7 @@ import gql from 'graphql-tag' import * as R from 'ramda' import React, { useState, useContext } from 'react' -import { AppContext } from 'src/App' +import AppContext from 'src/AppContext' import { Link } from 'src/components/buttons' import { Switch } from 'src/components/inputs' import TitleSection from 'src/components/layout/TitleSection' diff --git a/new-lamassu-admin/src/routing/PrivateRoute.js b/new-lamassu-admin/src/routing/PrivateRoute.js index 5e6ef5e4..2861612d 100644 --- a/new-lamassu-admin/src/routing/PrivateRoute.js +++ b/new-lamassu-admin/src/routing/PrivateRoute.js @@ -1,7 +1,7 @@ import React, { useContext } from 'react' import { Route, Redirect } from 'react-router-dom' -import { AppContext } from 'src/App' +import AppContext from 'src/AppContext' import { isLoggedIn } from './utils' diff --git a/new-lamassu-admin/src/routing/PublicRoute.js b/new-lamassu-admin/src/routing/PublicRoute.js index 278e1289..6d8bfb5e 100644 --- a/new-lamassu-admin/src/routing/PublicRoute.js +++ b/new-lamassu-admin/src/routing/PublicRoute.js @@ -1,7 +1,7 @@ import React, { useContext } from 'react' import { Route, Redirect } from 'react-router-dom' -import { AppContext } from 'src/App' +import AppContext from 'src/AppContext' import { isLoggedIn } from './utils' diff --git a/new-lamassu-admin/src/routing/routes.js b/new-lamassu-admin/src/routing/routes.js index 6b8ae778..d3159173 100644 --- a/new-lamassu-admin/src/routing/routes.js +++ b/new-lamassu-admin/src/routing/routes.js @@ -20,7 +20,7 @@ import ResetPassword from 'src/pages/Authentication/ResetPassword' import Blacklist from 'src/pages/Blacklist' import Cashout from 'src/pages/Cashout' import Commissions from 'src/pages/Commissions' -import ConfigMigration from 'src/pages/ConfigMigration' +// import ConfigMigration from 'src/pages/ConfigMigration' import { Customers, CustomerProfile } from 'src/pages/Customers' import Dashboard from 'src/pages/Dashboard' import Funding from 'src/pages/Funding'