@onesub/server 0.13.0 → 0.13.1

package/dist/__tests__/webhook-google.test.js

@@ -0,0 +1,255 @@
+/**
+ * Unit tests for webhook-google.ts handler behaviors.
+ *
+ * Covers gaps not reached by google-paused, google-price-change, or webhook-refund:
+ *   - Input validation (missing message.data)
+ *   - Webhook event deduplication via WebhookEventStore
+ *   - pushAudience JWT authentication (missing / invalid token → 401)
+ *   - Package name mismatch for subscription notifications
+ *   - Notification type mappings: CANCELED, REVOKED, EXPIRED, IN_GRACE_PERIOD, unknown fallback
+ *   - verifyGooglePushToken unit (no network required for invalid tokens)
+ */
+import { describe, it, expect, beforeEach } from 'vitest';
+import express from 'express';
+import { SUBSCRIPTION_STATUS } from '@onesub/shared';
+import { createWebhookRouter } from '../routes/webhook.js';
+import { InMemorySubscriptionStore, InMemoryPurchaseStore } from '../store.js';
+import { InMemoryWebhookEventStore } from '../webhook-events.js';
+import { verifyGooglePushToken } from '../routes/webhook-google.js';
+// ── helpers ──────────────────────────────────────────────────────────────────
+function googlePushBody(notificationType, purchaseToken, opts) {
+    const json = JSON.stringify({
+        version: '1.0',
+        packageName: opts?.packageName ?? 'com.example.app',
+        eventTimeMillis: String(Date.now()),
+        subscriptionNotification: {
+            version: '1.0',
+            notificationType,
+            purchaseToken,
+            subscriptionId: 'pro_monthly',
+        },
+    });
+    return {
+        message: {
+            data: Buffer.from(json).toString('base64'),
+            messageId: opts?.messageId ?? `msg-${Date.now()}`,
+        },
+        subscription: 'projects/x/subscriptions/y',
+    };
+}
+const baseConfig = {
+    google: { packageName: 'com.example.app' },
+    database: { url: '' },
+};
+const sampleSub = (overrides) => ({
+    userId: 'user_g',
+    productId: 'pro_monthly',
+    platform: 'google',
+    status: 'active',
+    expiresAt: '2099-01-01T00:00:00.000Z',
+    originalTransactionId: 'tok_g',
+    purchasedAt: '2026-01-01T00:00:00.000Z',
+    willRenew: true,
+    ...overrides,
+});
+function buildServer(config, store, webhookEventStore) {
+    const app = express();
+    app.use(express.json());
+    app.use(createWebhookRouter(config, store, new InMemoryPurchaseStore(), webhookEventStore));
+    return {
+        async request(body, headers) {
+            const srv = app.listen(0);
+            const port = srv.address().port;
+            try {
+                const resp = await fetch(`http://127.0.0.1:${port}/onesub/webhook/google`, {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json', ...headers },
+                    body: JSON.stringify(body),
+                });
+                const text = await resp.text();
+                let parsed = text;
+                try {
+                    parsed = JSON.parse(text);
+                }
+                catch { /* keep as text */ }
+                return { status: resp.status, body: parsed };
+            }
+            finally {
+                await new Promise((r) => srv.close(() => r()));
+            }
+        },
+    };
+}
+// ── Input validation ─────────────────────────────────────────────────────────
+describe('Google webhook — input validation', () => {
+    it('returns 400 when message.data is missing', async () => {
+        const store = new InMemorySubscriptionStore();
+        const server = buildServer(baseConfig, store);
+        const resp = await server.request({ message: { messageId: '1' }, subscription: 's' });
+        expect(resp.status).toBe(400);
+        expect(resp.body.errorCode).toBe('MISSING_MESSAGE_DATA');
+    });
+    it('returns 200 when message.data decodes to an unrecognized notification format', async () => {
+        const store = new InMemorySubscriptionStore();
+        const server = buildServer(baseConfig, store);
+        // Valid base64 but payload has no known notification field
+        const json = JSON.stringify({ version: '1.0', packageName: 'com.example.app' });
+        const resp = await server.request({
+            message: { data: Buffer.from(json).toString('base64'), messageId: '1' },
+            subscription: 's',
+        });
+        // decodeGoogleNotification returns null → ack with 200
+        expect(resp.status).toBe(200);
+        expect(resp.body.received).toBe(true);
+    });
+});
+// ── pushAudience authentication ───────────────────────────────────────────────
+describe('Google webhook — pushAudience authentication', () => {
+    const configWithAudience = {
+        google: { packageName: 'com.example.app', pushAudience: 'https://myapp.example.com' },
+        database: { url: '' },
+    };
+    it('returns 401 when Authorization header is absent', async () => {
+        const store = new InMemorySubscriptionStore();
+        const server = buildServer(configWithAudience, store);
+        const resp = await server.request(googlePushBody(2, 'tok_auth'));
+        expect(resp.status).toBe(401);
+        expect(resp.body.errorCode).toBe('UNAUTHORIZED');
+    });
+    it('returns 401 when Bearer token is malformed (not a valid JWT)', async () => {
+        const store = new InMemorySubscriptionStore();
+        const server = buildServer(configWithAudience, store);
+        const resp = await server.request(googlePushBody(2, 'tok_auth'), { Authorization: 'Bearer not-a-real-jwt' });
+        expect(resp.status).toBe(401);
+        expect(resp.body.errorCode).toBe('UNAUTHORIZED');
+    });
+    it('passes through (processes notification) when no pushAudience is configured', async () => {
+        const store = new InMemorySubscriptionStore();
+        await store.save(sampleSub({ originalTransactionId: 'tok_noauth' }));
+        const server = buildServer(baseConfig, store); // no pushAudience
+        const resp = await server.request(googlePushBody(2, 'tok_noauth'));
+        expect(resp.status).toBe(200);
+    });
+});
+// ── verifyGooglePushToken unit ────────────────────────────────────────────────
+describe('verifyGooglePushToken', () => {
+    it('returns false when Authorization header is absent', async () => {
+        const req = { headers: {} };
+        expect(await verifyGooglePushToken(req, 'https://example.com')).toBe(false);
+    });
+    it('returns false when header is not Bearer scheme', async () => {
+        const req = { headers: { authorization: 'Basic dXNlcjpwYXNz' } };
+        expect(await verifyGooglePushToken(req, 'https://example.com')).toBe(false);
+    });
+    it('returns false for a malformed JWT that cannot be verified', async () => {
+        // jose throws on invalid JWT format; verifyGooglePushToken catches and returns false
+        const req = { headers: { authorization: 'Bearer not.valid.jwt' } };
+        expect(await verifyGooglePushToken(req, 'https://example.com')).toBe(false);
+    });
+});
+// ── Package name validation ───────────────────────────────────────────────────
+describe('Google webhook — package name mismatch', () => {
+    it('returns 400 when notification packageName does not match config', async () => {
+        const store = new InMemorySubscriptionStore();
+        const server = buildServer(baseConfig, store);
+        const resp = await server.request(googlePushBody(2, 'tok_pkg', { packageName: 'com.attacker.app' }));
+        expect(resp.status).toBe(400);
+        expect(resp.body.errorCode).toBe('PACKAGE_NAME_MISMATCH');
+    });
+    it('accepts notification when no packageName is configured (open mode)', async () => {
+        const openConfig = {
+            google: {}, // no packageName restriction
+            database: { url: '' },
+        };
+        const store = new InMemorySubscriptionStore();
+        await store.save(sampleSub({ originalTransactionId: 'tok_open' }));
+        const server = buildServer(openConfig, store);
+        const resp = await server.request(googlePushBody(2, 'tok_open', { packageName: 'any.package.name' }));
+        expect(resp.status).toBe(200);
+    });
+});
+// ── Deduplication ────────────────────────────────────────────────────────────
+describe('Google webhook — deduplication', () => {
+    let store;
+    let webhookEventStore;
+    let server;
+    beforeEach(() => {
+        store = new InMemorySubscriptionStore();
+        webhookEventStore = new InMemoryWebhookEventStore();
+        server = buildServer(baseConfig, store, webhookEventStore);
+    });
+    it('processes the first delivery and returns received=true', async () => {
+        await store.save(sampleSub({ originalTransactionId: 'tok_dedup1' }));
+        const resp = await server.request(googlePushBody(2, 'tok_dedup1', { messageId: 'msg-dedup-1' }));
+        expect(resp.status).toBe(200);
+        expect(resp.body.received).toBe(true);
+        expect(resp.body.deduped).toBeUndefined();
+    });
+    it('returns deduped=true and skips store update on replay', async () => {
+        await store.save(sampleSub({ originalTransactionId: 'tok_dedup2', status: 'active' }));
+        const body = googlePushBody(3, 'tok_dedup2', { messageId: 'msg-dedup-2' }); // CANCELED
+        // First delivery → status becomes canceled
+        await server.request(body);
+        expect((await store.getByTransactionId('tok_dedup2'))?.status).toBe(SUBSCRIPTION_STATUS.CANCELED);
+        // Restore to simulate rollback
+        await store.save(sampleSub({ originalTransactionId: 'tok_dedup2', status: 'active' }));
+        // Replay → must be skipped, status stays active
+        const replay = await server.request(body);
+        expect(replay.status).toBe(200);
+        expect(replay.body.deduped).toBe(true);
+        expect((await store.getByTransactionId('tok_dedup2'))?.status).toBe(SUBSCRIPTION_STATUS.ACTIVE);
+    });
+});
+// ── Notification type → status mapping ──────────────────────────────────────
+describe('Google webhook — notification type mapping', () => {
+    let store;
+    let server;
+    beforeEach(() => {
+        store = new InMemorySubscriptionStore();
+        server = buildServer(baseConfig, store);
+    });
+    it('SUBSCRIPTION_CANCELED (3) → canceled', async () => {
+        await store.save(sampleSub({ originalTransactionId: 'tok_cancel' }));
+        await server.request(googlePushBody(3, 'tok_cancel'));
+        expect((await store.getByTransactionId('tok_cancel'))?.status).toBe(SUBSCRIPTION_STATUS.CANCELED);
+    });
+    it('SUBSCRIPTION_REVOKED (12) → canceled', async () => {
+        await store.save(sampleSub({ originalTransactionId: 'tok_revoke' }));
+        await server.request(googlePushBody(12, 'tok_revoke'));
+        expect((await store.getByTransactionId('tok_revoke'))?.status).toBe(SUBSCRIPTION_STATUS.CANCELED);
+    });
+    it('SUBSCRIPTION_EXPIRED (13) → expired', async () => {
+        await store.save(sampleSub({ originalTransactionId: 'tok_exp' }));
+        await server.request(googlePushBody(13, 'tok_exp'));
+        expect((await store.getByTransactionId('tok_exp'))?.status).toBe(SUBSCRIPTION_STATUS.EXPIRED);
+    });
+    it('SUBSCRIPTION_IN_GRACE_PERIOD (6) → grace_period', async () => {
+        await store.save(sampleSub({ originalTransactionId: 'tok_grace' }));
+        await server.request(googlePushBody(6, 'tok_grace'));
+        expect((await store.getByTransactionId('tok_grace'))?.status).toBe(SUBSCRIPTION_STATUS.GRACE_PERIOD);
+    });
+    it('SUBSCRIPTION_ON_HOLD (5) → on_hold', async () => {
+        await store.save(sampleSub({ originalTransactionId: 'tok_hold' }));
+        await server.request(googlePushBody(5, 'tok_hold'));
+        expect((await store.getByTransactionId('tok_hold'))?.status).toBe(SUBSCRIPTION_STATUS.ON_HOLD);
+    });
+    it('SUBSCRIPTION_PURCHASED (4) → active', async () => {
+        await store.save(sampleSub({ originalTransactionId: 'tok_buy', status: 'expired' }));
+        await server.request(googlePushBody(4, 'tok_buy'));
+        expect((await store.getByTransactionId('tok_buy'))?.status).toBe(SUBSCRIPTION_STATUS.ACTIVE);
+    });
+    it('unknown notification type (SUBSCRIPTION_DEFERRED=9) falls back to active', async () => {
+        // Type 9 is not handled by any isGoogle*Notification helper → else branch → ACTIVE
+        await store.save(sampleSub({ originalTransactionId: 'tok_deferred', status: 'on_hold' }));
+        await server.request(googlePushBody(9, 'tok_deferred'));
+        expect((await store.getByTransactionId('tok_deferred'))?.status).toBe(SUBSCRIPTION_STATUS.ACTIVE);
+    });
+    it('returns 200 even when purchaseToken is unknown (no store record, no serviceAccountKey)', async () => {
+        // Without serviceAccountKey, server cannot re-fetch from Play API.
+        // Should log a warning and ack 200 so Google doesn't retry forever.
+        const resp = await server.request(googlePushBody(2, 'tok_unknown_no_key'));
+        expect(resp.status).toBe(200);
+        expect(resp.body.received).toBe(true);
+    });
+});
+//# sourceMappingURL=webhook-google.test.js.map

