From ca1d76f1978966c4c3e80b90c01148f1f6bba60e Mon Sep 17 00:00:00 2001
From: Jan Cernik <66427541+jancernik@users.noreply.github.com>
Date: Wed, 14 Dec 2022 07:02:09 -0300
Subject: [PATCH] DEV: Reduce text-size cookie duration (#19445)

Following the same behavior as the theme/color-scheme cookies, now the
cookie expires in 1 year and automatically extends on every user visit.
---
 .../app/initializers/handle-cookies.js        |  2 ++
 .../javascripts/discourse/app/models/user.js  | 23 +++++++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/initializers/handle-cookies.js b/app/assets/javascripts/discourse/app/initializers/handle-cookies.js
index 4526f51055f..ed0a4c89d95 100644
--- a/app/assets/javascripts/discourse/app/initializers/handle-cookies.js
+++ b/app/assets/javascripts/discourse/app/initializers/handle-cookies.js
@@ -1,5 +1,6 @@
 import { extendThemeCookie } from "discourse/lib/theme-selector";
 import { extendColorSchemeCookies } from "discourse/lib/color-scheme-picker";
+import { extendTextSizeCookie } from "discourse/models/user";
 import { later } from "@ember/runloop";
 import { isTesting } from "discourse-common/config/environment";
 
@@ -13,6 +14,7 @@ export default {
     later(() => {
       extendThemeCookie();
       extendColorSchemeCookies();
+      extendTextSizeCookie();
     }, DELAY);
   },
 };
diff --git a/app/assets/javascripts/discourse/app/models/user.js b/app/assets/javascripts/discourse/app/models/user.js
index d1d1b7d78f8..e36bc13c7ff 100644
--- a/app/assets/javascripts/discourse/app/models/user.js
+++ b/app/assets/javascripts/discourse/app/models/user.js
@@ -58,6 +58,19 @@ export const SECOND_FACTOR_METHODS = {
   SECURITY_KEY: 3,
 };
 
+const TEXT_SIZE_COOKIE_NAME = "text_size";
+const COOKIE_EXPIRY_DAYS = 365;
+
+export function extendTextSizeCookie() {
+  const currentValue = cookie(TEXT_SIZE_COOKIE_NAME);
+  if (currentValue) {
+    cookie(TEXT_SIZE_COOKIE_NAME, currentValue, {
+      path: "/",
+      expires: COOKIE_EXPIRY_DAYS,
+    });
+  }
+}
+
 const isForever = (dt) => moment().diff(dt, "years") < -100;
 
 let userFields = [
@@ -1053,8 +1066,8 @@ const User = RestModel.extend({
 
   @discourseComputed("user_option.text_size_seq", "user_option.text_size")
   currentTextSize(serverSeq, serverSize) {
-    if (cookie("text_size")) {
-      const [cookieSize, cookieSeq] = cookie("text_size").split("|");
+    if (cookie(TEXT_SIZE_COOKIE_NAME)) {
+      const [cookieSize, cookieSeq] = cookie(TEXT_SIZE_COOKIE_NAME).split("|");
       if (cookieSeq >= serverSeq) {
         return cookieSize;
       }
@@ -1065,12 +1078,12 @@ const User = RestModel.extend({
   updateTextSizeCookie(newSize) {
     if (newSize) {
       const seq = this.get("user_option.text_size_seq");
-      cookie("text_size", `${newSize}|${seq}`, {
+      cookie(TEXT_SIZE_COOKIE_NAME, `${newSize}|${seq}`, {
         path: "/",
-        expires: 9999,
+        expires: COOKIE_EXPIRY_DAYS,
       });
     } else {
-      removeCookie("text_size", { path: "/", expires: 1 });
+      removeCookie(TEXT_SIZE_COOKIE_NAME, { path: "/" });
     }
   },