ros/claude-task-master
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: cleanup

Browse Source
This commit is contained in:
Ralph Khreish
2025-09-02 23:43:55 +02:00
parent 6a04da5a4e
commit 5a284e9abd
3 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/tm-core/src/auth/config.ts
View File

@@ -6,9 +6,8 @@ import os from 'os';
import path from 'path'; import path from 'path';
import { AuthConfig } from './types'; import { AuthConfig } from './types';
// Use build-time value if available, otherwise use runtime env or default // Single base domain for all URLs
// Build-time: process.env.TM_PUBLIC_BASE_DOMAIN gets replaced by tsup's env option // Build-time: process.env.TM_PUBLIC_BASE_DOMAIN gets replaced by tsup's env option
// Runtime: TM_BASE_DOMAIN or HAMSTER_BASE_URL from user's environment
// Default: https://tryhamster.com for production // Default: https://tryhamster.com for production
const BASE_DOMAIN = const BASE_DOMAIN =
process.env.TM_PUBLIC_BASE_DOMAIN || // This gets replaced at build time by tsup process.env.TM_PUBLIC_BASE_DOMAIN || // This gets replaced at build time by tsup
@@ -16,14 +15,11 @@ const BASE_DOMAIN =
/** /**
* Default authentication configuration * Default authentication configuration
* All URL configuration should be managed here * All URL configuration is derived from the single BASE_DOMAIN
*/ */
export const DEFAULT_AUTH_CONFIG: AuthConfig = { export const DEFAULT_AUTH_CONFIG: AuthConfig = {
// API endpoint for backend services // Base domain for all services
apiBaseUrl: process.env.HAMSTER_API_URL || `${BASE_DOMAIN}/api`, baseUrl: BASE_DOMAIN,
// Web URL for OAuth sign-in page
webBaseUrl: process.env.HAMSTER_WEB_URL || BASE_DOMAIN,
// Configuration directory and file paths // Configuration directory and file paths
configDir: path.join(os.homedir(), '.taskmaster'), configDir: path.join(os.homedir(), '.taskmaster'),

16
packages/tm-core/src/auth/oauth-service.ts
View File

@@ -24,7 +24,7 @@ export class OAuthService {
private logger = getLogger('OAuthService'); private logger = getLogger('OAuthService');
private credentialStore: CredentialStore; private credentialStore: CredentialStore;
private supabaseClient: SupabaseAuthClient; private supabaseClient: SupabaseAuthClient;
private webBaseUrl: string; private baseUrl: string;
private authorizationUrl: string | null = null; private authorizationUrl: string | null = null;
private originalState: string | null = null; private originalState: string | null = null;
@@ -35,7 +35,7 @@ export class OAuthService {
this.credentialStore = credentialStore; this.credentialStore = credentialStore;
this.supabaseClient = new SupabaseAuthClient(); this.supabaseClient = new SupabaseAuthClient();
const authConfig = getAuthConfig(config); const authConfig = getAuthConfig(config);
this.webBaseUrl = authConfig.webBaseUrl; this.baseUrl = authConfig.baseUrl;
} }
/** /**
@@ -160,7 +160,7 @@ export class OAuthService {
// Start server on localhost only // Start server on localhost only
server.listen(port, '127.0.0.1', () => { server.listen(port, '127.0.0.1', () => {
// Build authorization URL for web app sign-in page // Build authorization URL for web app sign-in page
const authUrl = new URL(`${this.webBaseUrl}/auth/sign-in`); const authUrl = new URL(`${this.baseUrl}/auth/sign-in`);
// Encode CLI data as base64 // Encode CLI data as base64
const cliParam = Buffer.from(JSON.stringify(cliData)).toString( const cliParam = Buffer.from(JSON.stringify(cliData)).toString(
@@ -311,12 +311,18 @@ export class OAuthService {
* Get a random available port * Get a random available port
*/ */
private async getRandomPort(): Promise<number> { private async getRandomPort(): Promise<number> {
return new Promise((resolve) => { return new Promise((resolve, reject) => {
const server = http.createServer(); const server = http.createServer();
server.listen(0, '127.0.0.1', () => { server.listen(0, '127.0.0.1', () => {
const port = (server.address() as any).port; const address = server.address();
if (!address || typeof address === 'string') {
reject(new Error('Failed to get port'));
return;
}
const port = address.port;
server.close(() => resolve(port)); server.close(() => resolve(port));
}); });
server.on('error', reject);
}); });
} }

3
packages/tm-core/src/auth/types.ts
View File

@@ -42,8 +42,7 @@ export interface OAuthFlowOptions {
} }
export interface AuthConfig { export interface AuthConfig {
apiBaseUrl: string; baseUrl: string;
webBaseUrl: string;
configDir: string; configDir: string;
configFile: string; configFile: string;
} }