Skip to content

Commit 9aa7ffc

Browse files
pballaipballai
committed
recipe-portal-v1.01
1 parent f6e1637 commit 9aa7ffc

4 files changed

Lines changed: 76 additions & 6 deletions

File tree

‎recipe-portal/app/api/execute/route.ts‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ function getCurrentTokenInfo() {
1111
const files = fs.readdirSync(tempDir);
1212
const tokenFiles = files.filter(file => file.startsWith('sigma-portal-token-') && file.endsWith('.json'));
1313

14+
console.log('=== EXECUTE ROUTE TOKEN DEBUGGING ===');
15+
console.log('Found token files:', tokenFiles);
16+
1417
let namedConfigTokens = [];
1518
let defaultToken = null;
1619

@@ -23,6 +26,7 @@ function getCurrentTokenInfo() {
2326
// Check if token is still valid (not expired)
2427
if (tokenData.expiresAt && now < tokenData.expiresAt) {
2528
const lastAccessTime = tokenData.lastAccessed || tokenData.createdAt;
29+
console.log(`Token ${file}: clientId=${tokenData.clientId?.substring(0,8) || 'default'}, fullLength=${tokenData.clientId?.length || 0}, createdAt=${new Date(tokenData.createdAt)}, lastAccessed=${tokenData.lastAccessed ? new Date(tokenData.lastAccessed) : 'none'}, lastAccessTime=${lastAccessTime}`);
2630

2731
const tokenInfo = {
2832
hasValidToken: true,
@@ -37,28 +41,43 @@ function getCurrentTokenInfo() {
3741
// Use same classification logic as /api/token
3842
if (tokenData.clientId && tokenData.clientId.length > 8) {
3943
namedConfigTokens.push(tokenInfo);
44+
console.log(` -> This is a named config token (full clientId: ${tokenData.clientId.length} chars)`);
4045
} else {
4146
defaultToken = tokenInfo;
47+
console.log(` -> This is the default token (clientId: ${tokenData.clientId || 'none'})`);
4248
}
4349
} else {
50+
console.log(`Token ${file} is expired, removing...`);
4451
// Token expired, remove file
4552
fs.unlinkSync(filePath);
4653
}
4754
} catch (err) {
55+
console.warn(`Failed to read token file ${file}:`, err);
4856
// Skip invalid token files
4957
}
5058
}
5159

60+
console.log(`Found ${namedConfigTokens.length} named config tokens and ${defaultToken ? 1 : 0} default tokens`);
61+
5262
// Prioritize named config tokens over default token (same as /api/token)
5363
if (namedConfigTokens.length > 0) {
64+
// Sort named config tokens by most recent access time
5465
namedConfigTokens.sort((a, b) => b.lastAccessTime - a.lastAccessTime);
66+
console.log('Named config tokens sorted by lastAccessTime:');
67+
namedConfigTokens.forEach((token, index) => {
68+
console.log(` ${index + 1}. ${token.clientId?.substring(0,8)}... - ${new Date(token.lastAccessTime)}`);
69+
});
70+
console.log(` -> Selected most recent named config token: ${namedConfigTokens[0].clientId?.substring(0,8)}`);
5571
return namedConfigTokens[0];
5672
} else if (defaultToken) {
73+
console.log(` -> No named config tokens, using default token`);
5774
return defaultToken;
5875
}
5976

77+
console.log(' -> No valid tokens found');
6078
return null;
6179
} catch (error) {
80+
console.error('Error in getCurrentTokenInfo:', error);
6281
return null;
6382
}
6483
}

