lukas/WordClockESP
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

remove www directory, as it is a build artefact

Browse Source 
replace custom made notification component with notistack
This commit is contained in:
rjwats
2019-08-04 18:42:58 +01:00
parent 77771aa807
commit a86b565c5a
20 changed files with 872 additions and 1093 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
interface/src/authentication/AuthenticatedRoute.js
View File

@ -5,12 +5,12 @@ import {
import { withAuthenticationContext } from './Context.js';
import * as Authentication from './Authentication';
import { withNotifier } from '../components/SnackbarNotification';
import { withSnackbar } from 'notistack';
export class AuthenticatedRoute extends React.Component {
render() {
const { raiseNotification, authenticationContext, component: Component, ...rest } = this.props;
const { enqueueSnackbar, authenticationContext, component: Component, ...rest } = this.props;
const { location } = this.props;
const renderComponent = (props) => {
if (authenticationContext.isAuthenticated()) {
@ -19,7 +19,9 @@ export class AuthenticatedRoute extends React.Component {
);
}
Authentication.storeLoginRedirect(location);
raiseNotification("Please log in to continue.");
enqueueSnackbar("Please log in to continue.", {
variant: 'info',
});
return (
<Redirect to='/' />
);
@ -31,4 +33,4 @@ export class AuthenticatedRoute extends React.Component {
}
export default withNotifier(withAuthenticationContext(AuthenticatedRoute));
export default withSnackbar(withAuthenticationContext(AuthenticatedRoute));

20
interface/src/authentication/AuthenticationWrapper.js
View File

@ -1,6 +1,6 @@
import * as React from 'react';
import history from '../history'
import { withNotifier } from '../components/SnackbarNotification';
import { withSnackbar } from 'notistack';
import { VERIFY_AUTHORIZATION_ENDPOINT } from '../constants/Endpoints';
import { ACCESS_TOKEN, authorizedFetch } from './Authentication';
import { AuthenticationContext } from './Context';
@ -33,7 +33,7 @@ class AuthenticationWrapper extends React.Component {
signIn: this.signIn,
signOut: this.signOut,
isAuthenticated: this.isAuthenticated,
isAdmin: this.isAdmin
isAdmin: this.isAdmin
},
initialized: false
};
@ -80,7 +80,9 @@ class AuthenticationWrapper extends React.Component {
this.setState({ initialized: true, context: { ...this.state.context, user } });
}).catch(error => {
this.setState({ initialized: true, context: { ...this.state.context, user: undefined } });
this.props.raiseNotification("Error verifying authorization: " + error.message);
this.props.enqueueSnackbar("Error verifying authorization: " + error.message, {
variant: 'error',
});
});
} else {
this.setState({ initialized: true, context: { ...this.state.context, user: undefined } });
@ -90,7 +92,11 @@ class AuthenticationWrapper extends React.Component {
signIn = (accessToken) => {
try {
localStorage.setItem(ACCESS_TOKEN, accessToken);
this.setState({ context: { ...this.state.context, user: jwtDecode(accessToken) } });
const user = jwtDecode(accessToken);
this.setState({ context: { ...this.state.context, user } });
this.props.enqueueSnackbar(`Logged in as ${user.username}`, {
variant: 'success',
});
} catch (err) {
this.setState({ initialized: true, context: { ...this.state.context, user: undefined } });
throw new Error("Failed to parse JWT " + err.message);
@ -105,7 +111,7 @@ class AuthenticationWrapper extends React.Component {
user: undefined
}
});
this.props.raiseNotification("You have signed out.");
this.props.enqueueSnackbar("You have signed out.");
history.push('/');
}
@ -114,10 +120,10 @@ class AuthenticationWrapper extends React.Component {
}
isAdmin = () => {
const { context } = this.state;
const { context } = this.state;
return context.user && context.user.admin;
}
}
export default withStyles(styles)(withNotifier(AuthenticationWrapper))
export default withStyles(styles)(withSnackbar(AuthenticationWrapper))