Merge pull request #109 from topcoder-platform/dev

sachin-maheshwari · web-flow · commit 9cc11b2dbaef · 2021-01-13T13:00:55.000+05:30
Fix for legacy forum broken link for non logged-in user
diff --git a/web-assets/js/setupAuth0WithRedirect.js b/web-assets/js/setupAuth0WithRedirect.js
@@ -42,7 +42,7 @@ const authSetup = function () {
     const IframeLogoutRequestType = "LOGOUT_REQUEST";
     const enterpriseCustomers = ['zurich', 'cs'];
     const mode = qs['mode'] || 'signIn';
-    let returnAppUrl = qs['retUrl'];
+    let returnAppUrl = handleSpecificReturnUrl(qs['retUrl'], 'retUrl');
     let appUrl = qs['appUrl'] || false;
 
     if (utmSource &&
@@ -88,7 +88,7 @@ const authSetup = function () {
                 logger('handleRedirectCallback() error: ', e);
             });
         } else if (shouldLogout) {
-            host = returnAppUrl ? returnAppUrl : host;
+            host = returnAppUrl ? decodeURIComponent(returnAppUrl) : host;
             logout();
             return;
         } else if (!isLoggedIn() && returnAppUrl) {
@@ -179,6 +179,7 @@ const authSetup = function () {
     };
 
     const login = function () {
+        logger('returnUrl', returnAppUrl);
         auth0
             .loginWithRedirect({
                 redirect_uri: host + '?appUrl=' + returnAppUrl,
@@ -622,6 +623,45 @@ const authSetup = function () {
         document.cookie = cname + "=" + cvalue + cdomain + expires + ";path=/";
     }
 
+    function handleSpecificReturnUrl(value, param) {
+        try {
+            let hostdomain = "";
+            if (location.hostname !== 'localhost') {
+                hostdomain = "." + location.hostname.split('.').reverse()[1] +
+                    "." + location.hostname.split('.').reverse()[0];
+            }
+            const prefixArray = ['apps', 'software'];
+            if (hostdomain && value) {
+                for (let i = 0; i < prefixArray.length; i++) {
+                    if (value.indexOf(prefixArray[i] + hostdomain) > -1) {
+                        const queryParam = window.location.search.substr(1);
+                        if (queryParam) {
+                            const indx = queryParam.indexOf(param);
+                            if (indx > -1) {
+                                //assuming queryParam value like retUrl=xxxxxx
+                                const result = queryParam.substring(indx + param.length + 1);
+                                // verify broken url : https://abc.com/&utm=abc
+                                logger('handleSpecificReturnUrl: match query result', result);
+                                if (result.indexOf('&') > -1 && result.indexOf('?') === -1) {
+                                        return value;
+                                }
+                                return encodeURIComponent(decodeURIComponent(result));
+                            } else {
+                                return value;
+                            }
+                        } else {
+                            return value;
+                        }
+                    }
+                }
+                return value;
+            }
+            return value;
+        } catch (e) {
+            logger('Issue while handling specific query param function', e.message);
+            return value;
+        }
+    };
 
     // execute    
     init();
diff --git a/web-assets/local/README b/web-assets/local/README
@@ -0,0 +1 @@
+Open index.html to get the token locally. 
diff --git a/web-assets/local/index.html b/web-assets/local/index.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <title>Auth0</title>
+    <meta charset="utf-8" />
+    <script language="javascript" type="text/javascript"
+        src="https://accounts-auth0.topcoder-dev.com/setupAuth0WithRedirect.js"></script>
+</head>
+
+<body>
+    <script>
+        window.onload = authSetup;
+
+        function doLogin() {
+            window.location = './?retUrl=http://' + location.host
+        }
+
+        function doLogout() {
+            window.location = './?logout=true&retUrl=http://' + location.host
+        }
+    </script>
+    <div>
+        <p>Instructions:</p>
+        <p>
+            Run this index.html as local server like - http://localhost:3000 and keep open in seperate tab for
+            refreshing token.
+        </p>
+    </div>
+    <p>----------------------------------</p>
+    <div>
+        <span>Click Here To Login! </span><span><a href="#" onclick="doLogin();">Login</a></span>
+    </div>
+    <p>----------------------------------</p>
+    <div>
+        <span>Click Here To Logout! </span> <span> <a href="#" onclick="doLogout();">Logout</a> </span>
+    </div>
+</body>
+
+</html>

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Open index.html to get the token locally.`