Skip to content

Commit 2b60b8c

Browse files
authored
Merge pull request #1137 from joshunrau/dev
fix: #1131
2 parents e555590 + 48b330a commit 2b60b8c

File tree

7 files changed

+240
-168
lines changed

7 files changed

+240
-168
lines changed

apps/api/src/users/users.service.ts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,13 +123,22 @@ export class UsersService {
123123
return user;
124124
}
125125

126-
async updateById(id: string, { groupIds, ...data }: UpdateUserDto, { ability }: EntityOperationOptions = {}) {
126+
async updateById(
127+
id: string,
128+
{ groupIds, password, ...data }: UpdateUserDto,
129+
{ ability }: EntityOperationOptions = {}
130+
) {
131+
let hashedPassword: string | undefined;
132+
if (password) {
133+
hashedPassword = await this.cryptoService.hashPassword(password);
134+
}
127135
return this.userModel.update({
128136
data: {
129137
...data,
130138
groups: {
131139
connect: groupIds?.map((id) => ({ id }))
132-
}
140+
},
141+
hashedPassword
133142
},
134143
omit: {
135144
hashedPassword: true

apps/outreach/astro.config.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ export default defineConfig({
6060
label: 'Français'
6161
}
6262
},
63+
markdown: {
64+
headingLinks: false
65+
},
6366
plugins: [
6467
starlightTypeDocPlugin({
6568
entryPoints: [path.resolve(runtimeCoreRoot, 'lib/index.d.ts')],

apps/outreach/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
"devDependencies": {
2323
"@astrojs/check": "^0.9.4",
2424
"@astrojs/sitemap": "^3.2.1",
25-
"@astrojs/starlight": "^0.34.2",
26-
"@astrojs/starlight-tailwind": "^4.0.1",
25+
"@astrojs/starlight": "^0.34.3",
26+
"@astrojs/starlight-tailwind": "4.0.1",
2727
"@opendatacapture/runtime-core": "workspace:*",
2828
"@tailwindcss/typography": "^0.5.16",
2929
"@tailwindcss/vite": "^4.1.5",

apps/outreach/src/styles/main.css

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,4 @@
88
max-width: theme(--breakpoint-2xl);
99
}
1010
}
11-
.sl-anchor-link {
12-
display: none;
13-
}
1411
}

0 commit comments

Comments
 (0)