propro-utils 1.4.19 → 1.4.21

package/package.json

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

package/src/server/index.js

@@ -1,5 +1,5 @@
 require('dotenv').config();
-const {exchangeToken} = require('./middleware/verifyToken');
+const {exchangeToken, formatRedirectUrl} = require('./middleware/verifyToken');
 const {checkIfUserExists} = require('../../middlewares/account_info');
 const {post} = require('axios');
 
@@ -151,16 +151,7 @@ function proproAuthMiddleware(options = {}, userSchema) {
 
                 console.log('redirectUrl', redirectUrl);
 
-                let urlToRedirect;
-
-                if (!redirectUrl.startsWith('http://') && !redirectUrl.startsWith('https://')) {
-                    if (redirectUrl.includes('localhost')) {
-                        urlToRedirect = `http://${redirectUrl}`;
-                    } else {
-                        urlToRedirect = `https://${redirectUrl}`;
-                    }
-                }
-
+                const urlToRedirect = formatRedirectUrl(clientUrl);
 
                 console.log('urlToRedirect', urlToRedirect);
 
@@ -185,15 +176,9 @@ function proproAuthMiddleware(options = {}, userSchema) {
 function constructRedirectUrl(clientUrl, appName, clientId, redirectUri) {
     console.log('constructRedirectUrl', clientUrl, appName, clientId, redirectUri);
 
-    if (!clientUrl.startsWith('http://') && !clientUrl.startsWith('https://')) {
-        if (clientUrl.includes('localhost')) {
-            clientUrl = `http://${clientUrl}`;
-        } else {
-            clientUrl = `https://${clientUrl}`;
-        }
-    }
+    const urlToRedirect = formatRedirectUrl(clientUrl)
 
-    return `${clientUrl}/signin?response_type=code&appName=${appName}&client_id=${clientId}&redirect_uri=${encodeURIComponent(redirectUri)}`;
+    return `${urlToRedirect}/signin?response_type=code&appName=${appName}&client_id=${clientId}&redirect_uri=${encodeURIComponent(redirectUri)}`;
 }
 
 

package/src/server/middleware/verifyToken.js

@@ -49,8 +49,9 @@ async function exchangeToken(
     redirectUri
 ) {
     try {
+        const formattedRedirectUri = formatRedirectUrl(authUrl)
         const response = await axios.post(
-            authUrl + "/api/v1/auth/authorize",
+            formattedRedirectUri + "/api/v1/auth/authorize",
             {
                 grantType: "authorization_code",
                 code: code,
@@ -133,8 +134,31 @@ function isValid(decodedToken, requiredPermissions) {
     );
 }
 
+/**
+ * Formats the redirect URL by adding 'http://' or 'https://' if necessary.
+ *
+ * @param {string} redirectUrl - The URL to be redirected.
+ * @return {string} The formatted redirect URL.
+ */
+function formatRedirectUrl(redirectUrl) {
+    let urlToRedirect;
+
+    if (!redirectUrl.startsWith('http://') && !redirectUrl.startsWith('https://')) {
+        if (redirectUrl.includes('localhost')) {
+            urlToRedirect = `http://${redirectUrl}`;
+        } else {
+            urlToRedirect = `https://${redirectUrl}`;
+        }
+    } else {
+        urlToRedirect = redirectUrl;
+    }
+
+    return urlToRedirect;
+}
+
 module.exports = {
     VerifyAccount,
     exchangeToken,
     verifyJWT,
+    formatRedirectUrl,
 };