Clean up global cookiejar patches (#8)

* Join all cookiejar patches into 1

* Fix generate.sh to use new patch

* Remove redundant patch files

Author: Katistic

generate.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-npm install @openapitools/openapi-generator-cli
+npm install @openapitools/openapi-generator-cli 
 
 rm vrchatapi docs -rf
 
@@ -13,14 +13,6 @@ rm vrchatapi docs -rf
 -i https://raw.githubusercontent.com/vrchatapi/specification/gh-pages/openapi.yaml \
 --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
-
 # Fix description, keywords, etc...
 # Echo to trim whitespace
 VERSION=`echo $(cat setup.py | grep "The version of the OpenAPI document" | cut -d ":" -f 2)`
@@ -36,5 +28,8 @@ sed -i 's/abcdefvrc//g' ./setup.py
 # Remove messily pasted markdown at top of every file
 find vrchatapi -type f -exec sed -i '/VRChat API Banner/d' {} \;
 
+# Enable Global cookies
+patch ./vrchatapi/rest.py < ./patches/cookiejar.patch
+
 # Make 2fa required error readable
 patch ./vrchatapi/rest.py < ./patches/error_2fa_verify_readable.patch

patches/cookiejar.patch

@@ -0,0 +1,40 @@
+diff --git a/rest.py b/restpatch.py
+index b8da0751..3702266e 100644
+--- a/rest.py
++++ b/restpatch.py
+@@ -61,6 +61,10 @@ class RESTClientObject(object):
+         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
+@@ -134,6 +138,13 @@ class RESTClientObject(object):
+         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, six.integer_types + (float, )):  # noqa: E501,F821
+@@ -209,6 +220,10 @@ class RESTClientObject(object):
+             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)
+