refactor frontend auth and add user service

Author: ngjiayuan

backend/src/auth/auth.controller.ts

@@ -1,11 +1,35 @@
 import { Request, Response } from "express";
-import { signUp, login, currentUser, logout } from "./auth.service";
+import { signUp, login, logout } from "./auth.service";
+
+export async function handleSignUp(req: Request, res: Response) {
+  try {
+    const { email, password } = req.body;
+    console.log(`signing up new user ${email}`);
+    const signedUp = await signUp(email, password);
+    res.status(200).send(signedUp);
+  } catch (error) {
+    console.error(error);
+    res.status(500).send(error);
+  }
+}
 
 export async function handleLogin(req: Request, res: Response) {
   try {
     const { email, password } = req.body;
+    console.log(`logging in user ${email}`);
     const loggedIn = await login(email, password);
-    res.send(loggedIn);
+    res.status(200).send(loggedIn);
+  } catch (error) {
+    console.error(error);
+    res.status(500).send(error);
+  }
+}
+
+export async function handleLogout(req: Request, res: Response) {
+  try {
+    console.log(`logging out`);
+    await logout();
+    res.status(200).send();
   } catch (error) {
     console.error(error);
     res.status(500).send(error);

backend/src/auth/auth.service.ts

@@ -4,60 +4,50 @@ import {
   createUserWithEmailAndPassword,
   signInWithEmailAndPassword,
   signOut,
+  UserCredential,
 } from "firebase/auth";
 import { firebaseConfig } from "../firebase/firebase.config";
 
-interface Result {
-  success: boolean;
-  data: {} | undefined;
-}
-
 initializeApp(firebaseConfig);
 const auth = getAuth();
 
-export async function signUp(email: string, password: string): Promise<Result> {
+export async function signUp(
+  email: string,
+  password: string
+): Promise<UserCredential> {
   try {
-    const data = await createUserWithEmailAndPassword(auth, email, password);
-    if (data) {
-      // get new user details
-      return Promise.resolve({ success: true, data });
-    }
-    return Promise.reject({ success: false, data });
-  } catch (error) {
-    console.log(error);
+    const user: UserCredential = await createUserWithEmailAndPassword(
+      auth,
+      email,
+      password
+    );
+    return Promise.resolve(user);
+  } catch (error: any) {
     return Promise.reject(error);
   }
 }
 
-export async function login(email: string, password: string): Promise<Result> {
+export async function login(
+  email: string,
+  password: string
+): Promise<UserCredential> {
   try {
-    const data = await signInWithEmailAndPassword(auth, email, password);
-    return Promise.resolve({ success: true, data });
+    const user: UserCredential = await signInWithEmailAndPassword(
+      auth,
+      email,
+      password
+    );
+    return Promise.resolve(user);
   } catch (error) {
-    console.error(error);
-    return Promise.reject({ success: false, error });
+    return Promise.reject(error);
   }
 }
 
-export async function logout(): Promise<Result> {
+export async function logout(): Promise<void> {
   try {
     await signOut(auth);
-    return Promise.resolve({ success: true, data: "logged out" });
-  } catch (error) {
-    console.error(error);
-    return Promise.reject({ success: false, error });
-  }
-}
-
-export async function currentUser(): Promise<Result> {
-  try {
-    const user = await auth.currentUser;
-    if (user) {
-      return Promise.resolve({ success: true, data: user });
-    }
-    return Promise.reject({ success: false, error: "You're not logged in!" });
+    return Promise.resolve();
   } catch (error) {
-    console.error(error);
-    return Promise.reject({ success: false, error });
+    return Promise.reject(error);
   }
 }

backend/src/index.ts

@@ -1,6 +1,11 @@
 import express from "express";
 import cors from "cors";
-import { handleLogin } from "./auth/auth.controller";
+import {
+  handleLogin,
+  handleLogout,
+  handleSignUp,
+} from "./auth/auth.controller";
+import { handleCreateUser, handleGetUser } from "./user/user.controller";
 const app = express();
 const port = 3001;
 
@@ -11,7 +16,12 @@ app.get("/", (req, res) => {
   res.send("Hello World!");
 });
 
+app.post("/signup", handleSignUp);
 app.post("/login", handleLogin);
+app.delete("/logout", handleLogout);
+
+app.post("/user", handleCreateUser);
+app.get("/user", handleGetUser);
 
 app.listen(port, () => {
   console.log(`Peerprep listening on port ${port}`);

backend/src/user/user.controller.ts

@@ -0,0 +1,31 @@
+import { Request, Response } from "express";
+import { createUser, getUser } from "./user.service";
+
+export async function handleCreateUser(req: Request, res: Response) {
+  try {
+    const { email } = req.body;
+    console.log(`creating user ${email}`);
+    const user = await createUser(email);
+    res.status(200).send(user);
+  } catch (error) {
+    console.error(error);
+    res.status(500).send(error);
+  }
+}
+
+export async function handleGetUser(req: Request, res: Response) {
+  try {
+    console.log(req.query.email);
+    const { email } = req.query;
+    console.log(`getting user ${email}`);
+    if (typeof email === "string") {
+      const user = await getUser(email);
+      res.status(200).send(user);
+    } else {
+      res.status(500).send("no params");
+    }
+  } catch (error) {
+    console.error(error);
+    res.status(500).send(error);
+  }
+}

backend/src/user/user.service.ts

@@ -0,0 +1,52 @@
+import { initializeApp } from "firebase/app";
+import { doc, getDoc, getFirestore, setDoc } from "firebase/firestore";
+import { firebaseConfig } from "../firebase/firebase.config";
+
+initializeApp(firebaseConfig);
+const db = getFirestore();
+
+interface User {
+  email: string;
+  name?: string;
+  year?: string;
+  major?: string;
+  role: string;
+  completed: number;
+}
+
+export async function createUser(email: string): Promise<User> {
+  try {
+    await setDoc(doc(db, "users", email), {
+      email: email,
+      role: "user",
+      completed: 0,
+    });
+    return Promise.resolve({
+      email: email,
+      role: "user",
+      completed: 0,
+    });
+  } catch (error) {
+    return Promise.reject(error);
+  }
+}
+
+export async function getUser(email: string): Promise<User> {
+  try {
+    const data = await getDoc(doc(db, "users", email));
+    const user = data.data();
+    if (user) {
+      return Promise.resolve({
+        email: email,
+        name: user.name ? user.name : undefined,
+        year: user.year ? user.year : undefined,
+        major: user.major ? user.major : undefined,
+        role: user.role,
+        completed: user.completed,
+      });
+    }
+    return Promise.reject("no such user");
+  } catch (error) {
+    return Promise.reject(error);
+  }
+}

frontend/src/api/auth/data.ts

@@ -0,0 +1,11 @@
+import httpClient from "../axios/config";
+import { AuthDTO } from "./dto";
+import { UserCredential } from "firebase/auth";
+
+export const registerUser = (params: AuthDTO) =>
+  httpClient.post<UserCredential>("/signup", params);
+
+export const signIn = (params: AuthDTO) =>
+  httpClient.post<UserCredential>("/login", params);
+
+export const signOut = () => httpClient.delete("/logout");

frontend/src/api/auth/dto.ts

@@ -0,0 +1,4 @@
+export interface AuthDTO {
+  email: string;
+  password: string;
+}

frontend/src/api/auth/index.ts

@@ -0,0 +1,2 @@
+export * from "./data";
+export * from "./dto";

frontend/src/api/axios/config.ts

@@ -0,0 +1,7 @@
+import axios from "axios";
+
+const httpClient = axios.create({
+  baseURL: process.env.REACT_APP_BASE_URL,
+});
+
+export default httpClient;

frontend/src/api/user/data.ts

@@ -0,0 +1,8 @@
+import httpClient from "../axios/config";
+import { UserModel } from "./model";
+
+export const createUser = (email: string) =>
+  httpClient.post<UserModel>("/user", { email: email });
+
+export const getUser = (email: string) =>
+  httpClient.get<UserModel>("/user", { params: { email: email } });