@unchainedshop/ticketing 4.0.0-rc.15 → 4.0.0-rc.17

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

@@ -17,8 +17,7 @@ export const googleWalletHandler = async (
       const [, , tokenId] = req.path.split('/');
 
       if (!tokenId) {
-        res.writeHead(404);
-        res.end();
+        res.status(404).end();
         return;
       }
 
@@ -27,32 +26,32 @@ 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

@@ -31,24 +31,39 @@ const googleWalletHandler: 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 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);

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"]
 }