Merge pull request element-hq#9383 from vector-im/travis/expire-mobile-page

turt2live · web-flow · commit 2aeaa081fe4f · 2019-04-04T12:00:10.000-06:00
Add expiration to mobile guide cookie
diff --git a/src/vector/index.js b/src/vector/index.js
@@ -272,7 +272,7 @@ async function loadApp() {
         const isIos = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
         const isAndroid = /Android/.test(navigator.userAgent);
         if (isIos || isAndroid) {
-            if (!document.cookie.split(';').some((c) => c.startsWith('mobile_redirect_to_guide'))) {
+            if (document.cookie.indexOf("riot_mobile_redirect_to_guide=false") === -1) {
                 window.location = "mobile_guide/";
                 return;
             }
diff --git a/src/vector/mobile_guide/index.js b/src/vector/mobile_guide/index.js
@@ -1,7 +1,8 @@
 import {getVectorConfig} from '../getconfig';
 
 function onBackToRiotClick() {
-    document.cookie = 'mobile_redirect_to_guide=false;path=/';
+    // Cookie should expire in 4 hours
+    document.cookie = 'riot_mobile_redirect_to_guide=false;path=/;max-age=14400';
     window.location.href = '../';
 }
 

Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ async function loadApp() {`
`272`	`272`	`const isIos = /iPad\|iPhone\|iPod/.test(navigator.userAgent) && !window.MSStream;`
`273`	`273`	`const isAndroid = /Android/.test(navigator.userAgent);`
`274`	`274`	`if (isIos \|\| isAndroid) {`
`275`		`- if (!document.cookie.split(';').some((c) => c.startsWith('mobile_redirect_to_guide'))) {`
	`275`	`+ if (document.cookie.indexOf("riot_mobile_redirect_to_guide=false") === -1) {`
`276`	`276`	`window.location = "mobile_guide/";`
`277`	`277`	`return;`
`278`	`278`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`import {getVectorConfig} from '../getconfig';`
`2`	`2`
`3`	`3`	`function onBackToRiotClick() {`
`4`		`- document.cookie = 'mobile_redirect_to_guide=false;path=/';`
	`4`	`+ // Cookie should expire in 4 hours`
	`5`	`+ document.cookie = 'riot_mobile_redirect_to_guide=false;path=/;max-age=14400';`
`5`	`6`	`window.location.href = '../';`
`6`	`7`	`}`
`7`	`8`