@xenon-device-management/xenon 2.13.2 → 2.15.0

package/lib/test/integration/forgot-password.spec.js

@@ -15,20 +15,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 require("reflect-metadata");
 const chai_1 = require("chai");
 const express_1 = __importDefault(require("express"));
-const supertest_1 = __importDefault(require("supertest"));
+const loopbackRequest_1 = __importDefault(require("../helpers/loopbackRequest"));
 const auth_1 = require("../../src/app/routers/auth");
 const typedi_1 = require("typedi");
 const UserService_1 = require("../../src/services/UserService");
 const PasswordResetService_1 = require("../../src/services/PasswordResetService");
 const prisma_1 = require("../../src/prisma");
+const scratch_database_1 = require("../helpers/scratch-database");
 describe('forgot-password flow (integration)', function () {
     this.timeout(30000);
+    (0, scratch_database_1.useScratchDatabase)({ wholeSuite: true });
     let user;
     const email = 'forgot-it@xenon.local';
     before(() => __awaiter(this, void 0, void 0, function* () {
-        yield prisma_1.prisma.passwordResetToken.deleteMany({ where: { user: { email } } });
-        yield prisma_1.prisma.userSession.deleteMany({ where: { user: { email } } });
-        yield prisma_1.prisma.user.deleteMany({ where: { email } });
         user = yield typedi_1.Container.get(UserService_1.UserService).createUser({
             email,
             name: 'Forgot IT',
@@ -36,42 +35,41 @@ describe('forgot-password flow (integration)', function () {
             role: 'ADMIN',
         });
     }));
-    after(() => __awaiter(this, void 0, void 0, function* () {
-        yield prisma_1.prisma.passwordResetToken.deleteMany({ where: { userId: user.id } });
-        yield prisma_1.prisma.userSession.deleteMany({ where: { userId: user.id } });
-        yield prisma_1.prisma.user.delete({ where: { id: user.id } });
-    }));
     function buildApp() {
         const app = (0, express_1.default)();
         app.use(express_1.default.json());
         app.use('/auth', (0, auth_1.authPublicRouter)());
         return app;
     }
+    // A POST with the token in the body: since #265 the token stays out of
+    // request URLs, which the server log records. The old GET /check/:token is
+    // gone, so it answered 404 to every token, valid or not.
+    const check = (app, token) => (0, loopbackRequest_1.default)(app).post('/auth/reset-password/check').send({ token });
     it('full flow: forgot -> DB token -> reset -> login with new password', () => __awaiter(this, void 0, void 0, function* () {
         const app = buildApp();
         // Generic 204 even with wrong email
-        const r1 = yield (0, supertest_1.default)(app).post('/auth/forgot-password').send({ email: 'no@no.com' });
+        const r1 = yield (0, loopbackRequest_1.default)(app).post('/auth/forgot-password').send({ email: 'no@no.com' });
         (0, chai_1.expect)(r1.status).to.equal(204);
-        const r2 = yield (0, supertest_1.default)(app).post('/auth/forgot-password').send({ email });
+        const r2 = yield (0, loopbackRequest_1.default)(app).post('/auth/forgot-password').send({ email });
         (0, chai_1.expect)(r2.status).to.equal(204);
         // Generate a token via the service directly so we have the raw value to reset with
         const { raw } = yield typedi_1.Container.get(PasswordResetService_1.PasswordResetService).createToken(user.id);
-        const check = yield (0, supertest_1.default)(app).get(`/auth/reset-password/check/${raw}`);
-        (0, chai_1.expect)(check.status).to.equal(200);
-        const reset = yield (0, supertest_1.default)(app)
+        const valid = yield check(app, raw);
+        (0, chai_1.expect)(valid.status).to.equal(200);
+        const reset = yield (0, loopbackRequest_1.default)(app)
             .post('/auth/reset-password')
             .send({ token: raw, newPassword: 'NewPassw0rd1' });
         (0, chai_1.expect)(reset.status).to.equal(204);
         // Token now consumed
-        const recheck = yield (0, supertest_1.default)(app).get(`/auth/reset-password/check/${raw}`);
+        const recheck = yield check(app, raw);
         (0, chai_1.expect)(recheck.status).to.equal(404);
         // Login with new password works
-        const login = yield (0, supertest_1.default)(app)
+        const login = yield (0, loopbackRequest_1.default)(app)
             .post('/auth/login')
             .send({ email, password: 'NewPassw0rd1' });
         (0, chai_1.expect)(login.status).to.equal(204);
         // Login with old password fails
-        const oldLogin = yield (0, supertest_1.default)(app)
+        const oldLogin = yield (0, loopbackRequest_1.default)(app)
             .post('/auth/login')
             .send({ email, password: 'old-password-1' });
         (0, chai_1.expect)(oldLogin.status).to.equal(401);
@@ -83,7 +81,8 @@ describe('forgot-password flow (integration)', function () {
             data: { expiresAt: new Date(Date.now() - 1000) },
         });
         const app = buildApp();
-        const r = yield (0, supertest_1.default)(app).get(`/auth/reset-password/check/${raw}`);
+        const r = yield check(app, raw);
         (0, chai_1.expect)(r.status).to.equal(404);
+        (0, chai_1.expect)(r.body).to.deep.equal({ error: 'invalid or expired token' });
     }));
 });

package/lib/test/integration/legacy-deprecation-headers.spec.js

@@ -48,8 +48,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 require("reflect-metadata");
 const chai_1 = require("chai");
 const express_1 = __importDefault(require("express"));
-const supertest_1 = __importDefault(require("supertest"));
+const loopbackRequest_1 = __importDefault(require("../helpers/loopbackRequest"));
+const scratch_database_1 = require("../helpers/scratch-database");
 describe('legacy /reservation headers', () => {
+    // The route reads the phones' reservations from the database.
+    (0, scratch_database_1.useScratchDatabase)({ wholeSuite: true });
     it('GET /reservation returns Deprecation + Sunset + Link headers', () => __awaiter(void 0, void 0, void 0, function* () {
         const router = (yield Promise.resolve().then(() => __importStar(require('../../src/app/routers/reservation')))).default;
         const app = (0, express_1.default)();
@@ -60,7 +63,7 @@ describe('legacy /reservation headers', () => {
             next();
         });
         app.use('/reservation', router);
-        const res = yield (0, supertest_1.default)(app).get('/reservation');
+        const res = yield (0, loopbackRequest_1.default)(app).get('/reservation');
         (0, chai_1.expect)(res.headers['deprecation']).to.equal('true');
         (0, chai_1.expect)(res.headers['sunset']).to.match(/^\d{4}-\d{2}-\d{2}T/);
         (0, chai_1.expect)(res.headers['link']).to.include('rel="alternate"');

package/lib/test/integration/migration.spec.js

@@ -13,15 +13,20 @@ require("reflect-metadata");
 const chai_1 = require("chai");
 const bootstrap_1 = require("../../src/services/identity/bootstrap");
 const prisma_1 = require("../../src/prisma");
+const scratch_database_1 = require("../helpers/scratch-database");
 describe('bootstrapIdentity idempotency (integration)', function () {
     this.timeout(30000);
+    (0, scratch_database_1.useScratchDatabase)({ wholeSuite: true });
+    // On a fresh database, so the first run has a super-admin to create. On a
+    // developer's populated one both runs returned at once and proved nothing.
     it('running twice does not create duplicate users', () => __awaiter(this, void 0, void 0, function* () {
         const before = yield prisma_1.prisma.user.count();
+        (0, chai_1.expect)(before, 'a fresh database').to.equal(0);
         yield (0, bootstrap_1.bootstrapIdentity)();
         const after1 = yield prisma_1.prisma.user.count();
+        (0, chai_1.expect)(after1, 'the bootstrap super-admin').to.equal(1);
         yield (0, bootstrap_1.bootstrapIdentity)();
         const after2 = yield prisma_1.prisma.user.count();
         (0, chai_1.expect)(after2).to.equal(after1);
-        (0, chai_1.expect)(after1).to.be.greaterThanOrEqual(before);
     }));
 });

package/lib/test/integration/node-pair-auth-rest.spec.js

@@ -15,15 +15,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 require("reflect-metadata");
 const chai_1 = require("chai");
 const express_1 = __importDefault(require("express"));
-const supertest_1 = __importDefault(require("supertest"));
+const loopbackRequest_1 = __importDefault(require("../helpers/loopbackRequest"));
 const authMiddleware_1 = require("../../src/middleware/authMiddleware");
 const grid_1 = __importDefault(require("../../src/app/routers/grid"));
 const typedi_1 = require("typedi");
 const UserService_1 = require("../../src/services/UserService");
 const ApiKeyService_1 = require("../../src/services/ApiKeyService");
-const prisma_1 = require("../../src/prisma");
+const scratch_database_1 = require("../helpers/scratch-database");
 describe('node pair auth — REST /register (integration)', function () {
     this.timeout(60000);
+    (0, scratch_database_1.useScratchDatabase)({ wholeSuite: true });
     let nodeUser;
     let rawToken;
     before(() => __awaiter(this, void 0, void 0, function* () {
@@ -41,11 +42,6 @@ describe('node pair auth — REST /register (integration)', function () {
         });
         rawToken = tok.raw;
     }));
-    after(() => __awaiter(this, void 0, void 0, function* () {
-        yield prisma_1.prisma.apiKey.deleteMany({ where: { userId: nodeUser.id } });
-        yield prisma_1.prisma.userSession.deleteMany({ where: { userId: nodeUser.id } });
-        yield prisma_1.prisma.user.delete({ where: { id: nodeUser.id } });
-    }));
     function buildApp() {
         const app = (0, express_1.default)();
         app.use(express_1.default.json());
@@ -54,7 +50,7 @@ describe('node pair auth — REST /register (integration)', function () {
         return app;
     }
     it('pair (accessKey, token) → not 401/403', () => __awaiter(this, void 0, void 0, function* () {
-        const r = yield (0, supertest_1.default)(buildApp())
+        const r = yield (0, loopbackRequest_1.default)(buildApp())
             .post('/register')
             .query({ type: 'add' })
             .set('x-xenon-access-key', nodeUser.accessKey)
@@ -64,7 +60,7 @@ describe('node pair auth — REST /register (integration)', function () {
         (0, chai_1.expect)(r.status).to.not.equal(403);
     }));
     it('no auth headers → 401', () => __awaiter(this, void 0, void 0, function* () {
-        const r = yield (0, supertest_1.default)(buildApp())
+        const r = yield (0, loopbackRequest_1.default)(buildApp())
             .post('/register')
             .query({ type: 'add' })
             .send([]);

package/lib/test/integration/ports-router.spec.js

@@ -48,7 +48,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 require("reflect-metadata");
 const chai_1 = require("chai");
 const express_1 = __importDefault(require("express"));
-const supertest_1 = __importDefault(require("supertest"));
+const loopbackRequest_1 = __importDefault(require("../helpers/loopbackRequest"));
 const sinon_1 = __importDefault(require("sinon"));
 describe('POST /xenon/api/ports/allocate', () => {
     let app;
@@ -62,7 +62,7 @@ describe('POST /xenon/api/ports/allocate', () => {
         app.use('/xenon/api/ports', router.makeRouter({ allocator: { allocate: allocateStub } }));
     }));
     it('returns 200 with the allocated ports', () => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (0, supertest_1.default)(app)
+        const res = yield (0, loopbackRequest_1.default)(app)
             .post('/xenon/api/ports/allocate')
             .send({ udid: 'u1', host: 'h1', purposes: ['systemPort', 'chromedriverPort'], durationMs: 60000 });
         (0, chai_1.expect)(res.status).to.equal(200);
@@ -70,14 +70,14 @@ describe('POST /xenon/api/ports/allocate', () => {
         (0, chai_1.expect)(allocateStub.calledOnce).to.equal(true);
     }));
     it('returns 400 when purposes is missing or empty', () => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (0, supertest_1.default)(app)
+        const res = yield (0, loopbackRequest_1.default)(app)
             .post('/xenon/api/ports/allocate')
             .send({ udid: 'u1', host: 'h1', durationMs: 60000 });
         (0, chai_1.expect)(res.status).to.equal(400);
     }));
     it('returns 500 on allocator failure', () => __awaiter(void 0, void 0, void 0, function* () {
         allocateStub.rejects(new Error('boom'));
-        const res = yield (0, supertest_1.default)(app)
+        const res = yield (0, loopbackRequest_1.default)(app)
             .post('/xenon/api/ports/allocate')
             .send({ udid: 'u1', host: 'h1', purposes: ['systemPort'], durationMs: 60000 });
         (0, chai_1.expect)(res.status).to.equal(500);

package/lib/test/integration/prisma-device-store-add-devices.spec.js

@@ -13,6 +13,7 @@ require("reflect-metadata");
 const chai_1 = require("chai");
 const prisma_store_1 = require("../../src/data-service/prisma-store");
 const prisma_1 = require("../../src/prisma");
+const scratch_database_1 = require("../helpers/scratch-database");
 /**
  * PrismaDeviceStore.addDevices, run as real queries.
  *
@@ -23,6 +24,7 @@ const prisma_1 = require("../../src/prisma");
  */
 describe('PrismaDeviceStore.addDevices (integration)', function () {
     this.timeout(60000);
+    (0, scratch_database_1.useScratchDatabase)({ wholeSuite: true });
     const store = new prisma_store_1.PrismaDeviceStore();
     const stamp = Date.now();
     const HOST = `http://add-devices-${stamp}:4723`;
@@ -46,9 +48,6 @@ describe('PrismaDeviceStore.addDevices (integration)', function () {
             },
         });
     }));
-    after(() => __awaiter(this, void 0, void 0, function* () {
-        yield prisma_1.prisma.device.deleteMany({ where: { udid: { in: UDIDS } } });
-    }));
     it('refreshes a known phone’s discovery columns but leaves its session alone', () => __awaiter(this, void 0, void 0, function* () {
         const added = yield store.addDevices([phone(KNOWN, { sdk: '11', sessionStartTime: 0 })]);
         (0, chai_1.expect)(added).to.deep.equal([]);

package/lib/test/integration/prisma-device-store-team-filter.spec.js

@@ -15,6 +15,7 @@ const typedi_1 = require("typedi");
 const prisma_store_1 = require("../../src/data-service/prisma-store");
 const TeamService_1 = require("../../src/services/TeamService");
 const prisma_1 = require("../../src/prisma");
+const scratch_database_1 = require("../helpers/scratch-database");
 /**
  * The team filter on the Prisma device store, run as a real query.
  *
@@ -25,6 +26,7 @@ const prisma_1 = require("../../src/prisma");
  */
 describe('PrismaDeviceStore team filter (integration)', function () {
     this.timeout(60000);
+    (0, scratch_database_1.useScratchDatabase)({ wholeSuite: true });
     const store = new prisma_store_1.PrismaDeviceStore();
     let teamA;
     let teamB;
@@ -51,11 +53,6 @@ describe('PrismaDeviceStore team filter (integration)', function () {
     beforeEach(() => __awaiter(this, void 0, void 0, function* () {
         yield prisma_1.prisma.device.updateMany({ where: { udid: { in: UDIDS } }, data: { busy: false } });
     }));
-    after(() => __awaiter(this, void 0, void 0, function* () {
-        yield prisma_1.prisma.device.deleteMany({ where: { udid: { in: UDIDS } } });
-        yield prisma_1.prisma.team.delete({ where: { id: teamA.id } }).catch(() => undefined);
-        yield prisma_1.prisma.team.delete({ where: { id: teamB.id } }).catch(() => undefined);
-    }));
     const udidsOf = (rows) => rows.map((r) => r.udid).sort();
     const busy = (udid) => __awaiter(this, void 0, void 0, function* () { var _a; return !!((_a = (yield prisma_1.prisma.device.findFirst({ where: { udid, host: HOST } }))) === null || _a === void 0 ? void 0 : _a.busy); });
     it('getDevices with one team returns the shared phone and that team’s', () => __awaiter(this, void 0, void 0, function* () {

package/lib/test/integration/profile-tokens.spec.js

@@ -15,20 +15,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 require("reflect-metadata");
 const chai_1 = require("chai");
 const express_1 = __importDefault(require("express"));
-const supertest_1 = __importDefault(require("supertest"));
+const loopbackRequest_1 = __importDefault(require("../helpers/loopbackRequest"));
 const profile_1 = require("../../src/app/routers/profile");
 const authMiddleware_1 = require("../../src/middleware/authMiddleware");
 const typedi_1 = require("typedi");
 const UserService_1 = require("../../src/services/UserService");
 const UserSessionService_1 = require("../../src/services/UserSessionService");
-const prisma_1 = require("../../src/prisma");
+const scratch_database_1 = require("../helpers/scratch-database");
 describe('profile/tokens (integration)', function () {
     this.timeout(30000);
+    (0, scratch_database_1.useScratchDatabase)({ wholeSuite: true });
     let user;
     let cookie;
     before(() => __awaiter(this, void 0, void 0, function* () {
-        yield prisma_1.prisma.userSession.deleteMany({ where: { user: { email: 'tokens-it@xenon.local' } } });
-        yield prisma_1.prisma.user.deleteMany({ where: { email: 'tokens-it@xenon.local' } });
         user = yield typedi_1.Container.get(UserService_1.UserService).createUser({
             email: 'tokens-it@xenon.local',
             name: 'Tokens IT',
@@ -38,40 +37,35 @@ describe('profile/tokens (integration)', function () {
         const session = yield typedi_1.Container.get(UserSessionService_1.UserSessionService).create(user.id);
         cookie = `xenon_dashboard_session=${session.id}`;
     }));
-    after(() => __awaiter(this, void 0, void 0, function* () {
-        yield prisma_1.prisma.apiKey.deleteMany({ where: { userId: user.id } });
-        yield prisma_1.prisma.userSession.deleteMany({ where: { userId: user.id } });
-        yield prisma_1.prisma.user.delete({ where: { id: user.id } });
-    }));
     it('creates and lists a token; rotating accessKey keeps the token valid', () => __awaiter(this, void 0, void 0, function* () {
         const app = (0, express_1.default)();
         app.use(express_1.default.json());
         app.use(authMiddleware_1.authMiddleware);
         app.use('/profile', (0, profile_1.profileRouter)());
-        const created = yield (0, supertest_1.default)(app)
+        const created = yield (0, loopbackRequest_1.default)(app)
             .post('/profile/tokens')
             .set('Cookie', cookie)
             .send({ name: 'CI' });
         (0, chai_1.expect)(created.status).to.equal(201);
         const token = created.body.token;
-        const list = yield (0, supertest_1.default)(app).get('/profile/tokens').set('Cookie', cookie);
+        const list = yield (0, loopbackRequest_1.default)(app).get('/profile/tokens').set('Cookie', cookie);
         (0, chai_1.expect)(list.body.length).to.equal(1);
-        const me = yield (0, supertest_1.default)(app).get('/profile/access-key').set('Cookie', cookie);
+        const me = yield (0, loopbackRequest_1.default)(app).get('/profile/access-key').set('Cookie', cookie);
         const ak = me.body.accessKey;
-        const headerCheck = yield (0, supertest_1.default)(app)
+        const headerCheck = yield (0, loopbackRequest_1.default)(app)
             .get('/profile/tokens')
             .set('x-xenon-access-key', ak)
             .set('x-xenon-token', token);
         (0, chai_1.expect)(headerCheck.status).to.equal(200);
-        const rotated = yield (0, supertest_1.default)(app).post('/profile/access-key/rotate').set('Cookie', cookie);
+        const rotated = yield (0, loopbackRequest_1.default)(app).post('/profile/access-key/rotate').set('Cookie', cookie);
         const newAk = rotated.body.accessKey;
         (0, chai_1.expect)(newAk).to.not.equal(ak);
-        const afterRotate = yield (0, supertest_1.default)(app)
+        const afterRotate = yield (0, loopbackRequest_1.default)(app)
             .get('/profile/tokens')
             .set('x-xenon-access-key', newAk)
             .set('x-xenon-token', token);
         (0, chai_1.expect)(afterRotate.status).to.equal(200);
-        const oldFails = yield (0, supertest_1.default)(app)
+        const oldFails = yield (0, loopbackRequest_1.default)(app)
             .get('/profile/tokens')
             .set('x-xenon-access-key', ak)
             .set('x-xenon-token', token);

package/lib/test/integration/recordings-router.spec.js

@@ -16,7 +16,7 @@ require("reflect-metadata");
 const chai_1 = require("chai");
 const sinon_1 = __importDefault(require("sinon"));
 const express_1 = __importDefault(require("express"));
-const supertest_1 = __importDefault(require("supertest"));
+const loopbackRequest_1 = __importDefault(require("../helpers/loopbackRequest"));
 const typedi_1 = require("typedi");
 const recordings_1 = __importDefault(require("../../src/app/routers/recordings"));
 const authMiddleware_1 = require("../../src/middleware/authMiddleware");
@@ -76,7 +76,7 @@ describe('Recordings router (integration)', () => {
             startedAt: new Date(),
             compositeEnabled: false,
         });
-        const r = yield (0, supertest_1.default)(makeApp())
+        const r = yield (0, loopbackRequest_1.default)(makeApp())
             .post('/xenon/api/recordings')
             .send({ udids: ['U1'] });
         (0, chai_1.expect)(r.status).to.equal(202);
@@ -88,7 +88,7 @@ describe('Recordings router (integration)', () => {
             .rejects(new RecordingOrchestrator_1.RecordingError('device_busy', [
             { udid: 'U2', reason: 'automation', sessionId: 'sess-x' },
         ]));
-        const r = yield (0, supertest_1.default)(makeApp())
+        const r = yield (0, loopbackRequest_1.default)(makeApp())
             .post('/xenon/api/recordings')
             .send({ udids: ['U1', 'U2'] });
         (0, chai_1.expect)(r.status).to.equal(409);
@@ -101,7 +101,7 @@ describe('Recordings router (integration)', () => {
         sinon_1.default
             .stub(typedi_1.Container.get(RecordingOrchestrator_1.RecordingOrchestrator), 'start')
             .rejects(new RecordingOrchestrator_1.RecordingError('concurrency_cap', undefined, 4, 4));
-        const r = yield (0, supertest_1.default)(makeApp())
+        const r = yield (0, loopbackRequest_1.default)(makeApp())
             .post('/xenon/api/recordings')
             .send({ udids: ['U1'] });
         (0, chai_1.expect)(r.status).to.equal(409);
@@ -109,16 +109,16 @@ describe('Recordings router (integration)', () => {
     }));
     it('POST /recordings: 400 when udids missing or empty', () => __awaiter(void 0, void 0, void 0, function* () {
         const app = makeApp();
-        yield (0, supertest_1.default)(app).post('/xenon/api/recordings').send({}).expect(400);
-        yield (0, supertest_1.default)(app).post('/xenon/api/recordings').send({ udids: [] }).expect(400);
-        yield (0, supertest_1.default)(app).post('/xenon/api/recordings').send({ udids: [123] }).expect(400);
+        yield (0, loopbackRequest_1.default)(app).post('/xenon/api/recordings').send({}).expect(400);
+        yield (0, loopbackRequest_1.default)(app).post('/xenon/api/recordings').send({ udids: [] }).expect(400);
+        yield (0, loopbackRequest_1.default)(app).post('/xenon/api/recordings').send({ udids: [123] }).expect(400);
     }));
     it('POST /recordings/:groupId/stop: 200', () => __awaiter(void 0, void 0, void 0, function* () {
         sinon_1.default.stub(typedi_1.Container.get(RecordingOrchestrator_1.RecordingOrchestrator), 'stop').resolves({
             groupId: 'g-1',
             recordings: [{ id: 'r-1', udid: 'U1', status: 'STOPPED', durationMs: 5000, sizeBytes: 1024 }],
         });
-        const r = yield (0, supertest_1.default)(makeApp()).post('/xenon/api/recordings/g-1/stop');
+        const r = yield (0, loopbackRequest_1.default)(makeApp()).post('/xenon/api/recordings/g-1/stop');
         (0, chai_1.expect)(r.status).to.equal(200);
         (0, chai_1.expect)(r.body.recordings[0].status).to.equal('STOPPED');
     }));
@@ -127,11 +127,11 @@ describe('Recordings router (integration)', () => {
         sinon_1.default
             .stub(typedi_1.Container.get(RecordingOrchestrator_1.RecordingOrchestrator), 'addBookmark')
             .resolves({ id: 'bm-1', label: 'bug here' });
-        const ok = yield (0, supertest_1.default)(makeApp())
+        const ok = yield (0, loopbackRequest_1.default)(makeApp())
             .post('/xenon/api/recordings/g-1/bookmark')
             .send({ recordingId: 'r-1', timecodeMs: 1000, label: 'bug here' });
         (0, chai_1.expect)(ok.status).to.equal(201);
-        const bad = yield (0, supertest_1.default)(makeApp())
+        const bad = yield (0, loopbackRequest_1.default)(makeApp())
             .post('/xenon/api/recordings/g-1/bookmark')
             .send({ timecodeMs: 1000 });
         (0, chai_1.expect)(bad.status).to.equal(400);
@@ -166,7 +166,7 @@ describe('Recordings router (integration)', () => {
             startedAt: new Date(),
             compositeEnabled: false,
         });
-        const r = yield (0, supertest_1.default)(makeBearerApp())
+        const r = yield (0, loopbackRequest_1.default)(makeBearerApp())
             .post('/xenon/api/recordings')
             .send({ udids: ['U1'] });
         (0, chai_1.expect)(r.status).to.equal(202);
@@ -176,7 +176,7 @@ describe('Recordings router (integration)', () => {
             groupId: 'g-1',
             recordings: [{ id: 'r-2', udid: 'U2', status: 'RECORDING' }],
         });
-        const r = yield (0, supertest_1.default)(makeBearerApp())
+        const r = yield (0, loopbackRequest_1.default)(makeBearerApp())
             .post('/xenon/api/recordings/g-1/add-device')
             .send({ udid: 'U2' });
         (0, chai_1.expect)(r.status).to.equal(201);
@@ -215,7 +215,7 @@ describe('Recordings router (integration)', () => {
             startedAt: new Date(),
             compositeEnabled: false,
         });
-        const r = yield (0, supertest_1.default)(makeHeaderPairApp())
+        const r = yield (0, loopbackRequest_1.default)(makeHeaderPairApp())
             .post('/xenon/api/recordings')
             .send({ udids: ['U1'] });
         (0, chai_1.expect)(r.status).to.equal(202);
@@ -227,7 +227,7 @@ describe('Recordings router (integration)', () => {
             groupId: 'g-1',
             recordings: [{ id: 'r-2', udid: 'U2', status: 'RECORDING' }],
         });
-        const r = yield (0, supertest_1.default)(makeHeaderPairApp())
+        const r = yield (0, loopbackRequest_1.default)(makeHeaderPairApp())
             .post('/xenon/api/recordings/g-1/add-device')
             .send({ udid: 'U2' });
         (0, chai_1.expect)(r.status).to.equal(201);
@@ -239,7 +239,7 @@ describe('Recordings router (integration)', () => {
         sinon_1.default
             .stub(typedi_1.Container.get(RecordingOrchestrator_1.RecordingOrchestrator), 'addAnnotation')
             .resolves({ id: 'an-1' });
-        const ok = yield (0, supertest_1.default)(makeApp())
+        const ok = yield (0, loopbackRequest_1.default)(makeApp())
             .post('/xenon/api/recordings/g-1/annotation')
             .send({
             recordingId: 'r-1',
@@ -249,7 +249,7 @@ describe('Recordings router (integration)', () => {
             color: '#ff0000',
         });
         (0, chai_1.expect)(ok.status).to.equal(201);
-        const bad = yield (0, supertest_1.default)(makeApp())
+        const bad = yield (0, loopbackRequest_1.default)(makeApp())
             .post('/xenon/api/recordings/g-1/annotation')
             .send({ shape: 'RECT' });
         (0, chai_1.expect)(bad.status).to.equal(400);

package/lib/test/integration/reset-revokes-sessions.spec.js

@@ -15,20 +15,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 require("reflect-metadata");
 const chai_1 = require("chai");
 const express_1 = __importDefault(require("express"));
-const supertest_1 = __importDefault(require("supertest"));
+const loopbackRequest_1 = __importDefault(require("../helpers/loopbackRequest"));
 const auth_1 = require("../../src/app/routers/auth");
 const typedi_1 = require("typedi");
 const UserService_1 = require("../../src/services/UserService");
 const UserSessionService_1 = require("../../src/services/UserSessionService");
 const PasswordResetService_1 = require("../../src/services/PasswordResetService");
 const prisma_1 = require("../../src/prisma");
+const scratch_database_1 = require("../helpers/scratch-database");
 describe('reset-password revokes all sessions', function () {
     this.timeout(30000);
+    (0, scratch_database_1.useScratchDatabase)({ wholeSuite: true });
     const email = 'reset-revokes-it@xenon.local';
     let user;
     before(() => __awaiter(this, void 0, void 0, function* () {
-        yield prisma_1.prisma.userSession.deleteMany({ where: { user: { email } } });
-        yield prisma_1.prisma.user.deleteMany({ where: { email } });
         user = yield typedi_1.Container.get(UserService_1.UserService).createUser({
             email,
             name: 'Reset Revokes IT',
@@ -36,11 +36,6 @@ describe('reset-password revokes all sessions', function () {
             role: 'MEMBER',
         });
     }));
-    after(() => __awaiter(this, void 0, void 0, function* () {
-        yield prisma_1.prisma.passwordResetToken.deleteMany({ where: { userId: user.id } });
-        yield prisma_1.prisma.userSession.deleteMany({ where: { userId: user.id } });
-        yield prisma_1.prisma.user.delete({ where: { id: user.id } });
-    }));
     it('deletes every UserSession for the resetting user', () => __awaiter(this, void 0, void 0, function* () {
         const sessions = [
             yield typedi_1.Container.get(UserSessionService_1.UserSessionService).create(user.id),
@@ -51,7 +46,7 @@ describe('reset-password revokes all sessions', function () {
         const app = (0, express_1.default)();
         app.use(express_1.default.json());
         app.use('/auth', (0, auth_1.authPublicRouter)());
-        const r = yield (0, supertest_1.default)(app)
+        const r = yield (0, loopbackRequest_1.default)(app)
             .post('/auth/reset-password')
             .send({ token: raw, newPassword: 'BrandNewPw1' });
         (0, chai_1.expect)(r.status).to.equal(204);

package/lib/test/integration/role-matrix.spec.js

@@ -15,13 +15,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 require("reflect-metadata");
 const chai_1 = require("chai");
 const express_1 = __importDefault(require("express"));
-const supertest_1 = __importDefault(require("supertest"));
+const loopbackRequest_1 = __importDefault(require("../helpers/loopbackRequest"));
 const authMiddleware_1 = require("../../src/middleware/authMiddleware");
 const apikeys_1 = require("../../src/app/routers/apikeys");
 const teams_1 = require("../../src/app/routers/teams");
 const processes_1 = require("../../src/app/routers/processes");
 const users_1 = require("../../src/app/routers/users");
-const prisma_1 = require("../../src/prisma");
+const scratch_database_1 = require("../helpers/scratch-database");
 const seedUser_1 = require("../helpers/seedUser");
 // scopesForRole now grants ADMIN the full 'admin,devices,sessions,read' set on
 // cookie sessions (the user themselves logged in via /login). Token-default
@@ -84,6 +84,7 @@ function buildApp() {
 }
 describe('role matrix (integration)', function () {
     this.timeout(60000);
+    (0, scratch_database_1.useScratchDatabase)({ wholeSuite: true });
     let users;
     before(() => __awaiter(this, void 0, void 0, function* () {
         users = {
@@ -92,18 +93,12 @@ describe('role matrix (integration)', function () {
             MEMBER: yield (0, seedUser_1.seedUser)('MEMBER'),
         };
     }));
-    after(() => __awaiter(this, void 0, void 0, function* () {
-        yield users.SUPER_ADMIN.cleanup();
-        yield users.ADMIN.cleanup();
-        yield users.MEMBER.cleanup();
-        yield prisma_1.prisma.user.deleteMany({ where: { email: { contains: 'rmcase-' } } });
-    }));
     CASES.forEach((c) => {
         ['SUPER_ADMIN', 'ADMIN', 'MEMBER'].forEach((role) => {
             it(`${role} ${c.method} ${c.path} → expect ${c.expect[role]}`, () => __awaiter(this, void 0, void 0, function* () {
                 const app = buildApp();
                 const expected = c.expect[role];
-                const reqBuilder = (0, supertest_1.default)(app)[c.method.toLowerCase()](c.path).set('Cookie', users[role].cookie);
+                const reqBuilder = (0, loopbackRequest_1.default)(app)[c.method.toLowerCase()](c.path).set('Cookie', users[role].cookie);
                 const body = typeof c.body === 'function' ? c.body() : c.body;
                 const r = body ? yield reqBuilder.send(body) : yield reqBuilder;
                 if (expected >= 200 && expected < 300) {

package/lib/test/integration/sdk-leases-router.spec.js

@@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 require("reflect-metadata");
 const chai_1 = require("chai");
 const express_1 = __importDefault(require("express"));
-const supertest_1 = __importDefault(require("supertest"));
+const loopbackRequest_1 = __importDefault(require("../helpers/loopbackRequest"));
 const sinon_1 = __importDefault(require("sinon"));
 // Static imports (recordings-router.spec idiom): the previous extensionless
 // dynamic `await import(...)` fails to resolve when Node's native ESM loader
@@ -53,7 +53,7 @@ describe('POST /xenon/api/sdk/leases', () => {
             allocatedPorts: { systemPort: 9001 },
             appiumCapabilities: { 'appium:udid': 'u1', 'xe:options': { leaseId: 'lse_1' } },
         });
-        const res = yield (0, supertest_1.default)(app)
+        const res = yield (0, loopbackRequest_1.default)(app)
             .post('/xenon/api/sdk/leases')
             .send({ filters: { platform: 'android' }, durationMs: 60000, heartbeatSeconds: 30 });
         (0, chai_1.expect)(res.status).to.equal(201);
@@ -62,7 +62,7 @@ describe('POST /xenon/api/sdk/leases', () => {
     }));
     it('records the api-key principal as actor/team on create', () => __awaiter(void 0, void 0, void 0, function* () {
         leaseSvc.create.resolves({ leaseId: 'lse_1', leaseToken: 't'.repeat(64) });
-        yield (0, supertest_1.default)(app)
+        yield (0, loopbackRequest_1.default)(app)
             .post('/xenon/api/sdk/leases')
             .send({ filters: { platform: 'android' } });
         (0, chai_1.expect)(leaseSvc.create.calledOnce).to.equal(true);
@@ -91,7 +91,7 @@ describe('POST /xenon/api/sdk/leases', () => {
         });
         bearerApp.use('/xenon/api/sdk/leases', (0, sdk_leases_1.makeRouter)({ leaseService: leaseSvc }));
         leaseSvc.create.resolves({ leaseId: 'lse_2', leaseToken: 't'.repeat(64) });
-        const res = yield (0, supertest_1.default)(bearerApp)
+        const res = yield (0, loopbackRequest_1.default)(bearerApp)
             .post('/xenon/api/sdk/leases')
             .send({ filters: { platform: 'android' } });
         (0, chai_1.expect)(res.status).to.equal(201);
@@ -103,7 +103,7 @@ describe('POST /xenon/api/sdk/leases', () => {
     }));
     it('returns 404 when no device matches', () => __awaiter(void 0, void 0, void 0, function* () {
         leaseSvc.create.rejects(new LeaseService_1.NoMatchingDevice('no device'));
-        const res = yield (0, supertest_1.default)(app)
+        const res = yield (0, loopbackRequest_1.default)(app)
             .post('/xenon/api/sdk/leases')
             .send({ filters: { platform: 'android', udid: 'absent' }, durationMs: 60000 });
         (0, chai_1.expect)(res.status).to.equal(404);
@@ -111,23 +111,23 @@ describe('POST /xenon/api/sdk/leases', () => {
     }));
     it('heartbeat: 200 with valid token; 403 without', () => __awaiter(void 0, void 0, void 0, function* () {
         leaseSvc.heartbeat.resolves({ heartbeatedAt: Date.now(), expiresAt: Date.now() + 60000 });
-        const res1 = yield (0, supertest_1.default)(app)
+        const res1 = yield (0, loopbackRequest_1.default)(app)
             .post('/xenon/api/sdk/leases/lse_1/heartbeat')
             .set('x-xenon-lease-token', 'cleartext');
         (0, chai_1.expect)(res1.status).to.equal(200);
-        const res2 = yield (0, supertest_1.default)(app).post('/xenon/api/sdk/leases/lse_1/heartbeat');
+        const res2 = yield (0, loopbackRequest_1.default)(app).post('/xenon/api/sdk/leases/lse_1/heartbeat');
         (0, chai_1.expect)(res2.status).to.equal(403);
     }));
     it('heartbeat: 403 on token mismatch from service', () => __awaiter(void 0, void 0, void 0, function* () {
         leaseSvc.heartbeat.rejects(new LeaseService_1.LeaseTokenMismatch());
-        const res = yield (0, supertest_1.default)(app)
+        const res = yield (0, loopbackRequest_1.default)(app)
             .post('/xenon/api/sdk/leases/lse_1/heartbeat')
             .set('x-xenon-lease-token', 'wrong');
         (0, chai_1.expect)(res.status).to.equal(403);
     }));
     it('heartbeat: 410 Gone on expired lease', () => __awaiter(void 0, void 0, void 0, function* () {
         leaseSvc.heartbeat.rejects(new LeaseService_1.LeaseGone('expired'));
-        const res = yield (0, supertest_1.default)(app)
+        const res = yield (0, loopbackRequest_1.default)(app)
             .post('/xenon/api/sdk/leases/lse_1/heartbeat')
             .set('x-xenon-lease-token', 'whatever');
         (0, chai_1.expect)(res.status).to.equal(410);