Fix command JSON responses downloaded as a file when Content-Type has a charset

resources/js/api/interceptors.ts

@@ -1,4 +1,4 @@
-import { parseBlobJSONContent } from "@/utils/request";
+import { blobHasMimeType, parseBlobJSONContent } from "@/utils/request";
 import { handleErrorAlert } from "./errors";
 import { Axios, AxiosError, isCancel } from "axios";
 import { CURRENT_PAGE_URL } from "@/api/headers";
@@ -50,9 +50,9 @@ export function installInterceptors(api: Axios) {
                 const response = error.response;
 
                 if(response.data instanceof Blob) {
-                    if(response.data.type === 'application/json') {
+                    if(blobHasMimeType(response.data, 'application/json')) {
                         response.data = await parseBlobJSONContent(response.data);
-                    } else if(response.data.type === 'text/html') {
+                    } else if(blobHasMimeType(response.data, 'text/html')) {
                         response.data = await response.data.text();
                     }
                 }

resources/js/commands/CommandManager.ts

@@ -1,7 +1,7 @@
 import { CommandData, CommandFormData, CommandResponseData, FormData } from "@/types";
 import { api } from "@/api/api";
 import { RootAlertDialog, showAlert, showConfirm } from "@/utils/dialogs";
-import { parseBlobJSONContent } from "@/utils/request";
+import { blobHasMimeType, parseBlobJSONContent } from "@/utils/request";
 import { AxiosResponse } from "axios";
 import { reactive } from "vue";
 import { __ } from "@/utils/i18n";
@@ -140,7 +140,7 @@ export class CommandManager {
     }
 
     async handleCommandApiResponse(response: AxiosResponse<Blob>): Promise<void> {
-        if(response.data.type !== 'application/json') {
+        if(!blobHasMimeType(response.data, 'application/json')) {
             const link = document.createElement("a");
             link.download = (response.headers['content-disposition'] as string)?.match(/filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/)?.[1] ?? 'download';
             link.href = URL.createObjectURL(response.data);

resources/js/utils/request.ts

@@ -10,6 +10,13 @@ export function parseBlobJSONContent(blob) {
     });
 }
 
+/**
+ * Compare only the MIME type, as Blob.type may include parameters (e.g. "application/json; charset=utf-8")
+ */
+export function blobHasMimeType(blob: Blob, mimeType: string) {
+    return blob.type.split(';')[0].trim().toLowerCase() === mimeType;
+}
+
 export function getCsrfToken() {
     return session('_token');
 }