devops/encoach_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated the login and register to transform the e-mail to lowercase

Browse Source
This commit is contained in:
Tiago Ribeiro
2024-01-29 09:53:47 +00:00
parent b7b2718387
commit 800d04da37
3 changed files with 155 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pages/(admin)/BatchCodeGenerator.tsx
View File

@@ -76,7 +76,7 @@ export default function BatchCodeGenerator({ user }: { user: User }) {
] = row as string[];
return EMAIL_REGEX.test(email.toString().trim())
? {
email: email.toString().trim(),
email: email.toString().trim().toLowerCase(),
name: `${firstName ?? ""} ${lastName ?? ""}`.trim(),
passport_id: passport_id?.toString().trim() || undefined,
}

26
src/pages/api/login.ts
View File

@@ -1,10 +1,10 @@
import {NextApiRequest, NextApiResponse} from "next";
import {getAuth, signInWithEmailAndPassword} from "firebase/auth";
import {app} from "@/firebase";
import {sessionOptions} from "@/lib/session";
import {withIronSessionApiRoute} from "iron-session/next";
import {User} from "@/interfaces/user";
import {getFirestore, getDoc, doc} from "firebase/firestore";
import { NextApiRequest, NextApiResponse } from "next";
import { getAuth, signInWithEmailAndPassword } from "firebase/auth";
import { app } from "@/firebase";
import { sessionOptions } from "@/lib/session";
import { withIronSessionApiRoute } from "iron-session/next";
import { User } from "@/interfaces/user";
import { getFirestore, getDoc, doc } from "firebase/firestore";
const auth = getAuth(app);
const db = getFirestore(app);
@@ -12,27 +12,27 @@ const db = getFirestore(app);
export default withIronSessionApiRoute(login, sessionOptions);
async function login(req: NextApiRequest, res: NextApiResponse) {
const {email, password} = req.body as {email: string; password: string};
const { email, password } = req.body as { email: string; password: string };
signInWithEmailAndPassword(auth, email, password)
signInWithEmailAndPassword(auth, email.toLowerCase(), password)
.then(async (userCredentials) => {
const userId = userCredentials.user.uid;
const docUser = await getDoc(doc(db, "users", userId));
if (!docUser.exists()) {
res.status(401).json({error: 401, message: "User does not exist!"});
res.status(401).json({ error: 401, message: "User does not exist!" });
return;
}
const user = docUser.data() as User;
req.session.user = {...user, id: userId};
req.session.user = { ...user, id: userId };
await req.session.save();
res.status(200).json({user: {...user, id: userId}});
res.status(200).json({ user: { ...user, id: userId } });
})
.catch((error) => {
console.log(error);
res.status(401).json({error});
res.status(401).json({ error });
});
}

89
src/pages/api/register.ts
View File

