@unchainedshop/ticketing 4.0.0-rc.16 → 4.0.0-rc.18

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

@@ -45,7 +45,7 @@ const appleWalletHandler: RouteHandlerMethod = async (
 
       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({
@@ -61,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);
@@ -93,7 +102,7 @@ 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 });
@@ -135,7 +144,7 @@ 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);
@@ -158,7 +167,7 @@ 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 });
@@ -202,52 +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,
-          )
-        ) {
-          logger.error('Unauthorized', { passTypeIdentifier, serialNumber });
-          reply.status(401);
-          return reply.send({
-            success: false,
-            message: 'Unauthorized',
-            name: 'UNAUTHORIZED',
-          });
-        }
+      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({
-            success: true,
-            message: 'Not modified',
-            name: 'NOT_MODIFIED',
-          });
-        }
+      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

@@ -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

@@ -32,13 +32,17 @@ export const googleWalletHandler = async (
 
       const { hash } = req.query;
       const correctHash = await modules.warehousing.buildAccessKeyForToken(tokenId);
-      if (hash !== correctHash) {
+      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) {

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

@@ -38,7 +38,7 @@ const googleWalletHandler: RouteHandlerMethod = async (
 
       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({
@@ -49,6 +49,11 @@ const googleWalletHandler: RouteHandlerMethod = async (
       }
 
       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) {
       logger.error(e);

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