diff --git a/src/controllers/auth.ts b/src/controllers/auth.ts index 05cdc08..b9fa1fa 100644 --- a/src/controllers/auth.ts +++ b/src/controllers/auth.ts @@ -165,6 +165,7 @@ export class AuthController { access_token: token, refresh_token: refresh_token.refresh_token, }, + user: user, } return ReturnHelper.successResponseAny(res, 200, Language.lang.success_login, data) diff --git a/src/controllers/user.ts b/src/controllers/user.ts index d07059b..12136c7 100644 --- a/src/controllers/user.ts +++ b/src/controllers/user.ts @@ -75,7 +75,7 @@ export class UserController { const { whereAttr, whereVal } = CommonHelper.handleFilter({ filter: param.filter, col_any_eq: ["email"], - col_any_like: ["User.name", "User.username"], + col_any_like: ["User.name", "User.username"], }); const res_count = userRepository @@ -674,6 +674,48 @@ export class UserController { } } + static async profile(req: Request, res: Response, next: NextFunction): Promise { + /* + #swagger.tags = ['User'] + #swagger.security = [{ + "bearerAuth": [] + }] + #swagger.parameters['id'] = { + in: 'path', + description: 'User ID.', + required: true, + type: 'string' + } + */ + + try { + const schema = Joi.object().keys({ + id: Joi.string().uuid().required().label("ID"), + }); + + const param: any = await schema.validateAsync({ id: req.params["id"] }); + + const userRepository = OrmHelper.DB.getRepository(User); + + const data = await userRepository.findOneBy({ id: param.id }); + + if (data != null) { + return ReturnHelper.successResponseAny(res, 200, Language.lang.success_view, data); + } else { + return ReturnHelper.errorResponse(res, 404, 401, Language.lang.failed_not_found, ""); + } + } catch (e: unknown) { + if (e instanceof Error) { + log.error(e.message, e.stack); + } else { + log.error(JSON.stringify(e)); + } + const err = e as Error; + + return ReturnHelper.errorResponse(res, 500, 402, Language.lang.failed_view, err.message); + } + } + static async delete(req: Request, res: Response, next: NextFunction): Promise { /* diff --git a/src/routes/private.ts b/src/routes/private.ts index 409b069..1e169ad 100644 --- a/src/routes/private.ts +++ b/src/routes/private.ts @@ -4,7 +4,7 @@ import { UserController } from '../controllers/user'; import { UserActivityController } from '../controllers/user_activity'; import { UserRefreshTokenController } from '../controllers/user_refresh_token'; import JwtHelper from '../helpers/jwt'; -import { UserRoleController } from '../controllers/user_roles'; +// import { UserRoleController } from '../controllers/user_roles'; export class RoutePrivate { static setup(app: express.Application) { @@ -21,6 +21,7 @@ export class RoutePrivate { app.put('/api/user/update_password', UserController.updatePassword) app.delete('/api/user/delete/:id/:hard', UserController.delete) app.put('/api/user/restore/:id', UserController.restore) + app.get('/api/user/profile/:id', UserController.profile) // app.get('/api/user_role/list', UserRoleController.list) // app.get('/api/user_role/export', UserRoleController.export)