mirror of
https://github.com/pds-nest/nest.git
synced 2024-11-22 13:04:19 +00:00
🔧 Add working
and error
to useSavedLogin
This commit is contained in:
parent
335dce68f7
commit
b69f4e6ef1
3 changed files with 48 additions and 32 deletions
|
@ -7,6 +7,8 @@ import {createContext} from "react";
|
||||||
* - `server`: The base url of the N.E.S.T. backend
|
* - `server`: The base url of the N.E.S.T. backend
|
||||||
* - `email`: The email of the account the user is logged in as
|
* - `email`: The email of the account the user is logged in as
|
||||||
* - `token`: The bearer token to use in authenticated API requests
|
* - `token`: The bearer token to use in authenticated API requests
|
||||||
|
* - `working`: `true` if the login procedure is running, `false` otherwise
|
||||||
|
* - `error`: `null` if no login error happened, an instance of {@link Error} otherwise.
|
||||||
* - `login`: an async function which logs in the user if given the following parameters: `server, email, password`
|
* - `login`: an async function which logs in the user if given the following parameters: `server, email, password`
|
||||||
* - `logout`: a function which logs out the user
|
* - `logout`: a function which logs out the user
|
||||||
* - `fetch_unauth`: a variant of {@link fetch} which uses `state.server` as the base url, allowing only the API path
|
* - `fetch_unauth`: a variant of {@link fetch} which uses `state.server` as the base url, allowing only the API path
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
import {useState} from "react"
|
||||||
import useLocalStorageState from "./useLocalStorageState"
|
import useLocalStorageState from "./useLocalStorageState"
|
||||||
|
|
||||||
|
|
||||||
|
@ -6,8 +7,12 @@ import useLocalStorageState from "./useLocalStorageState"
|
||||||
*/
|
*/
|
||||||
export default function useSavedLogin() {
|
export default function useSavedLogin() {
|
||||||
const [state, setState] = useLocalStorageState("login", null)
|
const [state, setState] = useLocalStorageState("login", null)
|
||||||
|
const [working, setWorking] = useState(false)
|
||||||
|
const [error, setError] = useState(null)
|
||||||
|
|
||||||
const login = async (server, email, password) => {
|
const login = async (server, email, password) => {
|
||||||
|
setWorking(true)
|
||||||
|
try {
|
||||||
console.debug("Contacting server to login...")
|
console.debug("Contacting server to login...")
|
||||||
const response = await fetch(`${server}/api/login`, {
|
const response = await fetch(`${server}/api/login`, {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
|
@ -26,8 +31,8 @@ export default function useSavedLogin() {
|
||||||
|
|
||||||
console.debug("Ensuring the request was a success...")
|
console.debug("Ensuring the request was a success...")
|
||||||
if(data["result"] !== "success") {
|
if(data["result"] !== "success") {
|
||||||
console.error(`Login failed: ${data["msg"]}`)
|
// noinspection ExceptionCaughtLocallyJS
|
||||||
return
|
throw new Error(data["msg"])
|
||||||
}
|
}
|
||||||
|
|
||||||
console.debug("Storing login state...")
|
console.debug("Storing login state...")
|
||||||
|
@ -38,9 +43,17 @@ export default function useSavedLogin() {
|
||||||
username: data["user"]["username"],
|
username: data["user"]["username"],
|
||||||
token: data["access_token"],
|
token: data["access_token"],
|
||||||
})
|
})
|
||||||
console.debug("Stored login state!")
|
|
||||||
|
console.debug("Clearing error...")
|
||||||
|
setError(null)
|
||||||
|
|
||||||
console.info("Login successful!")
|
console.info("Login successful!")
|
||||||
|
} catch(e) {
|
||||||
|
console.error(`Caught error while trying to login: ${e}`)
|
||||||
|
setError(e)
|
||||||
|
} finally {
|
||||||
|
setWorking(false)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const logout = () => {
|
const logout = () => {
|
||||||
|
@ -65,5 +78,5 @@ export default function useSavedLogin() {
|
||||||
return await fetch_unauth(path, init)
|
return await fetch_unauth(path, init)
|
||||||
}
|
}
|
||||||
|
|
||||||
return {state, login, logout, fetch_unauth, fetch_auth}
|
return {state, working, error, login, logout, fetch_unauth, fetch_auth}
|
||||||
}
|
}
|
|
@ -16,7 +16,7 @@ export default function PageLogin({ className, ...props }) {
|
||||||
const [server, setServer] = useState("http://localhost:5000")
|
const [server, setServer] = useState("http://localhost:5000")
|
||||||
const [email, setEmail] = useState("admin@admin.com")
|
const [email, setEmail] = useState("admin@admin.com")
|
||||||
const [password, setPassword] = useState("password")
|
const [password, setPassword] = useState("password")
|
||||||
const {login} = useContext(ContextLogin)
|
const {login, working, error} = useContext(ContextLogin)
|
||||||
const history = useHistory()
|
const history = useHistory()
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
@ -60,7 +60,8 @@ export default function PageLogin({ className, ...props }) {
|
||||||
history.push("/dashboard")
|
history.push("/dashboard")
|
||||||
}}
|
}}
|
||||||
icon={faArrowRight}
|
icon={faArrowRight}
|
||||||
color={"Green"}
|
color={error ? "Green" : "Red"}
|
||||||
|
disabled={working}
|
||||||
>
|
>
|
||||||
Login
|
Login
|
||||||
</Button>
|
</Button>
|
||||||
|
|
Loading…
Reference in a new issue