propro-utils 1.5.8 → 1.5.10

package/middlewares/access_token.js

@@ -35,6 +35,9 @@ const { checkIfUserExists } = require('./account_info');
  */
 const authValidation = (redisClient, userSchema, requiredPermissions = []) => {
   return async (req, res, next) => {
+    console.log('authValidation middleware');
+    console.log('req.cookies', JSON.stringify(req.cookies));
+    console.log('req.headers', JSON.stringify(req.headers));
     try {
       const accessToken =
         req.cookies['x-access-token'] ||

package/package.json

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

package/src/server/index.js

@@ -155,7 +155,8 @@ class AuthMiddleware {
   };
 
   handleRefreshToken = async (req, res) => {
-    const refreshToken = req.cookies['x-refresh-token'];
+    const refreshToken =
+      req.cookies['x-refresh-token'] || req.headers['x-refresh-token'];
     if (!refreshToken) {
       return res.status(401).json({
         redirectUrl: this.constructRedirectUrl(),
@@ -174,6 +175,11 @@ class AuthMiddleware {
       }
 
       const user = await checkIfUserExists(this.userSchema, account.accountId);
+
+      const { returnTokens } = req.query;
+      if (returnTokens === 'true') {
+        return res.status(200).json({ account, user, access, refresh });
+      }
       setAuthCookies(
         res,
         { access, refresh },