Fix CookieJar storage

Author: Foorack

examples/pom.xml

@@ -23,7 +23,7 @@
 		<dependency>
 			<groupId>com.github.vrchatapi</groupId>
 			<artifactId>vrchatapi-java</artifactId>
-			<version>1.0.1-globalcookie</version>
+			<version>1.0.1-globalcookie2</version>
 		</dependency>
 	</dependencies>
 </project>

generate.sh

@@ -1,6 +1,10 @@
 #!/bin/bash
 
-rm src/main docs -rf
+rm docs -rf
+rm src/main/java/io/github/vrchatapi/*.java
+rm src/main/java/io/github/vrchatapi/api -rf
+rm src/main/java/io/github/vrchatapi/auth -rf
+rm src/main/java/io/github/vrchatapi/model -rf
 openapi-generator-cli generate \
 -g java \
 --additional-properties=groupId=io.github.vrchatapi,apiPackage=io.github.vrchatapi.api,invokerPackage=io.github.vrchatapi,modelPackage=io.github.vrchatapi.model,artifactId=vrchatapi,licenseName=MIT,licenseUrl=https://github.com/vrchatapi/vrchatapi-java/blob/main/LICENSE,developerEmail=me@ruby.js.org,developerName=VRChatAPI,developerOrganization=vrchatapi,developerOrganizationUrl=https://github.com/VRChatAPI,hideGenerationTimestamp=true \
@@ -10,13 +14,7 @@ openapi-generator-cli generate \
 -i https://vrchatapi.github.io/specification/openapi.yaml \
 --http-user-agent="vrchatapi-java"
 
-sed -i '/<\/dependencies>/i \
-        <!-- Custom VRChat API dependencies -->\
-        <dependency>\
-            <groupId>com.squareup.okhttp3</groupId>\
-            <artifactId>okhttp-urlconnection</artifactId>\
-            <version>${okhttp-version}</version>\
-        </dependency>' pom.xml
+sed -i 's/java.version>1.7/java.version>1.8/g' pom.xml
 
 sed -i '/addNetworkInterceptor/a \
-        builder.cookieJar(new okhttp3.JavaNetCookieJar(new java.net.CookieManager()));' src/main/java/io/github/vrchatapi/ApiClient.java
+        builder.cookieJar(new io.github.vrchatapi.util.SimpleOkHttpCookieJar());' src/main/java/io/github/vrchatapi/ApiClient.java

src/main/java/io/github/vrchatapi/ApiClient.java

@@ -120,7 +120,7 @@ private void initHttpClient() {
     private void initHttpClient(List<Interceptor> interceptors) {
         OkHttpClient.Builder builder = new OkHttpClient.Builder();
         builder.addNetworkInterceptor(getProgressInterceptor());
-        builder.cookieJar(new okhttp3.JavaNetCookieJar(new java.net.CookieManager()));
+        builder.cookieJar(new io.github.vrchatapi.util.SimpleOkHttpCookieJar());
         for (Interceptor interceptor: interceptors) {
             builder.addInterceptor(interceptor);
         }

src/main/java/io/github/vrchatapi/util/SimpleOkHttpCookieJar.java

@@ -0,0 +1,29 @@
+package io.github.vrchatapi.util;
+
+import okhttp3.Cookie;
+import okhttp3.CookieJar;
+import okhttp3.HttpUrl;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+// https://gist.github.com/johannes-staehlin/63a72467bd1f21829d11bc55456c5836
+public class SimpleOkHttpCookieJar implements CookieJar {
+
+    private List<Cookie> storage = new ArrayList<>();
+
+    @Override
+    public void saveFromResponse(HttpUrl url, List<Cookie> cookies) {
+        storage.addAll(cookies);
+    }
+
+    @Override
+    public List<Cookie> loadForRequest(HttpUrl url) {
+        // Remove expired Cookies
+        storage.removeIf(cookie -> cookie.expiresAt() < System.currentTimeMillis());
+
+        // Only return matching Cookies
+        return storage.stream().filter(cookie -> cookie.matches(url)).collect(Collectors.toList());
+    }
+}