@terreno/admin-backend 0.9.3 → 0.11.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -436,7 +436,9 @@ var waitForScripts = function () { return new Promise(function (resolve) { retur
436
436
  case 2:
437
437
  res = _a.sent();
438
438
  logs = res.body.task.logs;
439
- cancelLog = logs.find(function (l) { return l.message.includes("cancelled"); });
439
+ cancelLog = logs.find(function (l) {
440
+ return l.message.includes("cancelled");
441
+ });
440
442
  (0, bun_test_1.expect)(cancelLog).toBeDefined();
441
443
  (0, bun_test_1.expect)(cancelLog.level).toBe("info");
442
444
  return [2 /*return*/];
@@ -529,7 +531,7 @@ var waitForScripts = function () { return new Promise(function (resolve) { retur
529
531
  var res;
530
532
  return __generator(this, function (_a) {
531
533
  switch (_a.label) {
532
- case 0: return [4 /*yield*/, (0, supertest_1.default)(app).get("/admin/config").expect(200)];
534
+ case 0: return [4 /*yield*/, adminAgent.get("/admin/config").expect(200)];
533
535
  case 1:
534
536
  res = _a.sent();
535
537
  (0, bun_test_1.expect)(res.body.scripts).toHaveLength(2);
@@ -542,13 +544,16 @@ var waitForScripts = function () { return new Promise(function (resolve) { retur
542
544
  });
543
545
  }); });
544
546
  (0, bun_test_1.it)("returns empty scripts array when no scripts configured", function () { return __awaiter(void 0, void 0, void 0, function () {
545
- var res;
547
+ var freshAdmin, res;
546
548
  return __generator(this, function (_a) {
547
549
  switch (_a.label) {
548
550
  case 0:
549
551
  app = buildApp([]);
550
- return [4 /*yield*/, (0, supertest_1.default)(app).get("/admin/config").expect(200)];
552
+ return [4 /*yield*/, (0, tests_1.authAsUser)(app, "admin")];
551
553
  case 1:
554
+ freshAdmin = _a.sent();
555
+ return [4 /*yield*/, freshAdmin.get("/admin/config").expect(200)];
556
+ case 2:
552
557
  res = _a.sent();
553
558
  (0, bun_test_1.expect)(res.body.scripts).toHaveLength(0);
554
559
  return [2 /*return*/];
@@ -70,6 +70,19 @@ var storage_1 = require("@google-cloud/storage");
70
70
  var api_1 = require("@terreno/api");
71
71
  var luxon_1 = require("luxon");
72
72
  var multer_1 = __importDefault(require("multer"));
73
+ // Express 5 wildcard route params (e.g. `*filepath`) come through as string[]
74
+ // when the URL has one or more path segments. Older signatures (and manual
75
+ // calls) may still provide a string. Normalize both shapes to a single
76
+ // forward-slash separated path.
77
+ var normalizePathParam = function (value) {
78
+ if (Array.isArray(value)) {
79
+ return value.filter(function (segment) { return typeof segment === "string"; }).join("/");
80
+ }
81
+ if (typeof value === "string") {
82
+ return value;
83
+ }
84
+ return "";
85
+ };
73
86
  var DEFAULT_ALLOWED_MIME_TYPES = new Set([
74
87
  "image/jpeg",
75
88
  "image/png",
@@ -205,7 +218,9 @@ var DocumentStorageApp = /** @class */ (function () {
205
218
  });
206
219
  }); })], false));
207
220
  // POST basePath/ — Upload a file
208
- app.post.apply(app, __spreadArray(__spreadArray(["".concat(basePath, "/")], __read(adminGuard), false), [upload.single("file"),
221
+ app.post.apply(app, __spreadArray(__spreadArray(["".concat(basePath, "/")], __read(adminGuard), false), [
222
+ // noExplicitAny: multer's RequestHandler type is incompatible with Express 5's middleware signature.
223
+ upload.single("file"),
209
224
  (0, api_1.asyncHandler)(function (req, res) { return __awaiter(_this, void 0, void 0, function () {
210
225
  var file, targetPrefix, sanitizedFilename, gcsPath, gcsFile, documentFile;
211
226
  var _a;
@@ -239,12 +254,12 @@ var DocumentStorageApp = /** @class */ (function () {
239
254
  }); })], false));
240
255
  // GET basePath/download/* — Stream file download
241
256
  app.get.apply(app, __spreadArray(__spreadArray(["".concat(basePath, "/download/*filepath")], __read(adminGuard), false), [(0, api_1.asyncHandler)(function (req, res) { return __awaiter(_this, void 0, void 0, function () {
242
- var filePath, gcsPath, gcsFile, metadata, _a, meta, err_1, contentType, filename, err_2;
257
+ var filePath, gcsPath, gcsFile, metadata, _a, meta, err_1, storageErr, contentType, filename, err_2, pipelineErr;
243
258
  var _b, _c, _d, _e;
244
259
  return __generator(this, function (_f) {
245
260
  switch (_f.label) {
246
261
  case 0:
247
- filePath = req.params.filepath;
262
+ filePath = normalizePathParam(req.params.filepath);
248
263
  if (!filePath) {
249
264
  throw new api_1.APIError({ status: 400, title: "File path is required" });
250
265
  }
@@ -259,14 +274,15 @@ var DocumentStorageApp = /** @class */ (function () {
259
274
  _a = __read.apply(void 0, [_f.sent(), 1]), meta = _a[0];
260
275
  metadata = meta;
261
276
  console.info("[documentStorage] getMetadata success", {
262
- contentType: meta === null || meta === void 0 ? void 0 : meta.contentType,
263
- etag: meta === null || meta === void 0 ? void 0 : meta.etag,
264
- size: meta === null || meta === void 0 ? void 0 : meta.size,
277
+ contentType: metadata.contentType,
278
+ etag: metadata.etag,
279
+ size: metadata.size,
265
280
  });
266
281
  return [3 /*break*/, 4];
267
282
  case 3:
268
283
  err_1 = _f.sent();
269
- if ((err_1 === null || err_1 === void 0 ? void 0 : err_1.code) === 404) {
284
+ storageErr = err_1;
285
+ if ((storageErr === null || storageErr === void 0 ? void 0 : storageErr.code) === 404) {
270
286
  throw new api_1.APIError({
271
287
  detail: filePath,
272
288
  disableExternalErrorTracking: true,
@@ -275,21 +291,21 @@ var DocumentStorageApp = /** @class */ (function () {
275
291
  });
276
292
  }
277
293
  console.error("[documentStorage] getMetadata error", {
278
- code: err_1 === null || err_1 === void 0 ? void 0 : err_1.code,
279
- errors: err_1 === null || err_1 === void 0 ? void 0 : err_1.errors,
280
- message: err_1 === null || err_1 === void 0 ? void 0 : err_1.message,
281
- response: err_1 === null || err_1 === void 0 ? void 0 : err_1.response,
282
- stack: err_1 === null || err_1 === void 0 ? void 0 : err_1.stack,
283
- status: err_1 === null || err_1 === void 0 ? void 0 : err_1.status,
294
+ code: storageErr === null || storageErr === void 0 ? void 0 : storageErr.code,
295
+ errors: storageErr === null || storageErr === void 0 ? void 0 : storageErr.errors,
296
+ message: storageErr === null || storageErr === void 0 ? void 0 : storageErr.message,
297
+ response: storageErr === null || storageErr === void 0 ? void 0 : storageErr.response,
298
+ stack: storageErr === null || storageErr === void 0 ? void 0 : storageErr.stack,
299
+ status: storageErr === null || storageErr === void 0 ? void 0 : storageErr.status,
284
300
  });
285
301
  api_1.logger.error("[documentStorage] getMetadata error", {
286
- code: err_1 === null || err_1 === void 0 ? void 0 : err_1.code,
287
- errors: err_1 === null || err_1 === void 0 ? void 0 : err_1.errors,
288
- message: err_1 === null || err_1 === void 0 ? void 0 : err_1.message,
289
- status: err_1 === null || err_1 === void 0 ? void 0 : err_1.status,
302
+ code: storageErr === null || storageErr === void 0 ? void 0 : storageErr.code,
303
+ errors: storageErr === null || storageErr === void 0 ? void 0 : storageErr.errors,
304
+ message: storageErr === null || storageErr === void 0 ? void 0 : storageErr.message,
305
+ status: storageErr === null || storageErr === void 0 ? void 0 : storageErr.status,
290
306
  });
291
307
  throw new api_1.APIError({
292
- detail: (_b = err_1 === null || err_1 === void 0 ? void 0 : err_1.message) !== null && _b !== void 0 ? _b : String(err_1),
308
+ detail: (_b = storageErr === null || storageErr === void 0 ? void 0 : storageErr.message) !== null && _b !== void 0 ? _b : String(err_1),
293
309
  status: 500,
294
310
  title: "Failed to access file",
295
311
  });
@@ -310,19 +326,20 @@ var DocumentStorageApp = /** @class */ (function () {
310
326
  return [3 /*break*/, 8];
311
327
  case 7:
312
328
  err_2 = _f.sent();
329
+ pipelineErr = err_2;
313
330
  console.error("[documentStorage] pipeline error", {
314
- code: err_2 === null || err_2 === void 0 ? void 0 : err_2.code,
315
- message: err_2 === null || err_2 === void 0 ? void 0 : err_2.message,
316
- stack: err_2 === null || err_2 === void 0 ? void 0 : err_2.stack,
331
+ code: pipelineErr === null || pipelineErr === void 0 ? void 0 : pipelineErr.code,
332
+ message: pipelineErr === null || pipelineErr === void 0 ? void 0 : pipelineErr.message,
333
+ stack: pipelineErr === null || pipelineErr === void 0 ? void 0 : pipelineErr.stack,
317
334
  });
318
335
  api_1.logger.error("[documentStorage] pipeline error", {
319
- code: err_2 === null || err_2 === void 0 ? void 0 : err_2.code,
320
- message: err_2 === null || err_2 === void 0 ? void 0 : err_2.message,
321
- stack: err_2 === null || err_2 === void 0 ? void 0 : err_2.stack,
336
+ code: pipelineErr === null || pipelineErr === void 0 ? void 0 : pipelineErr.code,
337
+ message: pipelineErr === null || pipelineErr === void 0 ? void 0 : pipelineErr.message,
338
+ stack: pipelineErr === null || pipelineErr === void 0 ? void 0 : pipelineErr.stack,
322
339
  });
323
340
  if (!res.headersSent) {
324
341
  throw new api_1.APIError({
325
- detail: (_e = err_2 === null || err_2 === void 0 ? void 0 : err_2.message) !== null && _e !== void 0 ? _e : String(err_2),
342
+ detail: (_e = pipelineErr === null || pipelineErr === void 0 ? void 0 : pipelineErr.message) !== null && _e !== void 0 ? _e : String(err_2),
326
343
  status: 500,
327
344
  title: "Failed to stream file",
328
345
  });
@@ -359,7 +376,7 @@ var DocumentStorageApp = /** @class */ (function () {
359
376
  return __generator(this, function (_b) {
360
377
  switch (_b.label) {
361
378
  case 0:
362
- folderPath = req.params.folderpath;
379
+ folderPath = normalizePathParam(req.params.folderpath);
363
380
  if (!folderPath) {
364
381
  throw new api_1.APIError({ status: 400, title: "Folder path is required" });
365
382
  }
@@ -380,7 +397,7 @@ var DocumentStorageApp = /** @class */ (function () {
380
397
  return __generator(this, function (_a) {
381
398
  switch (_a.label) {
382
399
  case 0:
383
- filePath = req.params.filepath;
400
+ filePath = normalizePathParam(req.params.filepath);
384
401
  if (!filePath) {
385
402
  throw new api_1.APIError({ status: 400, title: "File path is required" });
386
403
  }
@@ -0,0 +1 @@
1
+ export {};