refactor: server/api-utils.ts

packages/next/next-server/server/api-utils.ts

@@ -28,7 +28,7 @@ export async function apiResolver(
   apiContext: __ApiPreviewProps,
   propagateError: boolean,
   onError?: ({ err }: { err: any }) => Promise<void>
-) {
+): Promise<void> {
   const apiReq = req as NextApiRequest
   const apiRes = res as NextApiResponse
 
@@ -166,7 +166,9 @@ function parseJson(str: string): object {
  * Parse cookies from `req` header
  * @param req request object
  */
-export function getCookieParser(req: IncomingMessage) {
+export function getCookieParser(
+  req: IncomingMessage
+): () => NextApiRequestCookies {
   return function parseCookie(): NextApiRequestCookies {
     const header: undefined | string | string[] = req.headers.cookie
 
@@ -302,7 +304,7 @@ export function tryGetPreviewData(
   try {
     cookies = getCookies()
   } catch {
-    // TODO: warn
+    console.warn('Did not get data from NextApiRequestCookies')
     return false
   }
 
@@ -337,8 +339,8 @@ export function tryGetPreviewData(
       tokenPreviewData,
       options.previewModeSigningKey
     ) as typeof encryptedPreviewData
-  } catch {
-    // TODO: warn
+  } catch (e) {
+    console.warn(`Failed to veriry jsonwebtoken: ${e}`)
     clearPreviewData(res as NextApiResponse)
     return false
   }
@@ -369,22 +371,17 @@ function setPreviewData<T>(
     maxAge?: number
   } & __ApiPreviewProps
 ): NextApiResponse<T> {
-  if (
-    typeof options.previewModeId !== 'string' ||
-    options.previewModeId.length < 16
-  ) {
+  const isNotValidData = (str: string): boolean => {
+    return typeof str !== 'string' || str.length < 16
+  }
+
+  if (isNotValidData(options.previewModeId)) {
     throw new Error('invariant: invalid previewModeId')
   }
-  if (
-    typeof options.previewModeEncryptionKey !== 'string' ||
-    options.previewModeEncryptionKey.length < 16
-  ) {
+  if (isNotValidData(options.previewModeEncryptionKey)) {
     throw new Error('invariant: invalid previewModeEncryptionKey')
   }
-  if (
-    typeof options.previewModeSigningKey !== 'string' ||
-    options.previewModeSigningKey.length < 16
-  ) {
+  if (isNotValidData(options.previewModeSigningKey)) {
     throw new Error('invariant: invalid previewModeSigningKey')
   }