@terreno/api 0.23.1 → 0.25.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.
- package/README.md +1 -0
- package/dist/__tests__/versionCheckPlugin.test.js +47 -2
- package/dist/api.query.test.js +99 -0
- package/dist/auth.compile.test.d.ts +1 -0
- package/dist/auth.compile.test.js +201 -0
- package/dist/auth.js +38 -7
- package/dist/auth.test.js +249 -0
- package/dist/betterAuthSetup.test.js +76 -0
- package/dist/docLoader.test.js +0 -1
- package/dist/expressServer.d.ts +25 -1
- package/dist/expressServer.js +1 -3
- package/dist/expressServer.test.js +15 -8
- package/dist/githubAuth.d.ts +1 -1
- package/dist/httpClient.d.ts +119 -0
- package/dist/httpClient.js +412 -0
- package/dist/httpClient.test.d.ts +1 -0
- package/dist/httpClient.test.js +1470 -0
- package/dist/index.d.ts +1 -0
- package/dist/index.js +1 -0
- package/dist/notifiers/googleChatNotifier.test.js +0 -1
- package/dist/populate.test.js +30 -0
- package/dist/realtime/queryStore.d.ts +3 -3
- package/dist/realtime/queryStore.js +0 -1
- package/dist/realtime/realtime.test.js +22 -0
- package/dist/tests/fixtures/compileAuthEntry.d.ts +1 -0
- package/dist/tests/fixtures/compileAuthEntry.js +37 -0
- package/dist/transformers.test.js +0 -1
- package/package.json +2 -2
- package/src/__tests__/versionCheckPlugin.test.ts +37 -2
- package/src/api.query.test.ts +59 -0
- package/src/auth.compile.test.ts +106 -0
- package/src/auth.test.ts +177 -0
- package/src/auth.ts +49 -7
- package/src/betterAuthSetup.test.ts +65 -0
- package/src/docLoader.test.ts +4 -4
- package/src/expressServer.test.ts +17 -8
- package/src/expressServer.ts +30 -6
- package/src/githubAuth.ts +2 -4
- package/src/httpClient.test.ts +979 -0
- package/src/httpClient.ts +464 -0
- package/src/index.ts +1 -0
- package/src/notifiers/googleChatNotifier.test.ts +5 -4
- package/src/populate.test.ts +32 -0
- package/src/realtime/queryStore.ts +6 -7
- package/src/realtime/realtime.test.ts +28 -2
- package/src/realtime/realtimeApp.ts +3 -3
- package/src/tests/fixtures/compileAuthEntry.ts +43 -0
- package/src/transformers.test.ts +15 -8
package/README.md
CHANGED
|
@@ -16,6 +16,7 @@ model instances.
|
|
|
16
16
|
- **Permissions** — Fine-grained access control (IsAuthenticated, IsOwner, IsAdmin, etc.)
|
|
17
17
|
- **OpenAPI** — Automatic spec generation from models and routes
|
|
18
18
|
- **Logging** — Winston-based logging with scoped & feature-flagged loggers, automatic request correlation, and Google Cloud / Sentry support
|
|
19
|
+
- **HTTP client** — Authenticated axios factory for third-party APIs with token caching, safe retries, and normalized error handling (see [Call external APIs](../docs/how-to/call-external-apis.md))
|
|
19
20
|
|
|
20
21
|
## Getting started
|
|
21
22
|
|
|
@@ -66,13 +66,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
66
66
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
67
67
|
};
|
|
68
68
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
69
|
-
// biome-ignore-all lint/suspicious/noExplicitAny: test mock typing
|
|
70
69
|
var bun_test_1 = require("bun:test");
|
|
71
70
|
var supertest_1 = __importDefault(require("supertest"));
|
|
72
71
|
var versionConfig_1 = require("../models/versionConfig");
|
|
73
72
|
var terrenoApp_1 = require("../terrenoApp");
|
|
74
73
|
var tests_1 = require("../tests");
|
|
75
74
|
var versionCheckPlugin_1 = require("../versionCheckPlugin");
|
|
75
|
+
var typedUserModel = tests_1.UserModel;
|
|
76
76
|
(0, bun_test_1.describe)("VersionCheckPlugin", function () {
|
|
77
77
|
var app;
|
|
78
78
|
(0, bun_test_1.beforeEach)(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
@@ -87,7 +87,7 @@ var versionCheckPlugin_1 = require("../versionCheckPlugin");
|
|
|
87
87
|
_a.sent();
|
|
88
88
|
expressApp = new terrenoApp_1.TerrenoApp({
|
|
89
89
|
skipListen: true,
|
|
90
|
-
userModel:
|
|
90
|
+
userModel: typedUserModel,
|
|
91
91
|
})
|
|
92
92
|
.register(new versionCheckPlugin_1.VersionCheckPlugin())
|
|
93
93
|
.build();
|
|
@@ -248,6 +248,51 @@ var versionCheckPlugin_1 = require("../versionCheckPlugin");
|
|
|
248
248
|
}
|
|
249
249
|
});
|
|
250
250
|
}); });
|
|
251
|
+
(0, bun_test_1.it)("returns warning when a mobile version is below the mobile warning threshold", function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
252
|
+
var res;
|
|
253
|
+
return __generator(this, function (_a) {
|
|
254
|
+
switch (_a.label) {
|
|
255
|
+
case 0: return [4 /*yield*/, versionConfig_1.VersionConfig.create({
|
|
256
|
+
mobileRequiredVersion: 100,
|
|
257
|
+
mobileWarningVersion: 200,
|
|
258
|
+
warningMessage: "Update the mobile app",
|
|
259
|
+
})];
|
|
260
|
+
case 1:
|
|
261
|
+
_a.sent();
|
|
262
|
+
return [4 /*yield*/, app.get("/version-check").query({ platform: "mobile", version: 150 })];
|
|
263
|
+
case 2:
|
|
264
|
+
res = _a.sent();
|
|
265
|
+
(0, bun_test_1.expect)(res.status).toBe(200);
|
|
266
|
+
(0, bun_test_1.expect)(res.body).toEqual(bun_test_1.expect.objectContaining({
|
|
267
|
+
message: "Update the mobile app",
|
|
268
|
+
requiredVersion: 100,
|
|
269
|
+
status: "warning",
|
|
270
|
+
warningVersion: 200,
|
|
271
|
+
}));
|
|
272
|
+
return [2 /*return*/];
|
|
273
|
+
}
|
|
274
|
+
});
|
|
275
|
+
}); });
|
|
276
|
+
(0, bun_test_1.it)("omits mobile thresholds when they are not configured", function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
277
|
+
var res;
|
|
278
|
+
return __generator(this, function (_a) {
|
|
279
|
+
switch (_a.label) {
|
|
280
|
+
case 0: return [4 /*yield*/, versionConfig_1.VersionConfig.create({})];
|
|
281
|
+
case 1:
|
|
282
|
+
_a.sent();
|
|
283
|
+
return [4 /*yield*/, app.get("/version-check").query({ platform: "mobile", version: 1 })];
|
|
284
|
+
case 2:
|
|
285
|
+
res = _a.sent();
|
|
286
|
+
(0, bun_test_1.expect)(res.status).toBe(200);
|
|
287
|
+
(0, bun_test_1.expect)(res.body).toEqual(bun_test_1.expect.objectContaining({
|
|
288
|
+
status: "ok",
|
|
289
|
+
}));
|
|
290
|
+
(0, bun_test_1.expect)(res.body.requiredVersion).toBeUndefined();
|
|
291
|
+
(0, bun_test_1.expect)(res.body.warningVersion).toBeUndefined();
|
|
292
|
+
return [2 /*return*/];
|
|
293
|
+
}
|
|
294
|
+
});
|
|
295
|
+
}); });
|
|
251
296
|
(0, bun_test_1.it)("defaults to web when platform is invalid", function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
252
297
|
var res;
|
|
253
298
|
return __generator(this, function (_a) {
|
package/dist/api.query.test.js
CHANGED
|
@@ -374,6 +374,105 @@ var tests_1 = require("./tests");
|
|
|
374
374
|
}
|
|
375
375
|
});
|
|
376
376
|
}); });
|
|
377
|
+
(0, bun_test_1.it)("list returns 400 when created_gte is not a valid date", function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
378
|
+
var res;
|
|
379
|
+
return __generator(this, function (_a) {
|
|
380
|
+
switch (_a.label) {
|
|
381
|
+
case 0: return [4 /*yield*/, agent.get("/food").query({ created_gte: "not-a-date", limit: 10 }).expect(400)];
|
|
382
|
+
case 1:
|
|
383
|
+
res = _a.sent();
|
|
384
|
+
(0, bun_test_1.expect)(res.body.title).toBe("Invalid date for query parameter created_gte");
|
|
385
|
+
return [2 /*return*/];
|
|
386
|
+
}
|
|
387
|
+
});
|
|
388
|
+
}); });
|
|
389
|
+
(0, bun_test_1.it)("list returns 400 when created_lte is not a valid date", function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
390
|
+
var res;
|
|
391
|
+
return __generator(this, function (_a) {
|
|
392
|
+
switch (_a.label) {
|
|
393
|
+
case 0: return [4 /*yield*/, agent
|
|
394
|
+
.get("/food")
|
|
395
|
+
.query({ created_lte: "also-not-a-date", limit: 10 })
|
|
396
|
+
.expect(400)];
|
|
397
|
+
case 1:
|
|
398
|
+
res = _a.sent();
|
|
399
|
+
(0, bun_test_1.expect)(res.body.title).toBe("Invalid date for query parameter created_lte");
|
|
400
|
+
return [2 /*return*/];
|
|
401
|
+
}
|
|
402
|
+
});
|
|
403
|
+
}); });
|
|
404
|
+
(0, bun_test_1.it)("applies created_gte alone as a lower Date bound", function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
405
|
+
var res, names;
|
|
406
|
+
return __generator(this, function (_a) {
|
|
407
|
+
switch (_a.label) {
|
|
408
|
+
case 0: return [4 /*yield*/, agent
|
|
409
|
+
.get("/food")
|
|
410
|
+
.query({ created_gte: "2021-12-03T00:00:15.000Z", limit: 10 })
|
|
411
|
+
.expect(200)];
|
|
412
|
+
case 1:
|
|
413
|
+
res = _a.sent();
|
|
414
|
+
names = res.body.data.map(function (d) { return d.name; }).sort();
|
|
415
|
+
(0, bun_test_1.expect)(names).toEqual(["Spinach"]);
|
|
416
|
+
return [2 /*return*/];
|
|
417
|
+
}
|
|
418
|
+
});
|
|
419
|
+
}); });
|
|
420
|
+
(0, bun_test_1.it)("applies created_lte alone as an upper Date bound", function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
421
|
+
var res, names;
|
|
422
|
+
return __generator(this, function (_a) {
|
|
423
|
+
switch (_a.label) {
|
|
424
|
+
case 0: return [4 /*yield*/, agent
|
|
425
|
+
.get("/food")
|
|
426
|
+
.query({ created_lte: "2021-12-03T00:00:05.000Z", limit: 10 })
|
|
427
|
+
.expect(200)];
|
|
428
|
+
case 1:
|
|
429
|
+
res = _a.sent();
|
|
430
|
+
names = res.body.data.map(function (d) { return d.name; }).sort();
|
|
431
|
+
(0, bun_test_1.expect)(names).toEqual(["Carrots"]);
|
|
432
|
+
return [2 /*return*/];
|
|
433
|
+
}
|
|
434
|
+
});
|
|
435
|
+
}); });
|
|
436
|
+
(0, bun_test_1.it)("drops a scalar direct field value when a date range is also provided", function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
437
|
+
var res, names;
|
|
438
|
+
return __generator(this, function (_a) {
|
|
439
|
+
switch (_a.label) {
|
|
440
|
+
case 0: return [4 /*yield*/, agent
|
|
441
|
+
.get("/food")
|
|
442
|
+
.query({
|
|
443
|
+
created: "2021-12-03T00:00:20.000Z",
|
|
444
|
+
created_gte: "2021-12-03T00:00:05.000Z",
|
|
445
|
+
created_lte: "2021-12-03T00:00:25.000Z",
|
|
446
|
+
limit: 10,
|
|
447
|
+
})
|
|
448
|
+
.expect(200)];
|
|
449
|
+
case 1:
|
|
450
|
+
res = _a.sent();
|
|
451
|
+
names = res.body.data.map(function (d) { return d.name; }).sort();
|
|
452
|
+
(0, bun_test_1.expect)(names).toEqual(["Pizza", "Spinach"]);
|
|
453
|
+
return [2 /*return*/];
|
|
454
|
+
}
|
|
455
|
+
});
|
|
456
|
+
}); });
|
|
457
|
+
(0, bun_test_1.it)("merges date-range bounds into an existing object query for the field", function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
458
|
+
var res, names;
|
|
459
|
+
return __generator(this, function (_a) {
|
|
460
|
+
switch (_a.label) {
|
|
461
|
+
case 0: return [4 /*yield*/, agent
|
|
462
|
+
.get("/food?".concat(qs_1.default.stringify({
|
|
463
|
+
created: { $lte: "2021-12-03T00:00:25.000Z" },
|
|
464
|
+
created_gte: "2021-12-03T00:00:05.000Z",
|
|
465
|
+
limit: 10,
|
|
466
|
+
})))
|
|
467
|
+
.expect(200)];
|
|
468
|
+
case 1:
|
|
469
|
+
res = _a.sent();
|
|
470
|
+
names = res.body.data.map(function (d) { return d.name; }).sort();
|
|
471
|
+
(0, bun_test_1.expect)(names).toEqual(["Pizza", "Spinach"]);
|
|
472
|
+
return [2 /*return*/];
|
|
473
|
+
}
|
|
474
|
+
});
|
|
475
|
+
}); });
|
|
377
476
|
(0, bun_test_1.it)("list query params not in list", function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
378
477
|
var res;
|
|
379
478
|
return __generator(this, function (_a) {
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,201 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __assign = (this && this.__assign) || function () {
|
|
3
|
+
__assign = Object.assign || function(t) {
|
|
4
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
|
+
s = arguments[i];
|
|
6
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7
|
+
t[p] = s[p];
|
|
8
|
+
}
|
|
9
|
+
return t;
|
|
10
|
+
};
|
|
11
|
+
return __assign.apply(this, arguments);
|
|
12
|
+
};
|
|
13
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
14
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
15
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
16
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
17
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
18
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
19
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
20
|
+
});
|
|
21
|
+
};
|
|
22
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
23
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
|
|
24
|
+
return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
25
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
26
|
+
function step(op) {
|
|
27
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
28
|
+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
29
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
30
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
31
|
+
switch (op[0]) {
|
|
32
|
+
case 0: case 1: t = op; break;
|
|
33
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
34
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
35
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
36
|
+
default:
|
|
37
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
38
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
39
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
40
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
41
|
+
if (t[2]) _.ops.pop();
|
|
42
|
+
_.trys.pop(); continue;
|
|
43
|
+
}
|
|
44
|
+
op = body.call(thisArg, _);
|
|
45
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
46
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
47
|
+
}
|
|
48
|
+
};
|
|
49
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
50
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
51
|
+
};
|
|
52
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
53
|
+
var bun_test_1 = require("bun:test");
|
|
54
|
+
var promises_1 = require("node:fs/promises");
|
|
55
|
+
var node_net_1 = __importDefault(require("node:net"));
|
|
56
|
+
var node_os_1 = __importDefault(require("node:os"));
|
|
57
|
+
var node_path_1 = __importDefault(require("node:path"));
|
|
58
|
+
/**
|
|
59
|
+
* Regression test: auth failures must stay 401s inside `bun build --compile`
|
|
60
|
+
* binaries.
|
|
61
|
+
*
|
|
62
|
+
* passport's internal AuthenticationError calls `Error.captureStackTrace(this,
|
|
63
|
+
* arguments.callee)`. Bundling into a single-file executable puts that CJS
|
|
64
|
+
* code in strict-mode context, where touching `arguments.callee` throws a
|
|
65
|
+
* TypeError — so with `failWithError: true`, every unauthenticated request
|
|
66
|
+
* used to 500 instead of 401 (while behaving fine under plain `bun run`).
|
|
67
|
+
* authenticateMiddleware therefore must never route failures through
|
|
68
|
+
* passport's error class.
|
|
69
|
+
*
|
|
70
|
+
* This compiles a real fixture server (src/tests/fixtures/compileAuthEntry.ts)
|
|
71
|
+
* and asserts the 401 contract against the running binary.
|
|
72
|
+
*/
|
|
73
|
+
/** Grab an OS-assigned free port, then release it for the fixture binary. */
|
|
74
|
+
var findFreePort = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
75
|
+
return __generator(this, function (_a) {
|
|
76
|
+
return [2 /*return*/, new Promise(function (resolve, reject) {
|
|
77
|
+
var server = node_net_1.default.createServer();
|
|
78
|
+
server.listen(0, function () {
|
|
79
|
+
var address = server.address();
|
|
80
|
+
if (!address || typeof address === "string") {
|
|
81
|
+
server.close();
|
|
82
|
+
reject(new Error("Failed to allocate a port"));
|
|
83
|
+
return;
|
|
84
|
+
}
|
|
85
|
+
var port = address.port;
|
|
86
|
+
server.close(function () { return resolve(port); });
|
|
87
|
+
});
|
|
88
|
+
server.on("error", reject);
|
|
89
|
+
})];
|
|
90
|
+
});
|
|
91
|
+
}); };
|
|
92
|
+
(0, bun_test_1.describe)("authenticateMiddleware inside a bun-compiled binary", function () {
|
|
93
|
+
var tmpDir;
|
|
94
|
+
var child = null;
|
|
95
|
+
var baseUrl;
|
|
96
|
+
(0, bun_test_1.beforeAll)(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
97
|
+
var binaryPath, entryPath, build, buildExit, _a, _b, port, deadline, _c;
|
|
98
|
+
return __generator(this, function (_d) {
|
|
99
|
+
switch (_d.label) {
|
|
100
|
+
case 0: return [4 /*yield*/, (0, promises_1.mkdtemp)(node_path_1.default.join(node_os_1.default.tmpdir(), "terreno-compile-auth-"))];
|
|
101
|
+
case 1:
|
|
102
|
+
tmpDir = _d.sent();
|
|
103
|
+
binaryPath = node_path_1.default.join(tmpDir, "compile-auth-server");
|
|
104
|
+
entryPath = node_path_1.default.join(__dirname, "tests/fixtures/compileAuthEntry.ts");
|
|
105
|
+
build = Bun.spawn(["bun", "build", "--compile", entryPath, "--outfile", binaryPath], {
|
|
106
|
+
cwd: __dirname,
|
|
107
|
+
stderr: "pipe",
|
|
108
|
+
stdout: "pipe",
|
|
109
|
+
});
|
|
110
|
+
return [4 /*yield*/, build.exited];
|
|
111
|
+
case 2:
|
|
112
|
+
buildExit = _d.sent();
|
|
113
|
+
if (!(buildExit !== 0)) return [3 /*break*/, 4];
|
|
114
|
+
_a = Error.bind;
|
|
115
|
+
_b = "bun build --compile failed: ".concat;
|
|
116
|
+
return [4 /*yield*/, new Response(build.stderr).text()];
|
|
117
|
+
case 3: throw new (_a.apply(Error, [void 0, _b.apply("bun build --compile failed: ", [_d.sent()])]))();
|
|
118
|
+
case 4: return [4 /*yield*/, findFreePort()];
|
|
119
|
+
case 5:
|
|
120
|
+
port = _d.sent();
|
|
121
|
+
baseUrl = "http://127.0.0.1:".concat(port);
|
|
122
|
+
child = Bun.spawn([binaryPath], {
|
|
123
|
+
env: __assign(__assign({}, process.env), { PORT: String(port) }),
|
|
124
|
+
stderr: "inherit",
|
|
125
|
+
stdout: "inherit",
|
|
126
|
+
});
|
|
127
|
+
deadline = Date.now() + 15000;
|
|
128
|
+
_d.label = 6;
|
|
129
|
+
case 6:
|
|
130
|
+
_d.trys.push([6, 8, , 10]);
|
|
131
|
+
return [4 /*yield*/, fetch("".concat(baseUrl, "/secure"))];
|
|
132
|
+
case 7:
|
|
133
|
+
_d.sent();
|
|
134
|
+
return [3 /*break*/, 11];
|
|
135
|
+
case 8:
|
|
136
|
+
_c = _d.sent();
|
|
137
|
+
if (child.exitCode !== null) {
|
|
138
|
+
throw new Error("fixture server exited with code ".concat(child.exitCode));
|
|
139
|
+
}
|
|
140
|
+
if (Date.now() > deadline) {
|
|
141
|
+
throw new Error("fixture server never became reachable");
|
|
142
|
+
}
|
|
143
|
+
return [4 /*yield*/, Bun.sleep(100)];
|
|
144
|
+
case 9:
|
|
145
|
+
_d.sent();
|
|
146
|
+
return [3 /*break*/, 10];
|
|
147
|
+
case 10: return [3 /*break*/, 6];
|
|
148
|
+
case 11: return [2 /*return*/];
|
|
149
|
+
}
|
|
150
|
+
});
|
|
151
|
+
}); }, 120000);
|
|
152
|
+
(0, bun_test_1.afterAll)(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
153
|
+
return __generator(this, function (_a) {
|
|
154
|
+
switch (_a.label) {
|
|
155
|
+
case 0:
|
|
156
|
+
child === null || child === void 0 ? void 0 : child.kill();
|
|
157
|
+
return [4 /*yield*/, (child === null || child === void 0 ? void 0 : child.exited)];
|
|
158
|
+
case 1:
|
|
159
|
+
_a.sent();
|
|
160
|
+
return [4 /*yield*/, (0, promises_1.rm)(tmpDir, { force: true, recursive: true })];
|
|
161
|
+
case 2:
|
|
162
|
+
_a.sent();
|
|
163
|
+
return [2 /*return*/];
|
|
164
|
+
}
|
|
165
|
+
});
|
|
166
|
+
}); });
|
|
167
|
+
(0, bun_test_1.it)("returns 401 (not 500) for a request with no token", function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
168
|
+
var res, _a;
|
|
169
|
+
return __generator(this, function (_b) {
|
|
170
|
+
switch (_b.label) {
|
|
171
|
+
case 0: return [4 /*yield*/, fetch("".concat(baseUrl, "/secure"))];
|
|
172
|
+
case 1:
|
|
173
|
+
res = _b.sent();
|
|
174
|
+
(0, bun_test_1.expect)(res.status).toBe(401);
|
|
175
|
+
_a = bun_test_1.expect;
|
|
176
|
+
return [4 /*yield*/, res.json()];
|
|
177
|
+
case 2:
|
|
178
|
+
_a.apply(void 0, [_b.sent()]).toEqual({ status: 401, title: "Unauthorized" });
|
|
179
|
+
return [2 /*return*/];
|
|
180
|
+
}
|
|
181
|
+
});
|
|
182
|
+
}); });
|
|
183
|
+
(0, bun_test_1.it)("returns 401 (not 500) for a request with an invalid token", function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
184
|
+
var res, _a;
|
|
185
|
+
return __generator(this, function (_b) {
|
|
186
|
+
switch (_b.label) {
|
|
187
|
+
case 0: return [4 /*yield*/, fetch("".concat(baseUrl, "/secure"), {
|
|
188
|
+
headers: { Authorization: "Bearer not-a-real-jwt" },
|
|
189
|
+
})];
|
|
190
|
+
case 1:
|
|
191
|
+
res = _b.sent();
|
|
192
|
+
(0, bun_test_1.expect)(res.status).toBe(401);
|
|
193
|
+
_a = bun_test_1.expect;
|
|
194
|
+
return [4 /*yield*/, res.json()];
|
|
195
|
+
case 2:
|
|
196
|
+
_a.apply(void 0, [_b.sent()]).toEqual({ status: 401, title: "Unauthorized" });
|
|
197
|
+
return [2 /*return*/];
|
|
198
|
+
}
|
|
199
|
+
});
|
|
200
|
+
}); });
|
|
201
|
+
});
|
package/dist/auth.js
CHANGED
|
@@ -105,16 +105,31 @@ var authenticateMiddleware = function (anonymous) {
|
|
|
105
105
|
if (anonymous) {
|
|
106
106
|
strategies.push("anonymous");
|
|
107
107
|
}
|
|
108
|
-
var passportAuth = passport_1.default.authenticate(strategies, {
|
|
109
|
-
failureMessage: false, // this is just avoiding storing the message in the session
|
|
110
|
-
failWithError: true,
|
|
111
|
-
session: false,
|
|
112
|
-
});
|
|
113
108
|
return function (req, res, next) {
|
|
114
109
|
if (req.user) {
|
|
115
110
|
return next();
|
|
116
111
|
}
|
|
117
|
-
|
|
112
|
+
// Failures use a custom callback rather than passport's `failWithError`:
|
|
113
|
+
// passport's internal AuthenticationError touches `arguments.callee`,
|
|
114
|
+
// which throws a TypeError in strict-mode contexts — inside
|
|
115
|
+
// `bun build --compile` binaries that turned every 401 into a 500. The
|
|
116
|
+
// plain Error("Unauthorized") below is what apiUnauthorizedMiddleware
|
|
117
|
+
// matches on, so the response contract is unchanged.
|
|
118
|
+
// (The anonymous strategy calls pass(), which skips this callback and
|
|
119
|
+
// continues the chain with no user — same as before.)
|
|
120
|
+
return passport_1.default.authenticate(strategies, { session: false }, function (err, user, info) {
|
|
121
|
+
if (err) {
|
|
122
|
+
return next(err);
|
|
123
|
+
}
|
|
124
|
+
if (!user) {
|
|
125
|
+
return next(new Error("Unauthorized"));
|
|
126
|
+
}
|
|
127
|
+
req.user = user;
|
|
128
|
+
// req.logIn used to populate authInfo; keep that passport-public API
|
|
129
|
+
// intact for downstream consumers.
|
|
130
|
+
req.authInfo = (info !== null && info !== void 0 ? info : {});
|
|
131
|
+
return next();
|
|
132
|
+
})(req, res, next);
|
|
118
133
|
};
|
|
119
134
|
};
|
|
120
135
|
exports.authenticateMiddleware = authenticateMiddleware;
|
|
@@ -494,7 +509,23 @@ var addAuthRoutes = function (app, userModel, authOptions) {
|
|
|
494
509
|
}); });
|
|
495
510
|
var signupDisabled = process.env.SIGNUP_DISABLED === "true";
|
|
496
511
|
if (!signupDisabled) {
|
|
497
|
-
router.post("/signup",
|
|
512
|
+
router.post("/signup",
|
|
513
|
+
// Custom callback instead of `failWithError` — passport's internal
|
|
514
|
+
// AuthenticationError is unusable in strict-mode bundles (see
|
|
515
|
+
// authenticateMiddleware). Strategy errors (e.g. duplicate email) pass
|
|
516
|
+
// through unchanged; a bare failure (missing credentials) is a 400.
|
|
517
|
+
function (req, res, next) {
|
|
518
|
+
passport_1.default.authenticate("signup", { session: false }, function (err, user) {
|
|
519
|
+
if (err) {
|
|
520
|
+
return next(err);
|
|
521
|
+
}
|
|
522
|
+
if (!user) {
|
|
523
|
+
return next(new errors_1.APIError({ status: 400, title: "Missing credentials" }));
|
|
524
|
+
}
|
|
525
|
+
req.user = user;
|
|
526
|
+
return next();
|
|
527
|
+
})(req, res, next);
|
|
528
|
+
}, function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
|
|
498
529
|
var tokens;
|
|
499
530
|
var _a, _b;
|
|
500
531
|
return __generator(this, function (_c) {
|