Skip to content

Commit

Permalink
Work
Browse files Browse the repository at this point in the history
  • Loading branch information
mjrj97 committed Nov 15, 2023
1 parent 27602cc commit 17bcc00
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: ESLint check
run: yarn eslint .
- name: Prettier check
run: yarn prettier . --debug-check
run: yarn prettier . --check
- name: Typescript check
run: yarn check-types

Expand Down
5 changes: 3 additions & 2 deletions Src/routes/users.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ router.post(
router.post(
`/:orgId/login`,
userLoginValidationRules,
asyncHandler(async (req: Request, res: Response) => {const user: { user: User } = await userLogin(
asyncHandler(async (req: Request, res: Response) => {
const user: { user: User } = await userLogin(
req.body.email,
req.body.password,
req.params.orgId,
Expand Down Expand Up @@ -96,7 +97,7 @@ router.put(
}
const user: User = await getUserById(req.params.id);
let hashedPassword: string | undefined;
if(req.body.password){
if (req.body.password) {
hashedPassword = await bcrypt.hash(req.body.password, 10);
}
const updatedUser: User = {
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true
},
"include": ["src/**/*.ts"],
"include": ["src"],
"exclude": ["node_modules"]
}

0 comments on commit 17bcc00

Please sign in to comment.