From 0058ba219e60a3e26fea07f7be7a2e625d5970c7 Mon Sep 17 00:00:00 2001 From: abhayjoshi201 Date: Sat, 19 Oct 2024 14:28:58 +0530 Subject: [PATCH 1/6] Optimize Docker build script --- Docker/dev/build_images.sh | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/Docker/dev/build_images.sh b/Docker/dev/build_images.sh index 2de827dfe..1f9e86ba3 100755 --- a/Docker/dev/build_images.sh +++ b/Docker/dev/build_images.sh @@ -1,24 +1,25 @@ - #!/bin/bash # Change directory to root Server directory for correct Docker Context cd ../.. -#Client -client="./Docker/dev/client.Dockerfile" +# Define an array of services and their Dockerfiles +declare -A services=( + ["uptime_client"]="./Docker/dev/client.Dockerfile" + ["uptime_database_mongo"]="./Docker/dev/mongoDB.Dockerfile" + ["uptime_redis"]="./Docker/dev/redis.Dockerfile" + ["uptime_server"]="./Docker/dev/server.Dockerfile" +) -# MongoDB -mongoDB="./Docker/dev/mongoDB.Dockerfile" +# Loop through each service and build the corresponding image +for service in "${!services[@]}"; do + docker build -f "${services[$service]}" -t "$service" . + + # Check if the build succeeded + if [ $? -ne 0 ]; then + echo "Error building $service image. Exiting..." + exit 1 + fi +done -# Redis -redis="./Docker/dev/redis.Dockerfile" - -# Server -server="./Docker/dev/server.Dockerfile" - -docker build -f $client -t uptime_client . -docker build -f $mongoDB -t uptime_database_mongo . -docker build -f $redis -t uptime_redis . -docker build -f $server -t uptime_server . - -echo "All images built" \ No newline at end of file +echo "All images built successfully" From d28d049bcb25a361e06b1781998e4255d6ecd4e1 Mon Sep 17 00:00:00 2001 From: abhayjoshi201 Date: Sat, 19 Oct 2024 14:33:56 +0530 Subject: [PATCH 2/6] optimized-docker-build-script --- Docker/dev/build_images.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docker/dev/build_images.sh b/Docker/dev/build_images.sh index 1f9e86ba3..58bfc34f5 100755 --- a/Docker/dev/build_images.sh +++ b/Docker/dev/build_images.sh @@ -15,7 +15,7 @@ declare -A services=( for service in "${!services[@]}"; do docker build -f "${services[$service]}" -t "$service" . - # Check if the build succeeded + ## Check if the build succeeded if [ $? -ne 0 ]; then echo "Error building $service image. Exiting..." exit 1 From c8b8128aef7a9ce87c5e4759f14f235b4bb35258 Mon Sep 17 00:00:00 2001 From: abhayjoshi201 Date: Sat, 19 Oct 2024 15:18:00 +0530 Subject: [PATCH 3/6] made directory-independent --- Docker/dev/build_images.sh | 1 + git | 0 2 files changed, 1 insertion(+) create mode 100644 git diff --git a/Docker/dev/build_images.sh b/Docker/dev/build_images.sh index 58bfc34f5..f6171089c 100755 --- a/Docker/dev/build_images.sh +++ b/Docker/dev/build_images.sh @@ -1,6 +1,7 @@ #!/bin/bash # Change directory to root Server directory for correct Docker Context +cd "$(dirname "$0")" cd ../.. # Define an array of services and their Dockerfiles diff --git a/git b/git new file mode 100644 index 000000000..e69de29bb From dc1cc072dd44651549e5f6e6477f5e8d331a2c5e Mon Sep 17 00:00:00 2001 From: abhayjoshi201 Date: Sat, 19 Oct 2024 15:32:51 +0530 Subject: [PATCH 4/6] changes suggested by coderabbitai --- Server/controllers/authController.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/Server/controllers/authController.js b/Server/controllers/authController.js index 4ce5a0e2b..a01b4e78d 100644 --- a/Server/controllers/authController.js +++ b/Server/controllers/authController.js @@ -85,9 +85,7 @@ const registerUser = async (req, res, next) => { userId: newUser._id, }); - const userForToken = { ...newUser._doc }; - delete userForToken.profileImage; - delete userForToken.avatarImage; + const { password, avatarImage, ...userWithoutPassword } = user._doc; const appSettings = await req.settingsService.getSettings(); @@ -208,6 +206,7 @@ const editUser = async (req, res, next) => { try { // Change Password check + const { email } = jwt.verify(token, (await req.settingsService.getSettings()).jwtSecret); if (req.body.password && req.body.newPassword) { // Get token from headers const token = getTokenFromHeaders(req.headers); @@ -215,7 +214,17 @@ const editUser = async (req, res, next) => { const { jwtSecret } = req.settingsService.getSettings(); const { email } = jwt.verify(token, jwtSecret); // Add user email to body for DB operation + const monitors = teamMonitors?.monitors ?? []; + await Promise.all( + monitors.map(async (monitor) => { + await req.jobQueue.deleteJob(monitor); + await req.db.deleteChecks(monitor._id); + await req.db.deletePageSpeedChecksByMonitorId(monitor._id); + await req.db.deleteNotificationsByMonitorId(monitor._id); + }) + ); req.body.email = email; + // Get user const user = await req.db.getUserByEmail(email); // Compare passwords @@ -397,9 +406,6 @@ const deleteUser = async (req, res, next) => { try { const token = getTokenFromHeaders(req.headers); const decodedToken = jwt.decode(token); - const { email } = decodedToken; - - // Check if the user exists const user = await req.db.getUserByEmail(email); if (!user) { next(new Error(errorMessages.DB_USER_NOT_FOUND)); From 8d906913c675926fd2f7f605fbb22e34879e7733 Mon Sep 17 00:00:00 2001 From: abhayjoshi201 Date: Sun, 20 Oct 2024 12:54:46 +0530 Subject: [PATCH 5/6] reverted the authcontroler changes --- Server/controllers/authController.js | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/Server/controllers/authController.js b/Server/controllers/authController.js index a01b4e78d..4ce5a0e2b 100644 --- a/Server/controllers/authController.js +++ b/Server/controllers/authController.js @@ -85,7 +85,9 @@ const registerUser = async (req, res, next) => { userId: newUser._id, }); - const { password, avatarImage, ...userWithoutPassword } = user._doc; + const userForToken = { ...newUser._doc }; + delete userForToken.profileImage; + delete userForToken.avatarImage; const appSettings = await req.settingsService.getSettings(); @@ -206,7 +208,6 @@ const editUser = async (req, res, next) => { try { // Change Password check - const { email } = jwt.verify(token, (await req.settingsService.getSettings()).jwtSecret); if (req.body.password && req.body.newPassword) { // Get token from headers const token = getTokenFromHeaders(req.headers); @@ -214,17 +215,7 @@ const editUser = async (req, res, next) => { const { jwtSecret } = req.settingsService.getSettings(); const { email } = jwt.verify(token, jwtSecret); // Add user email to body for DB operation - const monitors = teamMonitors?.monitors ?? []; - await Promise.all( - monitors.map(async (monitor) => { - await req.jobQueue.deleteJob(monitor); - await req.db.deleteChecks(monitor._id); - await req.db.deletePageSpeedChecksByMonitorId(monitor._id); - await req.db.deleteNotificationsByMonitorId(monitor._id); - }) - ); req.body.email = email; - // Get user const user = await req.db.getUserByEmail(email); // Compare passwords @@ -406,6 +397,9 @@ const deleteUser = async (req, res, next) => { try { const token = getTokenFromHeaders(req.headers); const decodedToken = jwt.decode(token); + const { email } = decodedToken; + + // Check if the user exists const user = await req.db.getUserByEmail(email); if (!user) { next(new Error(errorMessages.DB_USER_NOT_FOUND)); From a332caf3426179007304d1001d006c1db96e2305 Mon Sep 17 00:00:00 2001 From: Alexander Holliday Date: Mon, 21 Oct 2024 10:09:49 +0800 Subject: [PATCH 6/6] Delete empty git file --- git | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 git diff --git a/git b/git deleted file mode 100644 index e69de29bb..000000000