btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

chore: feedback updated

Browse Source
This commit is contained in:
mirarifhasan
2024-02-12 21:36:34 +06:00
committed by Andrew Bastin
parent df2d5995fd
commit 2509545dea
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/hoppscotch-backend/src/admin/admin.service.ts
View File

@@ -15,7 +15,7 @@ import {
TEAM_INVITE_NO_INVITE_FOUND, TEAM_INVITE_NO_INVITE_FOUND,
USERS_NOT_FOUND, USERS_NOT_FOUND,
USER_ALREADY_INVITED, USER_ALREADY_INVITED,
USER_INVITATION_NOT_FOUND, USER_INVITATION_DELETION_FAILED,
USER_IS_ADMIN, USER_IS_ADMIN,
USER_NOT_FOUND, USER_NOT_FOUND,
} from '../errors'; } from '../errors';
@@ -164,7 +164,7 @@ export class AdminService {
}); });
return E.right(true); return E.right(true);
} catch (error) { } catch (error) {
return E.left(USER_INVITATION_NOT_FOUND); return E.left(USER_INVITATION_DELETION_FAILED);
} }
} }
@@ -543,7 +543,7 @@ export class AdminService {
const isUpdated = await this.userService.removeUsersAsAdmin(userUIDs); const isUpdated = await this.userService.removeUsersAsAdmin(userUIDs);
if (E.isLeft(isUpdated)) return E.left(isUpdated.left); if (E.isLeft(isUpdated)) return E.left(isUpdated.left);
return E.right(true); return E.right(isUpdated.right);
} }
/** /**

3
packages/hoppscotch-backend/src/errors.ts
View File

@@ -111,7 +111,8 @@ export const USER_IS_ADMIN = 'user/is_admin' as const;
* User invite deletion failure error due to invitation not found * User invite deletion failure error due to invitation not found
* (AdminService) * (AdminService)
*/ */
export const USER_INVITATION_NOT_FOUND = 'user/invitation_not_found' as const; export const USER_INVITATION_DELETION_FAILED =
'user/invitation_deletion_failed' as const;
/** /**
* Teams not found * Teams not found

9
packages/hoppscotch-backend/src/user/user.service.ts
View File

@@ -8,7 +8,7 @@ import * as T from 'fp-ts/Task';
import * as A from 'fp-ts/Array'; import * as A from 'fp-ts/Array';
import { pipe, constVoid } from 'fp-ts/function'; import { pipe, constVoid } from 'fp-ts/function';
import { AuthUser } from 'src/types/AuthUser'; import { AuthUser } from 'src/types/AuthUser';
import { USER_NOT_FOUND } from 'src/errors'; import { USERS_NOT_FOUND, USER_NOT_FOUND } from 'src/errors';
import { SessionType, User } from './user.model'; import { SessionType, User } from './user.model';
import { USER_UPDATE_FAILED } from 'src/errors'; import { USER_UPDATE_FAILED } from 'src/errors';
import { PubSubService } from 'src/pubsub/pubsub.service'; import { PubSubService } from 'src/pubsub/pubsub.service';
@@ -545,10 +545,15 @@ export class UserService {
* @returns a Either of true or error * @returns a Either of true or error
*/ */
async removeUsersAsAdmin(userUIDs: string[]) { async removeUsersAsAdmin(userUIDs: string[]) {
await this.prisma.user.updateMany({ const data = await this.prisma.user.updateMany({
where: { uid: { in: userUIDs } }, where: { uid: { in: userUIDs } },
data: { isAdmin: false }, data: { isAdmin: false },
}); });
if (data.count === 0) {
return E.left(USERS_NOT_FOUND);
}
return E.right(true); return E.right(true);
} }
} }