Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/migrate-users-delete-to-AJV.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@rocket.chat/rest-typings': minor
'@rocket.chat/meteor': minor
---

Migrate users.delete endpoint to make it openAPI and AJV compatible
58 changes: 43 additions & 15 deletions apps/meteor/app/api/server/v1/users.ts
Original file line number Diff line number Diff line change
Expand Up @@ -345,21 +345,6 @@ API.v1.addRoute(
},
);

API.v1.addRoute(
'users.delete',
{ authRequired: true, permissionsRequired: ['delete-user'] },
{
async post() {
const user = await getUserFromParams(this.bodyParams);
const { confirmRelinquish = false } = this.bodyParams;

const { deletedRooms } = await deleteUser(user._id, confirmRelinquish, this.userId);

return API.v1.success({ deletedRooms });
},
},
);

API.v1.addRoute(
'users.deleteOwnAccount',
{ authRequired: true },
Expand Down Expand Up @@ -878,6 +863,49 @@ const usersEndpoints = API.v1

return API.v1.success({ suggestions });
},
)
.post(
'users.delete',
{
authRequired: true,
permissionsRequired: ['delete-user'],
body: ajv.compile({
type: 'object',
properties: {
userId: { type: 'string' },
username: { type: 'string' },
confirmRelinquish: { type: 'boolean' },
},
additionalProperties: true,
}),
response: {
200: ajv.compile({
type: 'object',
properties: {
deletedRooms: {
type: 'array',
items: { type: 'string' },
},
success: {
type: 'boolean',
enum: [true],
},
},
required: ['deletedRooms', 'success'],
additionalProperties: false,
}),
401: validateUnauthorizedErrorResponse,
400: validateBadRequestErrorResponse,
},
},
async function action() {
const user = await getUserFromParams(this.bodyParams);
const { confirmRelinquish = false } = this.bodyParams;

const { deletedRooms } = await deleteUser(user._id, confirmRelinquish, this.userId);

return API.v1.success({ deletedRooms });
},
);

API.v1.addRoute(
Expand Down
4 changes: 0 additions & 4 deletions packages/rest-typings/src/v1/users.ts
Original file line number Diff line number Diff line change
Expand Up @@ -351,10 +351,6 @@ export type UsersEndpoints = {
};
};

'/v1/users.delete': {
POST: (params: { userId: IUser['_id']; confirmRelinquish?: boolean }) => void;
};

'/v1/users.getAvatar': {
GET: (params: { userId?: string; username?: string; user?: string }) => void;
};
Expand Down