fix(oauth): fix private key error for OAuth tokens
This commit is contained in:
@@ -1,5 +1,13 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 2025-07-22 - 3.0.6 - fix(oauth)
|
||||||
|
Fix OAuth token private key error
|
||||||
|
|
||||||
|
- Fixed "Private key not generated yet" error for OAuth tokens
|
||||||
|
- Added OAuth mode to HTTP client to skip request signing
|
||||||
|
- Skip response signature verification for OAuth tokens
|
||||||
|
- Properly handle missing private keys in OAuth mode
|
||||||
|
|
||||||
## 2025-07-22 - 3.0.5 - feat(oauth)
|
## 2025-07-22 - 3.0.5 - feat(oauth)
|
||||||
Add OAuth token support
|
Add OAuth token support
|
||||||
|
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@apiclient.xyz/bunq",
|
"name": "@apiclient.xyz/bunq",
|
||||||
"version": "3.0.5",
|
"version": "3.0.6",
|
||||||
"private": false,
|
"private": false,
|
||||||
"description": "A full-featured TypeScript/JavaScript client for the bunq API",
|
"description": "A full-featured TypeScript/JavaScript client for the bunq API",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
|
@@ -41,4 +41,31 @@ tap.test('should not attempt session refresh for OAuth tokens', async () => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
tap.test('should handle OAuth tokens without private key errors', async () => {
|
||||||
|
const oauthBunq = new bunq.BunqAccount({
|
||||||
|
apiKey: 'test-oauth-token',
|
||||||
|
deviceName: 'OAuth Test App',
|
||||||
|
environment: 'SANDBOX',
|
||||||
|
isOAuthToken: true
|
||||||
|
});
|
||||||
|
|
||||||
|
try {
|
||||||
|
// Initialize (should skip session creation)
|
||||||
|
await oauthBunq.init();
|
||||||
|
|
||||||
|
// Try to make a request (should skip signing)
|
||||||
|
// This would have thrown "Private key not generated yet" before the fix
|
||||||
|
const httpClient = oauthBunq.apiContext.getHttpClient();
|
||||||
|
|
||||||
|
// Test that HTTP client is in OAuth mode and won't try to sign
|
||||||
|
console.log('OAuth HTTP client test passed - no private key errors');
|
||||||
|
} catch (error) {
|
||||||
|
// Expected to fail with network/auth error, not private key error
|
||||||
|
if (error.message && error.message.includes('Private key not generated')) {
|
||||||
|
throw new Error('OAuth mode should not require private keys');
|
||||||
|
}
|
||||||
|
console.log('OAuth private key test completed (expected network failure)');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
tap.start();
|
tap.start();
|
@@ -10,12 +10,20 @@ export class BunqHttpClient {
|
|||||||
private crypto: BunqCrypto;
|
private crypto: BunqCrypto;
|
||||||
private context: IBunqApiContext;
|
private context: IBunqApiContext;
|
||||||
private requestCounter: number = 0;
|
private requestCounter: number = 0;
|
||||||
|
private isOAuthMode: boolean = false;
|
||||||
|
|
||||||
constructor(crypto: BunqCrypto, context: IBunqApiContext) {
|
constructor(crypto: BunqCrypto, context: IBunqApiContext) {
|
||||||
this.crypto = crypto;
|
this.crypto = crypto;
|
||||||
this.context = context;
|
this.context = context;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set OAuth mode
|
||||||
|
*/
|
||||||
|
public setOAuthMode(isOAuth: boolean): void {
|
||||||
|
this.isOAuthMode = isOAuth;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Update the API context (used after getting session token)
|
* Update the API context (used after getting session token)
|
||||||
*/
|
*/
|
||||||
@@ -36,13 +44,20 @@ export class BunqHttpClient {
|
|||||||
const body = options.body ? JSON.stringify(options.body) : undefined;
|
const body = options.body ? JSON.stringify(options.body) : undefined;
|
||||||
|
|
||||||
// Add signature if required
|
// Add signature if required
|
||||||
if (options.useSigning !== false && this.crypto.getPrivateKey()) {
|
// Skip signing for OAuth tokens or if explicitly disabled
|
||||||
headers['X-Bunq-Client-Signature'] = this.crypto.createSignatureHeader(
|
if (options.useSigning !== false && !this.isOAuthMode) {
|
||||||
options.method,
|
try {
|
||||||
options.endpoint,
|
const privateKey = this.crypto.getPrivateKey();
|
||||||
headers,
|
headers['X-Bunq-Client-Signature'] = this.crypto.createSignatureHeader(
|
||||||
body || ''
|
options.method,
|
||||||
);
|
options.endpoint,
|
||||||
|
headers,
|
||||||
|
body || ''
|
||||||
|
);
|
||||||
|
} catch (error) {
|
||||||
|
// If no private key is available (e.g., OAuth mode), skip signing
|
||||||
|
// This is expected for OAuth tokens
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Make the request
|
// Make the request
|
||||||
@@ -66,7 +81,8 @@ export class BunqHttpClient {
|
|||||||
const response = await plugins.smartrequest.request(url, requestOptions);
|
const response = await plugins.smartrequest.request(url, requestOptions);
|
||||||
|
|
||||||
// Verify response signature if we have server public key
|
// Verify response signature if we have server public key
|
||||||
if (this.context.serverPublicKey) {
|
// Skip verification for OAuth tokens as they don't have installation keys
|
||||||
|
if (this.context.serverPublicKey && !this.isOAuthMode) {
|
||||||
// Convert headers to string-only format
|
// Convert headers to string-only format
|
||||||
const stringHeaders: { [key: string]: string } = {};
|
const stringHeaders: { [key: string]: string } = {};
|
||||||
for (const [key, value] of Object.entries(response.headers)) {
|
for (const [key, value] of Object.entries(response.headers)) {
|
||||||
|
@@ -149,6 +149,8 @@ export class BunqSession {
|
|||||||
// OAuth tokens don't expire in the same way as regular sessions
|
// OAuth tokens don't expire in the same way as regular sessions
|
||||||
// Set a far future expiry time
|
// Set a far future expiry time
|
||||||
this.sessionExpiryTime = plugins.smarttime.TimeStamp.fromMilliSeconds(Date.now() + 365 * 24 * 60 * 60 * 1000);
|
this.sessionExpiryTime = plugins.smarttime.TimeStamp.fromMilliSeconds(Date.now() + 365 * 24 * 60 * 60 * 1000);
|
||||||
|
// Also set OAuth mode on HTTP client
|
||||||
|
this.httpClient.setOAuthMode(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user