mirrors/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2025-05-19 01:35:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #776 from hedgedoc/fix/UnauthorizedException

Browse source 
auth: Fix handling of internal server errors
This commit is contained in:
David Mehren 2021-01-29 20:52:36 +01:00 • committed by GitHub
commit b49c802c79
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/auth/auth.service.ts
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: AGPL-3.0-only * SPDX-License-Identifier: AGPL-3.0-only
*/ */
import { Injectable } from '@nestjs/common'; import { Injectable, UnauthorizedException } from '@nestjs/common';
import { UsersService } from '../users/users.service'; import { UsersService } from '../users/users.service';
import { User } from '../users/user.entity'; import { User } from '../users/user.entity';
import { AuthToken } from './auth-token.entity'; import { AuthToken } from './auth-token.entity';
@ -35,16 +35,20 @@ export class AuthService {
} }
async validateToken(token: string): Promise<User> { async validateToken(token: string): Promise<User> {
const [keyId, secret] = token.split('.'); try {
const accessToken = await this.getAuthTokenAndValidate(keyId, secret); const [keyId, secret] = token.split('.');
await this.setLastUsedToken(keyId); const accessToken = await this.getAuthTokenAndValidate(keyId, secret);
const user = await this.usersService.getUserByUsername( await this.setLastUsedToken(keyId);
accessToken.user.userName, return this.usersService.getUserByUsername(accessToken.user.userName);
); } catch (error) {
if (user) { if (
return user; error instanceof NotInDBError ||
error instanceof TokenNotValidError
) {
throw new UnauthorizedException(error.message);
}
throw error;
} }
return null;
} }
async hashPassword(cleartext: string): Promise<string> { async hashPassword(cleartext: string): Promise<string> {

8
src/auth/token.strategy.ts
View file

@ -6,7 +6,7 @@
import { Strategy } from 'passport-http-bearer'; import { Strategy } from 'passport-http-bearer';
import { PassportStrategy } from '@nestjs/passport'; import { PassportStrategy } from '@nestjs/passport';
import { Injectable, UnauthorizedException } from '@nestjs/common'; import { Injectable } from '@nestjs/common';
import { AuthService } from './auth.service'; import { AuthService } from './auth.service';
import { User } from '../users/user.entity'; import { User } from '../users/user.entity';
@ -17,10 +17,6 @@ export class TokenStrategy extends PassportStrategy(Strategy, 'token') {
} }
async validate(token: string): Promise<User> { async validate(token: string): Promise<User> {
const user = await this.authService.validateToken(token); return this.authService.validateToken(token);
if (!user) {
throw new UnauthorizedException();
}
return user;
} }
} }