hrms-bangkok/hrms-api-org
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into adiDev

Browse source
This commit is contained in:
AdisakKanthawilang 2024-05-30 16:06:19 +07:00
commit abd8327d17
2 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/controllers/UserController.ts
View file

@ -88,7 +88,8 @@ export class KeycloakController extends Controller {
});
if (typeof userId !== "string") {
throw new Error("ไม่สามารถติดต่อกับระบบจัดการผู้ใช้งานได้");
// throw new Error("ไม่สามารถติดต่อกับระบบจัดการผู้ใช้งานได้");
throw new Error(userId.errorMessage);
}
const now = new Date().toISOString();
@ -140,9 +141,15 @@ export class KeycloakController extends Controller {
firstName?: string;
lastName?: string;
email?: string;
attributes?: object
},
) {
return await editUser(userId, body);
// return await editUser(userId, body);
const chkUpdate = await editUser(userId, body);
if (typeof chkUpdate !== "boolean") {
throw new Error(chkUpdate.errorMessage);
}
return chkUpdate
}
@Delete("user/{userId}")
@ -191,8 +198,8 @@ export class KeycloakController extends Controller {
}
@Get("user")
async getUserList(@Query() search = "") {
const result = await getUserList(search);
async getUserList(@Query() first = "", @Query() max = "" ,@Query() search = "") {
const result = await getUserList(first, max, search);
if (Array.isArray(result)) {
return result;