diff --git a/api/src/auth/auth.service.ts b/api/src/auth/auth.service.ts index c1f8801543e846eced09055f83ac4dc51ab5e34e..eb2fb5a3e0e747e68398da931e19445ebf63ad5e 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 af78e8a70076b7b672007cfb6d8421251ce6325c..2bbfa3e6aba6d486b33105142de72e6824064404 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; } }