Fix global cookie storage

Author: Foorack

generate.sh

@@ -8,4 +8,12 @@ openapi-generator-cli generate \
 --git-repo-id=vrchatapi-python \
 -o . \
 -i https://vrchatapi.github.io/specification/openapi.yaml \
---http-user-agent="vrchatapi-python"
+--http-user-agent="vrchatapi-py"
+
+# Enable Global cookies
+sed -i '/cert_reqs = ssl.CERT_NONE/r patches/cookiejar_init.py' ./vrchatapi/rest.py
+sed -i '/headers = headers or {}/r patches/cookiejar_add.py' ./vrchatapi/rest.py
+
+sed -i 's/if _preload_content/abcdefvrc\n\n        if _preload_content/g' ./vrchatapi/rest.py
+sed -i '/abcdefvrc/r patches/cookiejar_extract.py' ./vrchatapi/rest.py
+sed -i 's/        abcdefvrc//g' ./vrchatapi/rest.py

patches/cookiejar_add.py

@@ -0,0 +1,7 @@
+
+        # VRChatAPI: Build a mock Request object to work with
+        from urllib.request import Request
+        mock_request_object = Request(url=url, method=method, headers=headers)
+        self.cookie_jar.add_cookie_header(mock_request_object)
+        if "Cookie" in mock_request_object.unredirected_hdrs:
+            headers["Cookie"] = mock_request_object.unredirected_hdrs["Cookie"]

patches/cookiejar_extract.py

@@ -0,0 +1,2 @@
+        # VRChatAPI: Extract and save cookies for global storage
+        self.cookie_jar.extract_cookies(r, mock_request_object)

patches/cookiejar_init.py

@@ -0,0 +1,4 @@
+
+        # VRChatAPI: Init global cookie storage
+        from http.cookiejar import CookieJar
+        self.cookie_jar = CookieJar()

vrchatapi/api_client.py

@@ -77,7 +77,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'vrchatapi-python'
+        self.user_agent = 'vrchatapi-py'
 
     def __enter__(self):
         return self

vrchatapi/rest.py

@@ -56,6 +56,10 @@ def __init__(self, configuration, pools_size=4, maxsize=None):
         else:
             cert_reqs = ssl.CERT_NONE
 
+        # VRChatAPI: Init global cookie storage
+        from http.cookiejar import CookieJar
+        self.cookie_jar = CookieJar()
+
         addition_pool_args = {}
         if configuration.assert_hostname is not None:
             addition_pool_args['assert_hostname'] = configuration.assert_hostname  # noqa: E501
@@ -129,6 +133,13 @@ def request(self, method, url, query_params=None, headers=None,
         post_params = post_params or {}
         headers = headers or {}
 
+        # VRChatAPI: Build a mock Request object to work with
+        from urllib.request import Request
+        mock_request_object = Request(url=url, method=method, headers=headers)
+        self.cookie_jar.add_cookie_header(mock_request_object)
+        if "Cookie" in mock_request_object.unredirected_hdrs:
+            headers["Cookie"] = mock_request_object.unredirected_hdrs["Cookie"]
+
         timeout = None
         if _request_timeout:
             if isinstance(_request_timeout, (int, float)):  # noqa: E501,F821
@@ -204,6 +215,10 @@ def request(self, method, url, query_params=None, headers=None,
             msg = "{0}\n{1}".format(type(e).__name__, str(e))
             raise ApiException(status=0, reason=msg)
 
+
+        # VRChatAPI: Extract and save cookies for global storage
+        self.cookie_jar.extract_cookies(r, mock_request_object)
+
         if _preload_content:
             r = RESTResponse(r)