Merge pull request #149 from increments/fix-error-message

Fix error message for forbidden error

Author: wataru86

src/commands/publish.ts

@@ -6,7 +6,11 @@ import { getFileSystemRepo } from "../lib/get-file-system-repo";
 import { getQiitaApiInstance } from "../lib/get-qiita-api-instance";
 import { syncArticlesFromQiita } from "../lib/sync-articles-from-qiita";
 import { validateItem } from "../lib/validators/item-validator";
-import { Item } from "../qiita-api";
+import {
+  Item,
+  QiitaForbiddenError,
+  QiitaForbiddenOrBadRequestError,
+} from "../qiita-api";
 
 export const publish = async (argv: string[]) => {
   const args = arg(
@@ -117,6 +121,14 @@ export const publish = async (argv: string[]) => {
     await fileSystemRepo.saveItem(responseItem, false, true);
   });
 
-  await Promise.all(promises);
+  try {
+    await Promise.all(promises);
+  } catch (err) {
+    if (err instanceof QiitaForbiddenError) {
+      // patchItem and postItem is possible to return 403 by bad request.
+      throw new QiitaForbiddenOrBadRequestError(err.message, { cause: err });
+    }
+    throw err;
+  }
   console.log("Successful!");
 };

src/lib/error-handler.ts

@@ -2,6 +2,7 @@ import {
   QiitaBadRequestError,
   QiitaFetchError,
   QiitaForbiddenError,
+  QiitaForbiddenOrBadRequestError,
   QiitaInternalServerError,
   QiitaNotFoundError,
   QiitaRateLimitError,
@@ -44,6 +45,14 @@ export const handleError = async (error: Error) => {
       );
       console.error(chalk.red(""));
       break;
+    case QiitaForbiddenOrBadRequestError.name:
+      console.error(chalk.red.bold("Qiita APIへのリクエストに失敗しました"));
+      console.error(chalk.red("  記事ファイルに不備がないかご確認ください"));
+      console.error(
+        chalk.red("  または、Qiitaのアクセストークンが正しいかご確認ください"),
+      );
+      console.error(chalk.red(""));
+      break;
     case QiitaNotFoundError.name:
       console.error(chalk.red.bold("記事が見つかりませんでした"));
       console.error(

src/qiita-api/errors.ts

@@ -53,3 +53,11 @@ export class QiitaUnknownError extends Error {
     this.name = "QiitaUnknownError";
   }
 }
+
+export class QiitaForbiddenOrBadRequestError extends Error {
+  constructor(message: string, options?: { cause?: Error }) {
+    // @ts-expect-error This error is fixed in ES2022.
+    super(message, options);
+    this.name = "QiitaForbiddenOrBadRequestError";
+  }
+}