propro-utils 1.4.1 → 1.4.3

package/package.json

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

package/src/server/index.js

@@ -39,10 +39,7 @@ function proproAuthMiddleware(options = {}, userSchema) {
 
             console.log('req.path', req.path);
             if (req.path === '/api/auth') {
-                const authClientUrl = `${clientUrl}/signin`;
-                const redirectUrl = `${authClientUrl}?response_type=code&appName=${appName}&client_id=${clientId}&redirect_uri=${encodeURIComponent(
-                    redirectUri
-                )}`;
+                const redirectUrl = constructRedirectUrl(clientUrl, appName, clientId, redirectUri);
                 return res.status(200).json({redirectUrl});
             }
 
@@ -51,11 +48,10 @@ function proproAuthMiddleware(options = {}, userSchema) {
                 const refreshToken = req.cookies['x-refresh-token'];
                 console.log('refreshToken', refreshToken);
                 if (!refreshToken) {
-                    const authClientUrl = `${clientUrl}/signin`;
-                    const redirectUrl = `${authClientUrl}?response_type=code&appName=${appName}&client_id=${clientId}&redirect_uri=${encodeURIComponent(
-                        redirectUri
-                    )}`;
-                    return res
+                    console.log('No refresh token provided');
+                    const redirectUrl = constructRedirectUrl(clientUrl, appName, clientId, redirectUri);
+                    console.log('redirectUrl', redirectUrl);
+                    res
                         .status(401)
                         .json({redirectUrl, error: 'No refresh token provided'});
                 }
@@ -157,4 +153,17 @@ function proproAuthMiddleware(options = {}, userSchema) {
     };
 }
 
+/**
+ * Constructs the redirect URL for a client application.
+ *
+ * @param {string} clientUrl - The URL of the client application.
+ * @param {string} appName - The name of the application.
+ * @param {string} clientId - The client ID.
+ * @param {string} redirectUri - The redirect URI.
+ * @return {string} The constructed redirect URL.
+ */
+function constructRedirectUrl(clientUrl, appName, clientId, redirectUri) {
+    return `${clientUrl}/signin?response_type=code&appName=${appName}&client_id=${clientId}&redirect_uri=${encodeURIComponent(redirectUri)}`;
+}
+
 module.exports = proproAuthMiddleware;