fix(accounts): accept numeric sub2api expiry values

Author: james-6-23

admin/handler.go

@@ -1063,17 +1063,17 @@ type importToken struct {
 
 // jsonAccountEntry CLIProxyAPI 凭证 JSON 条目
 type jsonAccountEntry struct {
-	RefreshToken      string `json:"refresh_token"`
-	SessionToken      string `json:"session_token"`
-	SessionTokenCamel string `json:"sessionToken"`
-	AccessToken       string `json:"access_token"`
-	IDToken           string `json:"id_token"`
-	AccountID         string `json:"account_id"`
-	Email             string `json:"email"`
-	Name              string `json:"name"`
-	PlanType          string `json:"plan_type"`
-	Expired           string `json:"expired"`
-	ExpiresAt         string `json:"expires_at"`
+	RefreshToken      string                 `json:"refresh_token"`
+	SessionToken      string                 `json:"session_token"`
+	SessionTokenCamel string                 `json:"sessionToken"`
+	AccessToken       string                 `json:"access_token"`
+	IDToken           string                 `json:"id_token"`
+	AccountID         string                 `json:"account_id"`
+	Email             string                 `json:"email"`
+	Name              string                 `json:"name"`
+	PlanType          string                 `json:"plan_type"`
+	Expired           importJSONScalarString `json:"expired"`
+	ExpiresAt         importJSONScalarString `json:"expires_at"`
 }
 
 type sub2apiImportPayload struct {
@@ -1086,16 +1086,45 @@ type sub2apiAccountEntry struct {
 }
 
 type sub2apiAccountCredentials struct {
-	RefreshToken      string `json:"refresh_token"`
-	SessionToken      string `json:"session_token"`
-	SessionTokenCamel string `json:"sessionToken"`
-	AccessToken       string `json:"access_token"`
-	IDToken           string `json:"id_token"`
-	AccountID         string `json:"account_id"`
-	Email             string `json:"email"`
-	PlanType          string `json:"plan_type"`
-	ExpiresAt         string `json:"expires_at"`
-	Expired           string `json:"expired"`
+	RefreshToken      string                 `json:"refresh_token"`
+	SessionToken      string                 `json:"session_token"`
+	SessionTokenCamel string                 `json:"sessionToken"`
+	AccessToken       string                 `json:"access_token"`
+	IDToken           string                 `json:"id_token"`
+	AccountID         string                 `json:"account_id"`
+	Email             string                 `json:"email"`
+	PlanType          string                 `json:"plan_type"`
+	ExpiresAt         importJSONScalarString `json:"expires_at"`
+	Expired           importJSONScalarString `json:"expired"`
+}
+
+type importJSONScalarString string
+
+func (v *importJSONScalarString) UnmarshalJSON(data []byte) error {
+	decoder := json.NewDecoder(bytes.NewReader(data))
+	decoder.UseNumber()
+
+	var raw interface{}
+	if err := decoder.Decode(&raw); err != nil {
+		return err
+	}
+
+	switch value := raw.(type) {
+	case string:
+		*v = importJSONScalarString(strings.TrimSpace(value))
+	case json.Number:
+		*v = importJSONScalarString(value.String())
+	case bool:
+		*v = importJSONScalarString(strconv.FormatBool(value))
+	default:
+		*v = ""
+	}
+
+	return nil
+}
+
+func (v importJSONScalarString) String() string {
+	return strings.TrimSpace(string(v))
 }
 
 var utf8BOM = []byte{0xef, 0xbb, 0xbf}
@@ -1155,7 +1184,7 @@ func jsonAccountEntriesToTokens(entries []jsonAccountEntry) []importToken {
 				idToken:      strings.TrimSpace(entry.IDToken),
 				accountID:    strings.TrimSpace(entry.AccountID),
 				planType:     strings.TrimSpace(entry.PlanType),
-				expiresAt:    firstNonEmpty(entry.ExpiresAt, entry.Expired),
+				expiresAt:    firstNonEmpty(entry.ExpiresAt.String(), entry.Expired.String()),
 			})
 		}
 	}
@@ -1190,7 +1219,7 @@ func parseSub2APIJSONImportTokens(data []byte) []importToken {
 				idToken:      strings.TrimSpace(account.Credentials.IDToken),
 				accountID:    strings.TrimSpace(account.Credentials.AccountID),
 				planType:     strings.TrimSpace(account.Credentials.PlanType),
-				expiresAt:    firstNonEmpty(account.Credentials.ExpiresAt, account.Credentials.Expired),
+				expiresAt:    firstNonEmpty(account.Credentials.ExpiresAt.String(), account.Credentials.Expired.String()),
 			})
 		}
 	}

admin/import_json_test.go

@@ -7,6 +7,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"testing"
+	"time"
 
 	"github.com/gin-gonic/gin"
 )
@@ -119,6 +120,41 @@ func TestParseImportJSONTokensSupportsSub2API(t *testing.T) {
 	}
 }
 
+func TestParseImportJSONTokensSupportsSub2APINumericExpiresAt(t *testing.T) {
+	data := []byte(`{
+		"accounts": [
+			{
+				"name": "Numeric Expiry",
+				"credentials": {
+					"refresh_token": "rt-numeric",
+					"access_token": "at-numeric",
+					"expires_at": 1779071020
+				}
+			}
+		]
+	}`)
+
+	tokens, err := parseImportJSONTokens(data)
+	if err != nil {
+		t.Fatalf("parseImportJSONTokens returned error: %v", err)
+	}
+
+	if len(tokens) != 1 {
+		t.Fatalf("tokens len = %d, want 1", len(tokens))
+	}
+	if tokens[0].expiresAt != "1779071020" {
+		t.Fatalf("expiresAt = %q, want numeric value preserved", tokens[0].expiresAt)
+	}
+}
+
+func TestParseCredentialExpiresAtSupportsUnixSeconds(t *testing.T) {
+	got := parseCredentialExpiresAt("1779071020").UTC()
+	want := time.Unix(1779071020, 0).UTC()
+	if !got.Equal(want) {
+		t.Fatalf("parseCredentialExpiresAt = %s, want %s", got, want)
+	}
+}
+
 func TestParseImportJSONTokensPreservesCPAFields(t *testing.T) {
 	data := []byte(`{
 		"type": "codex",

admin/token_credentials.go

@@ -1,6 +1,7 @@
 package admin
 
 import (
+	"strconv"
 	"strings"
 	"time"
 
@@ -130,6 +131,14 @@ func parseCredentialExpiresAt(raw string) time.Time {
 	if raw == "" {
 		return time.Time{}
 	}
+
+	if unixSeconds, err := strconv.ParseFloat(raw, 64); err == nil && unixSeconds > 0 {
+		if unixSeconds >= 1e12 {
+			return time.UnixMilli(int64(unixSeconds))
+		}
+		return time.Unix(int64(unixSeconds), 0)
+	}
+
 	for _, layout := range []string{
 		time.RFC3339Nano,
 		time.RFC3339,