Initial

server/controllers/psadtController.js

@@ -17,7 +17,6 @@ import {
   updatePsadtProfile
 } from '../models/psadtModel.js';
 import fs from 'node:fs';
-import path from 'node:path';
 import { config } from '../config.js';
 import { createChangeRequest, findApprovedRequest, findPendingRequest, markRequestExecuted } from '../models/changeRequestModel.js';
 import { buildIntuneWin, builderAvailability } from '../services/intuneWinBuilder.js';
@@ -30,6 +29,7 @@ import { parseIntunewin } from '../services/intunewinParser.js';
 import { createAssetFromUpload, getAssetFile } from '../models/assetModel.js';
 import { validatePsadtScript, validationRuleCatalog } from '../services/psadtValidator.js';
 import { planPsadtMigration } from '../services/psadtMigrationService.js';
+import { basenameAny, path } from '../utils/pathUtils.js';
 
 export function catalog(req, res) {
   res.json(getPsadtCatalog());
@@ -353,9 +353,10 @@ export async function intuneBuild(req, res) {
   try {
     const { outputFile } = await buildIntuneWin({ sourceFolder, setupFile, outputDir });
     const stats = fs.statSync(outputFile);
+    const outputName = basenameAny(outputFile, 'package.intunewin');
     const asset = createAssetFromUpload(
-      { path: outputFile, originalname: path.basename(outputFile), mimetype: 'application/octet-stream', size: stats.size },
-      { name: `${deployment.name} package`, visibility: deployment.visibility, groupId: deployment.groupId, packagePath: path.basename(outputFile) },
+      { path: outputFile, originalname: outputName, mimetype: 'application/octet-stream', size: stats.size },
+      { name: `${deployment.name} package`, visibility: deployment.visibility, groupId: deployment.groupId, packagePath: outputName },
       req.user.id
     );
     const updated = updateIntuneDeployment(req.params.id, { ...deployment, intunewinFile: asset.originalName }, req.user.id);