‎recipe-portal/app/api/token/clear/route.ts‎

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,44 @@ export async function POST(request: Request) {
1919
if (clearAll) {
2020
// Clear all token cache files
2121
const tempDir = os.tmpdir();
22+
console.log('=== CLEAR ALL TOKENS DEBUG ===');
23+
console.log('Temp directory:', tempDir);
24+
2225
const files = fs.readdirSync(tempDir);
2326
const tokenFiles = files.filter(file => file.startsWith('sigma-portal-token-') && file.endsWith('.json'));
2427

28+
console.log('All files in temp dir that match pattern:', tokenFiles);
2529
console.log('Clearing all tokens:', tokenFiles);
2630

2731
let clearedCount = 0;
32+
let failedToDelete = [];
33+
2834
for (const file of tokenFiles) {
2935
try {
30-
fs.unlinkSync(path.join(tempDir, file));
36+
const fullPath = path.join(tempDir, file);
37+
console.log(`Attempting to delete: ${fullPath}`);
38+
fs.unlinkSync(fullPath);
3139
clearedCount++;
32-
console.log(`Cleared token file: ${file}`);
40+
console.log(`✓ Successfully cleared token file: ${file}`);
3341
} catch (err) {
34-
console.warn(`Failed to delete token file ${file}:`, err);
42+
console.error(`✗ Failed to delete token file ${file}:`, err);
43+
failedToDelete.push({ file, error: err.message });
3544
}
3645
}
3746

47+
// Verify deletion by checking again
48+
const filesAfterDelete = fs.readdirSync(tempDir);
49+
const tokenFilesAfterDelete = filesAfterDelete.filter(file => file.startsWith('sigma-portal-token-') && file.endsWith('.json'));
50+
console.log('Token files remaining after deletion attempt:', tokenFilesAfterDelete);
51+
3852
return NextResponse.json({
39-
success: true,
40-
message: `Cleared ${clearedCount} authentication token(s)`
53+
success: failedToDelete.length === 0,
54+
message: `Cleared ${clearedCount} authentication token(s)`,
55+
details: {
56+
cleared: clearedCount,
57+
failed: failedToDelete,
58+
remainingFiles: tokenFilesAfterDelete
59+
}
4160
});
4261
} else {
4362
// Clear specific configuration's token

‎recipe-portal/components/CodeViewer.tsx‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -618,6 +618,14 @@ export function CodeViewer({ isOpen, onClose, filePath, fileName, envVariables =
618618
console.log('Validation passed, continuing execution...');
619619

620620
const allEnvVariables = { ...coreAuthVars, ...currentEnvValues };
621+
622+
// For authentication script, always add CONFIG_NAME to debug
623+
if (fileName === 'get-access-token.js') {
624+
console.log('DEBUG AUTH SCRIPT - selectedCredentialSet:', selectedCredentialSet);
625+
allEnvVariables['CONFIG_NAME'] = selectedCredentialSet || '';
626+
console.log('Added CONFIG_NAME to env variables:', allEnvVariables['CONFIG_NAME']);
627+
}
628+
621629
console.log('About to make API request with variables:', Object.keys(allEnvVariables));
622630

623631

‎recipe-portal/recipes/get-access-token.js‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,23 +77,41 @@ function getStoredCredentials(configName) {
7777
try {
7878
const keysFile = path.join(getKeysDirectory(), 'encrypted-keys.json');
7979

80+
console.log('=== AUTH SCRIPT CONFIG SELECTION DEBUG ===');
81+
console.log('Requested config name:', configName);
82+
console.log('Keys file path:', keysFile);
83+
8084
if (!fs.existsSync(keysFile)) {
85+
console.log('Keys file does not exist');
8186
return null;
8287
}
8388

8489
const allCredentials = JSON.parse(fs.readFileSync(keysFile, 'utf-8'));
90+
console.log('Available configs:', Object.keys(allCredentials).filter(k => k !== '_metadata'));
91+
console.log('Default set in metadata:', allCredentials._metadata?.defaultSet);
8592

8693
// Use provided name, or default, or first available
8794
let targetName = configName;
8895
if (!targetName) {
8996
targetName = allCredentials._metadata?.defaultSet || Object.keys(allCredentials).find(k => k !== '_metadata');
97+
console.log('No config name provided, using:', targetName);
98+
} else {
99+
console.log('Using provided config name:', targetName);
90100
}
91101

92102
if (!targetName || !allCredentials[targetName]) {
103+
console.log('Target config not found:', targetName);
93104
return null;
94105
}
95106

96-
return decryptCredentials(allCredentials[targetName].encrypted);
107+
const decrypted = decryptCredentials(allCredentials[targetName].encrypted);
108+
if (decrypted) {
109+
console.log('Successfully decrypted config for:', targetName);
110+
console.log('ClientId starts with:', decrypted.clientId?.substring(0, 8));
111+
console.log('BaseURL:', decrypted.baseURL);
112+
}
113+
114+
return decrypted;
97115
} catch (error) {
98116
console.error('Failed to retrieve stored credentials:', error);
99117
return null;
@@ -162,6 +180,12 @@ function cacheToken(token, clientId, expiresIn = 3600, baseURL = null, authURL =
162180
* Get bearer token using new authentication system
163181
*/
164182
async function getBearerToken(configName) {
183+
// Allow configName to be passed via environment variable for portal integration
184+
const envConfigName = process.env.CONFIG_NAME;
185+
if (!configName && envConfigName) {
186+
configName = envConfigName;
187+
console.log('Using config name from environment:', configName);
188+
}
165189
try {
166190
// Get stored credentials
167191
const credentials = getStoredCredentials(configName);

0 commit comments

Comments
 (0)