sonar comments resolved

in2workspace · Feb 24, 2025 · 5265db3 · 5265db3
1 parent 1ab10df
commit 5265db3
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 32 deletions.
diff --git a/src/app/core/services/credential-procedure.service.spec.ts b/src/app/core/services/credential-procedure.service.spec.ts
@@ -2,7 +2,7 @@ import { TestBed } from '@angular/core/testing';
 import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
 import { CredentialProcedureService } from './credential-procedure.service';
 import { environment } from 'src/environments/environment';
-import { HttpErrorResponse, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { HttpErrorResponse, provideHttpClient } from '@angular/common/http';
 import { ProcedureRequest } from '../models/dto/procedure-request.dto';
 import { ProcedureResponse } from "../models/dto/procedure-response.dto";
 import { LearCredentialEmployeeDataDetail } from "../models/dto/lear-credential-employee-data-detail.dto";
@@ -30,7 +30,7 @@ describe('CredentialProcedureService', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
     imports: [],
-    providers: [CredentialProcedureService, provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()]
+    providers: [CredentialProcedureService, provideHttpClient(), provideHttpClientTesting()]
 });
 
     service = TestBed.inject(CredentialProcedureService);

diff --git a/src/app/core/services/policies.service.ts b/src/app/core/services/policies.service.ts
@@ -3,7 +3,7 @@ import { Router } from '@angular/router';
 import { AuthService } from '../services/auth.service';
 import { TranslateService } from '@ngx-translate/core';
 import { DialogWrapperService } from 'src/app/shared/components/dialog/dialog-wrapper/dialog-wrapper.service';
-import { Observable, of, switchMap, take } from 'rxjs';
+import { Observable, of, switchMap, take, map } from 'rxjs';
 
 @Injectable({
   providedIn: 'root'
@@ -14,22 +14,20 @@ export class PoliciesService {
   private readonly dialog = inject(DialogWrapperService);
   private readonly translate = inject(TranslateService);
 
-
   private executePolicy(tmfFunction: string, action: string, redirectUrl: string, authFlag: boolean = false): Observable<boolean> {
     if (this.authService.hasPower(tmfFunction, action)) {
-      return of(true);
+      return of(true); 
     } else {
       const errorTitle = this.translate.instant(`error.policy.title`);
       const errorMessage = this.translate.instant(`error.policy.message`);
-
+      
       const dialogRef = this.dialog.openErrorInfoDialog(errorMessage, errorTitle);
-      dialogRef.afterClosed().pipe(
+      return dialogRef.afterClosed().pipe(
         take(1),
-        switchMap(() => authFlag ? this.authService.logout() : of(null))
-      ).subscribe(() => {
-        this.router.navigate([redirectUrl]).then(() => false);
-      });
-      return of(false);
+        switchMap(() => authFlag ? this.authService.logout() : of(null)),
+        switchMap(() => this.router.navigate([redirectUrl])),
+        map(() => false) 
+      );
     }
   }
 

diff --git a/src/app/features/credential-detail/credential-detail.component.spec.ts b/src/app/features/credential-detail/credential-detail.component.spec.ts
@@ -1,9 +1,9 @@
 import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { provideHttpClient } from '@angular/common/http';
 import { of, throwError } from 'rxjs';
 import { CredentialDetailComponent } from './credential-detail.component';
-import { ActivatedRoute, provideRouter, Router, RouterLink, RouterModule } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { CredentialProcedureService } from 'src/app/core/services/credential-procedure.service';
 import { LEARCredentialEmployeeJwtPayload } from "../../core/models/entity/lear-credential-employee.entity";
 import { LearCredentialEmployeeDataDetail } from "../../core/models/dto/lear-credential-employee-data-detail.dto";
@@ -161,7 +161,7 @@ describe('CredentialDetailComponent', () => {
                 }),
             },
         },
-        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClient(),
     ]
 })
 .overrideComponent(CredentialDetailComponent, {

diff --git a/src/app/features/credential-issuance/credential-issuance.component.spec.ts b/src/app/features/credential-issuance/credential-issuance.component.spec.ts
@@ -1,14 +1,13 @@
 import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { provideHttpClient } from '@angular/common/http';
 import { of } from 'rxjs';
 import { CredentialIssuanceComponent } from './credential-issuance.component';
-import { RouterModule, ActivatedRoute } from '@angular/router';
-import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import { RouterModule, ActivatedRoute, convertToParamMap } from '@angular/router';
+import { TranslateModule, TranslateService} from '@ngx-translate/core';
 import { OidcSecurityService, StsConfigLoader } from "angular-auth-oidc-client";
 import { AuthService } from "../../core/services/auth.service";
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { convertToParamMap } from '@angular/router';
 
 (globalThis as any).structuredClone = (obj: any) => JSON.parse(JSON.stringify(obj));
 
@@ -58,7 +57,7 @@ describe('CredentialIssuanceComponent', () => {
         { provide: OidcSecurityService, useValue: oidcSecurityService },
         { provide: StsConfigLoader, useValue: configService },
         { provide: ActivatedRoute, useValue: mockActivatedRoute },
-        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClient(),
     ]
 }).compileComponents();
 

diff --git a/src/app/features/credential-management/credential-management.component.spec.ts b/src/app/features/credential-management/credential-management.component.spec.ts
@@ -12,11 +12,11 @@ import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { AuthService } from 'src/app/core/services/auth.service';
 import { AuthModule } from 'angular-auth-oidc-client';
 import { By } from '@angular/platform-browser';
-import { CredentialProcedure, ProcedureResponse } from 'src/app/core/models/dto/procedure-response.dto';
+import { CredentialProcedure} from 'src/app/core/models/dto/procedure-response.dto';
 import { credentialProcedureListMock } from 'src/app/core/mocks/credential-procedure-list';
 import { MatSort } from '@angular/material/sort';
 import { ElementRef } from '@angular/core';
-import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { provideHttpClient } from '@angular/common/http';
 
 describe('CredentialManagementComponent', () => {
   let component: CredentialManagementComponent;
@@ -69,7 +69,7 @@ describe('CredentialManagementComponent', () => {
                 },
             },
         },
-        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClient(),
         provideHttpClientTesting(),
     ]
 }).compileComponents();

