Fix ngOnInit method signature in app components

damienbod · Mar 18, 2024 · b02b893 · b02b893
1 parent 89af487
commit b02b893
Show file tree

Hide file tree

Showing 51 changed files with 199 additions and 126 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -21,7 +21,6 @@
             "format": ["PascalCase"]
           }
         ],
-        "newline-before-return": "error",
         "max-len": "off",
         "no-useless-constructor": "off",
         "lines-between-class-members": ["error", "always"],
@@ -36,12 +35,22 @@
         "no-empty": ["error"],
         "@typescript-eslint/no-empty-function": ["error"],
         "no-unused-vars": "off",
-        "@typescript-eslint/no-unused-vars": ["error"],
         "@typescript-eslint/ban-types": ["error"],
         "no-useless-escape": ["error"],
         "no-prototype-builtins": ["error"],
         "prefer-spread": ["error"],
-        "@typescript-eslint/no-explicit-any": "off"
+        "@typescript-eslint/no-explicit-any": "off",
+        "@typescript-eslint/typedef": ["error"],
+        "@typescript-eslint/explicit-function-return-type": ["error"],
+        "newline-before-return": ["error"],
+        "@typescript-eslint/no-unused-vars": [
+          "error",
+          {
+            "argsIgnorePattern": "^_",
+            "varsIgnorePattern": "^_",
+            "caughtErrorsIgnorePattern": "^_"
+          }
+        ]
       }
     },
     {

diff --git a/projects/angular-auth-oidc-client/.eslintrc.json b/projects/angular-auth-oidc-client/.eslintrc.json
@@ -28,17 +28,6 @@
             "style": "camelCase"
           }
         ],
