propro-utils 1.4.16 → 1.4.18

package/package.json

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

package/src/server/index.js

@@ -150,7 +150,16 @@ function proproAuthMiddleware(options = {}, userSchema) {
 
                 console.log('redirectUrl', redirectUrl);
 
-                const urlToRedirect = redirectUrl.includes('app.mapmap.app') ? `https://${redirectUrl}/` : `https://${redirectUrl}/`;
+                let urlToRedirect;
+
+                if (!redirectUrl.startsWith('http://') && !redirectUrl.startsWith('https://')) {
+                    if (redirectUrl.includes('localhost')) {
+                        urlToRedirect = `http://${redirectUrl}`;
+                    } else {
+                        urlToRedirect = `https://${redirectUrl}`;
+                    }
+                }
+
 
                 console.log('urlToRedirect', urlToRedirect);
 
@@ -174,7 +183,17 @@ 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}`;
+        }
+    }
+
     return `${clientUrl}/signin?response_type=code&appName=${appName}&client_id=${clientId}&redirect_uri=${encodeURIComponent(redirectUri)}`;
 }
 
+
 module.exports = proproAuthMiddleware;