propro-utils 1.4.95 → 1.4.97

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "propro-utils",
-  "version": "1.4.95",
+  "version": "1.4.97",
   "description": "Auth middleware for propro-auth",
   "main": "src/index.js",
   "scripts": {
@@ -41,6 +41,7 @@
     "dotenv": "^16.4.1",
     "express": "^4.18.3",
     "express-rate-limit": "^7.1.4",
+    "form-data": "^4.0.0",
     "jest": "^29.7.0",
     "jest-mock-axios": "^4.7.3",
     "jsonwebtoken": "^9.0.2",

package/src/server/index.js

@@ -11,6 +11,7 @@ const { checkIfUserExists } = require('../../middlewares/account_info');
 const authValidation = require('../../middlewares/access_token');
 const axios = require('axios');
 const { Router, query } = require('express');
+const FormData = require('form-data');
 
 /**
  * Middleware for handling authentication and authorization.
@@ -71,7 +72,6 @@ class AuthMiddleware {
   };
 
   handleLogin = async (req, res) => {
-    const { email, name, password } = req.body;
     const { returnTokens } = req.query;
 
     console.log('returnTokens:', returnTokens);
@@ -81,15 +81,7 @@ class AuthMiddleware {
       const response = await this.proxyToAuthServer(
         req,
         `/api/v1/auth/login?returnTokens=${returnTokens}`,
-        'POST',
-        {
-          email,
-          name,
-          password,
-          clientId: this.options.clientId,
-          redirectUri: this.options.redirectUri,
-          returnTokens,
-        }
+        req.body
       );
 
       console.log('response:', JSON.stringify(response.data));
@@ -110,22 +102,13 @@ class AuthMiddleware {
   };
 
   handleRegister = async (req, res) => {
-    const { name, email, password } = req.body;
     const { returnTokens } = req.query;
 
     try {
       const response = await this.proxyToAuthServer(
         req,
         `/api/v1/auth/register?returnTokens=${returnTokens}`,
-        'POST',
-        {
-          name,
-          email,
-          password,
-          clientId: this.options.clientId,
-          redirectUri: this.options.redirectUri,
-          returnTokens,
-        }
+        req.body
       );
 
       const { account, tokens } = response.data;
@@ -255,7 +238,8 @@ class AuthMiddleware {
     try {
       const response = await this.proxyToAuthServer(
         req,
-        '/api/v1/accounts/profile'
+        '/api/v1/accounts/profile',
+        req.body
       );
       res.status(response.status).json(response.data);
     } catch (error) {
@@ -267,7 +251,8 @@ class AuthMiddleware {
     try {
       const response = await this.proxyToAuthServer(
         req,
-        '/api/v1/profile/password'
+        '/api/v1/profile/password',
+        req.body
       );
       res.status(response.status).json(response.data);
     } catch (error) {
@@ -279,7 +264,8 @@ class AuthMiddleware {
     try {
       const response = await this.proxyToAuthServer(
         req,
-        '/api/v1/profile/email'
+        '/api/v1/profile/email',
+        req.body
       );
       res.status(response.status).json(response.data);
     } catch (error) {
@@ -289,7 +275,11 @@ class AuthMiddleware {
 
   handleTwoFactorAuth = async (req, res) => {
     try {
-      const response = await this.proxyToAuthServer(req, '/api/v1/profile/2fa');
+      const response = await this.proxyToAuthServer(
+        req,
+        '/api/v1/profile/2fa',
+        req.body
+      );
       res.status(response.status).json(response.data);
     } catch (error) {
       this.handleProxyError(error, res);
@@ -300,7 +290,8 @@ class AuthMiddleware {
     try {
       const response = await this.proxyToAuthServer(
         req,
-        '/api/v1/accounts/avatar'
+        '/api/v1/accounts/avatar',
+        req.file
       );
       res.status(response.status).json(response.data);
     } catch (error) {
@@ -315,7 +306,7 @@ class AuthMiddleware {
     );
   };
 
-  proxyToAuthServer = async (req, path) => {
+  proxyToAuthServer = async (req, path, body) => {
     let accessToken = null;
     if (this.pathRequiresAccessToken(path)) {
       console.log('path requires access token');
@@ -339,13 +330,28 @@ 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));
     return axios({
       method: req.method,
       url: `${formattedAuthUrl}${path}`,
       data: req.body,
-      headers: headers,
+      headers: {
+        ...headers,
+        ...formData.getHeaders(),
+      },
     });
   };