From 0328c5b7b2ea3e5b8381dcd2b0c96afb9b28e59f Mon Sep 17 00:00:00 2001 From: Steve Reis <stevereis93@gmail.com> Date: Mon, 17 Oct 2022 13:59:53 +0200 Subject: [PATCH] candidate version, remove console logs --- api/src/auth/auth.service.ts | 6 ++---- .../engine/connectors/datashield/datashield.connector.ts | 8 ++++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/api/src/auth/auth.service.ts b/api/src/auth/auth.service.ts index c1f8801..eb2fb5a 100644 --- a/api/src/auth/auth.service.ts +++ b/api/src/auth/auth.service.ts @@ -93,9 +93,7 @@ export class AuthService { payload.context, ); - console.log('isConnected', isConnected); if (!isConnected) { - console.log('User need to reconnect'); throw new UnauthorizedException('User need to reconnect'); } @@ -109,8 +107,8 @@ export class AuthService { } return this.login(payload.context); } catch (error) { - console.log(error); - throw new UnauthorizedException('Invalid refresh token'); + const msg = error.message ?? 'Invalid refresh token'; + throw new UnauthorizedException(msg); } } diff --git a/api/src/engine/connectors/datashield/datashield.connector.ts b/api/src/engine/connectors/datashield/datashield.connector.ts index af78e8a..2bbfa3e 100644 --- a/api/src/engine/connectors/datashield/datashield.connector.ts +++ b/api/src/engine/connectors/datashield/datashield.connector.ts @@ -349,20 +349,20 @@ export default class DataShieldConnector implements Connector { const cookies = [`sid=${user.extraFields['sid']}`, `user=${user.id}`]; const path = this.options.baseurl + 'getvars'; - const response = await firstValueFrom( + await firstValueFrom( this.httpService.get(path, { headers: { cookie: cookies.join(';'), }, }), ); - console.log('status', response.status); + return true; } catch (err) { - DataShieldConnector.logger.warn( + DataShieldConnector.logger.verbose( `User ${user.id} is not connected to Datashield`, ); - DataShieldConnector.logger.warn(err); + DataShieldConnector.logger.debug(err); return false; } } -- GitLab