diff --git a/src/auth/auth.service.ts b/src/auth/auth.service.ts index 9fca772..16f9a9f 100644 --- a/src/auth/auth.service.ts +++ b/src/auth/auth.service.ts @@ -30,7 +30,7 @@ export class AuthService { profile, }: LoginDto): Promise { if (!this.allowedByUserFilter(profile.id)) { - throw new ForbiddenException("UserNotWhitelisted"); + throw new ForbiddenException("UserNotInUserFilter"); } const user = await this.usersService.createOrUpdate({ @@ -55,10 +55,7 @@ export class AuthService { session.user = user; await this.authSessionRepository.save(session); - const [{ refreshToken }] = await Promise.all([ - this.createRefreshToken(session), - this.createAccessToken(session), - ]); + const { refreshToken } = await this.createRefreshToken(session); return { session, refreshToken }; } @@ -100,23 +97,6 @@ export class AuthService { return { accessToken: token }; } - /** - * Switch to createAccessToken - * @deprecated - * @param user - */ - async createToken(user: User): Promise<{ accessToken }> { - const payload = { - sub: user.id, - name: user.displayName, - picture: user.photo, - }; - - const token = await this.jwtService.signAsync(payload); - - return { accessToken: token }; - } - async findSession(id: string): Promise { return this.authSessionRepository.findOne(id); } diff --git a/src/auth/spotify.filter.ts b/src/auth/spotify.filter.ts index 24470d6..67f7c5a 100644 --- a/src/auth/spotify.filter.ts +++ b/src/auth/spotify.filter.ts @@ -23,7 +23,7 @@ export class SpotifyAuthFilter implements ExceptionFilter { reason = "oauth2"; } else if ( exception instanceof ForbiddenException && - exception.message === "UserNotWhitelisted" + exception.message === "UserNotInUserFilter" ) { // User ID is not in the whitelist reason = "whitelist";