fix(backend): fix role for doc download

SocialGouv · Oct 30, 2024 · be58aba · be58aba
1 parent a21e9cc
commit be58aba
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 28 deletions.
diff --git a/packages/backend/src/auth/auth.module.ts b/packages/backend/src/auth/auth.module.ts
@@ -26,7 +26,7 @@ import { StructuresAuthController } from "./structures-auth.controller";
       JwtModule.register({
         secret: domifaConfig().security.jwtSecret,
         signOptions: {
-          expiresIn: "24h",
+          expiresIn: "12h",
         },
       })
     ),

diff --git a/packages/backend/src/auth/guards/usager-doc-access.guard.ts b/packages/backend/src/auth/guards/usager-doc-access.guard.ts
@@ -18,7 +18,7 @@ export class UsagerDocAccessGuard implements CanActivate {
     const user = request?.user as UserStructureAuthenticated;
 
     if (
-      user?.role === "simple" ||
+      user?.role === "facteur" ||
       !isUUID(request.params.docUuid) ||
       !isNumber(user?.structureId)
     ) {

diff --git a/packages/backend/src/auth/services/structures-auth.service.spec.ts b/packages/backend/src/auth/services/structures-auth.service.spec.ts
@@ -15,7 +15,7 @@ describe("StructuresAuthService", () => {
         JwtModule.register({
           secretOrPrivateKey: "secretKey",
           signOptions: {
-            expiresIn: 3600,
+            expiresIn: "12h",
           },
         }),
         UsersModule,

diff --git a/packages/backend/src/modules/portail-admin/services/admins-auth.service.spec.ts b/packages/backend/src/modules/portail-admin/services/admins-auth.service.spec.ts
@@ -17,7 +17,7 @@ describe("AdminsAuthService", () => {
         JwtModule.register({
           secretOrPrivateKey: "secretKey",
           signOptions: {
-            expiresIn: 3600,
+            expiresIn: "12h",
           },
         }),
         UsersModule,

diff --git a/...portail-usagers/controllers/postail-usagers-profile/portail-usagers-profile.controller.ts b/...portail-usagers/controllers/postail-usagers-profile/portail-usagers-profile.controller.ts
@@ -158,7 +158,7 @@ export class PortailUsagersProfileController {
     });
 
     try {
-      return this.fileManagerService.dowloadEncryptedFile(
+      return await this.fileManagerService.dowloadEncryptedFile(
         res,
         currentUser.structure.uuid,
         currentUser.usager.uuid,

diff --git a/packages/backend/src/modules/portail-usagers/services/usagers-auth.service.spec.ts b/packages/backend/src/modules/portail-usagers/services/usagers-auth.service.spec.ts
@@ -17,7 +17,7 @@ describe("UsagersAuthService", () => {
         JwtModule.register({
           secretOrPrivateKey: "secretKey",
           signOptions: {
-            expiresIn: 3600,
+            expiresIn: "12h",
           },
         }),
         UsersModule,

diff --git a/packages/frontend/src/app/interceptors/jwt.interceptor.ts b/packages/frontend/src/app/interceptors/jwt.interceptor.ts
@@ -19,7 +19,7 @@ export class JwtInterceptor implements HttpInterceptor {
   ): Observable<HttpEvent<any>> {
     const currentUser = this.authService.currentUserValue;
 
-    if (currentUser && currentUser.access_token) {
+    if (currentUser?.access_token) {
       request = request.clone({
         setHeaders: {
           Authorization: `Bearer ${currentUser.access_token}`,

diff --git a/packages/frontend/src/app/modules/shared/components/button/button.component.html b/packages/frontend/src/app/modules/shared/components/button/button.component.html
@@ -13,9 +13,10 @@
     <fa-icon
       [icon]="['fas', 'circle-notch']"
       aria-hidden="true"
+      [fixedWidth]="true"
       [spin]="true"
     ></fa-icon>
-    Patientez...
+    {{ loadingText }}
   </span>
   <span *ngIf="!loading">
     <fa-icon
@@ -26,20 +27,4 @@
     ></fa-icon>
     {{ content }}
   </span>
-
-  <span
-    *ngIf="loading"
-    class="position-absolute top-50 start-50 translate-middle d-inline-flex align-items-center"
-    role="status"
-    [attr.aria-label]="loadingAriaLabel"
-  >
-    <fa-icon
-      [icon]="['fas', 'circle-notch']"
-      [spin]="true"
-      [fixedWidth]="true"
-      class="me-1"
-      aria-hidden="true"
-    ></fa-icon>
-    {{ loadingText }}
-  </span>
 </button>
diff --git a/packages/frontend/src/app/modules/shared/components/button/button.component.ts b/packages/frontend/src/app/modules/shared/components/button/button.component.ts
@@ -13,7 +13,6 @@ export class ButtonComponent {
   @Input() icon?: IconName;
   @Input() prefix: IconPrefix = "fas";
   @Input() loadingText = "Patientez...";
-  @Input() loadingAriaLabel = "Chargement en cours";
   @Input() content = "";
   @Input() ariaLabel = "";
 

diff --git a/packages/frontend/src/app/modules/usager-shared/components/upload/upload.component.ts b/packages/frontend/src/app/modules/usager-shared/components/upload/upload.component.ts
@@ -58,7 +58,12 @@ export class UploadComponent implements OnInit, OnDestroy {
       file: ["", [Validators.required]],
       label: [
         "",
-        [Validators.required, NoWhiteSpaceValidator, Validators.minLength(2)],
+        [
+          Validators.required,
+          NoWhiteSpaceValidator,
+          Validators.minLength(2),
+          Validators.maxLength(100),
+        ],
       ],
     });
   }

diff --git a/packages/frontend/src/assets/css/main.scss b/packages/frontend/src/assets/css/main.scss
@@ -17,6 +17,7 @@ ul {
 caption {
   color: black !important;
 }
+
 .content {
   background-color: #f2f2f2;
   min-height: calc(90vh - 78px);

diff --git a/...sager-account/components/home-usager/sections/section-docs/section-docs.component.spec.ts b/...sager-account/components/home-usager/sections/section-docs/section-docs.component.spec.ts
@@ -1,18 +1,25 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { SectionDocsComponent } from "./section-docs.component";
+import { DEFAULT_USAGER } from "../../../../../../../_common";
+import { HttpClientTestingModule } from "@angular/common/http/testing";
+import { CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA } from "@angular/core";
+import { SharedModule } from "../../../../../shared/shared.module";
 
 describe("SectionDocsComponent", () => {
   let component: SectionDocsComponent;
   let fixture: ComponentFixture<SectionDocsComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [SectionDocsComponent],
+      declarations: [SectionDocsComponent],
+      imports: [SharedModule, HttpClientTestingModule],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA],
     }).compileComponents();
 
     fixture = TestBed.createComponent(SectionDocsComponent);
     component = fixture.componentInstance;
+    component.usager = DEFAULT_USAGER;
     fixture.detectChanges();
   });
 

diff --git a/packages/portail-usagers/src/app/modules/usager-account/services/usager-doc.service.spec.ts b/packages/portail-usagers/src/app/modules/usager-account/services/usager-doc.service.spec.ts
@@ -1,12 +1,13 @@
 import { TestBed } from "@angular/core/testing";
 
 import { UsagerDocService } from "./usager-doc.service";
+import { HttpClientTestingModule } from "@angular/common/http/testing";
 
 describe("UsagerDocService", () => {
   let service: UsagerDocService;
 
   beforeEach(() => {
-    TestBed.configureTestingModule({});
+    TestBed.configureTestingModule({ imports: [HttpClientTestingModule] });
     service = TestBed.inject(UsagerDocService);
   });