Remove login route (#750)

front/src/components/Articles.jsx

@@ -16,7 +16,7 @@ import Field from './Field'
 import Loading from './Loading'
 import { Search, Users } from 'react-feather'
 import ArticleTag from './Tag'
-import Select from "./Select";
+import Select from './Select'
 
 export default function Articles () {
   const dispatch = useDispatch()

front/src/components/Login.jsx

@@ -1,6 +1,6 @@
 import React, { useCallback, useState, useEffect } from 'react'
 import { Link, useHistory } from 'react-router-dom'
-import { useSelector, useDispatch } from 'react-redux'
+import { useSelector, useDispatch, shallowEqual } from 'react-redux'
 
 import styles from './login.module.scss'
 import Field from './Field'

front/src/components/UserInfos.jsx

@@ -19,9 +19,9 @@ export default function UserInfos () {
   const activeUser = useSelector(state => state.activeUser, shallowEqual)
   const sessionToken = useSelector(state => state.sessionToken)
   const [displayName, setDisplayName] = useState(activeUser.displayName)
-  const [firstName, setFirstName] = useState(activeUser.firstName)
-  const [lastName, setLastName] = useState(activeUser.lastName)
-  const [institution, setInstitution] = useState(activeUser.institution)
+  const [firstName, setFirstName] = useState(activeUser.firstName || '')
+  const [lastName, setLastName] = useState(activeUser.lastName || '')
+  const [institution, setInstitution] = useState(activeUser.institution || '')
   const [yaml, setYaml] = useState(activeUser.yaml)
   const [isSaving, setIsSaving] = useState(false)
 

front/src/index.jsx

@@ -22,7 +22,6 @@ import Field from './components/Field'
 import { Check, Copy, Search } from 'react-feather'
 import buttonStyles from './components/button.module.scss'
 import Select from './components/Select'
-import Login from './components/Login.jsx'
 
 // lazy loaded routes
 const Books = lazy(() => import('./components/Books'))
@@ -92,9 +91,6 @@ render(
             <Route path="/register" exact>
               <Register />
             </Route>
-            <Route path="/login" exact>
-              <Login />
-            </Route>
             {/* Articles index */}
             <PrivateRoute path={['/articles', '/']} exact>
               <Articles />

front/src/layouts/App.jsx

@@ -1,10 +1,22 @@
 import React, { Suspense, useCallback, useEffect } from 'react'
-import { useSelector } from 'react-redux'
+import { useDispatch, useSelector } from 'react-redux'
 
 import Loading from '../components/Loading'
+import { useHistory } from "react-router-dom";
 
 export default function StyloApp ({ children }) {
   const hasBooted = useSelector(state => state.hasBooted)
+  const dispatch = useDispatch()
+  const { replace, location } = useHistory()
+  const setSessionToken = useCallback((token) => dispatch({ type: 'UPDATE_SESSION_TOKEN', token }), [])
+  const authToken = new URLSearchParams(location.hash).get('#auth-token')
+
+  useEffect(() => {
+    if (authToken) {
+      setSessionToken(authToken)
+      replace(location.pathname)
+    }
+  }, [authToken])
 
   return (
     <main>

graphql/app.js

@@ -177,7 +177,7 @@ app.get(
     if (req.user) {
       const { email } = req.user
       const token = await createJWTToken({ email, jwtSecret })
-      res.redirect(`${req.headers.referer}/login#auth-token=${token}`)
+      res.redirect(`${req.headers.referer}#auth-token=${token}`)
     } else {
       req.session.origin = req.headers.referer
       next()
@@ -232,7 +232,7 @@ app.use('/authorization-code/callback',
   async function onSuccess (req, res) {
     const { email } = req.user
     const token = await createJWTToken({ email, jwtSecret })
-    return res.redirect(`${req.session.origin}/login#auth-token=${token}`)
+    return res.redirect(`${req.session.origin}#auth-token=${token}`)
   },
   function onFailure (error, req, res) {
     logger.error({ error }, 'Unexpected error.')