@@ -1,11 +1,23 @@
import {NextApiRequest, NextApiResponse} from "next";
import {createUserWithEmailAndPassword, getAuth} from "firebase/auth";
import {app} from "@/firebase";
import {sessionOptions} from "@/lib/session";
import {withIronSessionApiRoute} from "iron-session/next";
import {getFirestore, doc, setDoc, query, collection, where, getDocs} from "firebase/firestore";
import {CorporateInformation, DemographicInformation, Type} from "@/interfaces/user";
import {addUserToGroupOnCreation} from "@/utils/registration";
import { NextApiRequest, NextApiResponse } from "next";
import { createUserWithEmailAndPassword, getAuth } from "firebase/auth";
import { app } from "@/firebase";
import { sessionOptions } from "@/lib/session";
import { withIronSessionApiRoute } from "iron-session/next";
import {
getFirestore,
doc,
setDoc,
query,
collection,
where,
getDocs,
} from "firebase/firestore";
import {
CorporateInformation,
DemographicInformation,
Type,
} from "@/interfaces/user";
import { addUserToGroupOnCreation } from "@/utils/registration";
import moment from "moment";
const auth = getAuth(app);
@@ -28,7 +40,7 @@ const DEFAULT_LEVELS = {
};
async function register(req: NextApiRequest, res: NextApiResponse) {
const {type} = req.body as {
const { type } = req.body as {
type: "individual" | "corporate";
};
@@ -37,7 +49,7 @@ async function register(req: NextApiRequest, res: NextApiResponse) {
}
async function registerIndividual(req: NextApiRequest, res: NextApiResponse) {
const {email, passport_id, password, code} = req.body as {
const { email, passport_id, password, code } = req.body as {
email: string;
passport_id?: string;
password: string;
@@ -45,30 +57,47 @@ async function registerIndividual(req: NextApiRequest, res: NextApiResponse) {
};
const codeQuery = query(collection(db, "codes"), where("code", "==", code));
const codeDocs = (await getDocs(codeQuery)).docs.filter((x) => !Object.keys(x.data()).includes("userId"));
const codeDocs = (await getDocs(codeQuery)).docs.filter(
(x) => !Object.keys(x.data()).includes("userId"),
);
if (code && code.length > 0 && codeDocs.length === 0) {
res.status(400).json({error: "Invalid Code!"});
res.status(400).json({ error: "Invalid Code!" });
return;
}
const codeData = codeDocs.length > 0 ? (codeDocs[0].data() as {code: string; type: Type; creator?: string; expiryDate: Date | null}) : undefined;
const codeData =
codeDocs.length > 0
? (codeDocs[0].data() as {
code: string;
type: Type;
creator?: string;
expiryDate: Date | null;
})
: undefined;
createUserWithEmailAndPassword(auth, email, password)
createUserWithEmailAndPassword(auth, email.toLowerCase(), password)
.then(async (userCredentials) => {
const userId = userCredentials.user.uid;
delete req.body.password;
const user = {
...req.body,
email: email.toLowerCase(),
desiredLevels: DEFAULT_DESIRED_LEVELS,
levels: DEFAULT_LEVELS,
bio: "",
isFirstLogin: codeData ? codeData.type === "student" : true,
focus: "academic",
type: email.endsWith("@ecrop.dev") ? "developer" : codeData ? codeData.type : "student",
subscriptionExpirationDate: codeData ? codeData.expiryDate : moment().subtract(1, "days").toISOString(),
...(passport_id ? {demographicInformation: {passport_id}} : {}),
type: email.endsWith("@ecrop.dev")
? "developer"
: codeData
? codeData.type
: "student",
subscriptionExpirationDate: codeData
? codeData.expiryDate
: moment().subtract(1, "days").toISOString(),
...(passport_id ? { demographicInformation: { passport_id } } : {}),
registrationDate: new Date().toISOString(),
status: code ? "active" : "paymentDue",
};
@@ -76,35 +105,41 @@ async function registerIndividual(req: NextApiRequest, res: NextApiResponse) {
await setDoc(doc(db, "users", userId), user);
if (codeDocs.length > 0 && codeData) {
await setDoc(codeDocs[0].ref, {userId: userId}, {merge: true});
if (codeData.creator) await addUserToGroupOnCreation(userId, codeData.type, codeData.creator);
await setDoc(codeDocs[0].ref, { userId: userId }, { merge: true });
if (codeData.creator)
await addUserToGroupOnCreation(
userId,
codeData.type,
codeData.creator,
);
}
req.session.user = {...user, id: userId};
req.session.user = { ...user, id: userId };
await req.session.save();
res.status(200).json({user: {...user, id: userId}});
res.status(200).json({ user: { ...user, id: userId } });
})
.catch((error) => {
console.log(error);
res.status(401).json({error});
res.status(401).json({ error });
});
}
async function registerCorporate(req: NextApiRequest, res: NextApiResponse) {
const {email, password} = req.body as {
const { email, password } = req.body as {
email: string;
password: string;
corporateInformation: CorporateInformation;
};
createUserWithEmailAndPassword(auth, email, password)
createUserWithEmailAndPassword(auth, email.toLowerCase(), password)
.then(async (userCredentials) => {
const userId = userCredentials.user.uid;
delete req.body.password;
const user = {
...req.body,
email: email.toLowerCase(),
desiredLevels: DEFAULT_DESIRED_LEVELS,
levels: DEFAULT_LEVELS,
bio: "",
@@ -118,13 +153,13 @@ async function registerCorporate(req: NextApiRequest, res: NextApiResponse) {
await setDoc(doc(db, "users", userId), user);
req.session.user = {...user, id: userId};
req.session.user = { ...user, id: userId };
await req.session.save();
res.status(200).json({user: {...user, id: userId}});
res.status(200).json({ user: { ...user, id: userId } });
})
.catch((error) => {
console.log(error);
res.status(401).json({error});
res.status(401).json({ error });
});
}