From da1fe34249a741115c1aeedcade16c5c852e896b Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Wed, 20 Jan 2021 20:05:07 +0100 Subject: [PATCH] Implemented the get part of the runner selfservice (no jwts are availdable yet (tm) ref #111 --- src/controllers/RunnerSelfServiceController.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/controllers/RunnerSelfServiceController.ts b/src/controllers/RunnerSelfServiceController.ts index fa4c10e..23ad450 100644 --- a/src/controllers/RunnerSelfServiceController.ts +++ b/src/controllers/RunnerSelfServiceController.ts @@ -6,7 +6,7 @@ import { config } from '../config'; import { InvalidCredentialsError } from '../errors/AuthError'; import { RunnerNotFoundError } from '../errors/RunnerErrors'; import { Runner } from '../models/entities/Runner'; -import { ResponseUser } from '../models/responses/ResponseUser'; +import { ResponseSelfServiceRunner } from '../models/responses/ResponseSelfServiceRunner'; @JsonController('/runners') @@ -21,12 +21,12 @@ export class RunnerSelfServiceController { } @Get('/me/:jwt') - @ResponseSchema(ResponseUser) + @ResponseSchema(ResponseSelfServiceRunner) @ResponseSchema(RunnerNotFoundError, { statusCode: 404 }) @OnUndefined(RunnerNotFoundError) @OpenAPI({ description: 'Lists all information about yourself.
Please provide your runner jwt for auth.' }) async get(@Param('jwt') token: string) { - //TODO + return (new ResponseSelfServiceRunner(await this.getRunner(token))); } /** @@ -41,9 +41,7 @@ export class RunnerSelfServiceController { throw new InvalidCredentialsError(); } - console.log(jwtPayload); - - const runner = await this.runnerRepository.findOne({ id: jwtPayload["id"] }); + const runner = await this.runnerRepository.findOne({ id: jwtPayload["id"] }, { relations: ['scans', 'group', 'scans.track', 'cards', 'distanceDonations', 'distanceDonations.donor', 'distanceDonations.runner', 'distanceDonations.runner.scans', 'distanceDonations.runner.scans.track'] }); if (!runner) { throw new RunnerNotFoundError() } return runner; }