Skip to content

Commit 2bd1ec4

Browse files
committed
fix(backend): fix user rights
1 parent ccb2079 commit 2bd1ec4

File tree

9 files changed

+98
-43
lines changed

9 files changed

+98
-43
lines changed

packages/backend/src/auth/structures-auth.controller.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import { domifaConfig } from "../config";
2929
import { userSecurityPasswordChecker } from "../modules/users/services";
3030
import { AllowUserStructureRoles } from "./decorators";
3131
import { UserStructure } from "@domifa/common";
32+
import { appLogger } from "../util";
3233

3334
const userProfile: UserProfile = "structure";
3435

@@ -55,6 +56,7 @@ export class StructuresAuthController {
5556

5657
return res.status(HttpStatus.OK).json(accessToken);
5758
} catch (err) {
59+
appLogger.error(err);
5860
return res
5961
.status(HttpStatus.UNAUTHORIZED)
6062
.json({ message: "LOGIN_FAILED" });

packages/backend/src/modules/structures/controllers/structure-doc.controller.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import { join } from "path";
3737
import { FileManagerService } from "../../../util/file-manager/file-manager.service";
3838
import { validateDocTemplate } from "../../../usagers/utils/custom-docs";
3939
import { StructureDocTypesAvailable } from "@domifa/common";
40+
import { appLogger } from "../../../util";
4041

4142
@ApiTags("structure-docs")
4243
@ApiBearerAuth()
@@ -171,7 +172,8 @@ export class StructureDocController {
171172
});
172173

