Skip to content

Commit 614d649

Browse files
committed
feat(sonar): fix sonar lint issues
1 parent 7b15d30 commit 614d649

9 files changed

Lines changed: 26 additions & 22 deletions

File tree

src/app/app.component.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ export class AppComponent implements OnInit, OnDestroy {
114114
const refreshToken = this.authRepository.getRefreshTokenValue();
115115
if (refreshToken) {
116116
const refreshTokenValue = AuthService.decodeToken(refreshToken);
117-
const isRefreshTokenExpired = Date.now() >= (refreshTokenValue?.exp || 0) * 1000;
117+
const isRefreshTokenExpired = Date.now() >= (refreshTokenValue?.exp ?? 0) * 1000;
118118
if (isRefreshTokenExpired && !event.url.includes(authRoutes.logout)) {
119119
this.router.navigate([authRoutes.logout], {
120120
queryParams: {
@@ -152,9 +152,9 @@ export class AppComponent implements OnInit, OnDestroy {
152152

153153
if (accessToken && refreshToken) {
154154
const accessTokenValue = AuthService.decodeToken(accessToken);
155-
const isAccessTokenExpired = Date.now() >= (accessTokenValue?.exp || 0) * 1000;
155+
const isAccessTokenExpired = Date.now() >= (accessTokenValue?.exp ?? 0) * 1000;
156156
const refreshTokenValue = AuthService.decodeToken(refreshToken);
157-
const isRefreshTokenExpired = Date.now() >= (refreshTokenValue?.exp || 0) * 1000;
157+
const isRefreshTokenExpired = Date.now() >= (refreshTokenValue?.exp ?? 0) * 1000;
158158
if (isAccessTokenExpired) {
159159
if (!isRefreshTokenExpired) {
160160
this.authService
@@ -163,7 +163,7 @@ export class AppComponent implements OnInit, OnDestroy {
163163
takeUntil(this.destroy$),
164164
catchError((error): ObservableInput<HttpEvent<unknown>> => {
165165
this.navigateToLogout();
166-
return observableThrowError(error);
166+
throw new Error(error);
167167
}),
168168
)
169169
.subscribe();

src/app/modules/auth/shared/auth.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ export class AuthService {
144144
}
145145

146146
refreshToken(): Observable<UpdateTokenData | null> {
147-
const refreshToken = this.authRepository.getRefreshTokenValue() || '';
147+
const refreshToken = this.authRepository.getRefreshTokenValue() ?? '';
148148
return this.apollo
149149
.mutate({
150150
mutation: refreshTokenMutation,

src/app/modules/auth/store/auth.repository.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export class AuthRepository {
5959
return !!AuthService.decodeToken(token);
6060
}
6161
return false;
62-
} catch (Error) {
62+
} catch (error) {
6363
return false;
6464
}
6565
}

src/app/modules/hero/shared/hero.service.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ export class HeroService {
7373
})
7474
.pipe(
7575
map((response: unknown) => {
76-
return (response as CreateHeroResponse).data?.createHero || null;
76+
return (response as CreateHeroResponse).data?.createHero ?? null;
7777
}),
7878
);
7979
}
@@ -86,7 +86,7 @@ export class HeroService {
8686
heroId,
8787
},
8888
})
89-
.pipe(map((response: unknown) => (response as DeleteHeroResponse).data?.removeHero || null));
89+
.pipe(map((response: unknown) => (response as DeleteHeroResponse).data?.removeHero ?? null));
9090
}
9191

9292
voteForHero(heroId: string): Observable<Hero | null> {
@@ -99,7 +99,7 @@ export class HeroService {
9999
})
100100
.pipe(
101101
map((response: unknown) => {
102-
return (response as VoteForHeroResponse).data?.voteHero || null;
102+
return (response as VoteForHeroResponse).data?.voteHero ?? null;
103103
}),
104104
);
105105
}

src/app/modules/shared/components/alert/alert.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ export class AlertComponent implements OnInit, OnDestroy {
9393
}
9494

9595
setAlertKeys(alertData: AlertData, newAlert: Alert) {
96-
newAlert.code = alertData.options?.code || undefined;
97-
newAlert.delay = alertData.options?.delay || 0;
96+
newAlert.code = alertData.options?.code ?? undefined;
97+
newAlert.delay = alertData.options?.delay ?? 0;
9898
}
9999

100100
setAlertTimeOut(newAlert: Alert) {

src/app/modules/shared/interceptors/token.interceptor.ts

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ export class TokenInterceptor implements HttpInterceptor {
5454

5555
getTokenExpirations(accessToken: string, refreshToken: string) {
5656
const accessTokenValue = AuthService.decodeToken(accessToken);
57-
const isAccessTokenExpired = Date.now() >= (accessTokenValue?.exp || 0) * 1000;
57+
const isAccessTokenExpired = Date.now() >= (accessTokenValue?.exp ?? 0) * 1000;
5858

5959
const refreshTokenValue = AuthService.decodeToken(refreshToken);
60-
const isRefreshTokenExpired = Date.now() >= (refreshTokenValue?.exp || 0) * 1000;
60+
const isRefreshTokenExpired = Date.now() >= (refreshTokenValue?.exp ?? 0) * 1000;
6161

6262
return { isAccessTokenExpired, isRefreshTokenExpired };
6363
}
@@ -87,7 +87,9 @@ export class TokenInterceptor implements HttpInterceptor {
8787
this.checkUnAuthorizedError(response);
8888
return response;
8989
}),
90-
catchError(err => observableThrowError(err)),
90+
catchError(error => {
91+
throw new Error(error);
92+
}),
9193
);
9294
}
9395

@@ -103,11 +105,15 @@ export class TokenInterceptor implements HttpInterceptor {
103105
const updateTokenRequest = request.clone({
104106
setHeaders: headers,
105107
});
106-
return next.handle(updateTokenRequest).pipe(catchError(err => observableThrowError(err)));
108+
return next.handle(updateTokenRequest).pipe(
109+
catchError(error => {
110+
throw new Error(error);
111+
}),
112+
);
107113
}),
108114
catchError((error): ObservableInput<HttpEvent<unknown>> => {
109115
this.navigateToLogout();
110-
return observableThrowError(error);
116+
throw new Error(error);
111117
}),
112118
);
113119
}

src/app/modules/user/components/change-language/change-language.component.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { ApolloError } from '@apollo/client/errors';
55
import { AuthService } from '~modules/auth/shared/auth.service';
66
import { AlertId, AlertService } from '~modules/shared/services/alert.service';
77
import { NetworkHelperService } from '~modules/shared/services/network-helper.service';
8-
import { AuthRepository } from '~modules/auth/store/auth.repository';
98
import { NgIf } from '@angular/common';
109
import { User } from '~modules/user/shared/user.model';
1110
import { environment } from '~environments/environment';
@@ -33,15 +32,14 @@ export class ChangeLanguageComponent implements OnInit, OnDestroy {
3332
private formBuilder: FormBuilder,
3433
private authService: AuthService,
3534
private alertService: AlertService,
36-
private authRepository: AuthRepository,
3735
private utilService: NetworkHelperService,
3836
private document: Document,
3937
) {
4038
this.window = this.document.defaultView as Window;
4139
}
4240

4341
ngOnInit() {
44-
this.language = new FormControl<string | null>(this.user?.language || AppConfig.defaultLang);
42+
this.language = new FormControl<string | null>(this.user?.language ?? AppConfig.defaultLang);
4543
this.selectLanguageForm = this.formBuilder.group({
4644
language: this.language,
4745
});

src/app/modules/user/components/edit-profile/edit-profile.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ export class EditProfileComponent implements OnInit, OnDestroy {
5353
}
5454

5555
ngOnInit(): void {
56-
this.firstname = new FormControl<string>(this.user?.firstname || '', [
56+
this.firstname = new FormControl<string>(this.user?.firstname ?? '', [
5757
Validators.required,
5858
Validators.minLength(2),
5959
]);
60-
this.email = new FormControl<string>({ value: this.user?.email || '', disabled: true });
60+
this.email = new FormControl<string>({ value: this.user?.email ?? '', disabled: true });
6161

6262
this.profileForm = this.formBuilder.group({
6363
firstname: this.firstname,

src/app/modules/user/shared/user.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export class UserService {
1919
})
2020
.pipe(
2121
map((response: unknown) => {
22-
return (response as GetMeResponse).data?.me || null;
22+
return (response as GetMeResponse).data?.me ?? null;
2323
}),
2424
);
2525
}

0 commit comments

Comments
 (0)