Merge pull request #159 from mittwald/assertsuccess

add assertsuccess func, use for changed route codes

src/commands/cronjob/delete.ts

@@ -1,6 +1,6 @@
-import { assertStatus } from "@mittwald/api-client-commons";
 import { DeleteBaseCommand } from "../../DeleteBaseCommand.js";
 import { Args } from "@oclif/core";
+import assertSuccess from "../../lib/assert_success.js";
 
 export default class Delete extends DeleteBaseCommand<typeof Delete> {
   static description = "Delete a cron job";
@@ -20,6 +20,6 @@ export default class Delete extends DeleteBaseCommand<typeof Delete> {
       cronjobId,
     });
 
-    assertStatus(response, 200);
+    assertSuccess(response);
   }
 }

src/commands/cronjob/execution/abort.tsx

@@ -5,9 +5,9 @@ import {
 } from "../../../rendering/process/process_flags.js";
 import { ReactNode } from "react";
 import { Args } from "@oclif/core";
-import { assertStatus } from "@mittwald/api-client-commons";
 import { Success } from "../../../rendering/react/components/Success.js";
 import { Value } from "../../../rendering/react/components/Value.js";
+import assertSuccess from "../../../lib/assert_success.js";
 
 type Result = {
   executionId: string;
@@ -39,7 +39,7 @@ export class Abort extends ExecRenderBaseCommand<typeof Abort, Result> {
         executionId,
       });
 
-      assertStatus(r, 200);
+      assertSuccess(r);
     });
 
     p.complete(

src/commands/database/mysql/delete.ts

@@ -1,7 +1,7 @@
-import { assertStatus } from "@mittwald/api-client-commons";
 import { normalizeProjectIdToUuid } from "../../../Helpers.js";
 import { DeleteBaseCommand } from "../../../DeleteBaseCommand.js";
 import { mysqlArgs, withMySQLId } from "../../../lib/database/mysql/flags.js";
+import assertSuccess from "../../../lib/assert_success.js";
 
 export default class Delete extends DeleteBaseCommand<typeof Delete> {
   static description = "Delete a MySQL database";
@@ -21,7 +21,7 @@ export default class Delete extends DeleteBaseCommand<typeof Delete> {
       mysqlDatabaseId,
     });
 
-    assertStatus(response, 200);
+    assertSuccess(response);
   }
 
   protected mapResourceId(id: string): Promise<string> {

src/commands/project/delete.ts

@@ -1,6 +1,6 @@
-import { assertStatus } from "@mittwald/api-client-commons";
 import { DeleteBaseCommand } from "../../DeleteBaseCommand.js";
 import { projectArgs } from "../../lib/project/flags.js";
+import assertSuccess from "../../lib/assert_success.js";
 
 export default class Delete extends DeleteBaseCommand<typeof Delete> {
   static description = "Delete a project";
@@ -15,6 +15,6 @@ export default class Delete extends DeleteBaseCommand<typeof Delete> {
       projectId,
     });
 
-    assertStatus(response, 200);
+    assertSuccess(response);
   }
 }

src/lib/assert_success.ts

@@ -0,0 +1,12 @@
+import { Response, ApiClientError } from "@mittwald/api-client-commons";
+
+export function assertSuccess<T extends Response>(response: T): void {
+  if (response.status >= 300) {
+    throw ApiClientError.fromResponse(
+      `Unexpected response status (expected <300, got: ${response.status})`,
+      response,
+    );
+  }
+}
+
+export default assertSuccess;