173174
return res.status(HttpStatus.OK).json(docs);
174-
} catch (e) {
175+
} catch (err) {
176+
appLogger.error(err);
175177
return res
176178
.status(HttpStatus.BAD_REQUEST)
177179
.json({ message: "UPLOAD_FAIL" });
@@ -211,7 +213,8 @@ export class StructureDocController {
211213
structureId: user.structureId,
212214
});
213215
return res.status(HttpStatus.OK).json(docs);
214-
} catch (e) {
216+
} catch (err) {
217+
appLogger.error(err);
215218
return res
216219
.status(HttpStatus.BAD_REQUEST)
217220
.json({ message: "DOC_NOT_FOUND" });

packages/backend/src/modules/users/controllers/users.controller.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ import {
5252
UserStructureCreateLogContext,
5353
UserStructureRoleChangeLogContext,
5454
} from "../../app-logs/app-log-context.types";
55+
import { appLogger } from "../../../util";
5556

5657
const userProfile: UserProfile = "structure";
5758

@@ -64,7 +65,6 @@ export class UsersController {
6465
constructor(private readonly appLogService: AppLogsService) {}
6566

6667
@Get("")
67-
@AllowUserStructureRoles("responsable", "admin")
6868
public async getUsers(
6969
@CurrentUser() user: UserStructureAuthenticated
7070
): Promise<UserStructureProfile[]> {
@@ -87,7 +87,6 @@ export class UsersController {
8787
return users;
8888
}
8989

90-
@ApiOperation({ summary: "Accepter les CGU" })
9190
@Get("accept-terms")
9291
public async acceptTerms(@CurrentUser() user: UserStructureAuthenticated) {
9392
await userStructureRepository.update(
@@ -104,7 +103,6 @@ export class UsersController {
104103
return true;
105104
}
106105

107-
@ApiOperation({ summary: "Edition du mot de passe depuis le compte user" })
108106
@Get("last-password-update")
109107
public async getLastPasswordUpdate(
110108
@CurrentUser() user: UserStructureAuthenticated,
@@ -339,6 +337,7 @@ export class UsersController {
339337
});
340338
return res.status(HttpStatus.OK).json({ message: "OK" });
341339
} catch (err) {
340+
appLogger.error(err);
342341
return res
343342
.status(HttpStatus.BAD_REQUEST)
344343
.json({ message: "EDIT_PASSWORD_FAIL" });

packages/backend/src/modules/users/controllers/users.public.controller.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ const userProfile: UserProfile = "structure";
2525
@Controller("users")
2626
@ApiTags("users")
2727
export class UsersPublicController {
28+
// TODO: add a limit for this endpoint by ip
2829
@Post("validate-email")
2930
public async validateEmail(
3031
@Body() emailDto: EmailDto,
@@ -57,6 +58,7 @@ export class UsersPublicController {
5758
});
5859
return res.status(HttpStatus.OK).json({ message: "OK" });
5960
} catch (err) {
61+
appLogger.error(err);
6062
return res
6163
.status(HttpStatus.BAD_REQUEST)
6264
.json({ message: "TOKEN_INVALID" });
@@ -77,6 +79,7 @@ export class UsersPublicController {
7779
});
7880
return res.status(HttpStatus.OK).json({ message: "OK" });
7981
} catch (err) {
82+
appLogger.error(err);
8083
return res
8184
.status(HttpStatus.BAD_REQUEST)
8285
.json({ message: "TOKEN_INVALID" });
@@ -101,7 +104,7 @@ export class UsersPublicController {
101104
userProfile,
102105
});
103106
} catch (err) {
104-
appLogger.error("Cannot reset password");
107+
appLogger.error(err);
105108
}
106109
return res.status(HttpStatus.OK).json({ message: "OK" });
107110
}

packages/backend/src/usagers/controllers/agenda.controller.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import { RdvDto } from "../dto/decision-form/rdv.dto";
3131
import { UsagersService } from "../services/usagers.service";
3232
import { getPersonFullName, Usager } from "@domifa/common";
3333
import { usagerAppointmentCreatedEmailSender } from "../../modules/mails/services/templates-renderers";
34+
import { appLogger } from "../../util";
3435

3536
@ApiTags("agenda")
3637
@ApiBearerAuth()
@@ -148,7 +149,9 @@ export class AgendaController {
148149
message,
149150
});
150151
return res.status(HttpStatus.OK).json(updatedUsager);
151-
} catch (e) {
152+
} catch (err) {
153+
appLogger.error(err);
154+
152155
return res
153156
.status(HttpStatus.INTERNAL_SERVER_ERROR)
154157
.json({ message: "REGISTER_ERROR" });

packages/backend/src/usagers/controllers/import/import.controller.security-tests.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export const ImportControllerSecurityTests: AppTestHttpClientSecurityTestDef[] =
4444
expectedStatus: expectedResponseStatusBuilder.allowStructureOnly(
4545
context.user,
4646
{
47-
roles: ["simple", "responsable", "admin"],
47+
roles: ["responsable", "admin"],
4848
validExpectedResponseStatus: HttpStatus.BAD_REQUEST, // this is an invalid xls file
4949
}
5050
),

packages/backend/src/usagers/controllers/usager-structure-docs.controller.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import {
3838

3939
import { AppLogsService } from "../../modules/app-logs/app-logs.service";
4040
import { join } from "path";
41-
import { cleanPath } from "../../util";
41+
import { appLogger, cleanPath } from "../../util";
4242
import { FileManagerService } from "../../util/file-manager/file-manager.service";
4343
import {
4444
StructureDoc,
@@ -118,7 +118,8 @@ export class UsagerStructureDocsController {
118118
try {
119119
const docGenerated = await generateCustomDoc(content, docValues);
120120
return res.end(docGenerated);
121-
} catch (e) {
121+
} catch (err) {
122+
appLogger.error(err);
122123
return res
123124
.status(HttpStatus.BAD_REQUEST)
124125
.json({ message: "CANNOT_COMPLETE_DOC" });
@@ -205,7 +206,9 @@ export class UsagerStructureDocsController {
205206
try {
206207
const docGenerated = await generateCustomDoc(content, docValues);
207208
return res.end(docGenerated);
208-
} catch (e) {
209+
} catch (err) {
210+
appLogger.error(err);
211+
209212
return res
210213
.status(HttpStatus.BAD_REQUEST)
211214
.json({ message: "CANNOT_COMPLETE_DOMIFA_DOCS" });

0 commit comments

Comments
 (0)