ai/log
1
0
Fork 0
Code Pull Requests Actions Wiki Activity

fix oauth

Browse Source
This commit is contained in:
syui
2025-06-17 13:19:31 +09:00
parent 51e4a492bc
commit fcab7c7f83
1 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
oauth/src/services/atproto-oauth.ts
View File

@@ -38,11 +38,13 @@ class AtprotoOAuthService {
// Support multiple PDS hosts for OAuth // Support multiple PDS hosts for OAuth
console.log('[OAuth Debug] Initializing OAuth client with default settings');
this.oauthClient = await BrowserOAuthClient.load({ this.oauthClient = await BrowserOAuthClient.load({
clientId: clientId, clientId: clientId,
handleResolver: 'https://bsky.social', // Default resolver handleResolver: 'https://bsky.social', // Default resolver
plcDirectoryUrl: 'https://plc.directory', // Default PLC directory plcDirectoryUrl: 'https://plc.directory', // Default PLC directory
}); });
console.log('[OAuth Debug] OAuth client initialized with defaults');
@@ -116,23 +118,24 @@ class AtprotoOAuthService {
// Create Agent directly with session (per official docs) // Create Agent directly with session (per official docs)
try { try {
this.agent = new Agent(session); this.agent = new Agent(session);
console.log('[OAuth Debug] Agent created successfully with session');
// Check if agent has session info after creation // Check if agent has session info after creation
if (this.agent.session) { if (this.agent.session) {
console.log('[OAuth Debug] Agent has session:', this.agent.session);
} }
} catch (err) { } catch (err) {
console.log('[OAuth Debug] Failed to create agent with session:', err);
// Fallback to dpopFetch method // Fallback to dpopFetch method
this.agent = new Agent({ try {
service: session.server?.serviceEndpoint || 'https://bsky.social', this.agent = new Agent({
fetch: session.dpopFetch service: session.server?.serviceEndpoint || 'https://bsky.social',
}); fetch: session.dpopFetch
});
console.log('[OAuth Debug] Agent created with dpopFetch fallback');
} catch (fallbackErr) {
console.error('[OAuth Debug] Failed to create agent with fallback:', fallbackErr);
}
} }
// Store basic session info // Store basic session info
@@ -274,22 +277,30 @@ class AtprotoOAuthService {
// Detect PDS based on handle // Detect PDS based on handle
const pdsUrl = await this.detectPDSFromHandle(handle); const pdsUrl = await this.detectPDSFromHandle(handle);
// Starting OAuth flow console.log('[OAuth Debug] Detected PDS for handle', handle, ':', pdsUrl);
// Always re-initialize OAuth client with detected PDS // Always re-initialize OAuth client with detected PDS
// Re-initializing OAuth client console.log('[OAuth Debug] Re-initializing OAuth client');
// Clear existing client to force fresh initialization // Clear existing client to force fresh initialization
this.oauthClient = null; this.oauthClient = null;
this.initializePromise = null; this.initializePromise = null;
// Determine PLC directory based on input handle, not environment PDS
let plcDirectoryUrl = 'https://plc.directory'; // Default to Bluesky PLC
if (handle.endsWith('.syu.is') || handle.endsWith('.syui.ai')) {
plcDirectoryUrl = 'https://plc.syu.is';
}
console.log('[OAuth Debug] Using PLC directory:', plcDirectoryUrl);
this.oauthClient = await BrowserOAuthClient.load({ this.oauthClient = await BrowserOAuthClient.load({
clientId: this.getClientId(), clientId: this.getClientId(),
handleResolver: pdsUrl, handleResolver: pdsUrl,
plcDirectoryUrl: pdsUrl === 'https://syu.is' ? 'https://plc.syu.is' : 'https://plc.directory', plcDirectoryUrl: plcDirectoryUrl,
}); });
console.log('[OAuth Debug] OAuth client re-initialized successfully');
// OAuth client initialized // OAuth client initialized
// Start OAuth authorization flow // Start OAuth authorization flow