-        "@typescript-eslint/typedef": ["error"],
-        "@typescript-eslint/explicit-function-return-type": ["error"],
-        "newline-before-return": ["error"],
-        "@typescript-eslint/no-unused-vars": [
-          "error",
-          {
-            "argsIgnorePattern": "^_",
-            "varsIgnorePattern": "^_",
-            "caughtErrorsIgnorePattern": "^_"
-          }
-        ],
         "no-restricted-imports": [
           "error",
           {

diff --git a/projects/sample-code-flow-auth0/src/app/app.component.spec.ts b/projects/sample-code-flow-auth0/src/app/app.component.spec.ts
@@ -11,19 +11,23 @@ describe('AppComponent', () => {
   it('should create the app', () => {
     const fixture = TestBed.createComponent(AppComponent);
     const app = fixture.debugElement.componentInstance;
+
     expect(app).toBeTruthy();
   });
 
   it(`should have as title 'testSts'`, () => {
     const fixture = TestBed.createComponent(AppComponent);
     const app = fixture.debugElement.componentInstance;
+
     expect(app.title).toEqual('testSts');
   });
 
   it('should render title in a h1 tag', () => {
     const fixture = TestBed.createComponent(AppComponent);
+
     fixture.detectChanges();
     const compiled = fixture.debugElement.nativeElement;
+
     expect(compiled.querySelector('h1').textContent).toContain(
       'Welcome to testSts!'
     );

diff --git a/projects/sample-code-flow-auth0/src/app/app.component.ts b/projects/sample-code-flow-auth0/src/app/app.component.ts
@@ -8,7 +8,7 @@ import { OidcSecurityService } from 'angular-auth-oidc-client';
 export class AppComponent implements OnInit {
   constructor(public oidcSecurityService: OidcSecurityService) {}
 
-  ngOnInit() {
+  ngOnInit(): void {
     this.oidcSecurityService
       .checkAuth()
       .subscribe(({ isAuthenticated }) =>

diff --git a/projects/sample-code-flow-auth0/src/app/home/home.component.ts b/projects/sample-code-flow-auth0/src/app/home/home.component.ts
@@ -7,12 +7,14 @@ import { OidcSecurityService } from 'angular-auth-oidc-client';
 })
 export class HomeComponent implements OnInit {
   configuration$ = this.oidcSecurityService.getConfiguration();
+
   userData$ = this.oidcSecurityService.userData$;
+
   isAuthenticated = false;
 
   constructor(public oidcSecurityService: OidcSecurityService) {}
 
-  ngOnInit() {
+  ngOnInit(): void {
     this.oidcSecurityService.isAuthenticated$.subscribe(
       ({ isAuthenticated }) => {
         this.isAuthenticated = isAuthenticated;
@@ -22,35 +24,35 @@ export class HomeComponent implements OnInit {
     );
   }
 
-  login() {
+  login(): void {
     this.oidcSecurityService.authorize();
   }
 
-  refreshSession() {
+  refreshSession(): void {
     this.oidcSecurityService
       .forceRefreshSession()
       .subscribe((result) => console.log(result));
   }
 
-  logout() {
+  logout(): void {
     this.oidcSecurityService
       .logoff()
       .subscribe((result) => console.log(result));
   }
 
-  logoffAndRevokeTokens() {
+  logoffAndRevokeTokens(): void {
     this.oidcSecurityService
       .logoffAndRevokeTokens()
       .subscribe((result) => console.log(result));
   }
 
-  revokeRefreshToken() {
+  revokeRefreshToken(): void {
     this.oidcSecurityService
       .revokeRefreshToken()
       .subscribe((result) => console.log(result));
   }
 
-  revokeAccessToken() {
+  revokeAccessToken(): void {
     this.oidcSecurityService
       .revokeAccessToken()
       .subscribe((result) => console.log(result));

diff --git a/projects/sample-code-flow-auto-login/src/app/app.component.spec.ts b/projects/sample-code-flow-auto-login/src/app/app.component.spec.ts
@@ -11,19 +11,23 @@ describe('AppComponent', () => {
   it('should create the app', () => {
     const fixture = TestBed.createComponent(AppComponent);
     const app = fixture.debugElement.componentInstance;
+
     expect(app).toBeTruthy();
   });
 
   it(`should have as title 'sample-code-flow-auto-login'`, () => {
     const fixture = TestBed.createComponent(AppComponent);
     const app = fixture.debugElement.componentInstance;
+
     expect(app.title).toEqual('sample-code-flow-auto-login');
   });
 
   it('should render title in a h1 tag', () => {
     const fixture = TestBed.createComponent(AppComponent);
+
     fixture.detectChanges();
     const compiled = fixture.debugElement.nativeElement;
+
     expect(compiled.querySelector('h1').textContent).toContain(
       'Welcome to sample-code-flow-auto-login!'
     );

diff --git a/projects/sample-code-flow-auto-login/src/app/app.component.ts b/projects/sample-code-flow-auto-login/src/app/app.component.ts
@@ -7,7 +7,7 @@ import { OidcSecurityService } from 'angular-auth-oidc-client';
   styleUrls: ['./app.component.css'],
 })
 export class AppComponent implements OnInit {
-  constructor(private oidcSecurityService: OidcSecurityService) {}
+  constructor(private readonly oidcSecurityService: OidcSecurityService) {}
 
   ngOnInit() {
     this.oidcSecurityService

diff --git a/projects/sample-code-flow-auto-login/src/app/forbidden/forbidden.component.ts b/projects/sample-code-flow-auto-login/src/app/forbidden/forbidden.component.ts
@@ -8,7 +8,7 @@ import { OidcSecurityService } from 'angular-auth-oidc-client';
 export class ForbiddenComponent implements OnInit {
   public isAuthenticated = false;
 
-  constructor(private oidcSecurityService: OidcSecurityService) {}
+  constructor(private readonly oidcSecurityService: OidcSecurityService) {}
 
   ngOnInit() {
     this.oidcSecurityService.isAuthenticated$.subscribe(

diff --git a/projects/sample-code-flow-auto-login/src/app/home/home.component.ts b/projects/sample-code-flow-auto-login/src/app/home/home.component.ts
@@ -7,6 +7,7 @@ import { OidcSecurityService } from 'angular-auth-oidc-client';
 })
 export class HomeComponent implements OnInit {
   userData$ = this.oidcSecurityService.userData$;
+
   isAuthenticated = false;
 
   constructor(public oidcSecurityService: OidcSecurityService) {}

diff --git a/projects/sample-code-flow-azure-b2c/src/app/home/home.component.ts b/projects/sample-code-flow-azure-b2c/src/app/home/home.component.ts
@@ -7,11 +7,12 @@ import { OidcSecurityService } from 'angular-auth-oidc-client';
 })
 export class HomeComponent implements OnInit {
   userData$ = this.oidcSecurityService.userData$;
+
   isAuthenticated = false;
 
   constructor(public oidcSecurityService: OidcSecurityService) {}
 
-  ngOnInit() {
+  ngOnInit(): void {
     this.oidcSecurityService.isAuthenticated$.subscribe(
       ({ isAuthenticated }) => {
         this.isAuthenticated = isAuthenticated;

diff --git a/projects/sample-code-flow-azure-b2c/src/app/nav-menu/nav-menu.component.ts b/projects/sample-code-flow-azure-b2c/src/app/nav-menu/nav-menu.component.ts
@@ -8,11 +8,12 @@ import { OidcSecurityService } from 'angular-auth-oidc-client';
 })
 export class NavMenuComponent implements OnInit {
   isExpanded = false;
+
   isAuthenticated = false;
 
   constructor(public oidcSecurityService: OidcSecurityService) {}
 
-  ngOnInit() {
+  ngOnInit(): void {
     this.oidcSecurityService.isAuthenticated$.subscribe(
       ({ isAuthenticated }) => {
         this.isAuthenticated = isAuthenticated;
@@ -22,27 +23,27 @@ export class NavMenuComponent implements OnInit {
     );
   }
 
-  login() {
+  login(): void {
     this.oidcSecurityService.authorize();
   }
 
-  refreshSession() {
+  refreshSession(): void {
     this.oidcSecurityService
       .forceRefreshSession()
       .subscribe((result) => console.log(result));
   }
 
-  logout() {
+  logout(): void {
     this.oidcSecurityService
       .logoff()
       .subscribe((result) => console.log(result));
   }
 
-  collapse() {
+  collapse(): void {
     this.isExpanded = false;
   }
 
-  toggle() {
+  toggle(): void {
     this.isExpanded = !this.isExpanded;
   }
 }
diff --git a/projects/sample-code-flow-azuread/src/app/app.component.ts b/projects/sample-code-flow-azuread/src/app/app.component.ts
@@ -8,17 +8,17 @@ import { OidcSecurityService } from 'angular-auth-oidc-client';
 export class AppComponent {
   constructor(public oidcSecurityService: OidcSecurityService) {}
 
-  login() {
+  login(): void {
     console.log('start login');
     this.oidcSecurityService.authorize();
   }
 
-  refreshSession() {
+  refreshSession(): void {
     console.log('start refreshSession');
     this.oidcSecurityService.authorize();
   }
 
-  logout() {
+  logout(): void {
     console.log('start logoff');
     this.oidcSecurityService
       .logoff()

diff --git a/projects/sample-code-flow-azuread/src/app/home/home.component.ts b/projects/sample-code-flow-azuread/src/app/home/home.component.ts
@@ -7,11 +7,12 @@ import { OidcSecurityService } from 'angular-auth-oidc-client';
 })
 export class HomeComponent implements OnInit {
   userData$ = this.oidcSecurityService.userData$;
+
   isAuthenticated = false;
 
   constructor(public oidcSecurityService: OidcSecurityService) {}
 
-  ngOnInit() {
+  ngOnInit(): void {
     this.oidcSecurityService.isAuthenticated$.subscribe(
       ({ isAuthenticated }) => {
         this.isAuthenticated = isAuthenticated;

diff --git a/projects/sample-code-flow-azuread/src/app/nav-menu/nav-menu.component.ts b/projects/sample-code-flow-azuread/src/app/nav-menu/nav-menu.component.ts
@@ -13,7 +13,7 @@ export class NavMenuComponent implements OnInit {
 
   constructor(public oidcSecurityService: OidcSecurityService) {}
 
-  ngOnInit() {
+  ngOnInit(): void {
     this.oidcSecurityService.isAuthenticated$.subscribe(
       ({ isAuthenticated }) => {
         this.isAuthenticated = isAuthenticated;
@@ -23,26 +23,27 @@ export class NavMenuComponent implements OnInit {
     );
   }
 
-  login() {
+  login(): void {
     this.oidcSecurityService.authorize();
   }
 
-  refreshSession() {
+  refreshSession(): void {
     this.oidcSecurityService
       .forceRefreshSession()
       .subscribe((result) => console.log(result));
   }
 
-  logout() {
+  logout(): void {
     this.oidcSecurityService
       .logoff()
       .subscribe((result) => console.log(result));
   }
-  collapse() {
+
+  collapse(): void {
     this.isExpanded = false;
   }
 
-  toggle() {
+  toggle(): void {
     this.isExpanded = !this.isExpanded;
   }
 }
diff --git a/projects/sample-code-flow-http-config/src/app/app.component.spec.ts b/projects/sample-code-flow-http-config/src/app/app.component.spec.ts
@@ -11,19 +11,23 @@ describe('AppComponent', () => {
   it('should create the app', () => {
     const fixture = TestBed.createComponent(AppComponent);
     const app = fixture.debugElement.componentInstance;
+
     expect(app).toBeTruthy();
   });
 
   it(`should have as title 'testSts'`, () => {
     const fixture = TestBed.createComponent(AppComponent);
     const app = fixture.debugElement.componentInstance;
+
     expect(app.title).toEqual('testSts');
   });
 
   it('should render title in a h1 tag', () => {
     const fixture = TestBed.createComponent(AppComponent);
+
     fixture.detectChanges();
     const compiled = fixture.debugElement.nativeElement;
+
     expect(compiled.querySelector('h1').textContent).toContain(
       'Welcome to testSts!'
     );

diff --git a/projects/sample-code-flow-http-config/src/app/app.component.ts b/projects/sample-code-flow-http-config/src/app/app.component.ts
@@ -13,7 +13,7 @@ import { filter } from 'rxjs/operators';
 export class AppComponent implements OnInit {
   constructor(
     public oidcSecurityService: OidcSecurityService,
-    private eventService: PublicEventsService
+    private readonly eventService: PublicEventsService
   ) {}
 
   ngOnInit() {

diff --git a/projects/sample-code-flow-http-config/src/app/auth-config.module.ts b/projects/sample-code-flow-http-config/src/app/auth-config.module.ts
@@ -1,4 +1,3 @@
-/* eslint-disable arrow-body-style */
 import { HttpClient } from '@angular/common/http';
 import { NgModule } from '@angular/core';
 import {
@@ -9,7 +8,7 @@ import {
 } from 'angular-auth-oidc-client';
 import { map } from 'rxjs/operators';
 
-export const httpLoaderFactory = (httpClient: HttpClient) => {
+export const httpLoaderFactory = (httpClient: HttpClient): StsConfigLoader => {
   const config$ = httpClient
     .get<any>(
       `https://offeringsolutions-sts.azurewebsites.net/api/ClientAppSettings`