@unchainedshop/ticketing 4.0.0-rc.9 → 4.0.1

package/src/mobile-tickets/apple-handler-fastify.ts

@@ -38,15 +38,21 @@ const appleWalletHandler: RouteHandlerMethod = async (
       });
 
       if (!token) {
+        logger.error('Token not found', { tokenId });
         reply.status(404);
-        return reply.send('Token not found');
+        return reply.send();
       }
 
       const { hash } = req.query as Record<string, string>;
       const correctHash = await modules.warehousing.buildAccessKeyForToken(tokenId);
-      if (hash !== correctHash) {
+      if (!hash || hash !== correctHash) {
+        logger.error('Token hash invalid for current owner', { tokenId });
         reply.status(403);
-        return reply.send('Token hash invalid for current owner');
+        return reply.send({
+          success: false,
+          message: 'Token hash invalid for current owner',
+          name: 'HASH_MISMATCH',
+        });
       }
 
       const passFile = await modules.passes.upsertAppleWalletPass(token, resolvedContext);
@@ -55,6 +61,15 @@ const appleWalletHandler: RouteHandlerMethod = async (
       const signedUrl = await fileUploadAdapter.createDownloadURL(passFile);
       const url = signedUrl && (await modules.files.normalizeUrl(signedUrl, {}));
 
+      if (!url) {
+        reply.status(500);
+        return reply.send({
+          success: false,
+          message: 'Could not create download URL',
+          name: 'URL_SIGNING_FAILED',
+        });
+      }
+
       const response = await fetch(url);
       const data = await response.arrayBuffer();
       const uint8View = new Uint8Array(data);
@@ -64,10 +79,14 @@ const appleWalletHandler: RouteHandlerMethod = async (
       reply.header('Content-Disposition', `attachment; filename=${tokenId}.pkpass`);
       return reply.send(uint8View);
     } catch (e) {
-      console.error(e);
+      logger.error(e);
+      reply.status(500);
+      return reply.send({
+        success: false,
+        message: 'Error generating pass',
+        name: 'PASS_GENERATION_ERROR',
+      });
     }
-    reply.status(500);
-    return reply.send();
   }
 
   const [, apiVersion, endpoint, ...pathComponents] = path.split("/"); /* eslint-disable-line */
@@ -83,9 +102,10 @@ const appleWalletHandler: RouteHandlerMethod = async (
         if (
           !isAuthenticationTokenCorrect(
             req,
-            (pass.meta.rawData as any)._id || (pass.meta.rawData as any).tokenId,
+            (pass.meta?.rawData as any)?._id || (pass.meta?.rawData as any)?.tokenId,
           )
         ) {
+          logger.error('Unauthorized', { passTypeIdentifier, serialNumber });
           reply.status(401);
           return reply.send();
         }
@@ -101,11 +121,15 @@ const appleWalletHandler: RouteHandlerMethod = async (
 
         if (!newRegistration) {
           reply.status(200);
-          return reply.send();
+          return reply.send({
+            success: true,
+          });
         }
 
         reply.status(201);
-        return reply.send();
+        return reply.send({
+          success: true,
+        });
       }
     } else if (req.method === 'GET') {
       // Get the List of Updatable Passes
@@ -120,21 +144,19 @@ const appleWalletHandler: RouteHandlerMethod = async (
         deviceLibraryIdentifier,
         passesUpdatedSince,
       );
-      const serialNumbers = passes.map((t) => t.meta.serialNumber);
+      const serialNumbers = passes.map((t) => t.meta?.serialNumber).filter(Boolean) as string[];
 
       if (serialNumbers?.length) {
         reply.status(200);
-        reply.header('content-type', 'application/json');
-        return reply.send(
-          JSON.stringify({
-            serialNumbers,
-            lastUpdated,
-          }),
-        );
+        return reply.send({
+          success: true,
+          serialNumbers,
+          lastUpdated,
+        });
       }
 
       reply.status(204);
-      return reply.send();
+      return reply.send({ success: true });
     } else if (req.method === 'DELETE') {
       // Unregister Device
       const [deviceLibraryIdentifier, , passTypeIdentifier, serialNumber] = pathComponents;
@@ -145,11 +167,16 @@ const appleWalletHandler: RouteHandlerMethod = async (
         if (
           !isAuthenticationTokenCorrect(
             req,
-            (pass.meta.rawData as any)._id || (pass.meta.rawData as any).tokenId,
+            (pass.meta?.rawData as any)?._id || (pass.meta?.rawData as any)?.tokenId,
           )
         ) {
+          logger.error('Unauthorized', { passTypeIdentifier, serialNumber });
           reply.status(401);
-          return reply.send();
+          return reply.send({
+            success: false,
+            message: 'Unauthorized',
+            name: 'UNAUTHORIZED',
+          });
         }
 
         await modules.passes.unregisterDeviceForAppleWalletPass(
@@ -160,7 +187,9 @@ const appleWalletHandler: RouteHandlerMethod = async (
 
         // Unregistered
         reply.status(200);
-        return reply.send();
+        return reply.send({
+          success: true,
+        });
       }
     }
   } else if (endpoint === 'log') {
@@ -172,7 +201,9 @@ const appleWalletHandler: RouteHandlerMethod = async (
       }
     });
     reply.status(200);
-    return reply.send();
+    return reply.send({
+      success: true,
+    });
   } else if (endpoint === 'passes') {
     if (req.method === 'GET') {
       // Get an updated Pass
@@ -180,43 +211,64 @@ const appleWalletHandler: RouteHandlerMethod = async (
 
       const pass = await modules.passes.findAppleWalletPass(passTypeIdentifier, serialNumber);
 
-      if (pass) {
-        if (
-          !isAuthenticationTokenCorrect(
-            req,
-            (pass.meta.rawData as any)._id || (pass.meta.rawData as any).tokenId,
-          )
-        ) {
-          reply.status(401);
-          return reply.send();
-        }
+      if (!pass) {
+        reply.status(404);
+        return reply.send();
+      }
 
-        const { updated, created } = pass;
+      if (
+        !isAuthenticationTokenCorrect(
+          req,
+          (pass.meta?.rawData as any)?._id || (pass.meta?.rawData as any)?.tokenId,
+        )
+      ) {
+        logger.error('Unauthorized', { passTypeIdentifier, serialNumber });
+        reply.status(401);
+        return reply.send({
+          success: false,
+          message: 'Unauthorized',
+          name: 'UNAUTHORIZED',
+        });
+      }
 
-        const lastModifiedDate = new Date(updated || created);
-        lastModifiedDate.setMilliseconds(0);
+      const { updated, created } = pass;
 
-        const ifModifiedSinceDate = new Date(req.headers['if-modified-since']);
-        ifModifiedSinceDate.setMilliseconds(0);
+      const lastModifiedDate = new Date(updated || created);
+      lastModifiedDate.setMilliseconds(0);
 
-        if (ifModifiedSinceDate.getTime() >= lastModifiedDate.getTime()) {
-          reply.status(304);
-          return reply.send();
-        }
+      const ifModifiedSinceDate = new Date(req.headers['if-modified-since']!);
+      ifModifiedSinceDate.setMilliseconds(0);
 
-        const fileUploadAdapter = getFileAdapter();
-        const signedUrl = await fileUploadAdapter.createDownloadURL(pass);
-        const url = signedUrl && (await modules.files.normalizeUrl(signedUrl, {}));
+      if (ifModifiedSinceDate.getTime() >= lastModifiedDate.getTime()) {
+        reply.status(304);
+        return reply.send({
+          success: true,
+          message: 'Not modified',
+          name: 'NOT_MODIFIED',
+        });
+      }
 
-        const result = await fetch(url);
-        const data = await result.arrayBuffer();
-        const uint8View = new Uint8Array(data);
+      const fileUploadAdapter = getFileAdapter();
+      const signedUrl = await fileUploadAdapter.createDownloadURL(pass);
+      const url = signedUrl && (await modules.files.normalizeUrl(signedUrl, {}));
 
-        reply.status(200);
-        reply.header('content-type', 'application/vnd.apple.pkpass');
-        reply.header('last-modified', lastModifiedDate.toUTCString());
-        return reply.send(uint8View);
+      if (!url) {
+        reply.status(500);
+        return reply.send({
+          success: false,
+          message: 'Could not create download URL',
+          name: 'URL_SIGNING_FAILED',
+        });
       }
+
+      const result = await fetch(url);
+      const data = await result.arrayBuffer();
+      const uint8View = new Uint8Array(data);
+
+      reply.status(200);
+      reply.header('content-type', 'application/vnd.apple.pkpass');
+      reply.header('last-modified', lastModifiedDate.toUTCString());
+      return reply.send(uint8View);
     }
   }
 

package/src/mobile-tickets/apple-wallet.ts

@@ -1,4 +1,4 @@
-import apn from '@hyperlink/node-apn';
+import apn from '@parse/node-apn';
 import { Readable } from 'node:stream';
 
 export const pushToApplePushNotificationService = async (deviceTokens) => {
@@ -14,7 +14,7 @@ export const pushToApplePushNotificationService = async (deviceTokens) => {
 };
 
 export const buildPassBinary = async (
-  chainTokenId: string,
+  tokenSerialNumber: string,
   pass: {
     serialNumber: string;
     asBuffer: () => Promise<Buffer>;
@@ -23,7 +23,7 @@ export const buildPassBinary = async (
   const passBuffer = await pass.asBuffer();
   const rawFile = {
     _id: pass.serialNumber,
-    filename: `${chainTokenId}-${new Date().getTime()}.pkpass`,
+    filename: `${tokenSerialNumber}-${new Date().getTime()}.pkpass`,
     createReadStream: () => Readable.from(passBuffer),
     mimetype: 'application/vnd.apple.pkpass',
   };

package/src/mobile-tickets/google-handler-express.ts

@@ -12,13 +12,13 @@ export const googleWalletHandler = async (
   const { modules } = resolvedContext;
   logger.info(`${req.path} (${JSON.stringify(req.query)})`);
 
-  if (req.path.startsWith('/download/')) {
+  if (req.path.includes('/download/')) {
     try {
-      const [, , tokenId] = req.path.split('/');
+      const { tokenId } = req.params as { tokenId: string };
+      const { hash } = req.query as { hash?: string };
 
       if (!tokenId) {
-        res.writeHead(404);
-        res.end();
+        res.status(404).end();
         return;
       }
 
@@ -27,32 +27,31 @@ export const googleWalletHandler = async (
       });
 
       if (!token) {
-        res.writeHead(404);
-        res.end('Token not found');
+        res.status(404).send('Token not found');
         return;
       }
 
-      const { hash } = req.query;
       const correctHash = await modules.warehousing.buildAccessKeyForToken(tokenId);
-      if (hash !== correctHash) {
-        res.writeHead(403);
-        res.end('Token hash invalid for current owner');
+      if (!hash || hash !== correctHash) {
+        res.status(403).send('Token hash invalid for current owner');
         return;
       }
 
       const pass = await modules.passes.upsertGoogleWalletPass(token, resolvedContext);
 
+      if (!pass) {
+        throw new Error('Could not create Google Wallet pass');
+      }
+
       res.redirect(await pass.asURL());
       return;
     } catch (e) {
-      console.error(e);
+      logger.error(e);
     }
-    res.writeHead(500);
-    res.end();
+    res.status(500).end();
     return;
   }
-  res.writeHead(404);
-  res.end();
+  res.status(404).end();
 };
 
 export default googleWalletHandler;

package/src/mobile-tickets/google-handler-fastify.ts

@@ -16,11 +16,10 @@ const googleWalletHandler: RouteHandlerMethod = async (
   const path = req.url;
 
   logger.info(`${path} (${JSON.stringify(req.query)})`);
-
-  if (path.startsWith('/download/')) {
+  if (path.includes('/download/')) {
     try {
-      const [, , tokenId] = path.split('/');
-
+      const { tokenId } = req.params as { tokenId: string };
+      const { hash } = req.query as { hash?: string };
       if (!tokenId) {
         reply.status(404);
         return reply.send();
@@ -31,24 +30,37 @@ const googleWalletHandler: RouteHandlerMethod = async (
       });
 
       if (!token) {
+        logger.error('Token not found', { tokenId });
         reply.status(404);
         return reply.send('Token not found');
       }
-
-      const { hash } = req.query as Record<string, string>;
       const correctHash = await modules.warehousing.buildAccessKeyForToken(tokenId);
-      if (hash !== correctHash) {
+      if (!hash || hash !== correctHash) {
+        logger.error('Token hash invalid for current owner', { tokenId });
         reply.status(403);
-        return reply.send('Token hash invalid for current owner');
+        return reply.send({
+          success: false,
+          message: 'Token hash invalid for current owner',
+          name: 'HASH_MISMATCH',
+        });
       }
 
       const pass = await modules.passes.upsertGoogleWalletPass(token, resolvedContext);
+
+      if (!pass) {
+        throw new Error('Could not create Google Wallet pass');
+      }
+
       return reply.redirect(await pass.asURL());
     } catch (e) {
-      console.error(e);
+      logger.error(e);
+      reply.status(500);
+      return reply.send({
+        success: false,
+        message: 'Error generating pass',
+        name: 'PASS_GENERATION_ERROR',
+      });
     }
-    reply.status(500);
-    return reply.send();
   }
   reply.status(404);
   return reply.send();

package/src/module.ts

@@ -37,7 +37,7 @@ const configurePasses = async ({ db }: ModuleInput<Record<string, never>>) => {
     const pass = await createAppleWalletPass(token, unchainedAPI);
     const rawFile = Promise.resolve(
       // wrap in promise to make stream upload work
-      await buildPassBinary(token.chainTokenId, pass as any),
+      await buildPassBinary(token.tokenSerialNumber, pass as any),
     );
 
     const previousFile = await MediaObjects.findOne({
@@ -84,7 +84,7 @@ const configurePasses = async ({ db }: ModuleInput<Record<string, never>>) => {
     return pass;
   };
 
-  const findAppleWalletPass = async (passTypeIdentifier, serialNumber): Promise<File> => {
+  const findAppleWalletPass = async (passTypeIdentifier, serialNumber) => {
     const mediaObject = await MediaObjects.findOne({
       path: APPLE_WALLET_PASSES_FILE_DIRECTORY,
       'meta.passTypeIdentifier': passTypeIdentifier,
@@ -172,7 +172,7 @@ const configurePasses = async ({ db }: ModuleInput<Record<string, never>>) => {
 
     for (const pass of allPasses) {
       // Check if binary is already invalidated, if so, skip
-      const rawData = pass.meta.rawData as TokenSurrogate;
+      const rawData = pass.meta?.rawData as TokenSurrogate;
       if (rawData.invalidatedDate) continue;
 
       const redeemedToken = allTokens.find((t) => t._id === rawData._id && t.invalidatedDate);
@@ -188,7 +188,10 @@ const configurePasses = async ({ db }: ModuleInput<Record<string, never>>) => {
   const buildMagicKey = async (orderId: string) => {
     const msgUint8 = new TextEncoder().encode([orderId, process.env.UNCHAINED_SECRET].join(''));
     const hashBuffer = await crypto.subtle.digest('SHA-256', msgUint8);
-    return Buffer.from(hashBuffer).toString('hex');
+    // Convert ArrayBuffer to hex string without using Buffer
+    return Array.from(new Uint8Array(hashBuffer))
+      .map((b) => b.toString(16).padStart(2, '0'))
+      .join('');
   };
 
   const cancelTicket = async (tokenId: string) => {

package/src/pdf-tickets/print-handler-express.ts

@@ -4,6 +4,10 @@ import { Context } from '@unchainedshop/api';
 import { RendererTypes, getRenderer } from '../template-registry.js';
 import type { Request, Response } from 'express';
 
+import { createLogger } from '@unchainedshop/logger';
+
+const logger = createLogger('unchained:ticketing');
+
 export async function printTicketsHandler(req: Request & { unchainedContext: Context }, res: Response) {
   const { variant, orderId, otp } = req.query || {};
 
@@ -22,9 +26,8 @@ export async function printTicketsHandler(req: Request & { unchainedContext: Con
     res.setHeader('Content-Type', 'application/pdf');
     pdfStream.pipe(res);
   } catch (error) {
-    console.error(error);
-    res.status(403);
-    res.end();
+    logger.error(error);
+    res.status(403).end();
   }
 }
 

package/src/pdf-tickets/print-handler-fastify.ts

@@ -3,6 +3,9 @@ import { actions } from '@unchainedshop/api/lib/roles/index.js';
 import { RendererTypes, getRenderer } from '../template-registry.js';
 import { TicketingAPI } from '../types.js';
 import type { FastifyRequest, RouteHandlerMethod } from 'fastify';
+import { createLogger } from '@unchainedshop/logger';
+
+const logger = createLogger('unchained:ticketing:print-handler');
 
 const printTicketsHandler: RouteHandlerMethod = async (
   req: FastifyRequest & {
@@ -27,9 +30,13 @@ const printTicketsHandler: RouteHandlerMethod = async (
     reply.header('content-type', 'application/pdf');
     return reply.send(pdfStream);
   } catch (error) {
-    console.error(error);
+    logger.error(error);
     reply.status(403);
-    return reply.send();
+    return reply.send({
+      success: false,
+      message: 'Error generating PDF',
+      name: 'PDF_GENERATION_ERROR',
+    });
   }
 };
 

package/src/template-registry.ts

@@ -16,8 +16,8 @@ export type PassRenderer = (
   token: TokenSurrogate,
   context: UnchainedCore,
 ) => Promise<{
-  asURL?: () => Promise<string>;
-  asBuffer?: () => Promise<Buffer>;
+  asURL: () => Promise<string>;
+  asBuffer: () => Promise<Buffer>;
   serialNumber?: string;
   passTypeIdentifier?: string;
 }>;

package/tsconfig.json

@@ -3,7 +3,8 @@
   "compilerOptions": {
     "declarationDir": "./lib",
     "rootDir": "./src",
-    "outDir": "./lib"
+    "outDir": "./lib",
+    
   },
   "exclude": ["**/*.test.ts", "**/*.test.js", "tests", "lib"]
 }