propro-utils 1.4.97 → 1.4.98

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "propro-utils",
-  "version": "1.4.97",
+  "version": "1.4.98",
   "description": "Auth middleware for propro-auth",
   "main": "src/index.js",
   "scripts": {

package/src/server/index.js

@@ -288,10 +288,13 @@ class AuthMiddleware {
 
   handleAvatarUpdate = async (req, res) => {
     try {
+      if (!req.file) {
+        return res.status(400).json({ error: 'No file uploaded' });
+      }
+
       const response = await this.proxyToAuthServer(
         req,
-        '/api/v1/accounts/avatar',
-        req.file
+        '/api/v1/accounts/avatar'
       );
       res.status(response.status).json(response.data);
     } catch (error) {
@@ -306,7 +309,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 +319,13 @@ class AuthMiddleware {
       }
     }
 
+    const formData = new FormData();
+    if (req.file) {
+      formData.append('file', req.file.buffer, file.originalname);
+    }
+
     let headers = {
-      'Content-Type': 'application/json',
+      ...formData.getHeaders(),
     };
 
     if (accessToken) {
@@ -330,28 +338,19 @@ 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:', file);
+    console.log('formData:', formData);
+    console.log('headers:', headers);
+
+    const data = file ? formData : req.body;
+
     return axios({
       method: req.method,
       url: `${formattedAuthUrl}${path}`,
-      data: req.body,
-      headers: {
-        ...headers,
-        ...formData.getHeaders(),
-      },
+      data: data,
+      headers: headers,
     });
   };