Merge branch 'milestone-d4' of github.com:CS3219-AY2425S1/cs3219-ay2425s1-project-g15 into milestone-d4

Author: tingkai-mai

backend/user/.env.sample

@@ -0,0 +1,9 @@
+DB_CLOUD_URI=
+DB_LOCAL_URI=
+PORT=
+
+# Will use cloud MongoDB Atlas database
+ENV=
+
+# Secret for creating JWT signature
+JWT_SECRET=

backend/user/controller/auth-controller.js

@@ -1,4 +1,4 @@
-import bcrypt from "bcrypt";
+import bcrypt from 'bcryptjs';
 import jwt from "jsonwebtoken";
 import { findUserByEmail as _findUserByEmail } from "../model/repository.js";
 import { formatUserResponse } from "./user-controller.js";

backend/user/controller/user-controller.js

@@ -1,4 +1,4 @@
-import bcrypt from "bcrypt";
+import bcrypt from 'bcryptjs';
 import { isValidObjectId } from "mongoose";
 import {
   createUser as _createUser,

backend/user/package-lock.json

@@ -13,10 +13,12 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
+    "@types/bcryptjs": "^2.4.6",
     "nodemon": "^3.1.4"
   },
   "dependencies": {
     "bcrypt": "^5.1.1",
+    "bcryptjs": "^2.4.3",
     "cors": "^2.8.5",
     "dotenv": "^16.4.5",
     "express": "^4.19.2",

backend/user/package.json

@@ -30,7 +30,7 @@ export const getBaseUserData = () => {
   };
 };
 
-const NEXT_PUBLIC_USER_SERVICE = process.env.NEXT_PUBLIC_USER_SERVICE;
+const NEXT_PUBLIC_USER_SERVICE = process.env.NEXT_PUBLIC_USER_SERVICE || "https://user-service-598285527681.us-central1.run.app";
 
 export const verifyToken = async (needsLogin: boolean) => {
   const token = getToken();

frontend/src/api/user.tsx

@@ -12,8 +12,7 @@ import Navbar from "../../home/components/navbar/Navbar";
 const formSchema = z.object({
   email: z.string()
     .email("Invalid email"),
-  password: z.string()
-    .min(8, "Password must be at least 8 characters"),
+  password: z.string(),
 });
 
 const Login = () => {

frontend/src/app/(auth)/(user)/login/page.tsx

@@ -84,7 +84,7 @@ const Register = () => {
                 </FormItem>
               )}
             />
-            <Button type="submit" className="bg-yellow-500 hover:bg-yellow-300 px-4 py-2 my-2 rounded-md text-black">Login</Button>
+            <Button type="submit" className="bg-yellow-500 hover:bg-yellow-300 px-4 py-2 my-2 rounded-md text-black">Register</Button>
           </form>
         </Form>
       </div>