fix xxxcard log

2025-06-11 13:20:01 +09:00
parent 4fe0582c6b
commit bebd6a61eb
11 changed files with 133 additions and 81 deletions
--- a/aicard-web-oauth/src/App.tsx
+++ b/aicard-web-oauth/src/App.tsx
@@ -99,9 +99,9 @@ function App() {
      return false;
    };
    
-    // キャッシュがなければ、ATProtoから取得
+    // キャッシュがなければ、ATProtoから取得（認証状態に関係なく）
    if (!loadCachedComments()) {
-      loadAllComments(window.location.href);
+      loadAllComments(); // URLフィルタリングを無効にして全コメント表示
    }

    // Handle popstate events for mock OAuth flow
@@ -142,7 +142,8 @@ function App() {
        setUser(userProfile);
        
        // Load all comments for display (this will be the default view)
-        loadAllComments(window.location.href);
+        // Temporarily disable URL filtering to see all comments
+        loadAllComments();
        
        // Load user list records if admin
        if (userProfile.did === 'did:plc:uqzpqmrjnptsxezjx4xuh2mn') {
@@ -161,7 +162,8 @@ function App() {
        setUser(verifiedUser);
        
        // Load all comments for display (this will be the default view)
-        loadAllComments(window.location.href);
+        // Temporarily disable URL filtering to see all comments
+        loadAllComments();
        
        // Load user list records if admin
        if (verifiedUser.did === 'did:plc:uqzpqmrjnptsxezjx4xuh2mn') {
@@ -169,6 +171,9 @@ function App() {
        }
      }
      setIsLoading(false);
+      
+      // 認証状態に関係なく、コメントを読み込む
+      loadAllComments();
    };

    checkAuth();
@@ -265,17 +270,20 @@ function App() {
    try {
      // 管理者のユーザーリストを取得 (ai.syui.log.user collection)
      const adminDid = 'did:plc:uqzpqmrjnptsxezjx4xuh2mn'; // syui.ai
+      console.log('Fetching user list from admin DID:', adminDid);
      const response = await fetch(`https://bsky.social/xrpc/com.atproto.repo.listRecords?repo=${encodeURIComponent(adminDid)}&collection=ai.syui.log.user&limit=100`);
      
      if (!response.ok) {
-        console.warn('Failed to fetch user list from admin, using default users');
+        console.warn('Failed to fetch user list from admin, using default users. Status:', response.status);
        return getDefaultUsers();
      }
      
      const data = await response.json();
      const userRecords = data.records || [];
+      console.log('User records found:', userRecords.length);
      
      if (userRecords.length === 0) {
+        console.log('No user records found, using default users');
        return getDefaultUsers();
      }
      
@@ -349,20 +357,33 @@ function App() {
  };

  const getDefaultUsers = () => {
-    return [
+    const defaultUsers = [
      // bsky.social - 実際のDIDを使用
      { did: 'did:plc:uqzpqmrjnptsxezjx4xuh2mn', handle: 'syui.ai', pds: 'https://bsky.social' },
-      // 他のユーザーは実際のDIDが不明なので、実在するユーザーのみ含める
    ];
+    
+    // 現在ログインしているユーザーも追加（重複チェック）
+    if (user && user.did && user.handle && !defaultUsers.find(u => u.did === user.did)) {
+      defaultUsers.push({
+        did: user.did,
+        handle: user.handle,
+        pds: user.handle.endsWith('.syu.is') ? 'https://syu.is' : 'https://bsky.social'
+      });
+    }
+    
+    console.log('Default users list (including current user):', defaultUsers);
+    return defaultUsers;
  };

  // 新しい関数: 全ユーザーからコメントを収集
  const loadAllComments = async (pageUrl?: string) => {
    try {
      console.log('Loading comments from all users...');
+      console.log('Page URL filter:', pageUrl);
      
      // ユーザーリストを動的に取得
      const knownUsers = await loadUsersFromRecord();
+      console.log('Known users for comment fetching:', knownUsers);

      const allComments = [];

@@ -388,7 +409,8 @@ function App() {
            ? userComments.filter(record => record.value.url === pageUrl)
            : userComments;

-          console.log(`After URL filtering: ${filteredComments.length} comments from ${user.handle}`);
+          console.log(`After URL filtering (${pageUrl}): ${filteredComments.length} comments from ${user.handle}`);
+          console.log('All comments from this user:', userComments.map(r => ({ url: r.value.url, text: r.value.text })));
          allComments.push(...filteredComments);
        } catch (err) {
          console.warn(`Failed to load comments from ${user.handle}:`, err);
@@ -859,14 +881,16 @@ function App() {
                <button 
                  onClick={() => user && loadUserComments(user.did)}
                  className="comments-toggle-button"
+                  disabled={!user}
+                  title={!user ? "Login required to view your comments" : ""}
                >
-                  My Comments
+                  My Comments {!user && "(Login Required)"}
                </button>
                <button 
-                  onClick={() => loadAllComments(window.location.href)}
+                  onClick={() => loadAllComments()}
                  className="comments-toggle-button"
                >
-                  All Comments
+                  All Comments (No Filter)
                </button>
              </div>
            </div>
--- a/aicard-web-oauth/src/services/atproto-oauth.ts
+++ b/aicard-web-oauth/src/services/atproto-oauth.ts
@@ -188,13 +188,15 @@ class AtprotoOAuthService {
  }

  private getClientId(): string {
-    const origin = window.location.origin;
-    
-    // For production (xxxcard.syui.ai), use the actual URL
-    if (origin.includes('xxxcard.syui.ai')) {
-      return `${origin}/client-metadata.json`;
+    // Use environment variable if available
+    const envClientId = import.meta.env.VITE_OAUTH_CLIENT_ID;
+    if (envClientId) {
+      console.log('Using client ID from environment:', envClientId);
+      return envClientId;
    }
    
+    const origin = window.location.origin;
+    
    // For localhost development, use undefined for loopback client
    // The BrowserOAuthClient will handle this automatically
    if (origin.includes('localhost') || origin.includes('127.0.0.1')) {
--- a/aicard-web-oauth/src/utils/oauth-keys.ts
+++ b/aicard-web-oauth/src/utils/oauth-keys.ts
@@ -157,40 +157,19 @@ export class OAuthKeyManager {
 * Generate dynamic client metadata based on current URL
 */
 export function generateClientMetadata(): any {
-  const origin = window.location.origin;
-  const clientId = `${origin}/client-metadata.json`;
+  // Use environment variables if available, fallback to current origin
+  const host = import.meta.env.VITE_APP_HOST || window.location.origin;
+  const clientId = import.meta.env.VITE_OAUTH_CLIENT_ID || `${host}/client-metadata.json`;
+  const redirectUri = import.meta.env.VITE_OAUTH_REDIRECT_URI || `${host}/oauth/callback`;

-  // Use static production metadata for xxxcard.syui.ai
-  if (origin === 'https://xxxcard.syui.ai') {
-    return {
-      client_id: 'https://xxxcard.syui.ai/client-metadata.json',
-      client_name: 'ai.card',
-      client_uri: 'https://xxxcard.syui.ai',
-      logo_uri: 'https://xxxcard.syui.ai/favicon.ico',
-      tos_uri: 'https://xxxcard.syui.ai/terms',
-      policy_uri: 'https://xxxcard.syui.ai/privacy',
-      redirect_uris: ['https://xxxcard.syui.ai/oauth/callback'],
-      response_types: ['code'],
-      grant_types: ['authorization_code', 'refresh_token'],
-      token_endpoint_auth_method: 'private_key_jwt',
-      token_endpoint_auth_signing_alg: 'ES256',
-      scope: 'atproto transition:generic',
-      subject_type: 'public',
-      application_type: 'web',
-      dpop_bound_access_tokens: true,
-      jwks_uri: 'https://xxxcard.syui.ai/.well-known/jwks.json'
-    };
-  }
-
-  // Dynamic metadata for development
  return {
    client_id: clientId,
    client_name: 'ai.card',
-    client_uri: origin,
-    logo_uri: `${origin}/favicon.ico`,
-    tos_uri: `${origin}/terms`,
-    policy_uri: `${origin}/privacy`,
-    redirect_uris: [`${origin}/oauth/callback`],
+    client_uri: host,
+    logo_uri: `${host}/favicon.ico`,
+    tos_uri: `${host}/terms`,
+    policy_uri: `${host}/privacy`,
+    redirect_uris: [redirectUri, host],
    response_types: ['code'],
    grant_types: ['authorization_code', 'refresh_token'],
    token_endpoint_auth_method: 'private_key_jwt',
@@ -199,6 +178,6 @@ export function generateClientMetadata(): any {
    subject_type: 'public',
    application_type: 'web',
    dpop_bound_access_tokens: true,
-    jwks_uri: `${origin}/.well-known/jwks.json`
+    jwks_uri: `${host}/.well-known/jwks.json`
  };
 }