Kenrick Tandrian
16 hours ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with
3 additions and
3 deletions
-
apps/api/src/app/auth/google.strategy.ts
-
apps/client/src/app/core/module-preload.service.ts
-
eslint.config.cjs
|
|
|
@ -3,6 +3,7 @@ import { ConfigurationService } from '@ghostfolio/api/services/configuration/con |
|
|
|
import { Injectable, Logger } from '@nestjs/common'; |
|
|
|
import { PassportStrategy } from '@nestjs/passport'; |
|
|
|
import { Provider } from '@prisma/client'; |
|
|
|
import { DoneCallback } from 'passport'; |
|
|
|
import { Profile, Strategy } from 'passport-google-oauth20'; |
|
|
|
|
|
|
|
import { AuthService } from './auth.service'; |
|
|
|
@ -29,7 +30,7 @@ export class GoogleStrategy extends PassportStrategy(Strategy, 'google') { |
|
|
|
_token: string, |
|
|
|
_refreshToken: string, |
|
|
|
profile: Profile, |
|
|
|
done: Function |
|
|
|
done: DoneCallback |
|
|
|
) { |
|
|
|
try { |
|
|
|
const jwt = await this.authService.validateOAuthLogin({ |
|
|
|
|
|
|
|
@ -7,7 +7,7 @@ export class ModulePreloadService implements PreloadingStrategy { |
|
|
|
/** |
|
|
|
* Preloads all lazy loading modules with the attribute 'preload' set to true |
|
|
|
*/ |
|
|
|
preload(route: Route, load: Function): Observable<any> { |
|
|
|
preload<T>(route: Route, load: () => Observable<T>): Observable<T | null> { |
|
|
|
return route.data?.preload ? load() : of(null); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -170,7 +170,6 @@ module.exports = [ |
|
|
|
'@typescript-eslint/no-unsafe-argument': 'warn', |
|
|
|
'@typescript-eslint/no-unsafe-assignment': 'warn', |
|
|
|
'@typescript-eslint/no-unsafe-enum-comparison': 'warn', |
|
|
|
'@typescript-eslint/no-unsafe-function-type': 'warn', |
|
|
|
'@typescript-eslint/no-unsafe-member-access': 'warn', |
|
|
|
'@typescript-eslint/no-unsafe-return': 'warn', |
|
|
|
'@typescript-eslint/no-unsafe-call': 'warn', |
|
|
|
|