propro-utils 1.4.97 → 1.4.99

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "propro-utils",
-  "version": "1.4.97",
+  "version": "1.4.99",
   "description": "Auth middleware for propro-auth",
   "main": "src/index.js",
   "scripts": {
@@ -45,6 +45,7 @@
     "jest": "^29.7.0",
     "jest-mock-axios": "^4.7.3",
     "jsonwebtoken": "^9.0.2",
+    "multer": "^1.4.5-lts.1",
     "nodemailer": "^6.9.7",
     "nodemailer-mailgun-transport": "^2.1.5",
     "querystring": "^0.2.1",

package/src/server/index.js

@@ -12,6 +12,8 @@ const authValidation = require('../../middlewares/access_token');
 const axios = require('axios');
 const { Router, query } = require('express');
 const FormData = require('form-data');
+const multer = require('multer');
+const upload = multer().single('file');
 
 /**
  * Middleware for handling authentication and authorization.
@@ -287,16 +289,29 @@ class AuthMiddleware {
   };
 
   handleAvatarUpdate = async (req, res) => {
-    try {
-      const response = await this.proxyToAuthServer(
-        req,
-        '/api/v1/accounts/avatar',
-        req.file
-      );
-      res.status(response.status).json(response.data);
-    } catch (error) {
-      this.handleProxyError(error, res);
-    }
+    upload(req, res, async err => {
+      if (err instanceof multer.MulterError) {
+        return res.status(400).json({ error: 'File upload error' });
+      } else if (err) {
+        return res
+          .status(500)
+          .json({ error: 'Server error during file upload' });
+      }
+
+      if (!req.file) {
+        return res.status(400).json({ error: 'No file uploaded' });
+      }
+
+      try {
+        const response = await this.proxyToAuthServer(
+          req,
+          '/api/v1/accounts/avatar'
+        );
+        res.status(response.status).json(response.data);
+      } catch (error) {
+        this.handleProxyError(error, res);
+      }
+    });
   };
 
   pathRequiresAccessToken = path => {
@@ -306,7 +321,7 @@ class AuthMiddleware {
     );
   };
 
-  proxyToAuthServer = async (req, path, body) => {
+  proxyToAuthServer = async (req, path) => {
     let accessToken = null;
     if (this.pathRequiresAccessToken(path)) {
       console.log('path requires access token');
@@ -316,8 +331,16 @@ class AuthMiddleware {
       }
     }
 
+    const formData = new FormData();
+    if (req.file) {
+      formData.append('file', req.file.buffer, {
+        filename: req.file.originalname,
+        contentType: req.file.mimetype,
+      });
+    }
+
     let headers = {
-      'Content-Type': 'application/json',
+      ...formData.getHeaders(),
     };
 
     if (accessToken) {
@@ -330,28 +353,21 @@ class AuthMiddleware {
       formattedAuthUrl = `${formattedAuthUrl}&clientId=${this.options.clientId}&redirectUri=${this.options.redirectUri}`;
     }
 
-    const formData = new FormData();
-    if (req.file) {
-      formData.append('file', req.file.buffer, {
-        filename: req.file.originalname,
-        contentType: req.file.mimetype,
-      });
-    }
-
     console.log('formattedAuthUrl:', formattedAuthUrl);
     console.log('req.method:', req.method);
-    console.log('req.body:', req.body);
-    console.log('req.file:', req.file);
-    console.log('formData:', JSON.stringify(formData));
-    console.log('headers:', JSON.stringify(headers));
+    console.log('file:', req.file);
+    console.log('formData:', formData);
+    console.log('headers:', headers);
+
+    const data = req.file ? formData : req.body;
+
     return axios({
       method: req.method,
       url: `${formattedAuthUrl}${path}`,
-      data: req.body,
-      headers: {
-        ...headers,
-        ...formData.getHeaders(),
-      },
+      data: data,
+      headers: headers,
+      maxContentLength: Infinity,
+      maxBodyLength: Infinity,
     });
   };