Add context to pass the user token through components
This commit is contained in:
parent
9a5dcac620
commit
57dbfc8a87
7 changed files with 70 additions and 28 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -1,3 +1,4 @@
|
||||||
|
/server/craban
|
||||||
/server/craban.sqlite
|
/server/craban.sqlite
|
||||||
/server/web/static/*
|
/server/web/static/*
|
||||||
/webapp/node_modules/
|
/webapp/node_modules/
|
||||||
|
|
BIN
server/craban
BIN
server/craban
Binary file not shown.
|
@ -1,14 +1,13 @@
|
||||||
export class Client {
|
export class Client {
|
||||||
login(username, password) {
|
login(username, password) {
|
||||||
console.log('Logging with', username)
|
// ToDo: handle error
|
||||||
|
|
||||||
return fetch("/api/login", {
|
return fetch("/api/login", {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: { 'Content-Type': 'application/json' },
|
headers: { 'Content-Type': 'application/json' },
|
||||||
body: JSON.stringify({ username, password })
|
body: JSON.stringify({ username, password })
|
||||||
}).then(r => r.text()).then(token => {
|
}).then(r => r.text()).then(token => {
|
||||||
console.log("GOT TOKEN")
|
|
||||||
localStorage.setItem('token', token)
|
localStorage.setItem('token', token)
|
||||||
|
return token
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
import { useState, useContext } from 'react'
|
||||||
import ReactDOM from 'react-dom'
|
import ReactDOM from 'react-dom'
|
||||||
import {
|
import {
|
||||||
BrowserRouter as Router,
|
BrowserRouter as Router,
|
||||||
|
@ -9,12 +10,13 @@ import {
|
||||||
|
|
||||||
import { CssBaseline } from '@material-ui/core';
|
import { CssBaseline } from '@material-ui/core';
|
||||||
|
|
||||||
|
import UserContext from './user-context'
|
||||||
import Login from './pages/login'
|
import Login from './pages/login'
|
||||||
|
import Home from './pages/home'
|
||||||
|
|
||||||
|
|
||||||
const Secure = ({children}) => {
|
const Secure = ({children}) => {
|
||||||
const token = localStorage.getItem('token')
|
const { token } = useContext(UserContext)
|
||||||
|
|
||||||
if (!token) {
|
if (!token) {
|
||||||
return <Redirect to="/login" />
|
return <Redirect to="/login" />
|
||||||
}
|
}
|
||||||
|
@ -22,12 +24,11 @@ const Secure = ({children}) => {
|
||||||
return children
|
return children
|
||||||
}
|
}
|
||||||
|
|
||||||
const Home = () => {
|
|
||||||
return <h1>Home</h1>
|
|
||||||
}
|
|
||||||
|
|
||||||
const App = () => {
|
const App = () => {
|
||||||
|
const [token, setToken] = useState(localStorage.getItem('token'))
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
<UserContext.Provider value={{ token, setToken }}>
|
||||||
<Router>
|
<Router>
|
||||||
<CssBaseline />
|
<CssBaseline />
|
||||||
<Switch>
|
<Switch>
|
||||||
|
@ -42,6 +43,7 @@ const App = () => {
|
||||||
</Route>
|
</Route>
|
||||||
</Switch>
|
</Switch>
|
||||||
</Router>
|
</Router>
|
||||||
|
</UserContext.Provider>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
33
webapp/src/pages/home.js
Normal file
33
webapp/src/pages/home.js
Normal file
|
@ -0,0 +1,33 @@
|
||||||
|
import { useContext } from 'react'
|
||||||
|
import {
|
||||||
|
Box,
|
||||||
|
Button
|
||||||
|
} from '@material-ui/core';
|
||||||
|
|
||||||
|
import UserContext from '../user-context'
|
||||||
|
|
||||||
|
|
||||||
|
const Home = () => {
|
||||||
|
const { token, setToken } = useContext(UserContext)
|
||||||
|
|
||||||
|
const handleLogout = (e) => {
|
||||||
|
e.preventDefault()
|
||||||
|
localStorage.removeItem('token')
|
||||||
|
setToken(null)
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Box>
|
||||||
|
<h1>Home</h1>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
variant="contained"
|
||||||
|
color="secondary"
|
||||||
|
onClick={handleLogout}>
|
||||||
|
Logout
|
||||||
|
</Button>
|
||||||
|
</Box>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export default Home
|
|
@ -1,4 +1,4 @@
|
||||||
import { useState } from 'react'
|
import { useState, useContext } from 'react'
|
||||||
import { Redirect } from 'react-router-dom'
|
import { Redirect } from 'react-router-dom'
|
||||||
import {
|
import {
|
||||||
Box,
|
Box,
|
||||||
|
@ -7,9 +7,12 @@ import {
|
||||||
} from '@material-ui/core';
|
} from '@material-ui/core';
|
||||||
|
|
||||||
import client from '../client'
|
import client from '../client'
|
||||||
|
import UserContext from '../user-context'
|
||||||
|
|
||||||
const Login = () => {
|
const Login = () => {
|
||||||
if (localStorage.getItem('token')) {
|
const { token, setToken } = useContext(UserContext)
|
||||||
|
|
||||||
|
if (token) {
|
||||||
return <Redirect to='/' />
|
return <Redirect to='/' />
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -18,9 +21,8 @@ const Login = () => {
|
||||||
|
|
||||||
const handleSubmit = (e) => {
|
const handleSubmit = (e) => {
|
||||||
e.preventDefault()
|
e.preventDefault()
|
||||||
client.login(username, password).then(() => {
|
client.login(username, password).then(token => {
|
||||||
setUsername('')
|
setToken(token)
|
||||||
setPassword('')
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
5
webapp/src/user-context.js
Normal file
5
webapp/src/user-context.js
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
import React from 'react'
|
||||||
|
|
||||||
|
const UserContext = React.createContext()
|
||||||
|
|
||||||
|
export default UserContext
|
Loading…
Reference in a new issue