SessionData now stores _cfuvid cookie

Author: Cubicpath

src/chatgpt_gui/network/client/auth.py

@@ -338,7 +338,7 @@ def set_cookies(message: dict[str, Any]) -> None:
 
             cookie_values: dict[str, str] = {}
 
-            for cookie_name in ('__cf_bm', 'cf_clearance',):
+            for cookie_name in ('__cf_bm', '_cfuvid', 'cf_clearance'):
                 # Use regex to get the cookies
                 pattern = re.compile(f'{cookie_name}=.*?;')
                 if match := pattern.match(set_cookie_header):
@@ -354,6 +354,8 @@ def set_cookies(message: dict[str, Any]) -> None:
 
                         if cookie_name == '__cf_bm':
                             self.session_data.cf_bm = value
+                        elif cookie_name == '_cfuvid':
+                            self.session_data.cf_unique_visitor_id = value
                         elif cookie_name == 'cf_clearance':
                             self.session_data.cf_clearance = value
                             self.session_data.cf_expires = dt.datetime.now() + dt.timedelta(hours=1)

src/chatgpt_gui/network/client/chatgpt.py

@@ -110,6 +110,9 @@ def __init__(self, parent: QObject, **kwargs) -> None:
         if self.session_data.cf_bm:
             self.set_cookie('__cf_bm', self.session_data.cf_bm)
 
+        if self.session_data.cf_unique_visitor_id:
+            self.set_cookie('_cfuvid', self.session_data.cf_unique_visitor_id)
+
         if self.session_data.cf_clearance:
             self.set_cookie('cf_clearance', self.session_data.cf_clearance)
 
@@ -427,6 +430,9 @@ def refresh_auth(self) -> bool:
         if cf_bm := self.session.cookies.get('__cf_bm'):
             self.session_data.cf_bm = cf_bm
 
+        if cf_unique_visitor_id := self.session.cookies.get('_cfuvid'):
+            self.session_data.cf_unique_visitor_id = cf_unique_visitor_id
+
         if cf_clearance := self.session.cookies.get('cf_clearance'):
             self.session_data.cf_clearance = cf_clearance
 

src/chatgpt_gui/network/client/structures.py

@@ -151,6 +151,7 @@ class Session:
 
     user: User | None = field(default=None)
     cf_bm: str | None = field(default=None)
+    cf_unique_visitor_id: str | None = field(default=None)
     cf_clearance: str | None = field(default=None)
     cf_expires: dt.datetime | None = field(default=None)
     session_expires: dt.datetime | None = field(default=None)
@@ -177,6 +178,7 @@ def from_json(cls, data: dict[str, Any]) -> Session:
         return cls(
             user=user,
             cf_bm=cf_data.get('bm'),
+            cf_unique_visitor_id=cf_data.get('unique_visitor_id'),
             cf_clearance=cf_data.get('clearance'),
             cf_expires=cf_expires,
             session_expires=session_expires,
@@ -188,6 +190,7 @@ def clear(self) -> None:
         """Clear data while keeping object reference."""
         self.user = None
         self.cf_bm = None
+        self.cf_unique_visitor_id = None
         self.cf_clearance = None
         self.cf_expires = None
         self.session_expires = None
@@ -207,6 +210,7 @@ def to_json(self) -> dict[str, Any]:
             'user': self.user.to_json() if self.user else {},
             'cloudflare': {
                 'bm': self.cf_bm,
+                'unique_visitor_id': self.cf_unique_visitor_id,
                 'clearance': self.cf_clearance,
                 'expires': self.cf_expires.strftime(CG_DATE_FORMAT) if self.cf_expires is not None else None
             },