diff --git a/src/app/features/credential-offer/credential-offer-stepper/credential-offer-stepper.spec.ts b/src/app/features/credential-offer/credential-offer-stepper/credential-offer-stepper.spec.ts
@@ -1,6 +1,6 @@
 import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { HttpErrorResponse, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { HttpErrorResponse, provideHttpClient } from '@angular/common/http';
 import { BehaviorSubject, of, throwError } from 'rxjs';
 import { RouterModule } from '@angular/router';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
@@ -62,7 +62,7 @@ describe('Credential Offer Stepper', () => {
         { provide: OidcSecurityService, useValue: oidcSecurityService },
         { provide: StsConfigLoader, useValue: configService },
         { provide: CredentialProcedureService, useValue: procedureService },
-        provideHttpClient(withInterceptorsFromDi())
+        provideHttpClient()
     ]
 }).compileComponents();
 

diff --git a/src/app/shared/components/form-credential/form-credential.component.spec.ts b/src/app/shared/components/form-credential/form-credential.component.spec.ts
@@ -1,6 +1,6 @@
 import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
 import { FormsModule, FormGroupDirective, FormGroup, FormControl } from '@angular/forms';
-import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { provideHttpClient } from '@angular/common/http';
 import { FormCredentialComponent } from './form-credential.component';
 import { CredentialProcedureService } from 'src/app/core/services/credential-procedure.service';
 import { CountryService } from './services/country.service';
@@ -9,7 +9,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { ActivatedRoute, Router, RouterModule } from '@angular/router';
 import { AuthService } from 'src/app/core/services/auth.service';
-import { Observer, of } from 'rxjs';
+import { of } from 'rxjs';
 import { MaxLengthDirective } from '../../directives/validators/max-length-directive.directive';
 import { CustomEmailValidatorDirective } from '../../directives/validators/custom-email-validator.directive';
 import { UnicodeValidatorDirective } from '../../directives/validators/unicode-validator.directive';
@@ -182,7 +182,7 @@ describe('FormCredentialComponent', () => {
         { provide: AuthService, useValue: mockAuthService },
         { provide: Router, useValue: mockRouter },
         { provide: ActivatedRoute, useValue: { snapshot: { paramMap: {} } } },
-        provideHttpClient(withInterceptorsFromDi())
+        provideHttpClient()
     ]
 }).compileComponents();
   });

diff --git a/src/app/shared/components/form-credential/services/form-credential.service.spec.ts b/src/app/shared/components/form-credential/services/form-credential.service.spec.ts
@@ -11,7 +11,7 @@ import { AuthModule } from 'angular-auth-oidc-client';
 import { Mandatee, Mandator, Power, Signer } from "../../../../core/models/entity/lear-credential-employee.entity";
 import { TempPower } from "../../../../core/models/temporal/temp-power.interface";
 import { Country } from './country.service';
-import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { provideHttpClient } from '@angular/common/http';
 
 (globalThis as any).structuredClone = (obj: any) => JSON.parse(JSON.stringify(obj));
 
@@ -36,7 +36,7 @@ describe('FormCredentialService', () => {
     providers: [
         FormCredentialService,
         TranslateService,
-        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClient(),
         provideHttpClientTesting(),
     ]
 });

diff --git a/src/app/shared/components/navbar/navbar.component.html b/src/app/shared/components/navbar/navbar.component.html
@@ -16,7 +16,7 @@
             <mat-icon>{{ isMenuOpen ? 'keyboard_arrow_up' : 'keyboard_arrow_down' }}</mat-icon>
           </button>
           <mat-menu #menu="matMenu">
-            @if(isCredentialIssuer()){
+            @if(isCredentialIssuerAndConfigure()){
               <button mat-menu-item  [routerLink]="'/settings'">
                 <mat-icon>settings</mat-icon>
                 <span>{{ "navbar.menu.settings" | translate }}</span>

diff --git a/src/app/shared/components/navbar/navbar.component.ts b/src/app/shared/components/navbar/navbar.component.ts
@@ -51,7 +51,7 @@ export class NavbarComponent implements OnInit {
       });
   }
 
-  public isCredentialIssuer():boolean{
+  public isCredentialIssuerAndConfigure():boolean{
     if(this.authService.hasPower('CredentialIssuer','Configure')) return true
     return false;
   }