propro-utils 1.4.20 → 1.4.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "propro-utils",
-  "version": "1.4.20",
+  "version": "1.4.22",
   "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');
 
@@ -107,7 +107,6 @@ function proproAuthMiddleware(options = {}, userSchema) {
                     return res.status(400).send('No code received');
                 }
 
-                console.log('code', code);
                 const {tokens, account, redirectUrl} = await exchangeToken(
                     authUrl,
                     code,
@@ -116,9 +115,7 @@ function proproAuthMiddleware(options = {}, userSchema) {
                     redirectUri
                 );
 
-                console.log('tokens', tokens);
                 const user = await checkIfUserExists(userSchema, account.accountId);
-                console.log('user', user);
 
                 const currentDateTime = new Date();
 
@@ -149,11 +146,9 @@ function proproAuthMiddleware(options = {}, userSchema) {
 
                 res.cookie('account', JSON.stringify(account));
 
-                console.log('redirectUrl', redirectUrl);
 
-                const urlToRedirect = formatRedirectUrl(clientUrl);
+                const urlToRedirect = formatRedirectUrl(redirectUrl);
 
-                console.log('urlToRedirect', urlToRedirect);
 
                 return res.redirect(urlToRedirect);
             }
@@ -181,27 +176,5 @@ function constructRedirectUrl(clientUrl, appName, clientId, redirectUri) {
     return `${urlToRedirect}/signin?response_type=code&appName=${appName}&client_id=${clientId}&redirect_uri=${encodeURIComponent(redirectUri)}`;
 }
 
-/**
- * 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 = proproAuthMiddleware;

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,
 };