From 67ec56672894a18e07158dd22bb596ac1298432a Mon Sep 17 00:00:00 2001 From: Stephen Date: Fri, 23 Feb 2024 11:58:09 -0500 Subject: [PATCH 1/4] Added re enter password to register page --- frontend-next/src/app/register/page.js | 26 +++++++++++++++++++++----- package-lock.json | 6 ++++++ 2 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 package-lock.json diff --git a/frontend-next/src/app/register/page.js b/frontend-next/src/app/register/page.js index 027eba0..4c4fbb5 100644 --- a/frontend-next/src/app/register/page.js +++ b/frontend-next/src/app/register/page.js @@ -2,11 +2,19 @@ import { useRouter } from "next/navigation"; import { useForm, Form } from "react-hook-form"; import "../globals.css" +import { useState } from "react"; +import { data } from "autoprefixer"; function Register() { - var { register, control, setError, formState: { errors } } = useForm() + var { register, control, setError, handleSubmit, formState: { errors } } = useForm() var router = useRouter(); var emailRegex = /(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/ + var [passwordMismatch, setPasswordMismatch] = useState(false); + + const passwordMatch = (data) => { + return data.password === data.passwordCheck; + } + return (
@@ -17,14 +25,22 @@ function Register() {

Register

-
{ - router.push("/app"); - }} + { + if (passwordMatch(data)) { + router.push("/app"); + } else { + setPasswordMismatch(true); + return; + } + })} + control={control} >

+
+ {passwordMismatch &&

Passwords do not match

}
Have an account? Log In diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..8c17260 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,6 @@ +{ + "name": "ChatMaps", + "lockfileVersion": 3, + "requires": true, + "packages": {} +} From afd72ec72be1563679883e8b647eb0917d6b3afe Mon Sep 17 00:00:00 2001 From: Stephen Date: Fri, 23 Feb 2024 13:52:38 -0500 Subject: [PATCH 2/4] Added password confirmation on register page --- frontend-next/src/app/register/page.js | 29 ++++++++++++++++---------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/frontend-next/src/app/register/page.js b/frontend-next/src/app/register/page.js index 4c4fbb5..0d0291f 100644 --- a/frontend-next/src/app/register/page.js +++ b/frontend-next/src/app/register/page.js @@ -13,6 +13,17 @@ function Register() { const passwordMatch = (data) => { return data.password === data.passwordCheck; + }; + + const onSubmit = (data) => { + if (passwordMatch(data)) { + setPasswordMismatch(false); + router.push("/success"); + + } else{ + setPasswordMismatch(true); + return; + } } return ( @@ -25,21 +36,17 @@ function Register() {

Register

- { - if (passwordMatch(data)) { - router.push("/app"); - } else { - setPasswordMismatch(true); - return; - } - })} - + { + router.push("/app"); + }} + action="/api/register" + encType={'application/json'} control={control} >

-
+
{passwordMismatch &&

Passwords do not match

}
From 7ca4b6284863a82c5a39c32dac5a046aab577560 Mon Sep 17 00:00:00 2001 From: Stephen Date: Fri, 23 Feb 2024 14:05:14 -0500 Subject: [PATCH 3/4] Added password confirmation to register page --- frontend-next/src/app/register/page.js | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/frontend-next/src/app/register/page.js b/frontend-next/src/app/register/page.js index ed629b6..0d0291f 100644 --- a/frontend-next/src/app/register/page.js +++ b/frontend-next/src/app/register/page.js @@ -6,11 +6,7 @@ import { useState } from "react"; import { data } from "autoprefixer"; function Register() { -<<<<<<< HEAD var { register, control, setError, handleSubmit, formState: { errors } } = useForm() -======= - var { register, control, setError, formState: { errors, isSubmitting, isSubmitted } } = useForm() ->>>>>>> main var router = useRouter(); var emailRegex = /(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/ var [passwordMismatch, setPasswordMismatch] = useState(false); @@ -50,22 +46,10 @@ function Register() { >

-<<<<<<< HEAD
{passwordMismatch &&

Passwords do not match

}
-======= -
->>>>>>> main Have an account? Log In
From 9ee8bf337661f82aed2db96b05445c922e2da06f Mon Sep 17 00:00:00 2001 From: Nicholas Pease Date: Sat, 24 Feb 2024 02:15:53 +0000 Subject: [PATCH 4/4] Add username, fix onboarding --- frontend-next/src/app/api/onboard/route.js | 27 ++++++++++++++-------- frontend-next/src/app/onboarding/page.js | 1 + frontend-next/src/app/register/page.js | 1 - 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/frontend-next/src/app/api/onboard/route.js b/frontend-next/src/app/api/onboard/route.js index 4c177a8..b1b3e45 100644 --- a/frontend-next/src/app/api/onboard/route.js +++ b/frontend-next/src/app/api/onboard/route.js @@ -2,9 +2,10 @@ import { NextResponse } from "next/server"; // Lib Imports import { app } from "../firebase-config"; import { getDatabase, ref, set as firebaseSet } from "firebase/database"; +import { cookies } from "next/headers"; -async function onboard(firstName, lastName, req) { +async function onboard(onboardingJSON, req) { var session = req.cookies.get("session"); //Call the authentication endpoint var res = await fetch(new URL("/api/login", req.url), {headers: {Cookie: `session=${session?.value}`}}) @@ -14,16 +15,24 @@ async function onboard(firstName, lastName, req) { return NextResponse.json({}, { status: 401 }); } try { + var expiresIn = 20 * 60 * 1000; // 20 minutes var { uid, email } = await res.json() + onboardingJSON.email = email + onboardingJSON.uid = uid + onboardingJSON.defined = true var database = getDatabase(app) - await firebaseSet(ref(database, `users/${uid}`), { - firstName: firstName, - lastName: lastName, - email: email - }); + await firebaseSet(ref(database, `users/${uid}`), onboardingJSON); + var userOptions = { + name: "user", + value: JSON.stringify(onboardingJSON), + maxAge: expiresIn, // 20 mins + httpOnly: true, + secure: true, + }; + cookies().set(userOptions); return NextResponse.json({}, { status: 200 }); } catch(error) { - return NextResponse.json({ error: "Internal Server Error" },{ status: 500 }); + return NextResponse.json({ error: "Internal Server Error: "+error },{ status: 500 }); } } @@ -31,8 +40,8 @@ async function onboard(firstName, lastName, req) { // Handles POST requests (login requests) export async function POST(req, res) { try { - var { firstName, lastName } = await req?.json() - return await onboard(firstName, lastName, req); + var onboardingJSON = await req?.json() + return await onboard(onboardingJSON, req); } catch (error) { return NextResponse.json({ error: "Internal Server Error" },{ status: 500 }); } diff --git a/frontend-next/src/app/onboarding/page.js b/frontend-next/src/app/onboarding/page.js index 1f3b195..4493279 100644 --- a/frontend-next/src/app/onboarding/page.js +++ b/frontend-next/src/app/onboarding/page.js @@ -31,6 +31,7 @@ function Onboarding() { Welcome to ChatMaps! We are excited to have you join our community!
First we just need a little bit of information from you to get started.
+


diff --git a/frontend-next/src/app/register/page.js b/frontend-next/src/app/register/page.js index 0d0291f..cfdfffe 100644 --- a/frontend-next/src/app/register/page.js +++ b/frontend-next/src/app/register/page.js @@ -3,7 +3,6 @@ import { useRouter } from "next/navigation"; import { useForm, Form } from "react-hook-form"; import "../globals.css" import { useState } from "react"; -import { data } from "autoprefixer"; function Register() { var { register, control, setError, handleSubmit, formState: { errors } } = useForm()