Fix Safari cookie

WavJaby · Aug 30, 2023 · 64b640d · 64b640d
1 parent 5d4400f
commit 64b640d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/res/lib.js b/res/lib.js
@@ -45,11 +45,18 @@ export function fetchApi(endpoint, showState, option) {
 	}
 	const stateElement = showState ? requestState.addState(showState) : null;
 
+	if (isSafari) {
+		if (!option.headers)
+			option.headers = {};
+		option.headers['Safari-Cookie'] = document.cookie;
+	}
+
 	return fetch(apiEndPoint + endpoint, option)
 		.then(i => {
 			if (isSafari) {
 				const c = i.headers.get('Safari-Cookie');
-				if (c) c.split(',').forEach(i => document.cookie = i);
+				console.log(c);
+				if (c) c.split(',').forEach(i => document.cookie = i.replace(/Domain=[\w.]+/, 'Domain=' + window.location.hostname));
 			}
 			return i.json()
 		})

diff --git a/src/main/java/com/wavjaby/lib/Cookie.java b/src/main/java/com/wavjaby/lib/Cookie.java
@@ -155,8 +155,8 @@ public static void packStudentIdSysLoginStateCookie(HttpExchange req, String org
             addCookieToHeader("stuSysLoginData", cookieValue, "/", req);
     }
 
-    public static String[] splitCookie(Headers requestHeaders) {
-        String cookie = requestHeaders.getFirst("Cookie");
+    public static String[] splitCookie(Headers headers) {
+        String cookie = isSafari(headers) ? headers.getFirst("Safari-Cookie") : headers.getFirst("Cookie");
         return cookie == null ? null : cookie.split("; ?");
     }
 
@@ -167,11 +167,7 @@ public static String getDefaultCookie(Headers requestHeaders, CookieStore cookie
 
     public static void addCookieToHeader(String key, String value, String path, HttpExchange req) {
         Headers headers = req.getResponseHeaders();
-        String userAgent = req.getRequestHeaders().getFirst("User-Agent");
-        if (userAgent != null &&
-                userAgent.contains("Safari") && !userAgent.contains("Chrome") &&
-                !userAgent.contains("CriOS") &&
-                !userAgent.contains("FxiOS")) {
+        if (isSafari(req.getRequestHeaders())) {
             headers.add("Safari-Cookie", key + '=' + value + "; Path=" + path +
                     "; SameSite=None; Secure; Domain=" + cookieDomain);
         } else {
@@ -183,4 +179,12 @@ public static void addCookieToHeader(String key, String value, String path, Http
     public static void addRemoveCookieToHeader(String key, String path, HttpExchange req) {
         addCookieToHeader(key, "; Max-Age=0", path, req);
     }
+
+    private static boolean isSafari(Headers headers) {
+        String userAgent = headers.getFirst("User-Agent");
+        return userAgent != null &&
+                userAgent.contains("Safari") && !userAgent.contains("Chrome") &&
+                !userAgent.contains("CriOS") &&
+                !userAgent.contains("FxiOS");
+    }
 }