Skip to content

Commit f7d0ce9

Browse files
committed
debug logging
1 parent e1bf0ac commit f7d0ce9

2 files changed

Lines changed: 37 additions & 4 deletions

File tree

packages/astro/src/integration/create-integration.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@ import type { AstroClerkIntegrationParams } from '../types';
88
import { vitePluginAstroConfig } from './vite-plugin-astro-config';
99

1010
const buildEnvVarFromOption = (valueToBeStored: unknown, envName: keyof InternalEnv) => {
11-
// Always return a value to ensure Vite properly replaces previous definitions
12-
// For undefined values, use the literal 'undefined' identifier instead of a string
13-
const value = valueToBeStored !== undefined ? JSON.stringify(valueToBeStored) : 'undefined';
14-
return { [`import.meta.env.${envName}`]: value };
11+
return valueToBeStored ? { [`import.meta.env.${envName}`]: JSON.stringify(valueToBeStored) } : {};
1512
};
1613

1714
type HotloadAstroClerkIntegrationParams = AstroClerkIntegrationParams & {

packages/astro/src/server/keyless/utils.ts

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,37 @@ export async function resolveKeysWithKeylessFallback(
2121
let claimUrl: string | undefined;
2222
let apiKeysUrl: string | undefined;
2323

24+
console.log('[Keyless Debug] Input:', {
25+
hasPublishableKey: Boolean(configuredPublishableKey),
26+
hasSecretKey: Boolean(configuredSecretKey),
27+
isDev,
28+
canUseKeyless,
29+
});
30+
2431
if (!isDev || !canUseKeyless) {
32+
console.log('[Keyless Debug] Early return - not dev or keyless disabled');
33+
return { publishableKey, secretKey, claimUrl, apiKeysUrl };
34+
}
35+
36+
// If both keys are explicitly configured, skip all keyless logic
37+
if (publishableKey && secretKey) {
38+
console.log('[Keyless Debug] Both keys configured, skipping keyless');
2539
return { publishableKey, secretKey, claimUrl, apiKeysUrl };
2640
}
2741

2842
const keylessService = await keyless();
2943
const locallyStoredKeys = keylessService.readKeys();
3044

45+
console.log('[Keyless Debug] Stored keys:', {
46+
hasStoredKeys: Boolean(locallyStoredKeys),
47+
storedPublishableKey: locallyStoredKeys?.publishableKey?.substring(0, 20) + '...',
48+
});
49+
3150
const runningWithClaimedKeys =
3251
Boolean(configuredPublishableKey) && configuredPublishableKey === locallyStoredKeys?.publishableKey;
3352

53+
console.log('[Keyless Debug] Running with claimed keys:', runningWithClaimedKeys);
54+
3455
if (runningWithClaimedKeys && locallyStoredKeys) {
3556
try {
3657
await clerkDevelopmentCache?.run(() => keylessService.completeOnboarding(), {
@@ -46,10 +67,14 @@ export async function resolveKeysWithKeylessFallback(
4667
msg: createConfirmationMessage(),
4768
});
4869

70+
console.log('[Keyless Debug] Returning claimed keys (no keyless URLs)');
4971
return { publishableKey, secretKey, claimUrl, apiKeysUrl };
5072
}
5173

74+
console.log('[Keyless Debug] Checking if need to create keyless app');
75+
5276
if (!publishableKey && !secretKey) {
77+
console.log('[Keyless Debug] Creating keyless app (no keys configured)');
5378
const keylessApp: AccountlessApplication | null = await keylessService.getOrCreateKeys();
5479

5580
if (keylessApp) {
@@ -58,12 +83,23 @@ export async function resolveKeysWithKeylessFallback(
5883
claimUrl = keylessApp.claimUrl;
5984
apiKeysUrl = keylessApp.apiKeysUrl;
6085

86+
console.log('[Keyless Debug] Keyless app created/retrieved with URLs');
87+
6188
clerkDevelopmentCache?.log({
6289
cacheKey: keylessApp.publishableKey,
6390
msg: createKeylessModeMessage(keylessApp),
6491
});
6592
}
93+
} else {
94+
console.log('[Keyless Debug] Skipping keyless app creation (keys already configured)');
6695
}
6796

97+
console.log('[Keyless Debug] Final return:', {
98+
hasPublishableKey: Boolean(publishableKey),
99+
hasSecretKey: Boolean(secretKey),
100+
hasClaimUrl: Boolean(claimUrl),
101+
hasApiKeysUrl: Boolean(apiKeysUrl),
102+
});
103+
68104
return { publishableKey, secretKey, claimUrl, apiKeysUrl };
69105
}

0 commit comments

Comments
 (0)