package/dist/__tests__/webhook-google.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"webhook-google.test.js","sourceRoot":"","sources":["../../src/__tests__/webhook-google.test.ts"],"names":[],"mappings":"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"}

package/dist/cache.js

@@ -36,8 +36,4 @@ export function getDefaultCache() {
 export function setDefaultCache(adapter) {
     defaultAdapter = adapter;
 }
-/** Test helper — reset the default adapter to a fresh in-memory one. */
-export function __resetDefaultCacheForTests() {
-    defaultAdapter = new InMemoryCacheAdapter();
-}
 //# sourceMappingURL=cache.js.map

package/dist/cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"cache.js","sourceRoot":"","sources":["../src/cache.ts"],"names":[],"mappings":"AAyBA;;GAEG;AACH,MAAM,OAAO,oBAAoB;IACd,OAAO,GAAG,IAAI,GAAG,EAAiB,CAAC;IAEpD,KAAK,CAAC,GAAG,CAAI,GAAW;QACtB,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QACxB,IAAI,KAAK,CAAC,SAAS,KAAK,CAAC,IAAI,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;YAC1D,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACzB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC,KAAU,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,GAAG,CAAI,GAAW,EAAE,KAAQ,EAAE,UAAmB;QACrD,MAAM,SAAS,GAAG,UAAU,IAAI,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,UAAU,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QACpF,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,GAAW;QACnB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC;IAED,oFAAoF;IACpF,KAAK;QACH,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;CACF;AAED;;;GAGG;AACH,IAAI,cAAc,GAAiB,IAAI,oBAAoB,EAAE,CAAC;AAE9D,MAAM,UAAU,eAAe;IAC7B,OAAO,cAAc,CAAC;AACxB,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,OAAqB;IACnD,cAAc,GAAG,OAAO,CAAC;AAC3B,CAAC;AAED,wEAAwE;AACxE,MAAM,UAAU,2BAA2B;IACzC,cAAc,GAAG,IAAI,oBAAoB,EAAE,CAAC;AAC9C,CAAC"}
+{"version":3,"file":"cache.js","sourceRoot":"","sources":["../src/cache.ts"],"names":[],"mappings":"AAyBA;;GAEG;AACH,MAAM,OAAO,oBAAoB;IACd,OAAO,GAAG,IAAI,GAAG,EAAiB,CAAC;IAEpD,KAAK,CAAC,GAAG,CAAI,GAAW;QACtB,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QACxB,IAAI,KAAK,CAAC,SAAS,KAAK,CAAC,IAAI,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;YAC1D,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACzB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC,KAAU,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,GAAG,CAAI,GAAW,EAAE,KAAQ,EAAE,UAAmB;QACrD,MAAM,SAAS,GAAG,UAAU,IAAI,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,UAAU,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QACpF,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,GAAW;QACnB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC;IAED,oFAAoF;IACpF,KAAK;QACH,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;CACF;AAED;;;GAGG;AACH,IAAI,cAAc,GAAiB,IAAI,oBAAoB,EAAE,CAAC;AAE9D,MAAM,UAAU,eAAe;IAC7B,OAAO,cAAc,CAAC;AACxB,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,OAAqB;IACnD,cAAc,GAAG,OAAO,CAAC;AAC3B,CAAC"}

package/dist/index.cjs

@@ -1536,9 +1536,16 @@ function createPurchaseRouter(config, purchaseStore) {
     const { platform, receipt, userId, productId, type } = body;
     try {
       if (type === shared.PURCHASE_TYPE.NON_CONSUMABLE) {
-        const alreadyOwned = await purchaseStore.hasPurchased(userId, productId);
-        if (alreadyOwned) {
-          sendError(res, 409, shared.ONESUB_ERROR_CODE.NON_CONSUMABLE_ALREADY_OWNED, "NON_CONSUMABLE_ALREADY_OWNED", NO_PURCHASE);
+        const owned = (await purchaseStore.getPurchasesByUserId(userId)).find(
+          (p) => p.productId === productId
+        );
+        if (owned) {
+          const response2 = {
+            valid: true,
+            purchase: { ...owned, userId },
+            action: "restored"
+          };
+          res.status(200).json(response2);
           return;
         }
       }