@xen-orchestra/rest-api 0.12.0 → 0.13.1

package/dist/groups/group.controller.mjs

@@ -7,10 +7,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-import { Delete, Example, Get, Path, Query, Request, Response, Route, Security, SuccessResponse, Tags } from 'tsoa';
+import { Body, Delete, Example, Get, Middlewares, Patch, Path, Post, Put, Query, Request, Response, Route, Security, SuccessResponse, Tags, } from 'tsoa';
+import { json } from 'express';
 import { provide } from 'inversify-binding-decorators';
-import { noContentResp, notFoundResp, unauthorizedResp } from '../open-api/common/response.common.mjs';
-import { group, groupIds, partialGroups } from '../open-api/oa-examples/group.oa-example.mjs';
+import { forbiddenOperation } from 'xo-common/api-errors.js';
+import { createdResp, forbiddenOperationResp, invalidParameters, noContentResp, notFoundResp, resourceAlreadyExists, unauthorizedResp, } from '../open-api/common/response.common.mjs';
+import { group, groupId, groupIds, partialGroups } from '../open-api/oa-examples/group.oa-example.mjs';
 import { XoController } from '../abstract-classes/xo-controller.mjs';
 let GroupController = class GroupController extends XoController {
     // --- abstract methods
@@ -34,6 +36,26 @@ let GroupController = class GroupController extends XoController {
     getGroup(id) {
         return this.getObject(id);
     }
+    /**
+     * @example id "c98395a7-26d8-4e09-b055-d5f0f4a98312"
+     * @example body { "name": "new group name" }
+     */
+    async updateGroup(id, body) {
+        const group = await this.getObject(id);
+        if (group.provider !== undefined) {
+            throw forbiddenOperation('update group', 'synchronized group');
+        }
+        await this.restApi.xoApp.updateGroup(group.id, body);
+    }
+    /**
+     *  @example body {
+     *    "name": "new group"
+     *  }
+     */
+    async createGroup(body) {
+        const group = await this.restApi.xoApp.createGroup(body);
+        return { id: group.id };
+    }
     /**
      * @example id "7d98fee4-3357-41a7-ac3f-9124212badb7"
      */
@@ -41,6 +63,28 @@ let GroupController = class GroupController extends XoController {
         const groupId = id;
         await this.restApi.xoApp.deleteGroup(groupId);
     }
+    /**
+     * @example id "c98395a7-26d8-4e09-b055-d5f0f4a98312"
+     * @example userId "722d17b9-699b-49d2-8193-be1ac573d3de"
+     */
+    async removeUserFromGroup(id, userId) {
+        const group = await this.getObject(id);
+        if (group.provider !== undefined) {
+            throw forbiddenOperation('remove user from group', 'synchronized group');
+        }
+        await this.restApi.xoApp.removeUserFromGroup(userId, group.id);
+    }
+    /**
+     * @example id "6c81b5e1-afc1-43ea-8f8d-939ceb5f3f90"
+     * @example userId "722d17b9-699b-49d2-8193-be1ac573d3de"
+     */
+    async addUserToGroup(id, userId) {
+        const group = await this.getObject(id);
+        if (group.provider !== undefined) {
+            throw forbiddenOperation('add user to group', 'synchronized group');
+        }
+        await this.restApi.xoApp.addUserToGroup(userId, group.id);
+    }
 };
 __decorate([
     Example(groupIds),
@@ -58,12 +102,47 @@ __decorate([
     Response(notFoundResp.status, notFoundResp.description),
     __param(0, Path())
 ], GroupController.prototype, "getGroup", null);
+__decorate([
+    Patch('{id}'),
+    Middlewares(json()),
+    SuccessResponse(noContentResp.status, noContentResp.description),
+    Response(notFoundResp.status, notFoundResp.description),
+    Response(resourceAlreadyExists.status, resourceAlreadyExists.description),
+    Response(forbiddenOperationResp.status, forbiddenOperationResp.description),
+    __param(0, Path()),
+    __param(1, Body())
+], GroupController.prototype, "updateGroup", null);
+__decorate([
+    Example(groupId),
+    Post(''),
+    Middlewares(json()),
+    SuccessResponse(createdResp.status, createdResp.description),
+    Response(invalidParameters.status, invalidParameters.description),
+    Response(resourceAlreadyExists.status, resourceAlreadyExists.description),
+    __param(0, Body())
+], GroupController.prototype, "createGroup", null);
 __decorate([
     Delete('{id}'),
     SuccessResponse(noContentResp.status, noContentResp.description),
     Response(notFoundResp.status, notFoundResp.description),
     __param(0, Path())
 ], GroupController.prototype, "deleteGroup", null);
+__decorate([
+    Delete('{id}/users/{userId}'),
+    SuccessResponse(noContentResp.status, noContentResp.description),
+    Response(notFoundResp.status, notFoundResp.description),
+    Response(forbiddenOperationResp.status, forbiddenOperationResp.description),
+    __param(0, Path()),
+    __param(1, Path())
+], GroupController.prototype, "removeUserFromGroup", null);
+__decorate([
+    Put('{id}/users/{userId}'),
+    SuccessResponse(noContentResp.status, noContentResp.description),
+    Response(notFoundResp.status, notFoundResp.description),
+    Response(forbiddenOperationResp.status, forbiddenOperationResp.description),
+    __param(0, Path()),
+    __param(1, Path())
+], GroupController.prototype, "addUserToGroup", null);
 GroupController = __decorate([
     Route('groups'),
     Security('*'),

package/dist/groups/group.type.mjs

@@ -0,0 +1 @@
+export {};

package/dist/hosts/host.service.mjs

@@ -17,12 +17,12 @@ export class HostService {
         for (const id in hosts) {
             total++;
             const host = hosts[id];
-            if (!host.enabled) {
-                nDisabled++;
-                continue;
-            }
             switch (host.power_state) {
                 case HOST_POWER_STATE.RUNNING:
+                    if (!host.enabled) {
+                        nDisabled++;
+                        break;
+                    }
                     nRunning++;
                     break;
                 case HOST_POWER_STATE.HALTED:

package/dist/middlewares/generic-error-handler.middleware.mjs

@@ -9,7 +9,10 @@ export default function genericErrorHandler(error, req, res, _next) {
         res.status(500).json({ error });
         return;
     }
-    const responseError = { error: error.message };
+    const responseError = {
+        error: error.message,
+        data: 'data' in error ? error.data : undefined,
+    };
     let statusCode;
     if (noSuchObject.is(error)) {
         statusCode = 404;
@@ -19,7 +22,6 @@ export default function genericErrorHandler(error, req, res, _next) {
     }
     else if (featureUnauthorized.is(error)) {
         statusCode = 403;
-        responseError.data = error.data;
     }
     else if (invalidCredentials.is(error)) {
         statusCode = 401;
@@ -35,7 +37,6 @@ export default function genericErrorHandler(error, req, res, _next) {
     }
     else if (incorrectState.is(error)) {
         statusCode = 409;
-        responseError.data = error.data;
     }
     else {
         if (error.name === 'XapiError') {

package/dist/open-api/common/response.common.mjs

@@ -35,3 +35,7 @@ export const invalidParameters = {
     status: 422,
     description: 'Invalid parameters',
 };
+export const forbiddenOperationResp = {
+    status: 403,
+    description: 'Forbidden',
+};

package/dist/open-api/oa-examples/group.oa-example.mjs

@@ -21,3 +21,6 @@ export const group = {
     users: ['722d17b9-699b-49d2-8193-be1ac573d3de'],
     id: '7d98fee4-3357-41a7-ac3f-9124212badb7',
 };
+export const groupId = {
+    id: '67bfee1d-a021-4307-a53a-9fec2b2bd67d',
+};