document: --me の domain_code を保存済みOAuthトークンからも解決

--xpoint-domain-code / XPOINT_DOMAIN_CODE が未設定でも `xp auth login` で
キーリングに保存された domain_code をフォールバックとして使うように
resolveDomainCode を追加。

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

Author: buty4649

README.md

@@ -104,7 +104,7 @@ xp document search --title 経費                       # 件名部分一致
 xp document search --form-name 稟議 --form-group-id 3 # フォーム名 + フォームグループID
 xp document search --writer alice --writer bob        # 申請者指定（複数可）
 xp document search --writer-group grp1                # 申請者グループ指定
-xp document search --me                               # 自分が申請者の書類（XPOINT_USER、未設定なら /scim/v2/{domain_code}/Me から取得）
+xp document search --me                               # 自分が申請者の書類（XPOINT_USER、未設定なら /scim/v2/{domain_code}/Me から取得。domain_code は保存済み OAuth トークンの値も利用）
 xp document search --since 2024-01-01 --until 2024-12-31
 ```
 

cmd/document.go

@@ -476,9 +476,9 @@ func resolveCurrentUserCode(ctx context.Context, client *xpoint.Client) (string,
 	if u := pick(flagUser, "XPOINT_USER"); u != "" {
 		return u, nil
 	}
-	domain := pick(flagDomainCode, "XPOINT_DOMAIN_CODE")
+	domain := resolveDomainCode()
 	if domain == "" {
-		return "", fmt.Errorf("--me requires the current user code: set --xpoint-user / XPOINT_USER, or --xpoint-domain-code / XPOINT_DOMAIN_CODE to look it up via /scim/v2/{domain_code}/Me")
+		return "", fmt.Errorf("--me requires the current user code: set --xpoint-user / XPOINT_USER, or provide a domain code (--xpoint-domain-code / XPOINT_DOMAIN_CODE / stored OAuth login) to look it up via /scim/v2/{domain_code}/Me")
 	}
 	info, err := client.GetSelfInfo(ctx, domain)
 	if err != nil {

cmd/document_test.go

@@ -168,16 +168,6 @@ func TestResolveCurrentUserCode_UsesEnvUser(t *testing.T) {
 	}
 }
 
-func TestResolveCurrentUserCode_ErrorsWithoutUserOrDomain(t *testing.T) {
-	resetSearchFlags(t)
-	t.Setenv("XPOINT_USER", "")
-	t.Setenv("XPOINT_DOMAIN_CODE", "")
-
-	_, err := resolveCurrentUserCode(context.Background(), nil)
-	if err == nil || !strings.Contains(err.Error(), "--xpoint-user") {
-		t.Errorf("err = %v", err)
-	}
-}
 
 func TestRunDocumentSearch_BodyAndFilterConflict(t *testing.T) {
 	resetSearchFlags(t)

cmd/root.go

@@ -59,6 +59,20 @@ func resolveSubdomain() (string, error) {
 	return "", errors.New("subdomain is required: set --xpoint-subdomain or XPOINT_SUBDOMAIN, or run 'xp auth login' first")
 }
 
+// resolveDomainCode returns the X-point domain code in priority order:
+// --xpoint-domain-code flag, XPOINT_DOMAIN_CODE env, then the domain code
+// saved alongside the OAuth token by `xp auth login`. Returns an empty
+// string if none is available.
+func resolveDomainCode() string {
+	if d := pick(flagDomainCode, "XPOINT_DOMAIN_CODE"); d != "" {
+		return d
+	}
+	if t, err := xpoint.LoadToken(); err == nil && t.DomainCode != "" {
+		return t.DomainCode
+	}
+	return ""
+}
+
 // authFromFlags returns the credential supplied via --xpoint-* command-line
 // flags. The bool is true only when the user explicitly passed flags. This is
 // the highest-priority auth source: a one-shot flag should always win.