Merge branch 'main' into setup-infra

backend/src/main/java/edu/nus/market/dao/AccountDao.java

@@ -30,8 +30,8 @@ public interface AccountDao {
         "RETURNING id")
     int updatePassword(int id, String passwordHash, String passwordSalt);
 
-    @Update("UPDATE account SET nickname = #{nickname}, avatar_url = #{avatar}, phone_code = #{phoneCode}, phone_number = #{phoneNumber}, preferred_currency = #{currency} WHERE id = #{id} AND deleted_at IS NULL" +
+    @Update("UPDATE account SET nickname = #{nickname}, avatar_url = #{avatar}, phone_code = #{phoneCode}, phone_number = #{phoneNumber}, preferred_currency = #{currency} WHERE id = #{id} AND deleted_at IS NULL " +
         "RETURNING id")
-    int updateProfile(String nickname, String avatar, String phoneCode, String phone_number, String currency, int id);
+    int updateProfile(String nickname, String avatar, String phoneCode, String phoneNumber, String currency, int id);
 }
 

backend/src/main/java/edu/nus/market/security/CookieManager.java

@@ -9,20 +9,18 @@ public class CookieManager {
     public static ResponseCookie generateCookie(String accessToken){
         ResponseCookie cookie = ResponseCookie.from("access_token", accessToken)
             .httpOnly(true)
-            .secure(true)
             .path("/")
-            .maxAge(7 * 24 * 60 * 60)         // 1 week
-            .sameSite("Strict")
+            .maxAge(7 * 24 * 60 * 60)
+            .sameSite("Lax")
             .build();
         return cookie;
     }
     public static ResponseCookie deleteCookie(){
         ResponseCookie cookie = ResponseCookie.from("access_token", null)
             .httpOnly(true)
-            .secure(true)
             .path("/")
-            .maxAge(0)         // 1 week
-            .sameSite("Strict")
+            .maxAge(0)
+            .sameSite("Lax")
             .build();
         return cookie;
     }

backend/src/main/java/edu/nus/market/service/AccountServiceImpl.java

@@ -57,7 +57,7 @@ public ResponseEntity<Object> getAccountService(int id) {
     @Override
     public ResponseEntity<Object> logoutService(){
         ResponseCookie cookie = cookieManager.deleteCookie();
-        return ResponseEntity.status(HttpStatus.NO_CONTENT).header("Cookie", cookie.toString()).build();
+        return ResponseEntity.status(HttpStatus.NO_CONTENT).header("Set-Cookie", cookie.toString()).build();
     }
 
     /**
@@ -76,7 +76,7 @@ public ResponseEntity loginService(LoginReq loginReq){
             String accessToken = jwtTokenManager.generateAccessToken(account.getId());
             ResponseCookie cookie = cookieManager.generateCookie(accessToken);
             // generate the JWTaccesstoken and send it to the frontend
-            return ResponseEntity.status(HttpStatus.CREATED).header("Cookie", cookie.toString()).body(new ResAccount(account));
+            return ResponseEntity.status(HttpStatus.CREATED).header("Set-Cookie", cookie.toString()).body(new ResAccount(account));
         }
         return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(new ErrorMsg(ErrorMsgEnum.WRONG_PASSWORD.ErrorMsg));
     }
@@ -103,7 +103,7 @@ public ResponseEntity<Object> registerService(RegisterReq registerReq){
         String accessToken = jwtTokenManager.generateAccessToken((accountId));
         ResponseCookie cookie = cookieManager.generateCookie(accessToken);
         // generate the JWTaccesstoken and send it to the frontend
-        return ResponseEntity.status(HttpStatus.CREATED).header("Cookie", cookie.toString()).body(new ResAccount(account));
+        return ResponseEntity.status(HttpStatus.CREATED).header("Set-Cookie", cookie.toString()).body(new ResAccount(account));
     }
 
     @Override

docker-compose.dev.yaml

@@ -1,23 +1,21 @@
-version: '3.8'
-
 services:
   frontend:
     build:
       context: frontend
       dockerfile: Dockerfile
       args:
         NEXT_PUBLIC_API_BASE_URL: ${NEXT_PUBLIC_API_BASE_URL}
-    image: z1yoon/nus-secondhand-market-frontend:latest
     ports:
       - "80:3000"
     restart: always
+    environment:
+      - API_BASE_URL=${API_BASE_URL}
     user: root
 
   backend:
     build:
       context: backend
       dockerfile: Dockerfile
-    image: z1yoon/nus-secondhand-market-backend:latest
     ports:
       - "8081:8081"
     restart: always

docker-compose.yaml

@@ -1,11 +1,11 @@
-version: '3.8'
-
 services:
   frontend:
     image: z1yoon/nus-secondhand-market-frontend:latest
     ports:
       - "80:3000"
     restart: always
+    environment:
+      - API_BASE_URL=${API_BASE_URL}
     user: root
 
   backend:

frontend/.env.example

@@ -1,4 +1,3 @@
 # The base URL of backend API entrypoint.
-# For example, "http://localhost:8080/",
-# Note: A trailing slash is mandatory.
+# For example, "http://localhost:8080",
 NEXT_PUBLIC_API_BASE_URL=

frontend/Dockerfile

@@ -28,9 +28,7 @@ WORKDIR /app
 RUN addgroup --system --gid 1001 nodejs
 RUN adduser --system --uid 1001 nextjs
 
-COPY --from=build --chown=nextjs:nodejs /app/public public
 COPY --from=build --chown=nextjs:nodejs /app/.next/standalone .
-COPY --from=build --chown=nextjs:nodejs /app/.next/static .next/static
 
 USER nextjs
 

frontend/package.json

@@ -5,8 +5,8 @@
   "packageManager": "pnpm@9.11.0",
   "scripts": {
     "dev": "next dev",
-    "build": "next build",
-    "start": "next start",
+    "build": "next build && cp -r .next/static .next/standalone/.next && cp -r public .next/standalone",
+    "start": "node .next/standalone/server.js",
     "lint": "tsc && eslint . --cache --cache-location node_modules/.cache/eslint/.eslint-cache"
   },
   "dependencies": {

frontend/src/app/login/form.tsx

@@ -36,15 +36,15 @@ export function LoginForm() {
     string,
     FormEvent<HTMLFormElement>
   >(
-    "auth/me",
+    "/auth/me",
     async (_, { arg: event }) => {
       event.preventDefault();
 
       const formData = Object.fromEntries(new FormData(event.currentTarget));
 
       const { email, password } = v.parse(formSchema, formData);
 
-      return await new ClientRequester().post<Account>("auth/token", {
+      return await new ClientRequester().post<Account>("/auth/token", {
         email,
         password,
       });
@@ -58,6 +58,7 @@ export function LoginForm() {
           description: `Welcome back, ${account.nickname ?? account.email}!`,
         });
         router.push("/");
+        router.refresh();
       },
       throwOnError: false,
       onError: (error) => {

frontend/src/app/register/form.tsx

@@ -40,7 +40,7 @@ export function RegisterForm() {
     string,
     FormEvent<HTMLFormElement>
   >(
-    "auth/me",
+    "/auth/me",
     async (_, { arg: event }) => {
       event.preventDefault();
 
@@ -52,7 +52,7 @@ export function RegisterForm() {
         throw new Error("Passwords do not match. Please double check.");
       }
 
-      return await new ClientRequester().post<Account>("auth/me", {
+      return await new ClientRequester().post<Account>("/auth/me", {
         email,
         password,
       });
@@ -66,6 +66,7 @@ export function RegisterForm() {
           description: `Welcome on board, ${account.email}!`,
         });
         router.push("/");
+        router.refresh();
       },
       throwOnError: false,
       onError: (error) => {

frontend/src/app/settings/cards/delete-account-card.tsx

@@ -95,9 +95,9 @@ function DeleteAccountButton() {
     string,
     MouseEvent<HTMLButtonElement>
   >(
-    "auth/me",
+    "/auth/me",
     async () => {
-      return await new ClientRequester().delete<undefined>("auth/me");
+      return await new ClientRequester().delete<undefined>("/auth/me");
     },
     {
       populateCache: true,
@@ -109,6 +109,7 @@ function DeleteAccountButton() {
             "We are sorry to see you go. 🥲 Remember you can contact our support team to find your account back in the next 30 days!",
         });
         router.push("/");
+        router.refresh();
       },
       throwOnError: false,
       onError: (error) => {

frontend/src/app/settings/cards/update-email-card.tsx

@@ -38,15 +38,15 @@ export function UpdateEmailCard({ initialEmail }: Props) {
     string,
     FormEvent<HTMLFormElement>
   >(
-    "auth/me",
+    "/auth/me",
     async (_, { arg: event }) => {
       event.preventDefault();
 
       const formData = Object.fromEntries(new FormData(event.currentTarget));
 
       const { email } = v.parse(formSchema, formData);
 
-      return await new ClientRequester().patch<Account>("auth/me", {
+      return await new ClientRequester().patch<Account>("/auth/me", {
         email,
       });
     },

frontend/src/app/settings/cards/update-nickname-card.tsx

@@ -39,15 +39,15 @@ export function UpdateNicknameCard({ initialNickname }: Props) {
     string,
     FormEvent<HTMLFormElement>
   >(
-    "auth/me",
+    "/auth/me",
     async (_, { arg: event }) => {
       event.preventDefault();
 
       const formData = Object.fromEntries(new FormData(event.currentTarget));
 
       const { nickname } = v.parse(formSchema, formData);
 
-      return await new ClientRequester().patch<Account>("auth/me", {
+      return await new ClientRequester().patch<Account>("/auth/me", {
         nickname,
       });
     },

frontend/src/app/settings/cards/update-whatsapp-card.tsx

@@ -49,15 +49,15 @@ export function UpdateWhatsappCard({
     string,
     FormEvent<HTMLFormElement>
   >(
-    "auth/me",
+    "/auth/me",
     async (_, { arg: event }) => {
       event.preventDefault();
 
       const formData = Object.fromEntries(new FormData(event.currentTarget));
 
       const { phoneCode, phoneNumber } = v.parse(formSchema, formData);
 
-      return await new ClientRequester().patch<Account>("auth/me", {
+      return await new ClientRequester().patch<Account>("/auth/me", {
         phone_code: phoneCode,
         phone_number: phoneNumber,
       });

frontend/src/app/settings/contacts/page.tsx

@@ -3,7 +3,7 @@ import { ServerRequester } from "@/utils/requester/server";
 import { UpdateWhatsappCard } from "../cards/update-whatsapp-card";
 
 export default async function ContactsSettingsPage() {
-  const me = await new ServerRequester().get<Account | undefined>("auth/me");
+  const me = await new ServerRequester().get<Account | undefined>("/auth/me");
 
   return (
     <div className="grid gap-6">

frontend/src/app/settings/display/page.tsx

@@ -3,7 +3,7 @@ import { ServerRequester } from "@/utils/requester/server";
 import { UpdateNicknameCard } from "../cards/update-nickname-card";
 
 export default async function DisplaySettingsPage() {
-  const me = await new ServerRequester().get<Account | undefined>("auth/me");
+  const me = await new ServerRequester().get<Account | undefined>("/auth/me");
 
   return (
     <div className="grid gap-6">

frontend/src/app/settings/page.tsx

@@ -4,7 +4,7 @@ import { DeleteAccountCard } from "./cards/delete-account-card";
 import { UpdateEmailCard } from "./cards/update-email-card";
 
 export default async function SettingsPage() {
-  const me = await new ServerRequester().get<Account | undefined>("auth/me");
+  const me = await new ServerRequester().get<Account | undefined>("/auth/me");
 
   return (
     <div className="grid gap-6">

frontend/src/components/framework/me-card/log-out-button.tsx

@@ -19,9 +19,9 @@ export function LogOutButton() {
     string,
     MouseEvent<HTMLButtonElement>
   >(
-    "auth/me",
+    "/auth/me",
     async () => {
-      return await new ClientRequester().delete<undefined>("auth/token");
+      return await new ClientRequester().delete<undefined>("/auth/token");
     },
     {
       populateCache: true,

frontend/src/components/framework/me-card/me-card-client.tsx

@@ -24,9 +24,9 @@ type Props = {
 
 export function MeCardClient({ initialMe, fallback }: Props) {
   const { data: me } = useSWR(
-    "auth/me",
+    "/auth/me",
     async () => {
-      return await new ClientRequester().get<Account>("auth/me");
+      return await new ClientRequester().get<Account>("/auth/me");
     },
     {
       fallbackData: initialMe as Account,

frontend/src/components/framework/me-card/me-card-server.tsx

@@ -4,7 +4,7 @@ import { JoinNowCard } from "./join-now-card";
 import { MeCardClient } from "./me-card-client";
 
 export async function MeCardServer() {
-  const me = await new ServerRequester().get<Account | undefined>("auth/me");
+  const me = await new ServerRequester().get<Account | undefined>("/auth/me");
 
   return <MeCardClient initialMe={me} fallback={<JoinNowCard />} />;
 }

frontend/src/utils/requester/client-fetcher.ts

@@ -2,9 +2,12 @@ import type { Fetcher } from "./fetcher";
 
 export class ClientFetcher implements Fetcher {
   public async fetch<T>(endpoint: string, init: RequestInit = {}) {
-    const url = new URL(endpoint, process.env["NEXT_PUBLIC_API_BASE_URL"]);
+    const url = process.env["NEXT_PUBLIC_API_BASE_URL"] + endpoint;
 
-    const response = await fetch(url, init);
+    const response = await fetch(url, {
+      ...init,
+      credentials: "include",
+    });
 
     if (response.status === 204) {
       return undefined as never;

frontend/src/utils/requester/server-fetcher.ts

@@ -3,15 +3,16 @@ import type { Fetcher } from "./fetcher";
 
 export class ServerFetcher implements Fetcher {
   public async fetch<T>(endpoint: string, init: RequestInit = {}) {
-    const url = new URL(endpoint, process.env["NEXT_PUBLIC_API_BASE_URL"]);
+    const url = process.env["API_BASE_URL"] + endpoint;
 
     const response = await fetch(url, {
       ...init,
       headers: {
         ...init.headers,
+        credentials: "include",
         Cookie: cookies().toString(),
       },
-    });
+    } as RequestInit);
 
     if (response.status === 204) {
       return undefined as never;

init/1-schema.sql

@@ -31,8 +31,11 @@ create table account (
   -- Department or school of the user.
   department_id int default null references department(id) on delete set null,
 
+  -- User's WhatsApp phone country code.
+  phone_code text default null,
+
   -- User's WhatsApp phone number.
-  phone text default null,
+  phone_number text default null,
 
   -- User's preferred display currency, in the form of ISO 4217, e.g. CNY, SGD.
   preferred_currency text default null,