@xenon-device-management/xenon 1.29.0 → 2.0.0

package/lib/src/dashboard/services/app-service.js

@@ -21,6 +21,7 @@ const appium_adb_1 = require("appium-adb");
 const logger_1 = __importDefault(require("../../logger"));
 const uuid_1 = require("uuid");
 const crypto_1 = __importDefault(require("crypto"));
+const appVisibility_1 = require("../../services/device-access/appVisibility");
 class AppService {
     constructor() {
         this.ensureAppDir();
@@ -35,9 +36,15 @@ class AppService {
             }
         });
     }
-    getApps() {
+    /**
+     * The apps a caller may see (`teamIds` as on req.auth: undefined is an
+     * admin), newest first, each with its team's name for the Team column.
+     */
+    getApps(teamIds) {
         return __awaiter(this, void 0, void 0, function* () {
             return yield prisma_1.prisma.app.findMany({
+                where: (0, appVisibility_1.visibleAppWhere)(teamIds),
+                include: { team: { select: { id: true, name: true } } },
                 orderBy: { createdAt: 'desc' },
             });
         });
@@ -77,8 +84,22 @@ class AppService {
             }
         });
     }
-    uploadApp(file) {
+    /** Moves an app to a team, or to the shared pool with null. Returns rows changed (0 or 1). */
+    setAppTeam(id, teamId) {
         return __awaiter(this, void 0, void 0, function* () {
+            const result = yield prisma_1.prisma.app.updateMany({ where: { id }, data: { teamId } });
+            return result.count;
+        });
+    }
+    /**
+     * Stores an uploaded app in `teamId`'s team, or shared when null.
+     *
+     * The same bytes (by md5, which is unique) are stored once: re-uploading
+     * them returns the existing app unchanged, in whatever team it is already
+     * in. An admin who wants it elsewhere moves it with PUT /apps/:id/team.
+     */
+    uploadApp(file_1) {
+        return __awaiter(this, arguments, void 0, function* (file, teamId = null) {
             var _a;
             yield this.ensureAppDir();
             // Calculate MD5 to check for duplicates
@@ -125,6 +146,7 @@ class AppService {
                     version,
                     platform,
                     md5,
+                    teamId,
                 },
             });
         });

package/lib/src/data-service/device-service.js

@@ -184,8 +184,9 @@ function filterRowsByVisibleDevice(rows, teamIds, udidField) {
         if (teamIds === undefined)
             return rows;
         const udids = Array.from(new Set(rows.map((r) => String(r[udidField])).filter(Boolean)));
+        // A row with no udid has no phone to be visible through (fail closed).
         if (udids.length === 0)
-            return rows;
+            return [];
         const devices = yield prisma_1.prisma.device.findMany({
             where: { udid: { in: udids } },
             select: { udid: true, teamId: true },

package/lib/src/data-service/queue-service.js

@@ -118,12 +118,13 @@ let QueueService = class QueueService {
         });
     }
     /**
-     * Returns a high-level summary of the entire queue
+     * Returns a high-level summary of the entire queue. Pass the pending rows
+     * already read, so a caller's other counts come from the same read.
      */
-    getQueueSummary() {
+    getQueueSummary(pending) {
         return __awaiter(this, void 0, void 0, function* () {
             logger_1.default.info('[QueueService] Calculating global queue summary');
-            const allPending = yield this.pendingStore.getAllPendingSessions();
+            const allPending = pending !== null && pending !== void 0 ? pending : (yield this.pendingStore.getAllPendingSessions());
             const platforms = [
                 ...new Set(allPending.map((s) => { var _a; return (((_a = s.alwaysMatch) === null || _a === void 0 ? void 0 : _a.platformName) || s.platformName || 'any').toLowerCase(); })),
             ];

package/lib/src/device-utils.js

@@ -159,7 +159,7 @@ const NO_LEASE_PROOF = {
  * and update the capability json with required device informations
  * @param capability
  * @param leaseProof who the session is, and the lease token it sent; only a
- *   session naming a lease in `xenon:options.leaseId` reads it
+ *   session naming a lease in `xe:options.leaseId` reads it
  * @returns
  */
 function allocateDeviceForSession(capability_1, deviceTimeOutMs_1, deviceQueryIntervalMs_1, pluginArgs_1, callerTeamIds_1) {