propro-utils 1.4.82 → 1.4.84

package/package.json

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

package/src/server/index.js

@@ -71,9 +71,12 @@ class AuthMiddleware {
   };
 
   handleLogin = async (req, res) => {
-    const { email, username, password } = req.body;
+    const { email, name, password } = req.body;
     const { returnTokens } = req.query;
 
+    console.log('returnTokens:', returnTokens);
+    console.log('email:', email);
+
     try {
       const response = await this.proxyToAuthServer(
         req,
@@ -81,7 +84,7 @@ class AuthMiddleware {
         'POST',
         {
           email,
-          username,
+          name,
           password,
           clientId: this.options.clientId,
           redirectUri: this.options.redirectUri,
@@ -89,6 +92,8 @@ class AuthMiddleware {
         }
       );
 
+      console.log('response:', JSON.stringify(response.data));
+
       const { account, tokens } = response.data;
       const user = await checkIfUserExists(this.userSchema, account.accountId);
 
@@ -302,10 +307,19 @@ class AuthMiddleware {
     }
   };
 
+  pathRequiresAccessToken = path => {
+    return (
+      !path.includes('/api/v1/auth/login') &&
+      !path.includes('/api/v1/auth/register')
+    );
+  };
+
   proxyToAuthServer = async (req, path) => {
-    const accessToken = req.cookies['x-access-token'];
-    if (!accessToken) {
-      throw new Error('No access token provided');
+    if (this.pathRequiresAccessToken(path)) {
+      const accessToken = req.cookies['x-access-token'];
+      if (!accessToken) {
+        throw new Error('No access token provided');
+      }
     }
 
     const formattedAuthUrl = formatRedirectUrl(this.options.authUrl);