Added cookies

Macos docs

.github/FUNDING.yml

@@ -0,0 +1,5 @@
+# These are supported funding model platforms
+
+patreon: krgamestudios
+ko_fi: krgamestudios
+custom: ["https://www.paypal.com/donate/?hosted_button_id=73Q82T2ZHV8AA"]

README.md

@@ -39,7 +39,7 @@ docker-compose up --build
 To set up this template in development mode:
 
 1. Ensure mariadb is running in your development environment
-2. Run `mariadb sql/create_database.sql` as the root user
+2. Run `mariadb tools/create_database.sql` as the root user
 3. Run `npm install`
 4. Run `cp .envdev .env` and enter your details into the `.env` file
 5. Execute `npm run dev`
@@ -56,6 +56,7 @@ To set up this template in development mode:
 	- Account deletion
 	- Password management
 	- JSON web token authentication
+	- Optional post validation hook
 - Fully Featured News Blog (as a microservice)
 	- Publish, edit or delete articles as needed
 	- Secured via admin panel

client/markdown/credits.md

@@ -1,10 +0,0 @@
-<header>
-	<h1 class="text centered">Credits</h1>
-</header>
-
-## MERN-template
-
-The MERN-template developed by Kayne Ruse, KR Game Studios
-
-[https://github.com/krgamestudios/MERN-template](https://github.com/krgamestudios/MERN-template)
-

client/markdown/privacy-policy.md

@@ -1,4 +0,0 @@
-<header>
-	<h1 class="text centered">Privacy Policy</h1>
-</header>
-

client/pages/accounts/account.jsx

@@ -23,12 +23,7 @@ const Account = props => {
 
 	//grab the user's info
 	useEffect(() => {
-		authTokens.tokenFetch(`${process.env.AUTH_URI}/auth/account`, {
-			method: 'GET',
-			headers: {
-				'Access-Control-Allow-Origin': '*'
-			}
-		})
+		authTokens.tokenFetch(`${process.env.AUTH_URI}/auth/account`)
 			.then(blob => blob.json())
 			.then(json => contactRef.current.checked = json.contact)
 			.catch(e => console.error(e))
@@ -88,7 +83,6 @@ const update = async (password, retype, contact, tokenFetch) => {
 	const result = await tokenFetch(`${process.env.AUTH_URI}/auth/account`, {
 		method: 'PATCH',
 		headers: {
-			'Access-Control-Allow-Origin': '*',
 			'Content-Type': 'application/json'
 		},
 		body: JSON.stringify({

client/pages/accounts/login.jsx

@@ -31,15 +31,14 @@ const Login = props => {
 							async evt => {
 								//on submit
 								evt.preventDefault();
-								const [err, newTokens] = await handleSubmit(emailRef.current.value, passwordRef.current.value);
+								const [err, accessToken] = await handleSubmit(emailRef.current.value, passwordRef.current.value);
 								if (err) {
 									alert(err);
 								}
 
 								//save auth tokens and redirect
-								if (newTokens) {
-									authTokens.setAccessToken(newTokens.accessToken);
-									authTokens.setRefreshToken(newTokens.refreshToken);
+								if (accessToken) {
+									authTokens.setAccessToken(accessToken);
 
 									props.history.push('/');
 								}
@@ -72,13 +71,13 @@ const handleSubmit = async (email, password) => {
 	const result = await fetch(`${process.env.AUTH_URI}/auth/login`, {
 		method: 'POST',
 		headers: {
-			'Content-Type': 'application/json',
-			'Access-Control-Allow-Origin': '*'
+			'Content-Type': 'application/json'
 		},
 		body: JSON.stringify({
 			email,
 			password,
-		})
+		}),
+		credentials: 'include'
 	});
 
 	//handle errors
@@ -89,8 +88,8 @@ const handleSubmit = async (email, password) => {
 	}
 
 	//return the new auth tokens
-	const newTokens = await result.json();
-	return [null, newTokens];
+	const accessToken = await result.text();
+	return [null, accessToken];
 };
 
 //returns an error message, or null on success

client/pages/accounts/panels/delete-account.jsx

@@ -38,7 +38,6 @@ const handleSubmit = async (password, authTokens) => {
 	const result = await authTokens.tokenFetch(`${process.env.AUTH_URI}/auth/account`, {
 		method: 'DELETE',
 		headers: {
-			'Access-Control-Allow-Origin': '*',
 			'Content-Type': 'application/json'
 		},
 		body: JSON.stringify({
@@ -52,14 +51,7 @@ const handleSubmit = async (password, authTokens) => {
 
 	//force a logout
 	const result2 = await authTokens.tokenFetch(`${process.env.AUTH_URI}/auth/logout`, {
-		method: 'DELETE',
-		headers: {
-			'Access-Control-Allow-Origin': '*',
-			'Content-Type': 'application/json'
-		},
-		body: JSON.stringify({
-			token: authTokens.refreshToken
-		})
+		method: 'DELETE'
 	});
 
 	if (!result2.ok) {
@@ -67,7 +59,6 @@ const handleSubmit = async (password, authTokens) => {
 	}
 
 	authTokens.setAccessToken('');
-	authTokens.setRefreshToken('');
 
 	return [null];
 };

client/pages/accounts/panels/logout.jsx

@@ -12,14 +12,7 @@ const Logout = () => {
 			{ /* Logout logs you out of the server too */ }
 			<Link to='/' onClick={async () => {
 				const result = await authTokens.tokenFetch(`${process.env.AUTH_URI}/auth/logout`, { //NOTE: this gets overwritten as a bugfix
-					method: 'DELETE',
-					headers: {
-						'Content-Type': 'application/json',
-						'Access-Control-Allow-Origin': '*'
-					},
-					body: JSON.stringify({
-						token: authTokens.refreshToken
-					})
+					method: 'DELETE'
 				});
 
 				//any problems?
@@ -27,7 +20,6 @@ const Logout = () => {
 					console.error(await result.text());
 				} else {
 					authTokens.setAccessToken('');
-					authTokens.setRefreshToken('');
 				}
 			}}>Logout</Link>
 		</>

client/pages/accounts/recover.jsx

@@ -66,8 +66,7 @@ const handleSubmit = async (email) => {
 	const result = await fetch(`${process.env.AUTH_URI}/auth/recover`, {
 		method: 'POST',
 		headers: {
-			'Content-Type': 'application/json',
-			'Access-Control-Allow-Origin': '*'
+			'Content-Type': 'application/json'
 		},
 		body: JSON.stringify({
 			email

client/pages/accounts/reset.jsx

@@ -68,7 +68,6 @@ const update = async (password, retype, query) => {
 	const result = await fetch(`${process.env.AUTH_URI}/auth/reset?email=${query.email}&token=${query.token}`, {
 		method: 'PATCH',
 		headers: {
-			'Access-Control-Allow-Origin': '*',
 			'Content-Type': 'application/json'
 		},
 		body: JSON.stringify({

client/pages/accounts/signup.jsx

@@ -83,8 +83,7 @@ const handleSubmit = async (email, username, password, retype, contact) => {
 	const result = await fetch(`${process.env.AUTH_URI}/auth/signup`, {
 		method: 'POST',
 		headers: {
-			'Content-Type': 'application/json',
-			'Access-Control-Allow-Origin': '*'
+			'Content-Type': 'application/json'
 		},
 		body: JSON.stringify({
 			email,

client/pages/administration/admin.jsx

@@ -5,9 +5,6 @@ import ApplyToBody from '../utilities/apply-to-body';
 
 import { TokenContext } from '../utilities/token-provider';
 
-import NewsPublisher from './panels/news-publisher';
-import NewsEditor from './panels/news-editor';
-
 import GrantAdmin from './panels/grant-admin';
 import GrantMod from './panels/grant-mod';
 
@@ -26,9 +23,6 @@ const Admin = props => {
 			<div className='page panel'>
 				<div className='central panel'>
 					<h1 className='text centered'>Administration Tools</h1>
-					<NewsPublisher />
-					<br />
-					<NewsEditor />
 					<br />
 					<GrantAdmin />
 					<br />

client/pages/administration/mod.jsx

@@ -5,6 +5,9 @@ import ApplyToBody from '../utilities/apply-to-body';
 
 import { TokenContext } from '../utilities/token-provider';
 
+import NewsPublisher from './panels/news-publisher';
+import NewsEditor from './panels/news-editor';
+
 import ChatReports from './panels/chat-reports';
 import BanUser from './panels/ban-user';
 
@@ -23,7 +26,12 @@ const Mod = props => {
 			<div className='page panel'>
 				<div className='central panel'>
 					<h1 className='text centered'>Moderation Tools</h1>
+					<NewsPublisher />
+					<br />
+					<NewsEditor />
+					<br />
 					<BanUser />
+					<br />
 					<ChatReports />
 					<Link to='/' className='text centered'>Return Home</Link>
 				</div>

client/pages/administration/panels/ban-user.jsx

@@ -42,8 +42,7 @@ const handleButtonPress = async (username, tokenFetch) => {
 	const result = await tokenFetch(`${process.env.AUTH_URI}/admin/banuser`, {
 		method: 'POST',
 		headers: {
-			'Content-Type': 'application/json',
-			'Access-Control-Allow-Origin': '*'
+			'Content-Type': 'application/json'
 		},
 		body: JSON.stringify({
 			username

client/pages/administration/panels/chat-reports.jsx

@@ -8,12 +8,7 @@ const ChatReports = props => {
 	const authTokens = useContext(TokenContext);
 
 	useEffect(async () => {
-		const result = await authTokens.tokenFetch(`${process.env.CHAT_URI}/admin/reports`, {
-			method: 'GET',
-			headers: {
-				'Access-Control-Allow-Origin': '*'
-			}
-		});
+		const result = await authTokens.tokenFetch(`${process.env.CHAT_URI}/admin/reports`);
 
 		if (!result.ok) {
 			const err = `${result.status}: ${await result.text()}`;
@@ -59,8 +54,7 @@ const deleteReportsFor = (chatlogIndex, tokenFetch, setReports) => {
 	tokenFetch(`${process.env.CHAT_URI}/admin/reports`, {
 		method: 'DELETE',
 		headers: {
-			'Content-Type': 'application/json',
-			'Access-Control-Allow-Origin': '*'
+			'Content-Type': 'application/json'
 		},
 		body: JSON.stringify({ chatlogIndex })
 	});

client/pages/administration/panels/grant-admin.jsx

@@ -51,8 +51,7 @@ const handleButtonPress = async (username, tokenFetch, method) => {
 	const result = await tokenFetch(`${process.env.AUTH_URI}/admin/admin`, {
 		method: method,
 		headers: {
-			'Content-Type': 'application/json',
-			'Access-Control-Allow-Origin': '*'
+			'Content-Type': 'application/json'
 		},
 		body: JSON.stringify({
 			username

client/pages/administration/panels/grant-mod.jsx

@@ -51,8 +51,7 @@ const handleButtonPress = async (username, tokenFetch, method) => {
 	const result = await tokenFetch(`${process.env.AUTH_URI}/admin/mod`, {
 		method: method,
 		headers: {
-			'Content-Type': 'application/json',
-			'Access-Control-Allow-Origin': '*'
+			'Content-Type': 'application/json'
 		},
 		body: JSON.stringify({
 			username

client/pages/administration/panels/news-editor.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useContext, useRef } from 'react';
-import Select from 'react-dropdown-select';
+import Select from 'react-select';
 
 import { TokenContext } from '../../utilities/token-provider';
 
@@ -18,13 +18,7 @@ const NewsEditor = props => {
 
 	//run once
 	useEffect(async () => {
-		const result = await fetch(`${process.env.NEWS_URI}/news/metadata?limit=999`, {
-			method: 'GET',
-			headers: {
-				'Content-Type': 'application/json',
-				'Access-Control-Allow-Origin': '*'
-			},
-		});
+		const result = await fetch(`${process.env.NEWS_URI}/news/metadata?limit=999`);
 
 		if (!result.ok) {
 			const err = `${result.status}: ${await result.text()}`;
@@ -39,16 +33,10 @@ const NewsEditor = props => {
 		<div className='panel'>
 			<h2 className='text centered'>News Editor</h2>
 			<Select
-				options={articles.map(article => { return { label: article.title, value: article.index }; })}
-				onChange={async values => {
+				options={articles.map(article => { return { label: article.title, index: article.index }; })}
+				onChange={async ({index}) => {
 					//fetch this article
-					const index = values[0].value;
-
-					const result = await fetch(`${process.env.NEWS_URI}/news/archive/${index}`, {
-						headers: {
-							'Access-Control-Allow-Origin': '*'
-						}
-					});
+					const result = await fetch(`${process.env.NEWS_URI}/news/archive/${index}`);
 
 					if (!result.ok) {
 						const err = `${result.status}: ${await result.text()}`;
@@ -109,8 +97,7 @@ const handleSubmit = async (title, author, body, index, tokenFetch) => {
 	const result = await tokenFetch(`${process.env.NEWS_URI}/news/${index}`, {
 		method: 'PATCH',
 		headers: {
-			'Content-Type': 'application/json',
-			'Access-Control-Allow-Origin': '*'
+			'Content-Type': 'application/json'
 		},
 		body: JSON.stringify({
 			title,

client/pages/administration/panels/news-publisher.jsx

@@ -28,7 +28,7 @@ const NewsPublisher = props => {
 				<input type='text' name='title' placeholder='Title' ref={titleRef} />
 				<input type='text' name='author' placeholder='Author' ref={authorRef} />
 				<textarea name='body' rows='10' cols='150' placeholder='Body of the article goes here...' ref={bodyRef} />
-	
+
 				<button type='submit'>Publish</button>
 			</form>
 		</div>
@@ -46,8 +46,7 @@ const handleSubmit = async (title, author, body, tokenFetch) => {
 		{
 			method: 'POST',
 			headers: {
-				'Content-Type': 'application/json',
-				'Access-Control-Allow-Origin': '*'
+				'Content-Type': 'application/json'
 			},
 			body: JSON.stringify({
 				title,

client/pages/app.jsx

@@ -5,7 +5,6 @@ import { TokenContext } from './utilities/token-provider';
 
 //library components
 import LazyRoute from './utilities/lazy-route';
-import MarkdownPage from './utilities/markdown-page';
 
 //styling
 import '../styles/styles.css';
@@ -34,8 +33,8 @@ const App = props => {
 					<LazyRoute path='/admin' component={() => import('./administration/admin')} />
 					<LazyRoute path='/mod' component={() => import('./administration/mod')} />
 
-					<LazyRoute path='/privacypolicy' component={async () => () => <MarkdownPage content={require('../markdown/privacy-policy.md').default} />} />
-					<LazyRoute path='/credits' component={async () => () => <MarkdownPage content={require('../markdown/credits.md').default} />} />
+					<LazyRoute path='/privacypolicy' component={() => import('./static/privacy-policy')} />
+					<LazyRoute path='/credits' component={() => import('./static/credits')} />
 
 					<LazyRoute path='*' component={() => import('./not-found')} />
 				</Switch>

client/pages/dashboard.jsx

@@ -5,7 +5,6 @@ import ApplyToBody from './utilities/apply-to-body';
 
 import { TokenContext } from './utilities/token-provider';
 
-import MarkdownPanel from './utilities/markdown-panel';
 import Logout from './accounts/panels/logout';
 
 const Dashboard = props => {

client/pages/homepage.jsx

@@ -5,7 +5,6 @@ import ApplyToBody from './utilities/apply-to-body';
 
 import { TokenContext } from './utilities/token-provider';
 
-import MarkdownPanel from './utilities/markdown-panel';
 import NewsFeed from './panels/news-feed';
 
 const HomePage = props => {

client/pages/panels/footer.jsx

@@ -13,7 +13,7 @@ const Break = () => {
 const Footer = () => {
 	return (
 		<footer>
-			<p className='text centered'>© <a href='https://krgamestudios.com'>KR Game Studios</a> 2020-2021<Break /><Link to='/privacypolicy'>Privacy Policy</Link><Break /><Link to='/credits'>Credits</Link></p>
+			<p className='text centered'>© <a href='https://krgamestudios.com'>KR Game Studios</a> 2020-2022<Break /><Link to='/privacypolicy'>Privacy Policy</Link><Break /><Link to='/credits'>Credits</Link></p>
 		</footer>
 	);
 };

client/pages/panels/news-feed.jsx

@@ -1,8 +1,6 @@
 import React, { useState, useEffect, useRef } from 'react';
 import dateFormat from 'dateformat';
 
-import MarkdownPanel from '../utilities/markdown-panel';
-
 const NewsFeed = props => {
 	const [articles, setArticles] = useState([]);
 	const aborter = useRef(new AbortController()); //BUGFIX: double-renders = double fetches + react update after unmount
@@ -10,11 +8,6 @@ const NewsFeed = props => {
 	useEffect(() => {
 		//this... um...
 		fetch(`${process.env.NEWS_URI}/news`, {
-			method: 'GET',
-			headers: {
-				'Content-Type': 'application/json',
-				'Access-Control-Allow-Origin': '*'
-			},
 			signal: aborter.current.signal //oh dear
 		})
 			.then(blob => blob.json())
@@ -29,6 +22,7 @@ const NewsFeed = props => {
 		<div className='panel'>
 			<h1 className='text centered'>News Feed</h1>
 			{articles.map((article, index) => {
+				console.log(article)
 				return (
 					<div key={index} className='panel'>
 						<hr />
@@ -40,7 +34,7 @@ const NewsFeed = props => {
 							<span>Published {dateFormat(article.createdAt, 'fullDate')}</span>
 						}</em></p>
 						<br />
-						<MarkdownPanel style={{whiteSpace: 'pre-wrap'}} content={article.body} />
+						<div dangerouslySetInnerHTML={{ __html: article.rendered }} />
 					</div>
 				);
 			})}

client/pages/panels/popup-chat.jsx

@@ -78,7 +78,7 @@ const handleSend = (inputRef, pushChatlog, username, accessToken) => {
 	});
 
 	if (!inputRef.current.value.startsWith('/')) {
-		pushChatlog({ username: username, text: inputRef.current.value });
+		pushChatlog({ createdAt: (new Date(Date.now())).toISOString(), username: username, text: inputRef.current.value });
 	}
 
 	inputRef.current.value = '';
@@ -86,7 +86,36 @@ const handleSend = (inputRef, pushChatlog, username, accessToken) => {
 
 //render each line
 const processLine = (line, index, accessToken) => {
-	let content = <div className='content'>{line.username ? <span className='username'>{line.username}: </span> : ''}{line.text ? <span className='text'>{line.text}</span> : ''}</div>;
+	//utility functions
+	const isValidDate = d => {
+		return d instanceof Date && !isNaN(d);
+	};
+
+	const isToday = d => {
+		const now = new Date(Date.now());
+		return d.getDate() == now.getDate() && d.getMonth() == now.getMonth() && d.getFullYear() == now.getFullYear();
+	};
+
+	const isThisYear = d => {
+		const now = new Date(Date.now());
+		return d.getFullYear() == now.getFullYear();
+	};
+
+	//parse the date
+	const date = new Date(line.createdAt);
+
+	//split it up so we can format each field individually
+	const year = `${date.getFullYear()}`;
+	const month = `${date.getMonth() + 1}`;
+	const day = `${date.getDate()}`;
+	const hours = `${date.getHours()}`;
+	const minutes = `${date.getMinutes()}`.padStart(2, '0');
+
+	//combine into the final timestamp
+	const timestamp = !isValidDate(date) ? '' : isToday(date) ? `${hours}:${minutes}` : isThisYear(date) ? `${month}/${day}` : `${year}`;
+
+	//generate the content string
+	let content = <div className='content row'>{timestamp.length > 0 ? <span className='timestamp col'>{timestamp}</span> : null }<span className='inner col'>{line.username ? <span className='username'>{line.username}: </span> : ''}{line.text ? <span className='text'>{line.text}</span> : ''}</span></div>;
 
 	//decorators
 	if (line.emphasis) {
@@ -97,7 +126,8 @@ const processLine = (line, index, accessToken) => {
 		content = <strong>{content}</strong>;
 	}
 
-	return <li key={index} className='line'>{content}<a className='report' onClick={() => processReport(line, accessToken)}>!!!</a></li>;
+
+	return <li key={index} className='line table noCollapse'>{content}<a className='report' onClick={() => processReport(line, accessToken)}>!!!</a></li>;
 };
 
 const processReport = (line, accessToken) => {

client/pages/static/credits.jsx

@@ -0,0 +1,18 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+
+const Static = props => {
+	return (
+		<div className='page central'>
+			<header>
+				<h1 className='text centered'>Credits</h1>
+			</header>
+			<h2 className='text centered'>MERN-template</h2>
+			<p>The <a href='https://github.com/krgamestudios/MERN-template'>MERN-template</a> developed by Kayne Ruse, KR Game Studios</p>
+
+			<Link className='text centered' to='/'>Return Home</Link>
+		</div>
+	);
+};
+
+export default Static;

client/pages/static/privacy-policy.jsx

@@ -0,0 +1,16 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+
+const Static = props => {
+	return (
+		<div className='page central'>
+			<header>
+				<h1 className="text centered">Privacy Policy</h1>
+
+				<Link className='text centered' to='/'>Return Home</Link>
+			</header>
+		</div>
+	);
+};
+
+export default Static;

client/pages/utilities/markdown-page.jsx

@@ -1,22 +0,0 @@
-import React from 'react';
-import { Link } from 'react-router-dom';
-
-import ApplyToBody from '../utilities/apply-to-body';
-
-import MarkdownPanel from './markdown-panel';
-
-const MarkdownPage = props => {
-	return (
-		<>
-			<ApplyToBody className='dashboard' />
-			<div className='page'>
-				<div className='central panel'>
-					<MarkdownPanel uri={props.uri} content={props.content} />
-					<Link to='/' className='text centered'>Return Home</Link>
-				</div>
-			</div>
-		</>
-	)
-};
-
-export default MarkdownPage;

client/pages/utilities/markdown-panel.jsx

@@ -1,35 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import ReactMarkdown from 'react-markdown';
-import rehypeRaw from 'rehype-raw';
-
-const Markdown = props => {
-	//content?
-	let [contentHook, setContentHook] = useState(null);
-
-	//check arguments
-	if (!props.content) {
-		if (!props.uri) {
-			throw 'Markdown requires either content or uri prop';
-		}
-
-		//once
-		useEffect(() => {
-			fetch(props.uri)
-				.then(blob => blob.text())
-				.then(blob => setContentHook(blob))
-				.catch(e => console.error(e))
-			;
-		}, []);
-	}
-
-	//assume raw info
-	else if (!contentHook) {
-		setContentHook(props.content);
-	}
-
-	return (
-		<ReactMarkdown rehypePlugins={[rehypeRaw]} props={{...props}}>{contentHook}</ReactMarkdown>
-	);
-};
-
-export default Markdown;

client/pages/utilities/token-provider.jsx

@@ -8,19 +8,16 @@ export const TokenContext = createContext();
 const TokenProvider = props => {
 	//state to be used
 	const [accessToken, setAccessToken] = useState('');
-	const [refreshToken, setRefreshToken] = useState('');
 
-	//make the access and refresh tokens persist between reloads
+	//make the access token persist between reloads
 	useEffect(() => {
 		setAccessToken(localStorage.getItem("accessToken") || '');
-		setRefreshToken(localStorage.getItem("refreshToken") || '');
 	}, []);
 
 	//update the stored copies
 	useEffect(() => {
 		localStorage.setItem("accessToken", accessToken);
-		localStorage.setItem("refreshToken", refreshToken);
-	}, [accessToken, refreshToken]);
+	}, [accessToken]);
 
 	//wrap the default fetch function
 	const tokenFetch = async (url, options) => {
@@ -36,26 +33,16 @@ const TokenProvider = props => {
 				return fetch(url, {
 					method: 'DELETE',
 					headers: {
-						'Content-Type': 'application/json',
-						'Access-Control-Allow-Origin': '*',
 						'Authorization': `Bearer ${bearer}`
 					},
-					body: JSON.stringify({
-						token: refreshToken
-					})
+					credentials: 'include'
 				});
 			}
 
-			//ping the auth server for a new token
+			//ping the auth server for a new access token
 			const response = await fetch(`${process.env.AUTH_URI}/auth/token`, {
 				method: 'POST',
-				headers: {
-					'Content-Type': 'application/json',
-					'Access-Control-Allow-Origin': '*'
-				},
-				body: JSON.stringify({
-					token: refreshToken
-				})
+				credentials: 'include'
 			});
 
 			//any errors, throw them
@@ -67,7 +54,6 @@ const TokenProvider = props => {
 			const newAuth = await response.json();
 
 			setAccessToken(newAuth.accessToken);
-			setRefreshToken(newAuth.refreshToken);
 			bearer = newAuth.accessToken;
 		}
 
@@ -77,7 +63,8 @@ const TokenProvider = props => {
 			headers: {
 				...(options || { headers: {} }).headers,
 				'Authorization': `Bearer ${bearer}`
-			}
+			},
+			credentials: 'include'
 		});
 	};
 
@@ -90,13 +77,7 @@ const TokenProvider = props => {
 			//ping the auth server for a new token
 			const response = await fetch(`${process.env.AUTH_URI}/auth/token`, {
 				method: 'POST',
-				headers: {
-					'Content-Type': 'application/json',
-					'Access-Control-Allow-Origin': '*'
-				},
-				body: JSON.stringify({
-					token: refreshToken
-				})
+				credentials: 'include'
 			});
 
 			//any errors, throw them
@@ -108,7 +89,6 @@ const TokenProvider = props => {
 			const newAuth = await response.json();
 
 			setAccessToken(newAuth.accessToken);
-			setRefreshToken(newAuth.refreshToken);
 
 			//finally
 			return cb(newAuth.accessToken);
@@ -118,7 +98,7 @@ const TokenProvider = props => {
 	};
 
 	return (
-		<TokenContext.Provider value={{ accessToken, refreshToken, setAccessToken, setRefreshToken, tokenFetch, tokenCallback, getPayload: () => decode(accessToken) }}>
+		<TokenContext.Provider value={{ accessToken, setAccessToken, tokenFetch, tokenCallback, getPayload: () => decode(accessToken) }}>
 			{props.children}
 		</TokenContext.Provider>
 	)

client/styles/popup-chat.css

@@ -77,6 +77,16 @@
 	display: flex;
 }
 
+.chat .timestamp {
+	max-width: 44px;
+}
+
+.chat .inner {
+	flex: 1 !important;
+	display: inline-block !important;
+	flex-direction: row !important;
+}
+
 .chat .username {
 	font-weight: bold;
 }

configure-script.js

@@ -46,6 +46,14 @@ See https://github.com/krgamestudios/MERN-template/wiki for help.
 `
 );
 
+	//determine local computer address for mac user vs everyone else
+	let macUser = '';
+	while (macUser.toLowerCase() !== 'yes' && macUser.toLowerCase() !== 'no') {
+		macUser = await question('Will the MERN Template be running locally on a MacOS system? (yes or no)', '');
+	}
+
+	const localAddress = macUser ? 'localhost' : '%';
+
 	//project configuration
 	const projectName = await question('Project Name', 'template');
 	const projectWebAddress = await question('Project Web Address', 'example.com');
@@ -62,6 +70,7 @@ See https://github.com/krgamestudios/MERN-template/wiki for help.
 	//auth configuration
 	const authName = await question('Auth Name', 'auth');
 	const authWebAddress = await question('Auth Web Address', `${authName}.${projectWebAddress}`);
+	const authPostValidationHookArray = await question('Auth Post Validation Hook Array', '');
 	const authResetAddress = await question('Auth Reset Addr', `${projectWebAddress}/reset`);
 	const authDBUser = await question('Auth DB Username', authName);
 	const authDBPass = await question('Auth DB Password', 'charizard');
@@ -180,6 +189,7 @@ services:
     environment:
       - WEB_PROTOCOL=https
       - WEB_ADDRESS=${authWebAddress}
+      - HOOK_POST_VALIDATION_ARRAY=${authPostValidationHookArray}
       - WEB_RESET_ADDRESS=${authResetAddress}
       - WEB_PORT=${authPort}
       - DB_HOSTNAME=database
@@ -245,11 +255,14 @@ services:
       - --api.insecure=false
       - --providers.docker=true
       - --providers.docker.exposedbydefault=false
+      - --entrypoints.web.address=:80
+      - --entrypoints.web.http.redirections.entryPoint.to=websecure
+      - --entrypoints.web.http.redirections.entryPoint.scheme=https
+      - --entrypoints.web.http.redirections.entrypoint.permanent=true
       - --entrypoints.websecure.address=:443
       - --certificatesresolvers.myresolver.acme.tlschallenge=true
       - --certificatesresolvers.myresolver.acme.email=${supportEmail}
       - --certificatesresolvers.myresolver.acme.storage=/letsencrypt/acme.json
-      -  traefik.docker.network=app-network
     ports:
       - 80:80
       - 443:443
@@ -265,7 +278,7 @@ networks:
 `;
 
 	const dockerfile = `
-FROM node:15
+FROM node:16
 WORKDIR "/app"
 COPY . /app
 RUN mkdir /app/public
@@ -279,24 +292,25 @@ CMD ["sleep 10 && npm start"]
 
 	const sqlfile = `
 CREATE DATABASE IF NOT EXISTS ${projectName};
-CREATE USER IF NOT EXISTS '${projectDBUser}'@'%' IDENTIFIED BY '${projectDBPass}';
-GRANT ALL PRIVILEGES ON ${projectName}.* TO '${projectDBUser}'@'%';
+CREATE USER IF NOT EXISTS '${projectDBUser}'@'${localAddress}' IDENTIFIED BY '${projectDBPass}';
+GRANT ALL PRIVILEGES ON ${projectName}.* TO '${projectDBUser}'@'${localAddress}';
 
 CREATE DATABASE IF NOT EXISTS ${newsName};
-CREATE USER IF NOT EXISTS '${newsDBUser}'@'%' IDENTIFIED BY '${newsDBPass}';
-GRANT ALL PRIVILEGES ON ${newsName}.* TO '${newsDBUser}'@'%';
+CREATE USER IF NOT EXISTS '${newsDBUser}'@'${localAddress}' IDENTIFIED BY '${newsDBPass}';
+GRANT ALL PRIVILEGES ON ${newsName}.* TO '${newsDBUser}'@'${localAddress}';
 
 CREATE DATABASE IF NOT EXISTS ${authName};
-CREATE USER IF NOT EXISTS '${authDBUser}'@'%' IDENTIFIED BY '${authDBPass}';
-GRANT ALL PRIVILEGES ON ${authName}.* TO '${authDBUser}'@'%';
+CREATE USER IF NOT EXISTS '${authDBUser}'@'${localAddress}' IDENTIFIED BY '${authDBPass}';
+GRANT ALL PRIVILEGES ON ${authName}.* TO '${authDBUser}'@'${localAddress}';
 
 CREATE DATABASE IF NOT EXISTS ${chatName};
-CREATE USER IF NOT EXISTS '${chatDBUser}'@'%' IDENTIFIED BY '${chatDBPass}';
-GRANT ALL PRIVILEGES ON ${chatName}.* TO '${chatDBUser}'@'%';
+CREATE USER IF NOT EXISTS '${chatDBUser}'@'${localAddress}' IDENTIFIED BY '${chatDBPass}';
+GRANT ALL PRIVILEGES ON ${chatName}.* TO '${chatDBUser}'@'${localAddress}';
 
 FLUSH PRIVILEGES;
 `;
 
+
 	fs.writeFileSync('docker-compose.yml', ymlfile);
 	fs.writeFileSync('Dockerfile', dockerfile);
 	fs.writeFileSync('startup.sql', sqlfile);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mern-template",
-  "version": "1.0.5",
+  "version": "1.3.0",
   "description": "A website template using the MERN stack.",
   "main": "server/server.js",
   "scripts": {
@@ -8,9 +8,12 @@
     "build": "npm run build:server && npm run build:client",
     "build:server": "exit 0",
     "build:client": "webpack --env=production --config webpack.config.js",
-    "dev": "concurrently npm:watch:server npm:watch:client",
-    "watch:server": "nodemon ./* --ext js,jsx,json --ignore 'node_modules/*'",
-    "watch:client": "webpack serve --env=development --config webpack.config.js",
+    "dev": "concurrently npm:dev:server npm:dev:client",
+    "dev:server": "nodemon --ext js,jsx,json --ignore 'node_modules/*'",
+    "dev:client": "webpack serve --env=development --config webpack.config.js",
+    "local": "concurrently npm:local:server npm:local:client",
+    "local:server": "nodemon --ext js,jsx,json --ignore 'node_modules/*'",
+    "local:client": "webpack serve --env=local --config webpack.config.js",
     "analyze": "webpack --env=production --env=analyze --config webpack.config.js"
   },
   "repository": {
@@ -40,14 +43,11 @@
     "jwt-decode": "^3.1.2",
     "mariadb": "^2.5.4",
     "query-string": "^7.0.1",
-    "raw-loader": "^4.0.2",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-dropdown-select": "^4.7.4",
-    "react-markdown": "^6.0.2",
     "react-router": "^5.2.0",
     "react-router-dom": "^5.2.0",
-    "rehype-raw": "^5.1.0",
+    "react-select": "^5.2.1",
     "sequelize": "^6.6.5",
     "socket.io-client": "^4.1.3",
     "style-loader": "^3.2.1",
@@ -57,6 +57,6 @@
   },
   "devDependencies": {
     "nodemon": "^2.0.12",
-    "webpack-dev-server": "^3.11.2"
+    "webpack-dev-server": "^4.6.0"
   }
 }

webpack.config.js

@@ -9,7 +9,7 @@ const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
 const path = require('path');
 
 //the exported config function
-module.exports = ({ production, analyze }) => {
+module.exports = ({ production, development, local, analyze }) => {
 	return {
 		mode: production ? "production" : "development",
 		entry: path.resolve(__dirname, 'client', 'client.jsx'),
@@ -19,7 +19,7 @@ module.exports = ({ production, analyze }) => {
 			filename: '[name].[chunkhash].js',
 			sourceMapFilename: '[name].[chunkhash].js.map'
 		},
-		devtool: production ? 'source-map' : 'eval-source-map',
+		devtool: production ? false : 'eval-source-map',
 		resolve: {
 			extensions: ['.js', '.jsx']
 		},
@@ -42,23 +42,15 @@ module.exports = ({ production, analyze }) => {
 					test: /\.(css)$/,
 					use: ['style-loader', 'css-loader']
 				},
-				{
-					test: /\.(md)$/,
-					use: [
-						{
-							loader: 'raw-loader'
-						},
-					],
-				},
 			]
 		},
 		plugins: [
 			new DefinePlugin({
 				'process.env': {
 					'PRODUCTION': production,
-					'NEWS_URI': production ? `"${process.env.NEWS_URI}"` : '"https://dev-news.krgamestudios.com"',
-					'AUTH_URI': production ? `"${process.env.AUTH_URI}"` : '"https://dev-auth.krgamestudios.com"',
-					'CHAT_URI': production ? `"${process.env.CHAT_URI}"` : '"https://dev-chat.krgamestudios.com"',
+					'NEWS_URI': production ? `"${process.env.NEWS_URI}"` : development ? '"https://dev-news.krgamestudios.com"' : '"http://localhost:3100"',
+					'AUTH_URI': production ? `"${process.env.AUTH_URI}"` : development ? '"https://dev-auth.krgamestudios.com"' : '"http://localhost:3200"',
+					'CHAT_URI': production ? `"${process.env.CHAT_URI}"` : development ? '"https://dev-chat.krgamestudios.com"' : '"http://localhost:3300"',
 				}
 			}),
 			new CleanWebpackPlugin({
@@ -83,41 +75,31 @@ module.exports = ({ production, analyze }) => {
 			})
 		],
 		devServer: {
-			contentBase: path.resolve(__dirname, 'public'),
-			compress: true,
-			port: 3001,
-			proxy: {
-				'/api/': 'http://localhost:3000/'
-			},
-			overlay: {
-				errors: true
-			},
-			stats: {
-				colors: true,
-				hash: false,
-				version: false,
-				timings: false,
-				assets: false,
-				chunks: false,
-				modules: false,
-				reasons: false,
-				children: false,
-				source: false,
-				errors: true,
-				errorDetails: false,
-				warnings: true,
-				publicPath: false
-			},
-			host: '0.0.0.0',
-			disableHostCheck: true,
-			clientLogLevel: 'silent',
-			historyApiFallback: true,
 			hot: true,
-			injectHot: true
-		},
-		watchOptions: {
-			ignored: /(node_modules)/
+			host: 'localhost',
+			port: 3001,
+			client: {
+				overlay: {
+					errors: true,
+					warnings: true,
+				},
+			},
+
+			watchFiles: {
+				options: {
+					ignored: ['node_modules/**']
+				}
+			},
+
+			proxy: {
+				'/api': {
+					target: 'http://localhost:3000'
+				}
+			},
+
+			static: '/public',
+
+			historyApiFallback: true
 		}
 	}
 };
-