X-Git-Url: https://git.giacomolli.uk/onechat/blobdiff_plain/6b21fcf78372995c6d8130c63f2f8aa2609bf7fe..c781f79f3c8cb9a7577ee1574d196988da2719b3:/chatgpt_fake_helper_test.go

diff --git a/chatgpt_fake_helper_test.go b/chatgpt_fake_helper_test.go
index dfcf17d..0dca6bb 100644
--- a/chatgpt_fake_helper_test.go
+++ b/chatgpt_fake_helper_test.go
@@ -35,6 +35,27 @@ type ChatGPTFake struct {
 	access      []string
 }
 
+func newChatGPTFake(t *testing.T) *ChatGPTFake {
+	t.Helper()
+
+	f := &ChatGPTFake{}
+	mux := http.NewServeMux()
+	mux.HandleFunc("POST /api/accounts/deviceauth/usercode", f.userCode)
+	mux.HandleFunc("POST /api/accounts/deviceauth/token", f.deviceToken)
+	mux.HandleFunc("POST /oauth/token", f.oauthToken)
+
+	f.Server = httptest.NewServer(mux)
+	t.Cleanup(f.Close)
+
+	return f
+}
+
+func newTestChatGPTAuth(t *testing.T, server *ChatGPTFake) *ChatGPTAuth {
+	t.Helper()
+
+	return newChatGPTAuth(filepath.Join(t.TempDir(), chatgptTokenFileName), server.URL)
+}
+
 // token returns a new access token that expires after ttl, for a token file
 // that a test writes.
 func (f *ChatGPTFake) token(ttl time.Duration) string {
@@ -67,9 +88,11 @@ func (f *ChatGPTFake) newToken(ttl time.Duration) string {
 
 func (f *ChatGPTFake) userCode(w http.ResponseWriter, r *http.Request) {
 	var body map[string]string
+
 	err := json.NewDecoder(r.Body).Decode(&body)
 	if err != nil || body["client_id"] != chatgptClientID {
 		http.Error(w, "bad client", http.StatusBadRequest)
+
 		return
 	}
 
@@ -85,20 +108,24 @@ func (f *ChatGPTFake) deviceToken(w http.ResponseWriter, r *http.Request) {
 	defer f.mutex.Unlock()
 
 	var body map[string]string
+
 	err := json.NewDecoder(r.Body).Decode(&body)
 	if err != nil || body["device_auth_id"] != "device-1" || body["user_code"] != "CODE-1234" {
 		http.Error(w, "bad device", http.StatusBadRequest)
+
 		return
 	}
 
 	f.polls++
 	if f.deny {
 		http.Error(w, "denied", http.StatusBadRequest)
+
 		return
 	}
 
 	if f.polls <= f.pending {
 		http.Error(w, "pending", http.StatusForbidden)
+
 		return
 	}
 
@@ -117,6 +144,7 @@ func (f *ChatGPTFake) oauthToken(w http.ResponseWriter, r *http.Request) {
 		err := r.ParseForm()
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusBadRequest)
+
 			return
 		}
 
@@ -131,9 +159,11 @@ func (f *ChatGPTFake) oauthToken(w http.ResponseWriter, r *http.Request) {
 	}
 
 	var body map[string]string
+
 	err := json.NewDecoder(r.Body).Decode(&body)
 	if err != nil || body["grant_type"] != "refresh_token" || body["client_id"] != chatgptClientID {
 		http.Error(w, "bad refresh", http.StatusBadRequest)
+
 		return
 	}
 
@@ -141,6 +171,7 @@ func (f *ChatGPTFake) oauthToken(w http.ResponseWriter, r *http.Request) {
 	f.refreshed = body["refresh_token"]
 	if f.failRefresh {
 		http.Error(w, `{"error": "invalid_grant", "token": "`+body["refresh_token"]+`"}`, http.StatusUnauthorized)
+
 		return
 	}
 
@@ -156,26 +187,6 @@ func (f *ChatGPTFake) oauthToken(w http.ResponseWriter, r *http.Request) {
 	chatgptWriteJSON(w, answer)
 }
 
-func newChatGPTFake(t *testing.T) *ChatGPTFake {
-	t.Helper()
-
-	f := &ChatGPTFake{}
-	mux := http.NewServeMux()
-	mux.HandleFunc("POST /api/accounts/deviceauth/usercode", f.userCode)
-	mux.HandleFunc("POST /api/accounts/deviceauth/token", f.deviceToken)
-	mux.HandleFunc("POST /oauth/token", f.oauthToken)
-	f.Server = httptest.NewServer(mux)
-	t.Cleanup(f.Close)
-
-	return f
-}
-
-func newTestChatGPTAuth(t *testing.T, server *ChatGPTFake) *ChatGPTAuth {
-	t.Helper()
-
-	return newChatGPTAuth(filepath.Join(t.TempDir(), chatgptTokenFileName), server.URL)
-}
-
 func chatgptWriteTestTokens(t *testing.T, auth *ChatGPTAuth, access, refresh string) {
 	t.Helper()
 
@@ -190,6 +201,7 @@ func chatgptWriteTestTokens(t *testing.T, auth *ChatGPTAuth, access, refresh str
 
 func chatgptWriteJSON(w http.ResponseWriter, value any) {
 	w.Header().Set("Content-Type", "application/json")
+
 	err := json.NewEncoder(w).Encode(value)
 	if err != nil {
 		panic(fmt.Sprint("encode answer: ", err))