matching cookie expiry time with token expiry and introducing 'mode' to distinguish between signIn and signUp

Author: Sachin Maheshwari

web-assets/js/.DS_Store

@@ -38,11 +38,12 @@ const authSetup = function () {
     const utmSource = qs['utm_source'];
     const utmMedium = qs['utm_medium'];
     const utmCampaign = qs['utm_campaign'];
-    const appUrl = qs['appUrl'] || false;
     const loggerMode = "dev";
     const IframeLogoutRequestType = "LOGOUT_REQUEST";
     const enterpriseCustomers = ['zurich', 'cs'];
+    const mode = qs['mode'] || 'signIn';
     let returnAppUrl = qs['retUrl'];
+    let appUrl = qs['appUrl'] || false;
 
     if (utmSource &&
         (utmSource != 'undefined') &&
@@ -185,7 +186,8 @@ const authSetup = function () {
                 utmSource: utmSource,
                 utmCampaign: utmCampaign,
                 utmMedium: utmMedium,
-                returnUrl: returnAppUrl
+                returnUrl: returnAppUrl,
+                mode: mode
             })
             .then(function () {
                 auth0.isAuthenticated().then(function (isAuthenticated) {
@@ -272,9 +274,25 @@ const authSetup = function () {
                     return false;
                 });
                 logger('Storing token...', true);
-                setCookie(tcJWTCookie, idToken, cookieExpireIn);
-                setCookie(v3JWTCookie, idToken, cookieExpireIn);
-                setCookie(tcSSOCookie, tcsso, cookieExpireIn);
+                try {
+                    const exT = getCookieExpiry(idToken);
+                    if (exT) {
+                        setDomainCookie(tcJWTCookie, idToken, exT);
+                        setDomainCookie(v3JWTCookie, idToken, exT);
+                        setDomainCookie(tcSSOCookie, tcsso, exT);
+                    } else {
+                        setCookie(tcJWTCookie, idToken, cookieExpireIn);
+                        setCookie(v3JWTCookie, idToken, cookieExpireIn);
+                        setCookie(tcSSOCookie, tcsso, cookieExpireIn);
+                    }
+                } catch (e) {
+                    logger('Error occured in fecthing token expiry time', e.message);
+                }
+
+                // session still active, but app calling login
+                if (!appUrl && returnAppUrl) {
+                    appUrl = returnAppUrl
+                }
                 redirectToApp();
             } else {
                 logger("User active ? ", userActive);
@@ -457,10 +475,22 @@ const authSetup = function () {
                                 return false;
                             });
                             logger('Storing refreshed token...', true);
-                            setCookie(tcJWTCookie, idToken, cookieExpireIn);
-                            setCookie(v3JWTCookie, idToken, cookieExpireIn);
-                            setCookie(tcSSOCookie, tcsso, cookieExpireIn);
-                            informIt(success);
+                            try {
+                                const exT = getCookieExpiry(idToken);
+                                if (exT) {
+                                    setDomainCookie(tcJWTCookie, idToken, exT);
+                                    setDomainCookie(v3JWTCookie, idToken, exT);
+                                    setDomainCookie(tcSSOCookie, tcsso, exT);
+                                } else {
+                                    setCookie(tcJWTCookie, idToken, cookieExpireIn);
+                                    setCookie(v3JWTCookie, idToken, cookieExpireIn);
+                                    setCookie(tcSSOCookie, tcsso, cookieExpireIn);
+                                }
+                                informIt(success);
+                            } catch (e) {
+                                logger('Error occured in fecthing token expiry time', e.message);
+                                informIt(failed);
+                            }
                         } else {
                             logger("Refeshed token - user active ? ", userActive);
                             informIt(failed);
@@ -546,6 +576,29 @@ const authSetup = function () {
         }
     }
 
+    function getCookieExpiry(token) {
+        const d = getTokenExpirationDate(token)
+        if (d === null) {
+            return false;
+        }
+        const diff = d.valueOf() - (new Date().valueOf()); //in millseconds
+        if (diff > 0) {
+            return diff; // in milliseconds
+        }
+        return false;
+    }
+
+    function setDomainCookie(cname, cvalue, exMilliSeconds) {
+        const cdomain = getHostDomain();
+
+        let d = new Date();
+        d.setTime(d.getTime() + exMilliSeconds);
+
+        let expires = ";expires=" + d.toUTCString();
+        document.cookie = cname + "=" + cvalue + cdomain + expires + ";path=/";
+    }
+
+
     // execute    
     init();
 };