propro-utils 1.4.6 → 1.4.8

package/package.json

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

package/src/server/index.js

@@ -41,7 +41,7 @@ function proproAuthMiddleware(options = {}, userSchema) {
             console.log('req.path', req.path);
             if (req.path === '/api/auth') {
                 const redirectUrl = constructRedirectUrl(clientUrl, appName, clientId, redirectUri);
-                return res.status(200).json({redirectUrl});
+                res.status(200).json({redirectUrl});
             }
 
             if (req.path === '/api/refreshToken') {
@@ -51,7 +51,7 @@ function proproAuthMiddleware(options = {}, userSchema) {
                 // const refreshToken = req.cookies['x-refresh-token'];
                 if (!refreshToken) {
                     const redirectUrl = constructRedirectUrl(clientUrl, appName, clientId, redirectUri);
-                    return res
+                    res
                         .status(401)
                         .json({redirectUrl, error: 'No refresh token provided'});
                 }
@@ -71,7 +71,7 @@ function proproAuthMiddleware(options = {}, userSchema) {
                 const {account, access, refresh} = response.data;
 
                 if (!account || !access || !refresh) {
-                    return res
+                    res
                         .status(401)
                         .json({error: 'Invalid or expired refresh token'});
                 }
@@ -96,7 +96,7 @@ function proproAuthMiddleware(options = {}, userSchema) {
                     maxAge: accessMaxAge,
                 });
 
-                return res
+                res
                     .status(200)
                     .json({message: 'Token refreshed successfully'});
             }
@@ -104,7 +104,7 @@ function proproAuthMiddleware(options = {}, userSchema) {
             if (req.path === '/api/callback') {
                 const code = req.query.code;
                 if (!code) {
-                    return res.status(400).send('No code received');
+                    res.status(400).send('No code received');
                 }
 
                 const {tokens, account, redirectUrl} = await exchangeToken(
@@ -144,7 +144,7 @@ function proproAuthMiddleware(options = {}, userSchema) {
 
                 const urlToRedirect = `http://${redirectUrl}/`;
 
-                return res.redirect(urlToRedirect);
+                res.redirect(urlToRedirect);
             }
         } catch (error) {
             // console.error("Error in proproAuthMiddleware:", error);
@@ -163,6 +163,7 @@ function proproAuthMiddleware(options = {}, userSchema) {
  * @return {string} The constructed redirect URL.
  */
 function constructRedirectUrl(clientUrl, appName, clientId, redirectUri) {
+    console.log('constructRedirectUrl', clientUrl, appName, clientId, redirectUri);
     return `${clientUrl}/signin?response_type=code&appName=${appName}&client_id=${clientId}&redirect_uri=${encodeURIComponent(redirectUri)}`;
 }