Compare commits

...

2 Commits
3.0.4 ... 3.0.6

8 changed files with 178 additions and 10 deletions

View File

@@ -1,5 +1,22 @@
# 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)
Add OAuth token support
- Added support for OAuth access tokens with isOAuthToken flag
- OAuth tokens skip session creation since they already have an associated session
- Fixed "Authentication token already has a user session" error for OAuth tokens
- Added OAuth documentation to readme with usage examples
- Created test cases for OAuth token flow
## 2025-07-22 - 3.0.4 - fix(tests,security)
Improve test reliability and remove sensitive file

View File

@@ -1,6 +1,6 @@
{
"name": "@apiclient.xyz/bunq",
"version": "3.0.4",
"version": "3.0.6",
"private": false,
"description": "A full-featured TypeScript/JavaScript client for the bunq API",
"type": "module",
@@ -17,6 +17,7 @@
"test:session": "(tstest test/test.session.ts --verbose)",
"test:errors": "(tstest test/test.errors.ts --verbose)",
"test:advanced": "(tstest test/test.advanced.ts --verbose)",
"test:oauth": "(tstest test/test.oauth.ts --verbose)",
"build": "(tsbuild --web)"
},
"devDependencies": {

View File

@@ -428,6 +428,27 @@ const payment = await BunqPayment.builder(bunq, account)
// The same request ID will return the original payment without creating a duplicate
```
### OAuth Token Support
```typescript
// Using OAuth access token instead of API key
const bunq = new BunqAccount({
apiKey: 'your-oauth-access-token', // OAuth token from bunq OAuth flow
deviceName: 'OAuth App',
environment: 'PRODUCTION',
isOAuthToken: true // Important: Set this flag for OAuth tokens
});
await bunq.init();
// OAuth tokens already have an associated session from the OAuth flow,
// so the library will skip session creation and use the token directly
const accounts = await bunq.getAccounts();
// Note: OAuth tokens have their own expiry mechanism managed by bunq's OAuth server
// The library will not attempt to refresh OAuth tokens
```
### Error Handling
```typescript

71
test/test.oauth.ts Normal file
View File

@@ -0,0 +1,71 @@
import { expect, tap } from '@git.zone/tstest/tapbundle';
import * as bunq from '../ts/index.js';
tap.test('should handle OAuth token initialization', async () => {
// Note: This test requires a valid OAuth token to run properly
// In a real test environment, you would use a test OAuth token
// Test OAuth token initialization
const oauthBunq = new bunq.BunqAccount({
apiKey: 'test-oauth-token', // This would be a real OAuth token
deviceName: 'OAuth Test App',
environment: 'SANDBOX',
isOAuthToken: true
});
// Mock test - in reality this would connect to bunq
try {
// The init should skip session creation for OAuth tokens
await oauthBunq.init();
console.log('OAuth token initialization successful (mock)');
} catch (error) {
// In sandbox with fake token, this will fail, which is expected
console.log('OAuth token test completed (expected failure with mock token)');
}
});
tap.test('should not attempt session refresh for OAuth tokens', async () => {
const oauthBunq = new bunq.BunqAccount({
apiKey: 'test-oauth-token',
deviceName: 'OAuth Test App',
environment: 'SANDBOX',
isOAuthToken: true
});
// Test that ensureValidSession doesn't try to refresh OAuth tokens
try {
await oauthBunq.apiContext.ensureValidSession();
console.log('OAuth session management test passed');
} catch (error) {
console.log('OAuth session test completed');
}
});
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();

View File

@@ -9,6 +9,7 @@ export interface IBunqConstructorOptions {
apiKey: string;
environment: 'SANDBOX' | 'PRODUCTION';
permittedIps?: string[];
isOAuthToken?: boolean; // Set to true when using OAuth access token instead of API key
}
/**
@@ -35,7 +36,8 @@ export class BunqAccount {
apiKey: this.options.apiKey,
environment: this.options.environment,
deviceDescription: this.options.deviceName,
permittedIps: this.options.permittedIps
permittedIps: this.options.permittedIps,
isOAuthToken: this.options.isOAuthToken
});
// Initialize API context (handles installation, device registration, session)

View File

@@ -9,6 +9,7 @@ export interface IBunqApiContextOptions {
environment: 'SANDBOX' | 'PRODUCTION';
deviceDescription: string;
permittedIps?: string[];
isOAuthToken?: boolean;
}
export class BunqApiContext {
@@ -43,6 +44,15 @@ export class BunqApiContext {
* Initialize the API context (installation, device, session)
*/
public async init(): Promise<void> {
// If using OAuth token, skip session creation
if (this.options.isOAuthToken) {
// OAuth tokens already have an associated session
this.context.sessionToken = this.options.apiKey;
this.session = new BunqSession(this.crypto, this.context);
this.session.setOAuthMode(true);
return;
}
// Try to load existing context
const existingContext = await this.loadContext();
@@ -125,6 +135,11 @@ export class BunqApiContext {
* Refresh session if needed
*/
public async ensureValidSession(): Promise<void> {
// OAuth tokens don't need session refresh
if (this.options.isOAuthToken) {
return;
}
await this.session.refreshSession();
await this.saveContext();
}

View File

@@ -10,12 +10,20 @@ export class BunqHttpClient {
private crypto: BunqCrypto;
private context: IBunqApiContext;
private requestCounter: number = 0;
private isOAuthMode: boolean = false;
constructor(crypto: BunqCrypto, context: IBunqApiContext) {
this.crypto = crypto;
this.context = context;
}
/**
* Set OAuth mode
*/
public setOAuthMode(isOAuth: boolean): void {
this.isOAuthMode = isOAuth;
}
/**
* 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;
// Add signature if required
if (options.useSigning !== false && this.crypto.getPrivateKey()) {
headers['X-Bunq-Client-Signature'] = this.crypto.createSignatureHeader(
options.method,
options.endpoint,
headers,
body || ''
);
// Skip signing for OAuth tokens or if explicitly disabled
if (options.useSigning !== false && !this.isOAuthMode) {
try {
const privateKey = this.crypto.getPrivateKey();
headers['X-Bunq-Client-Signature'] = this.crypto.createSignatureHeader(
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
@@ -66,7 +81,8 @@ export class BunqHttpClient {
const response = await plugins.smartrequest.request(url, requestOptions);
// 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
const stringHeaders: { [key: string]: string } = {};
for (const [key, value] of Object.entries(response.headers)) {

View File

@@ -13,6 +13,7 @@ export class BunqSession {
private crypto: BunqCrypto;
private context: IBunqApiContext;
private sessionExpiryTime: plugins.smarttime.TimeStamp;
private isOAuthMode: boolean = false;
constructor(crypto: BunqCrypto, context: IBunqApiContext) {
this.crypto = crypto;
@@ -139,10 +140,29 @@ export class BunqSession {
this.sessionExpiryTime = plugins.smarttime.TimeStamp.fromMilliSeconds(Date.now() + 600000);
}
/**
* Set OAuth mode
*/
public setOAuthMode(isOAuth: boolean): void {
this.isOAuthMode = isOAuth;
if (isOAuth) {
// OAuth tokens don't expire in the same way as regular sessions
// Set a far future expiry time
this.sessionExpiryTime = plugins.smarttime.TimeStamp.fromMilliSeconds(Date.now() + 365 * 24 * 60 * 60 * 1000);
// Also set OAuth mode on HTTP client
this.httpClient.setOAuthMode(true);
}
}
/**
* Check if session is still valid
*/
public isSessionValid(): boolean {
// OAuth tokens are always considered valid (they have their own expiry mechanism)
if (this.isOAuthMode) {
return true;
}
if (!this.sessionExpiryTime) {
return false;
}
@@ -155,6 +175,11 @@ export class BunqSession {
* Refresh the session if needed
*/
public async refreshSession(): Promise<void> {
// OAuth tokens don't need session refresh
if (this.isOAuthMode) {
return;
}
if (!this.isSessionValid()) {
await this.createSession();
}