From 36e79a513ff706b5d28fd5ff6d3be888832cf1ad Mon Sep 17 00:00:00 2001
From: Kayne Ruse <kayneruse@gmail.com>
Date: Sun, 4 Dec 2022 11:48:23 +0000
Subject: [PATCH] Fixed reset page

---
 client/pages/accounts/reset.jsx | 15 +++++++--------
 package.json                    |  1 -
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/client/pages/accounts/reset.jsx b/client/pages/accounts/reset.jsx
index 6712584..d0f0c82 100644
--- a/client/pages/accounts/reset.jsx
+++ b/client/pages/accounts/reset.jsx
@@ -1,6 +1,5 @@
 import React, { useContext, useRef } from 'react';
-import { Link, useNavigate } from 'react-router-dom';
-import queryString from 'query-string';
+import { Link, useNavigate, useSearchParams } from 'react-router-dom';
 
 import ApplyToBody from '../utilities/apply-to-body';
 
@@ -13,11 +12,11 @@ const Reset = props => {
 	//context
 	const authTokens = useContext(TokenContext);
 
-	//query
-	const query = queryString.parse(props.location.search);
+	//params
+	const [params, setParams] = useSearchParams();
 
 	//misplaced?
-	if (authTokens.accessToken || !query.email || !query.token) {
+	if (authTokens.accessToken || !params.email || !params.token) {
 		navigate("/");
 	}
 
@@ -34,7 +33,7 @@ const Reset = props => {
 					<h1 className='text centered'>Reset Password</h1>
 					<form className='constrained' onSubmit={async evt => {
 						evt.preventDefault();
-						const [err, redirect] = await update(passwordRef.current.value, retypeRef.current.value, query);
+						const [err, redirect] = await update(passwordRef.current.value, retypeRef.current.value, params);
 
 						if (err) {
 							alert(err);
@@ -59,7 +58,7 @@ const Reset = props => {
 	);
 };
 
-const update = async (password, retype, query) => {
+const update = async (password, retype, params) => {
 	if (password != retype) {
 		return ['Passwords do not match'];
 	}
@@ -68,7 +67,7 @@ const update = async (password, retype, query) => {
 		return ['Password is too short'];
 	}
 
-	const result = await fetch(`${process.env.AUTH_URI}/auth/reset?email=${query.email}&token=${query.token}`, {
+	const result = await fetch(`${process.env.AUTH_URI}/auth/reset?email=${params.email}&token=${params.token}`, {
 		method: 'PATCH',
 		headers: {
 			'Content-Type': 'application/json'
diff --git a/package.json b/package.json
index 450ed82..439457f 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,6 @@
     "html-webpack-plugin": "^5.5.0",
     "jwt-decode": "^3.1.2",
     "mariadb": "^3.0.2",
-    "query-string": "^4.3.4",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-router": "^6.3.0",