Merge pull request 'Release 0.10.0' (#186) from dev into main

Reviewed-on: #186
Reviewed-by: Philipp Dormann <philipp@philippdormann.de>

CHANGELOG.md

@@ -2,8 +2,46 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
+#### [v0.10.0](https://git.odit.services/lfk/backend/compare/v0.9.2...v0.10.0)
+
+- 🚀Bumped version to v0.10.0 [`dc3071f`](https://git.odit.services/lfk/backend/commit/dc3071f7d2be298f0bb02d86ec67ed1125cd3b49)
+- 🧾New changelog file version [CI SKIP] [skip ci] [`5fb355f`](https://git.odit.services/lfk/backend/commit/5fb355f450f19e96d3671b1a46e94d564495942b)
+- Merge pull request 'Mail locales feature/184-mail_locales' (#185) from feature/184-mail_locales into dev [`33c13de`](https://git.odit.services/lfk/backend/commit/33c13de32c68a3d9e87e4fd9ad12a815ed8c9fde)
+- Added locale to mail related runner endpoints [`7af883f`](https://git.odit.services/lfk/backend/commit/7af883f27198206af542bcaff4686221d3788e87)
+- Added locale to mail related runner endpoints [`f543307`](https://git.odit.services/lfk/backend/commit/f5433076b01c743ed9af085fccadb8f1edc26419)
+- Added locale to mail related user endpoints [`1be073a`](https://git.odit.services/lfk/backend/commit/1be073a4fa39f0332a46f567ee6af10a9137844c)
+- 🧾New changelog file version [CI SKIP] [skip ci] [`6aafe4a`](https://git.odit.services/lfk/backend/commit/6aafe4a6ae7d253ab39220e551c52ae067cc481a)
+
+#### [v0.9.2](https://git.odit.services/lfk/backend/compare/v0.9.1...v0.9.2)
+
+> 29 March 2021
+
+- Merge pull request 'Release 0.9.2' (#183) from dev into main [`bdeeb03`](https://git.odit.services/lfk/backend/commit/bdeeb036459c2a2131e843d8a5a6b338e0ba46ea)
+- 🧾New changelog file version [CI SKIP] [skip ci] [`675c876`](https://git.odit.services/lfk/backend/commit/675c8762e8e4cf28d2f334d5ab2e1cb6b594e33c)
+- Fixed bug in return creation [`6c9b91d`](https://git.odit.services/lfk/backend/commit/6c9b91d75a0d08fc4ab0e72c7a09bd0133566368)
+- 🧾New changelog file version [CI SKIP] [skip ci] [`8c00aef`](https://git.odit.services/lfk/backend/commit/8c00aefd6ce3723d9f83d1c94e6491d5d597391f)
+- 🚀Bumped version to v0.9.2 [`89e3924`](https://git.odit.services/lfk/backend/commit/89e392473c52a3f328545699a0f4df89be33ba89)
+
+#### [v0.9.1](https://git.odit.services/lfk/backend/compare/v0.9.0...v0.9.1)
+
+> 29 March 2021
+
+- Merge pull request 'Release v0.9.1' (#182) from dev into main [`3afd785`](https://git.odit.services/lfk/backend/commit/3afd785a54fac91c12af789af19b45e6124e0e39)
+- 🚀Bumped version to v0.9.1 [`a139554`](https://git.odit.services/lfk/backend/commit/a139554e059e9a10acb1733ce1a82b610cc99269)
+- 🧾New changelog file version [CI SKIP] [skip ci] [`8099999`](https://git.odit.services/lfk/backend/commit/8099999e2cdfc8046f9ff4a90681281b671e402d)
+- 🧾New changelog file version [CI SKIP] [skip ci] [`0290b0e`](https://git.odit.services/lfk/backend/commit/0290b0e5f531364d37d8157e639614cf5a6b4189)
+- Merge pull request 'Return cards generated in bulk feature/180-blank_generation_return' (#181) from feature/180-blank_generation_return into dev [`0f7fa99`](https://git.odit.services/lfk/backend/commit/0f7fa990d473ce2dce032c47c39f79c1d0e8df90)
+- Added query param to return created runenrcards [`5a36c8d`](https://git.odit.services/lfk/backend/commit/5a36c8dcae3d79b3b05ffb30a7ebb0d31dc8183a)
+- 🧾New changelog file version [CI SKIP] [skip ci] [`58f4d21`](https://git.odit.services/lfk/backend/commit/58f4d2151f459bc72692cc70e02a59b77abfb9f0)
+- Added test for returnCards=true array length [`1cb2dc9`](https://git.odit.services/lfk/backend/commit/1cb2dc9d53b530435f5798f9cdf7ee866eb7416e)
+- Added test for single card generation with returnCards=true [`6005b06`](https://git.odit.services/lfk/backend/commit/6005b0661f1d5c461bb102e243cc209a8adc21fa)
+- Fixed copy-paste oversight [`2f568c9`](https://git.odit.services/lfk/backend/commit/2f568c9cb8ae39ce40ec8df6d9acbaf0d5ae1a26)
+
 #### [v0.9.0](https://git.odit.services/lfk/backend/compare/v0.8.0...v0.9.0)
 
+> 26 March 2021
+
+- Merge pull request 'Release 0.9.0' (#179) from dev into main [`95135dd`](https://git.odit.services/lfk/backend/commit/95135ddc893dcf64be67b47b0ef2b0d9041253bd)
 - Reenabled user tests [`4c66650`](https://git.odit.services/lfk/backend/commit/4c6665062fe6717242e43b58e66c1f1d030c018d)
 - Moved to tmp files to better check for other problems [`7a64f23`](https://git.odit.services/lfk/backend/commit/7a64f2393783f97a9729356bc1dfd831927dd312)
 - Added user creation invalid tests [`888cab5`](https://git.odit.services/lfk/backend/commit/888cab5898caf9e552c421346934bf90f717a653)
@@ -15,16 +53,17 @@ All notable changes to this project will be documented in this file. Dates are d
 - 🧾New changelog file version [CI SKIP] [skip ci] [`274a146`](https://git.odit.services/lfk/backend/commit/274a146b9bccfe5e1a879ca137ebb4f51eaa5d57)
 - Fixed test params [`070560e`](https://git.odit.services/lfk/backend/commit/070560e8632e833dd26505c02ccb2474462b63ac)
 - No longer using createuser in seeding process [`96ba25e`](https://git.odit.services/lfk/backend/commit/96ba25ec6c6c397cd2aa322afa79024395f658fe)
+- 🧾New changelog file version [CI SKIP] [skip ci] [`a7fe1e1`](https://git.odit.services/lfk/backend/commit/a7fe1e175918edd7a98983ece570b47075e85e9a)
+- 🚀Bumped version to v0.8.0 [`c23b4d9`](https://git.odit.services/lfk/backend/commit/c23b4d907f20ed7af37a6de6ea4c61433e30b29b)
+- 🚀Bumped version to v0.9.0 [`56a5f41`](https://git.odit.services/lfk/backend/commit/56a5f4168621263daeab5d2fda97b944cdc6ab31)
+- Merge pull request 'Password security feature/99-password_checks' (#177) from feature/99-password_checks into dev [`5a3fc5b`](https://git.odit.services/lfk/backend/commit/5a3fc5b2bd06b3e26177d017d3503f4f627be3f2)
 - Added pw errors to user controller [`b24e24f`](https://git.odit.services/lfk/backend/commit/b24e24ff7dd75d972cdab0fd1e2fe6c532ca2b2f)
 - Now checking password rules on user creation [`5daaa3a`](https://git.odit.services/lfk/backend/commit/5daaa3a73c4eca2817d67e226679d125928a3645)
 - Now checking password rules on user update [`48a87e8`](https://git.odit.services/lfk/backend/commit/48a87e8936e13c48f4baa3f4b10f781ad2f55a44)
 - Fixed pw not getting hashed currectly; [`cb3ea9b`](https://git.odit.services/lfk/backend/commit/cb3ea9b1ebb82c650abd83d4be8629cfe29a5b21)
 - Added pw errors to me controller [`9ce35d8`](https://git.odit.services/lfk/backend/commit/9ce35d8eb78a01f40af8c70e640eca3bcb142304)
-- 🚀Bumped version to v0.8.0 [`c23b4d9`](https://git.odit.services/lfk/backend/commit/c23b4d907f20ed7af37a6de6ea4c61433e30b29b)
-- Added password checker dependency [`bd00f4f`](https://git.odit.services/lfk/backend/commit/bd00f4f8d585fb6878874810f7de0b8b9f3950d5)
-- 🚀Bumped version to v0.9.0 [`56a5f41`](https://git.odit.services/lfk/backend/commit/56a5f4168621263daeab5d2fda97b944cdc6ab31)
-- Merge pull request 'Password security feature/99-password_checks' (#177) from feature/99-password_checks into dev [`5a3fc5b`](https://git.odit.services/lfk/backend/commit/5a3fc5b2bd06b3e26177d017d3503f4f627be3f2)
 - Now forceing user deletion in tests [`8154e71`](https://git.odit.services/lfk/backend/commit/8154e715bbf18938bd5d1031656a88d39231fa81)
+- Added password checker dependency [`bd00f4f`](https://git.odit.services/lfk/backend/commit/bd00f4f8d585fb6878874810f7de0b8b9f3950d5)
 - Fixed empty object getting called [`5369000`](https://git.odit.services/lfk/backend/commit/536900091afd7366128f21058490d0d4f15c6c89)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`03d76e6`](https://git.odit.services/lfk/backend/commit/03d76e6d0bc5b4655f7f441232681c9462815526)
 - Formatting [`b8c28eb`](https://git.odit.services/lfk/backend/commit/b8c28ebb0808395218b5fb9031f477ae1d48e65e)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@odit/lfk-backend",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "main": "src/app.ts",
   "repository": "https://git.odit.services/lfk/backend",
   "author": {

src/controllers/AuthController.ts

@@ -87,7 +87,7 @@ export class AuthController {
 	@ResponseSchema(UserNotFoundError, { statusCode: 404 })
 	@ResponseSchema(UsernameOrEmailNeededError, { statusCode: 406 })
 	@ResponseSchema(MailSendingError, { statusCode: 500 })
-	@OpenAPI({ description: "Request a password reset token. <br> This will provide you with a reset token that you can use by posting to /api/auth/reset/{token}." })
+	@OpenAPI({ description: "Request a password reset token. <br> This will provide you with a reset token that you can use by posting to /api/auth/reset/{token}.", parameters: [{ in: "query", name: "locale", schema: { type: "string", enum: ["de", "en"] } }] })
 	async getResetToken(@Body({ validate: true }) passwordReset: CreateResetToken, @QueryParam("locale") locale: string = "en") {
 		const reset_token: string = await passwordReset.toResetToken();
 		await Mailer.sendResetMail(passwordReset.email, reset_token, locale);

src/controllers/RunnerCardController.ts

@@ -1,121 +1,131 @@
-import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers';
+import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers';
-import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
+import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
-import { getConnectionManager, Repository } from 'typeorm';
+import { getConnectionManager, Repository } from 'typeorm';
-import { RunnerCardHasScansError, RunnerCardIdsNotMatchingError, RunnerCardNotFoundError } from '../errors/RunnerCardErrors';
+import { RunnerCardHasScansError, RunnerCardIdsNotMatchingError, RunnerCardNotFoundError } from '../errors/RunnerCardErrors';
-import { RunnerNotFoundError } from '../errors/RunnerErrors';
+import { RunnerNotFoundError } from '../errors/RunnerErrors';
-import { CreateRunnerCard } from '../models/actions/create/CreateRunnerCard';
+import { CreateRunnerCard } from '../models/actions/create/CreateRunnerCard';
-import { UpdateRunnerCard } from '../models/actions/update/UpdateRunnerCard';
+import { UpdateRunnerCard } from '../models/actions/update/UpdateRunnerCard';
-import { RunnerCard } from '../models/entities/RunnerCard';
+import { RunnerCard } from '../models/entities/RunnerCard';
-import { ResponseEmpty } from '../models/responses/ResponseEmpty';
+import { ResponseEmpty } from '../models/responses/ResponseEmpty';
-import { ResponseRunnerCard } from '../models/responses/ResponseRunnerCard';
+import { ResponseRunnerCard } from '../models/responses/ResponseRunnerCard';
-import { ScanController } from './ScanController';
+import { ScanController } from './ScanController';
-
+
-@JsonController('/cards')
+@JsonController('/cards')
-@OpenAPI({ security: [{ "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
+@OpenAPI({ security: [{ "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
-export class RunnerCardController {
+export class RunnerCardController {
-	private cardRepository: Repository<RunnerCard>;
+	private cardRepository: Repository<RunnerCard>;
-
+
-	/**
+	/**
-	 * Gets the repository of this controller's model/entity.
+	 * Gets the repository of this controller's model/entity.
-	 */
+	 */
-	constructor() {
+	constructor() {
-		this.cardRepository = getConnectionManager().get().getRepository(RunnerCard);
+		this.cardRepository = getConnectionManager().get().getRepository(RunnerCard);
-	}
+	}
-
+
-	@Get()
+	@Get()
-	@Authorized("CARD:GET")
+	@Authorized("CARD:GET")
-	@ResponseSchema(ResponseRunnerCard, { isArray: true })
+	@ResponseSchema(ResponseRunnerCard, { isArray: true })
-	@OpenAPI({ description: 'Lists all card.' })
+	@OpenAPI({ description: 'Lists all card.' })
-	async getAll() {
+	async getAll() {
-		let responseCards: ResponseRunnerCard[] = new Array<ResponseRunnerCard>();
+		let responseCards: ResponseRunnerCard[] = new Array<ResponseRunnerCard>();
-		const cards = await this.cardRepository.find({ relations: ['runner', 'runner.group', 'runner.group.parentGroup'] });
+		const cards = await this.cardRepository.find({ relations: ['runner', 'runner.group', 'runner.group.parentGroup'] });
-		cards.forEach(card => {
+		cards.forEach(card => {
-			responseCards.push(new ResponseRunnerCard(card));
+			responseCards.push(new ResponseRunnerCard(card));
-		});
+		});
-		return responseCards;
+		return responseCards;
-	}
+	}
-
+
-	@Get('/:id')
+	@Get('/:id')
-	@Authorized("CARD:GET")
+	@Authorized("CARD:GET")
-	@ResponseSchema(ResponseRunnerCard)
+	@ResponseSchema(ResponseRunnerCard)
-	@ResponseSchema(RunnerCardNotFoundError, { statusCode: 404 })
+	@ResponseSchema(RunnerCardNotFoundError, { statusCode: 404 })
-	@OnUndefined(RunnerCardNotFoundError)
+	@OnUndefined(RunnerCardNotFoundError)
-	@OpenAPI({ description: "Lists all information about the card whose id got provided." })
+	@OpenAPI({ description: "Lists all information about the card whose id got provided." })
-	async getOne(@Param('id') id: number) {
+	async getOne(@Param('id') id: number) {
-		let card = await this.cardRepository.findOne({ id: id }, { relations: ['runner', 'runner.group', 'runner.group.parentGroup'] });
+		let card = await this.cardRepository.findOne({ id: id }, { relations: ['runner', 'runner.group', 'runner.group.parentGroup'] });
-		if (!card) { throw new RunnerCardNotFoundError(); }
+		if (!card) { throw new RunnerCardNotFoundError(); }
-		return card.toResponse();
+		return card.toResponse();
-	}
+	}
-
+
-	@Post('/bulk')
+	@Post('/bulk')
-	@Authorized("CARD:CREATE")
+	@Authorized("CARD:CREATE")
-	@ResponseSchema(ResponseEmpty, { statusCode: 200 })
+	@ResponseSchema(ResponseEmpty, { statusCode: 200 })
-	@OpenAPI({ description: "Create blank cards in bulk. <br> Just provide the count as a query param and wait for the 200 response." })
+	@OpenAPI({ description: "Create blank cards in bulk. <br> Just provide the count as a query param and wait for the 200 response. <br> You can provide the 'returnCards' query param if you want to receive the RESPONSERUNNERCARD objects in the response." })
-	async postBlancoBulk(@QueryParam("count") count: number) {
+	async postBlancoBulk(@QueryParam("count") count: number, @QueryParam("returnCards") returnCards: boolean = false) {
-		let createPromises = new Array<any>();
+		let createPromises = new Array<any>();
-		for (let index = 0; index < count; index++) {
+		for (let index = 0; index < count; index++) {
-			createPromises.push(this.cardRepository.save({ runner: null, enabled: true }))
+			createPromises.push(this.cardRepository.save({ runner: null, enabled: true }))
-		}
+		}
-		await Promise.all(createPromises);
+
-		let response = new ResponseEmpty();
+		const cards = await Promise.all(createPromises);
-		response.response = `Created ${count} new blanco cards.`
+
-		return response;
+		if (returnCards) {
-	}
+			let responseCards: ResponseRunnerCard[] = new Array<ResponseRunnerCard>();
-
+			for await (let card of cards) {
-	@Post()
+				let dbCard = await this.cardRepository.findOne({ id: card.id });
-	@Authorized("CARD:CREATE")
+				responseCards.push(new ResponseRunnerCard(dbCard));
-	@ResponseSchema(ResponseRunnerCard)
+			}
-	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
+			return responseCards;
-	@OpenAPI({ description: "Create a new card. <br> You can provide a associated runner by id but you don't have to." })
+		}
-	async post(@Body({ validate: true }) createCard: CreateRunnerCard) {
+		let response = new ResponseEmpty();
-		let card = await createCard.toEntity();
+		response.response = `Created ${count} new blanco cards.`
-		card = await this.cardRepository.save(card);
+		return response;
-		return (await this.cardRepository.findOne({ id: card.id }, { relations: ['runner', 'runner.group', 'runner.group.parentGroup'] })).toResponse();
+	}
-	}
+
-
+	@Post()
-	@Put('/:id')
+	@Authorized("CARD:CREATE")
-	@Authorized("CARD:UPDATE")
+	@ResponseSchema(ResponseRunnerCard)
-	@ResponseSchema(ResponseRunnerCard)
+	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
-	@ResponseSchema(RunnerCardNotFoundError, { statusCode: 404 })
+	@OpenAPI({ description: "Create a new card. <br> You can provide a associated runner by id but you don't have to." })
-	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
+	async post(@Body({ validate: true }) createCard: CreateRunnerCard) {
-	@ResponseSchema(RunnerCardIdsNotMatchingError, { statusCode: 406 })
+		let card = await createCard.toEntity();
-	@OpenAPI({ description: "Update the card whose id you provided. <br> Scans created via this card will still be associated with the old runner. <br> Please remember that ids can't be changed." })
+		card = await this.cardRepository.save(card);
-	async put(@Param('id') id: number, @Body({ validate: true }) card: UpdateRunnerCard) {
+		return (await this.cardRepository.findOne({ id: card.id }, { relations: ['runner', 'runner.group', 'runner.group.parentGroup'] })).toResponse();
-		let oldCard = await this.cardRepository.findOne({ id: id });
+	}
-
+
-		if (!oldCard) {
+	@Put('/:id')
-			throw new RunnerCardNotFoundError();
+	@Authorized("CARD:UPDATE")
-		}
+	@ResponseSchema(ResponseRunnerCard)
-
+	@ResponseSchema(RunnerCardNotFoundError, { statusCode: 404 })
-		if (oldCard.id != card.id) {
+	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
-			throw new RunnerCardIdsNotMatchingError();
+	@ResponseSchema(RunnerCardIdsNotMatchingError, { statusCode: 406 })
-		}
+	@OpenAPI({ description: "Update the card whose id you provided. <br> Scans created via this card will still be associated with the old runner. <br> Please remember that ids can't be changed." })
-
+	async put(@Param('id') id: number, @Body({ validate: true }) card: UpdateRunnerCard) {
-		await this.cardRepository.save(await card.update(oldCard));
+		let oldCard = await this.cardRepository.findOne({ id: id });
-		return (await this.cardRepository.findOne({ id: id }, { relations: ['runner', 'runner.group', 'runner.group.parentGroup'] })).toResponse();
+
-	}
+		if (!oldCard) {
-
+			throw new RunnerCardNotFoundError();
-	@Delete('/:id')
+		}
-	@Authorized("CARD:DELETE")
+
-	@ResponseSchema(ResponseRunnerCard)
+		if (oldCard.id != card.id) {
-	@ResponseSchema(ResponseEmpty, { statusCode: 204 })
+			throw new RunnerCardIdsNotMatchingError();
-	@ResponseSchema(RunnerCardHasScansError, { statusCode: 406 })
+		}
-	@OnUndefined(204)
+
-	@OpenAPI({ description: "Delete the card whose id you provided. <br> If no card with this id exists it will just return 204(no content). <br> If the card still has scans associated you have to provide the force=true query param (warning: this deletes all scans associated with by this card - please disable it instead or just remove the runner association)." })
+		await this.cardRepository.save(await card.update(oldCard));
-	async remove(@Param("id") id: number, @QueryParam("force") force: boolean) {
+		return (await this.cardRepository.findOne({ id: id }, { relations: ['runner', 'runner.group', 'runner.group.parentGroup'] })).toResponse();
-		let card = await this.cardRepository.findOne({ id: id });
+	}
-		if (!card) { return null; }
+
-
+	@Delete('/:id')
-		const cardScans = (await this.cardRepository.findOne({ id: id }, { relations: ["scans"] })).scans;
+	@Authorized("CARD:DELETE")
-		if (cardScans.length != 0 && !force) {
+	@ResponseSchema(ResponseRunnerCard)
-			throw new RunnerCardHasScansError();
+	@ResponseSchema(ResponseEmpty, { statusCode: 204 })
-		}
+	@ResponseSchema(RunnerCardHasScansError, { statusCode: 406 })
-		const scanController = new ScanController;
+	@OnUndefined(204)
-		for (let scan of cardScans) {
+	@OpenAPI({ description: "Delete the card whose id you provided. <br> If no card with this id exists it will just return 204(no content). <br> If the card still has scans associated you have to provide the force=true query param (warning: this deletes all scans associated with by this card - please disable it instead or just remove the runner association)." })
-			await scanController.remove(scan.id, force);
+	async remove(@Param("id") id: number, @QueryParam("force") force: boolean) {
-		}
+		let card = await this.cardRepository.findOne({ id: id });
-
+		if (!card) { return null; }
-		await this.cardRepository.delete(card);
+
-		return card.toResponse();
+		const cardScans = (await this.cardRepository.findOne({ id: id }, { relations: ["scans"] })).scans;
-	}
+		if (cardScans.length != 0 && !force) {
+			throw new RunnerCardHasScansError();
+		}
+		const scanController = new ScanController;
+		for (let scan of cardScans) {
+			await scanController.remove(scan.id, force);
+		}
+
+		await this.cardRepository.delete(card);
+		return card.toResponse();
+	}
 }

src/controllers/RunnerSelfServiceController.ts

@@ -1,228 +1,228 @@
-import { Request } from "express";
+import { Request } from "express";
-import * as jwt from "jsonwebtoken";
+import * as jwt from "jsonwebtoken";
-import { Body, Delete, Get, JsonController, OnUndefined, Param, Post, QueryParam, Req, UseBefore } from 'routing-controllers';
+import { Body, Delete, Get, JsonController, OnUndefined, Param, Post, QueryParam, Req, UseBefore } from 'routing-controllers';
-import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
+import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
-import { getConnectionManager, Repository } from 'typeorm';
+import { getConnectionManager, Repository } from 'typeorm';
-import { config } from '../config';
+import { config } from '../config';
-import { InvalidCredentialsError, JwtNotProvidedError } from '../errors/AuthError';
+import { InvalidCredentialsError, JwtNotProvidedError } from '../errors/AuthError';
-import { MailSendingError } from '../errors/MailErrors';
+import { MailSendingError } from '../errors/MailErrors';
-import { RunnerEmailNeededError, RunnerHasDistanceDonationsError, RunnerNotFoundError, RunnerSelfserviceTimeoutError } from '../errors/RunnerErrors';
+import { RunnerEmailNeededError, RunnerHasDistanceDonationsError, RunnerNotFoundError, RunnerSelfserviceTimeoutError } from '../errors/RunnerErrors';
-import { RunnerOrganizationNotFoundError } from '../errors/RunnerOrganizationErrors';
+import { RunnerOrganizationNotFoundError } from '../errors/RunnerOrganizationErrors';
-import { ScanStationNotFoundError } from '../errors/ScanStationErrors';
+import { ScanStationNotFoundError } from '../errors/ScanStationErrors';
-import { JwtCreator } from '../jwtcreator';
+import { JwtCreator } from '../jwtcreator';
-import { Mailer } from '../mailer';
+import { Mailer } from '../mailer';
-import ScanAuth from '../middlewares/ScanAuth';
+import ScanAuth from '../middlewares/ScanAuth';
-import { CreateSelfServiceCitizenRunner } from '../models/actions/create/CreateSelfServiceCitizenRunner';
+import { CreateSelfServiceCitizenRunner } from '../models/actions/create/CreateSelfServiceCitizenRunner';
-import { CreateSelfServiceRunner } from '../models/actions/create/CreateSelfServiceRunner';
+import { CreateSelfServiceRunner } from '../models/actions/create/CreateSelfServiceRunner';
-import { Runner } from '../models/entities/Runner';
+import { Runner } from '../models/entities/Runner';
-import { RunnerGroup } from '../models/entities/RunnerGroup';
+import { RunnerGroup } from '../models/entities/RunnerGroup';
-import { RunnerOrganization } from '../models/entities/RunnerOrganization';
+import { RunnerOrganization } from '../models/entities/RunnerOrganization';
-import { ScanStation } from '../models/entities/ScanStation';
+import { ScanStation } from '../models/entities/ScanStation';
-import { ResponseEmpty } from '../models/responses/ResponseEmpty';
+import { ResponseEmpty } from '../models/responses/ResponseEmpty';
-import { ResponseScanStation } from '../models/responses/ResponseScanStation';
+import { ResponseScanStation } from '../models/responses/ResponseScanStation';
-import { ResponseSelfServiceOrganisation } from '../models/responses/ResponseSelfServiceOrganisation';
+import { ResponseSelfServiceOrganisation } from '../models/responses/ResponseSelfServiceOrganisation';
-import { ResponseSelfServiceRunner } from '../models/responses/ResponseSelfServiceRunner';
+import { ResponseSelfServiceRunner } from '../models/responses/ResponseSelfServiceRunner';
-import { ResponseSelfServiceScan } from '../models/responses/ResponseSelfServiceScan';
+import { ResponseSelfServiceScan } from '../models/responses/ResponseSelfServiceScan';
-import { DonationController } from './DonationController';
+import { DonationController } from './DonationController';
-import { RunnerCardController } from './RunnerCardController';
+import { RunnerCardController } from './RunnerCardController';
-import { ScanController } from './ScanController';
+import { ScanController } from './ScanController';
-
+
-@JsonController()
+@JsonController()
-export class RunnerSelfServiceController {
+export class RunnerSelfServiceController {
-	private runnerRepository: Repository<Runner>;
+	private runnerRepository: Repository<Runner>;
-	private orgRepository: Repository<RunnerOrganization>;
+	private orgRepository: Repository<RunnerOrganization>;
-	private stationRepository: Repository<ScanStation>;
+	private stationRepository: Repository<ScanStation>;
-
+
-	/**
+	/**
-	 * Gets the repository of this controller's model/entity.
+	 * Gets the repository of this controller's model/entity.
-	 */
+	 */
-	constructor() {
+	constructor() {
-		this.runnerRepository = getConnectionManager().get().getRepository(Runner);
+		this.runnerRepository = getConnectionManager().get().getRepository(Runner);
-		this.orgRepository = getConnectionManager().get().getRepository(RunnerOrganization);
+		this.orgRepository = getConnectionManager().get().getRepository(RunnerOrganization);
-		this.stationRepository = getConnectionManager().get().getRepository(ScanStation);
+		this.stationRepository = getConnectionManager().get().getRepository(ScanStation);
-	}
+	}
-
+
-	@Get('/runners/me/:jwt')
+	@Get('/runners/me/:jwt')
-	@ResponseSchema(ResponseSelfServiceRunner)
+	@ResponseSchema(ResponseSelfServiceRunner)
-	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
+	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
-	@OnUndefined(RunnerNotFoundError)
+	@OnUndefined(RunnerNotFoundError)
-	@OpenAPI({ description: 'Lists all information about yourself. <br> Please provide your runner jwt(that code we gave you during registration) for auth. <br> If you lost your jwt/personalized link please use the forgot endpoint.' })
+	@OpenAPI({ description: 'Lists all information about yourself. <br> Please provide your runner jwt(that code we gave you during registration) for auth. <br> If you lost your jwt/personalized link please use the forgot endpoint.' })
-	async get(@Param('jwt') token: string) {
+	async get(@Param('jwt') token: string) {
-		return (new ResponseSelfServiceRunner(await this.getRunner(token)));
+		return (new ResponseSelfServiceRunner(await this.getRunner(token)));
-	}
+	}
-
+
-	@Delete('/runners/me/:jwt')
+	@Delete('/runners/me/:jwt')
-	@ResponseSchema(ResponseSelfServiceRunner)
+	@ResponseSchema(ResponseSelfServiceRunner)
-	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
+	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
-	@OnUndefined(RunnerNotFoundError)
+	@OnUndefined(RunnerNotFoundError)
-	@OpenAPI({ description: 'Deletes all information about yourself. <br> Please provide your runner jwt(that code we gave you during registration) for auth. <br> If you lost your jwt/personalized link please use the forgot endpoint.' })
+	@OpenAPI({ description: 'Deletes all information about yourself. <br> Please provide your runner jwt(that code we gave you during registration) for auth. <br> If you lost your jwt/personalized link please use the forgot endpoint.' })
-	async remove(@Param('jwt') token: string, @QueryParam("force") force: boolean) {
+	async remove(@Param('jwt') token: string, @QueryParam("force") force: boolean) {
-		const responseRunner = await this.getRunner(token);
+		const responseRunner = await this.getRunner(token);
-		let runner = await this.runnerRepository.findOne({ id: responseRunner.id });
+		let runner = await this.runnerRepository.findOne({ id: responseRunner.id });
-
+
-		if (!runner) { return null; }
+		if (!runner) { return null; }
-		if (!runner) {
+		if (!runner) {
-			throw new RunnerNotFoundError();
+			throw new RunnerNotFoundError();
-		}
+		}
-
+
-		const runnerDonations = (await this.runnerRepository.findOne({ id: runner.id }, { relations: ["distanceDonations"] })).distanceDonations;
+		const runnerDonations = (await this.runnerRepository.findOne({ id: runner.id }, { relations: ["distanceDonations"] })).distanceDonations;
-		if (runnerDonations.length > 0 && !force) {
+		if (runnerDonations.length > 0 && !force) {
-			throw new RunnerHasDistanceDonationsError();
+			throw new RunnerHasDistanceDonationsError();
-		}
+		}
-		const donationController = new DonationController();
+		const donationController = new DonationController();
-		for (let donation of runnerDonations) {
+		for (let donation of runnerDonations) {
-			await donationController.remove(donation.id, force);
+			await donationController.remove(donation.id, force);
-		}
+		}
-
+
-		const runnerCards = (await this.runnerRepository.findOne({ id: runner.id }, { relations: ["cards"] })).cards;
+		const runnerCards = (await this.runnerRepository.findOne({ id: runner.id }, { relations: ["cards"] })).cards;
-		const cardController = new RunnerCardController;
+		const cardController = new RunnerCardController;
-		for (let card of runnerCards) {
+		for (let card of runnerCards) {
-			await cardController.remove(card.id, force);
+			await cardController.remove(card.id, force);
-		}
+		}
-
+
-		const runnerScans = (await this.runnerRepository.findOne({ id: runner.id }, { relations: ["scans"] })).scans;
+		const runnerScans = (await this.runnerRepository.findOne({ id: runner.id }, { relations: ["scans"] })).scans;
-		const scanController = new ScanController;
+		const scanController = new ScanController;
-		for (let scan of runnerScans) {
+		for (let scan of runnerScans) {
-			await scanController.remove(scan.id, force);
+			await scanController.remove(scan.id, force);
-		}
+		}
-
+
-		await this.runnerRepository.delete(runner);
+		await this.runnerRepository.delete(runner);
-		return new ResponseSelfServiceRunner(responseRunner);
+		return new ResponseSelfServiceRunner(responseRunner);
-	}
+	}
-
+
-	@Get('/runners/me/:jwt/scans')
+	@Get('/runners/me/:jwt/scans')
-	@ResponseSchema(ResponseSelfServiceScan, { isArray: true })
+	@ResponseSchema(ResponseSelfServiceScan, { isArray: true })
-	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
+	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
-	@OnUndefined(RunnerNotFoundError)
+	@OnUndefined(RunnerNotFoundError)
-	@OpenAPI({ description: 'Lists all your (runner) scans. <br> Please provide your runner jwt(that code we gave you during registration) for auth. <br> If you lost your jwt/personalized link please contact support.' })
+	@OpenAPI({ description: 'Lists all your (runner) scans. <br> Please provide your runner jwt(that code we gave you during registration) for auth. <br> If you lost your jwt/personalized link please contact support.' })
-	async getScans(@Param('jwt') token: string) {
+	async getScans(@Param('jwt') token: string) {
-		const scans = (await this.getRunner(token)).scans;
+		const scans = (await this.getRunner(token)).scans;
-		let responseScans = new Array<ResponseSelfServiceScan>()
+		let responseScans = new Array<ResponseSelfServiceScan>()
-		for (let scan of scans) {
+		for (let scan of scans) {
-			responseScans.push(new ResponseSelfServiceScan(scan));
+			responseScans.push(new ResponseSelfServiceScan(scan));
-		}
+		}
-		return responseScans;
+		return responseScans;
-	}
+	}
-
+
-	@Get('/stations/me')
+	@Get('/stations/me')
-	@UseBefore(ScanAuth)
+	@UseBefore(ScanAuth)
-	@ResponseSchema(ResponseScanStation)
+	@ResponseSchema(ResponseScanStation)
-	@ResponseSchema(ScanStationNotFoundError, { statusCode: 404 })
+	@ResponseSchema(ScanStationNotFoundError, { statusCode: 404 })
-	@OnUndefined(ScanStationNotFoundError)
+	@OnUndefined(ScanStationNotFoundError)
-	@OpenAPI({ description: 'Lists basic information about the station whose token got provided. <br> This includes it\'s associated track.', security: [{ "StationApiToken": [] }] })
+	@OpenAPI({ description: 'Lists basic information about the station whose token got provided. <br> This includes it\'s associated track.', security: [{ "StationApiToken": [] }] })
-	async getStationMe(@Req() req: Request) {
+	async getStationMe(@Req() req: Request) {
-		let scan = await this.stationRepository.findOne({ id: parseInt(req.headers["station_id"].toString()) }, { relations: ['track'] })
+		let scan = await this.stationRepository.findOne({ id: parseInt(req.headers["station_id"].toString()) }, { relations: ['track'] })
-		if (!scan) { throw new ScanStationNotFoundError(); }
+		if (!scan) { throw new ScanStationNotFoundError(); }
-		return scan.toResponse();
+		return scan.toResponse();
-	}
+	}
-
+
-	@Post('/runners/forgot')
+	@Post('/runners/forgot')
-	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
+	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
-	@OnUndefined(ResponseEmpty)
+	@OnUndefined(ResponseEmpty)
-	@OpenAPI({ description: 'Use this endpoint to reuqest a new selfservice token/link to be sent to your mail address (rate limited to one mail every 24hrs).' })
+	@OpenAPI({ description: 'Use this endpoint to reuqest a new selfservice token/link to be sent to your mail address (rate limited to one mail every 24hrs).', parameters: [{ in: "query", name: "locale", schema: { type: "string", enum: ["de", "en"] } }] })
-	async requestNewToken(@QueryParam('mail') mail: string) {
+	async requestNewToken(@QueryParam('mail') mail: string, @QueryParam("locale") locale: string = "en") {
-		if (!mail) {
+		if (!mail) {
-			throw new RunnerNotFoundError();
+			throw new RunnerNotFoundError();
-		}
+		}
-		const runner = await this.runnerRepository.findOne({ email: mail });
+		const runner = await this.runnerRepository.findOne({ email: mail });
-		if (!runner) { throw new RunnerNotFoundError(); }
+		if (!runner) { throw new RunnerNotFoundError(); }
-
+
-		if (runner.resetRequestedTimestamp > (Math.floor(Date.now() / 1000) - 60 * 60 * 24)) { throw new RunnerSelfserviceTimeoutError(); }
+		if (runner.resetRequestedTimestamp > (Math.floor(Date.now() / 1000) - 60 * 60 * 24)) { throw new RunnerSelfserviceTimeoutError(); }
-		const token = JwtCreator.createSelfService(runner);
+		const token = JwtCreator.createSelfService(runner);
-
+
-		try {
+		try {
-			await Mailer.sendSelfserviceForgottenMail(runner.email, token, "en")
+			await Mailer.sendSelfserviceForgottenMail(runner.email, token, locale)
-		} catch (error) {
+		} catch (error) {
-			throw new MailSendingError();
+			throw new MailSendingError();
-		}
+		}
-
+
-		runner.resetRequestedTimestamp = Math.floor(Date.now() / 1000);
+		runner.resetRequestedTimestamp = Math.floor(Date.now() / 1000);
-		await this.runnerRepository.save(runner);
+		await this.runnerRepository.save(runner);
-
+
-		return { token };
+		return { token };
-	}
+	}
-
+
-	@Post('/runners/register')
+	@Post('/runners/register')
-	@ResponseSchema(ResponseSelfServiceRunner)
+	@ResponseSchema(ResponseSelfServiceRunner)
-	@ResponseSchema(RunnerEmailNeededError, { statusCode: 406 })
+	@ResponseSchema(RunnerEmailNeededError, { statusCode: 406 })
-	@OpenAPI({ description: 'Create a new selfservice runner in the citizen org. <br> This endpoint shoud be used to allow "everyday citizen" to register themselves. <br> You have to provide a mail address, b/c the future we\'ll implement email verification.' })
+	@OpenAPI({ description: 'Create a new selfservice runner in the citizen org. <br> This endpoint shoud be used to allow "everyday citizen" to register themselves. <br> You have to provide a mail address, b/c the future we\'ll implement email verification.', parameters: [{ in: "query", name: "locale", schema: { type: "string", enum: ["de", "en"] } }] })
-	async registerRunner(@Body({ validate: true }) createRunner: CreateSelfServiceCitizenRunner) {
+	async registerRunner(@Body({ validate: true }) createRunner: CreateSelfServiceCitizenRunner, @QueryParam("locale") locale: string = "en") {
-		let runner = await createRunner.toEntity();
+		let runner = await createRunner.toEntity();
-
+
-		runner = await this.runnerRepository.save(runner);
+		runner = await this.runnerRepository.save(runner);
-		let response = new ResponseSelfServiceRunner(await this.runnerRepository.findOne(runner, { relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards', 'distanceDonations', 'distanceDonations.donor', 'distanceDonations.runner', 'distanceDonations.runner.scans', 'distanceDonations.runner.scans.track'] }));
+		let response = new ResponseSelfServiceRunner(await this.runnerRepository.findOne(runner, { relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards', 'distanceDonations', 'distanceDonations.donor', 'distanceDonations.runner', 'distanceDonations.runner.scans', 'distanceDonations.runner.scans.track'] }));
-		response.token = JwtCreator.createSelfService(runner);
+		response.token = JwtCreator.createSelfService(runner);
-
+
-		try {
+		try {
-			await Mailer.sendSelfserviceWelcomeMail(runner.email, response.token, "en")
+			await Mailer.sendSelfserviceWelcomeMail(runner.email, response.token, locale)
-		} catch (error) {
+		} catch (error) {
-			throw new MailSendingError();
+			throw new MailSendingError();
-		}
+		}
-
+
-		return response;
+		return response;
-	}
+	}
-
+
-	@Post('/runners/register/:token')
+	@Post('/runners/register/:token')
-	@ResponseSchema(ResponseSelfServiceRunner)
+	@ResponseSchema(ResponseSelfServiceRunner)
-	@ResponseSchema(RunnerOrganizationNotFoundError, { statusCode: 404 })
+	@ResponseSchema(RunnerOrganizationNotFoundError, { statusCode: 404 })
-	@OpenAPI({ description: 'Create a new selfservice runner in a provided org. <br> The orgs get provided and authorized via api tokens that can be optained via the /organizations endpoint.' })
+	@OpenAPI({ description: 'Create a new selfservice runner in a provided org. <br> The orgs get provided and authorized via api tokens that can be optained via the /organizations endpoint.', parameters: [{ in: "query", name: "locale", schema: { type: "string", enum: ["de", "en"] } }] })
-	async registerOrganizationRunner(@Param('token') token: string, @Body({ validate: true }) createRunner: CreateSelfServiceRunner) {
+	async registerOrganizationRunner(@Param('token') token: string, @Body({ validate: true }) createRunner: CreateSelfServiceRunner, @QueryParam("locale") locale: string = "en") {
-		const org = await this.getOrgansisation(token);
+		const org = await this.getOrgansisation(token);
-
+
-		let runner = await createRunner.toEntity(org);
+		let runner = await createRunner.toEntity(org);
-		runner = await this.runnerRepository.save(runner);
+		runner = await this.runnerRepository.save(runner);
-
+
-		let response = new ResponseSelfServiceRunner(await this.runnerRepository.findOne(runner, { relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards', 'distanceDonations', 'distanceDonations.donor', 'distanceDonations.runner', 'distanceDonations.runner.scans', 'distanceDonations.runner.scans.track'] }));
+		let response = new ResponseSelfServiceRunner(await this.runnerRepository.findOne(runner, { relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards', 'distanceDonations', 'distanceDonations.donor', 'distanceDonations.runner', 'distanceDonations.runner.scans', 'distanceDonations.runner.scans.track'] }));
-		response.token = JwtCreator.createSelfService(runner);
+		response.token = JwtCreator.createSelfService(runner);
-
+
-		try {
+		try {
-			await Mailer.sendSelfserviceWelcomeMail(runner.email, response.token, "en")
+			await Mailer.sendSelfserviceWelcomeMail(runner.email, response.token, locale)
-		} catch (error) {
+		} catch (error) {
-			throw new MailSendingError();
+			throw new MailSendingError();
-		}
+		}
-
+
-		return response;
+		return response;
-	}
+	}
-
+
-	@Get('/organizations/selfservice/:token')
+	@Get('/organizations/selfservice/:token')
-	@ResponseSchema(ResponseSelfServiceOrganisation, { isArray: false })
+	@ResponseSchema(ResponseSelfServiceOrganisation, { isArray: false })
-	@ResponseSchema(RunnerOrganizationNotFoundError, { statusCode: 404 })
+	@ResponseSchema(RunnerOrganizationNotFoundError, { statusCode: 404 })
-	@OpenAPI({ description: 'Get the basic info and teams for a org.' })
+	@OpenAPI({ description: 'Get the basic info and teams for a org.' })
-	async getSelfserviceOrg(@Param('token') token: string) {
+	async getSelfserviceOrg(@Param('token') token: string) {
-		const orgid = (await this.getOrgansisation(token)).id;
+		const orgid = (await this.getOrgansisation(token)).id;
-		const org = await this.orgRepository.findOne({ id: orgid }, { relations: ['teams'] })
+		const org = await this.orgRepository.findOne({ id: orgid }, { relations: ['teams'] })
-
+
-		return new ResponseSelfServiceOrganisation(<RunnerOrganization>org);
+		return new ResponseSelfServiceOrganisation(<RunnerOrganization>org);
-	}
+	}
-
+
-	/**
+	/**
-	 * Get's a runner by a provided jwt token.
+	 * Get's a runner by a provided jwt token.
-	 * @param token The runner jwt provided by the runner to identitfy themselves.
+	 * @param token The runner jwt provided by the runner to identitfy themselves.
-	 */
+	 */
-	private async getRunner(token: string): Promise<Runner> {
+	private async getRunner(token: string): Promise<Runner> {
-		if (token == "") { throw new JwtNotProvidedError(); }
+		if (token == "") { throw new JwtNotProvidedError(); }
-		let jwtPayload = undefined
+		let jwtPayload = undefined
-		try {
+		try {
-			jwtPayload = <any>jwt.verify(token, config.jwt_secret);
+			jwtPayload = <any>jwt.verify(token, config.jwt_secret);
-		} catch (error) {
+		} catch (error) {
-			throw new InvalidCredentialsError();
+			throw new InvalidCredentialsError();
-		}
+		}
-
+
-		const runner = await this.runnerRepository.findOne({ id: jwtPayload["id"] }, { relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards', 'distanceDonations', 'distanceDonations.donor', 'distanceDonations.runner', 'distanceDonations.runner.scans', 'distanceDonations.runner.scans.track'] });
+		const runner = await this.runnerRepository.findOne({ id: jwtPayload["id"] }, { relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards', 'distanceDonations', 'distanceDonations.donor', 'distanceDonations.runner', 'distanceDonations.runner.scans', 'distanceDonations.runner.scans.track'] });
-		if (!runner) { throw new RunnerNotFoundError() }
+		if (!runner) { throw new RunnerNotFoundError() }
-		return runner;
+		return runner;
-	}
+	}
-
+
-	/**
+	/**
-	 * Get's a runner org by a provided registration api key.
+	 * Get's a runner org by a provided registration api key.
-	 * @param token The organization's registration api token.
+	 * @param token The organization's registration api token.
-	 */
+	 */
-	private async getOrgansisation(token: string): Promise<RunnerGroup> {
+	private async getOrgansisation(token: string): Promise<RunnerGroup> {
-		token = Buffer.from(token, 'base64').toString('utf8');
+		token = Buffer.from(token, 'base64').toString('utf8');
-
+
-		const organization = await this.orgRepository.findOne({ key: token });
+		const organization = await this.orgRepository.findOne({ key: token });
-		if (!organization) { throw new RunnerOrganizationNotFoundError; }
+		if (!organization) { throw new RunnerOrganizationNotFoundError; }
-
+
-		return organization;
+		return organization;
-	}
+	}
 }

src/tests/cards/cards_add.spec.ts

@@ -1,174 +1,186 @@
-import axios from 'axios';
+import axios from 'axios';
-import { config } from '../../config';
+import { config } from '../../config';
-const base = "http://localhost:" + config.internal_port
+const base = "http://localhost:" + config.internal_port
-
+
-let access_token;
+let access_token;
-let axios_config;
+let axios_config;
-
+
-beforeAll(async () => {
+beforeAll(async () => {
-	jest.setTimeout(20000);
+	jest.setTimeout(20000);
-	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
+	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
-	access_token = res.data["access_token"];
+	access_token = res.data["access_token"];
-	axios_config = {
+	axios_config = {
-		headers: { "authorization": "Bearer " + access_token },
+		headers: { "authorization": "Bearer " + access_token },
-		validateStatus: undefined
+		validateStatus: undefined
-	};
+	};
-});
+});
-
+
-
+
-describe('POST /api/cards illegally', () => {
+describe('POST /api/cards illegally', () => {
-	it('non-existant runner input should return 404', async () => {
+	it('non-existant runner input should return 404', async () => {
-		const res = await axios.post(base + '/api/cards', {
+		const res = await axios.post(base + '/api/cards', {
-			"runner": 999999999999999999999999
+			"runner": 999999999999999999999999
-		}, axios_config);
+		}, axios_config);
-		expect(res.status).toEqual(404);
+		expect(res.status).toEqual(404);
-		expect(res.headers['content-type']).toContain("application/json")
+		expect(res.headers['content-type']).toContain("application/json")
-	});
+	});
-});
+});
-// ---------------
+// ---------------
-describe('POST /api/cards successfully (without runner)', () => {
+describe('POST /api/cards successfully (without runner)', () => {
-	it('creating a card with the minimum amount of parameters should return 200', async () => {
+	it('creating a card with the minimum amount of parameters should return 200', async () => {
-		const res = await axios.post(base + '/api/cards', null, axios_config);
+		const res = await axios.post(base + '/api/cards', null, axios_config);
-		expect(res.status).toEqual(200);
+		expect(res.status).toEqual(200);
-		expect(res.headers['content-type']).toContain("application/json");
+		expect(res.headers['content-type']).toContain("application/json");
-		delete res.data.id;
+		delete res.data.id;
-		delete res.data.code;
+		delete res.data.code;
-		expect(res.data).toEqual({
+		expect(res.data).toEqual({
-			"runner": null,
+			"runner": null,
-			"enabled": true,
+			"enabled": true,
-			"responseType": "RUNNERCARD"
+			"responseType": "RUNNERCARD"
-		});
+		});
-	});
+	});
-	it('creating a disabled card should return 200', async () => {
+	it('creating a disabled card should return 200', async () => {
-		const res = await axios.post(base + '/api/cards', {
+		const res = await axios.post(base + '/api/cards', {
-			"enabled": false
+			"enabled": false
-		}, axios_config);
+		}, axios_config);
-		expect(res.status).toEqual(200);
+		expect(res.status).toEqual(200);
-		expect(res.headers['content-type']).toContain("application/json");
+		expect(res.headers['content-type']).toContain("application/json");
-		delete res.data.id;
+		delete res.data.id;
-		delete res.data.code;
+		delete res.data.code;
-		expect(res.data).toEqual({
+		expect(res.data).toEqual({
-			"runner": null,
+			"runner": null,
-			"enabled": false,
+			"enabled": false,
-			"responseType": "RUNNERCARD"
+			"responseType": "RUNNERCARD"
-		});
+		});
-	});
+	});
-	it('creating a enabled card should return 200', async () => {
+	it('creating a enabled card should return 200', async () => {
-		const res = await axios.post(base + '/api/cards', {
+		const res = await axios.post(base + '/api/cards', {
-			"enabled": true
+			"enabled": true
-		}, axios_config);
+		}, axios_config);
-		expect(res.status).toEqual(200);
+		expect(res.status).toEqual(200);
-		expect(res.headers['content-type']).toContain("application/json");
+		expect(res.headers['content-type']).toContain("application/json");
-		delete res.data.id;
+		delete res.data.id;
-		delete res.data.code;
+		delete res.data.code;
-		expect(res.data).toEqual({
+		expect(res.data).toEqual({
-			"runner": null,
+			"runner": null,
-			"enabled": true,
+			"enabled": true,
-			"responseType": "RUNNERCARD"
+			"responseType": "RUNNERCARD"
-		});
+		});
-	});
+	});
-});
+});
-// ---------------
+// ---------------
-describe('POST /api/cards successfully (with runner)', () => {
+describe('POST /api/cards successfully (with runner)', () => {
-	let added_org;
+	let added_org;
-	let added_runner;
+	let added_runner;
-	it('creating a new org with just a name should return 200', async () => {
+	it('creating a new org with just a name should return 200', async () => {
-		const res1 = await axios.post(base + '/api/organizations', {
+		const res1 = await axios.post(base + '/api/organizations', {
-			"name": "test123"
+			"name": "test123"
-		}, axios_config);
+		}, axios_config);
-		added_org = res1.data
+		added_org = res1.data
-		expect(res1.status).toEqual(200);
+		expect(res1.status).toEqual(200);
-		expect(res1.headers['content-type']).toContain("application/json")
+		expect(res1.headers['content-type']).toContain("application/json")
-	});
+	});
-	it('creating a new runner with only needed params should return 200', async () => {
+	it('creating a new runner with only needed params should return 200', async () => {
-		const res2 = await axios.post(base + '/api/runners', {
+		const res2 = await axios.post(base + '/api/runners', {
-			"firstname": "first",
+			"firstname": "first",
-			"lastname": "last",
+			"lastname": "last",
-			"group": added_org.id
+			"group": added_org.id
-		}, axios_config);
+		}, axios_config);
-		added_runner = res2.data;
+		added_runner = res2.data;
-		expect(res2.status).toEqual(200);
+		expect(res2.status).toEqual(200);
-		expect(res2.headers['content-type']).toContain("application/json")
+		expect(res2.headers['content-type']).toContain("application/json")
-	});
+	});
-	it('creating a card with the minimum amount of parameters should return 200', async () => {
+	it('creating a card with the minimum amount of parameters should return 200', async () => {
-		const res = await axios.post(base + '/api/cards', {
+		const res = await axios.post(base + '/api/cards', {
-			"runner": added_runner.id
+			"runner": added_runner.id
-		}, axios_config);
+		}, axios_config);
-		expect(res.status).toEqual(200);
+		expect(res.status).toEqual(200);
-		expect(res.headers['content-type']).toContain("application/json");
+		expect(res.headers['content-type']).toContain("application/json");
-		delete res.data.id;
+		delete res.data.id;
-		delete res.data.code;
+		delete res.data.code;
-		expect(res.data).toEqual({
+		expect(res.data).toEqual({
-			"runner": added_runner,
+			"runner": added_runner,
-			"enabled": true,
+			"enabled": true,
-			"responseType": "RUNNERCARD"
+			"responseType": "RUNNERCARD"
-		});
+		});
-	});
+	});
-	it('creating a card with runner (no optional params) should return 200', async () => {
+	it('creating a card with runner (no optional params) should return 200', async () => {
-		const res = await axios.post(base + '/api/cards', {
+		const res = await axios.post(base + '/api/cards', {
-			"runner": added_runner.id
+			"runner": added_runner.id
-		}, axios_config);
+		}, axios_config);
-		expect(res.status).toEqual(200);
+		expect(res.status).toEqual(200);
-		expect(res.headers['content-type']).toContain("application/json");
+		expect(res.headers['content-type']).toContain("application/json");
-		delete res.data.id;
+		delete res.data.id;
-		delete res.data.code;
+		delete res.data.code;
-		expect(res.data).toEqual({
+		expect(res.data).toEqual({
-			"runner": added_runner,
+			"runner": added_runner,
-			"enabled": true,
+			"enabled": true,
-			"responseType": "RUNNERCARD"
+			"responseType": "RUNNERCARD"
-		});
+		});
-	});
+	});
-	it('creating a enabled card with runner should return 200', async () => {
+	it('creating a enabled card with runner should return 200', async () => {
-		const res = await axios.post(base + '/api/cards', {
+		const res = await axios.post(base + '/api/cards', {
-			"runner": added_runner.id,
+			"runner": added_runner.id,
-			"enabled": true
+			"enabled": true
-		}, axios_config);
+		}, axios_config);
-		expect(res.status).toEqual(200);
+		expect(res.status).toEqual(200);
-		expect(res.headers['content-type']).toContain("application/json");
+		expect(res.headers['content-type']).toContain("application/json");
-		delete res.data.id;
+		delete res.data.id;
-		delete res.data.code;
+		delete res.data.code;
-		expect(res.data).toEqual({
+		expect(res.data).toEqual({
-			"runner": added_runner,
+			"runner": added_runner,
-			"enabled": true,
+			"enabled": true,
-			"responseType": "RUNNERCARD"
+			"responseType": "RUNNERCARD"
-		});
+		});
-	});
+	});
-	it('creating a disabled card with runner should return 200', async () => {
+	it('creating a disabled card with runner should return 200', async () => {
-		const res = await axios.post(base + '/api/cards', {
+		const res = await axios.post(base + '/api/cards', {
-			"runner": added_runner.id,
+			"runner": added_runner.id,
-			"enabled": false
+			"enabled": false
-		}, axios_config);
+		}, axios_config);
-		expect(res.status).toEqual(200);
+		expect(res.status).toEqual(200);
-		expect(res.headers['content-type']).toContain("application/json");
+		expect(res.headers['content-type']).toContain("application/json");
-		delete res.data.id;
+		delete res.data.id;
-		delete res.data.code;
+		delete res.data.code;
-		expect(res.data).toEqual({
+		expect(res.data).toEqual({
-			"runner": added_runner,
+			"runner": added_runner,
-			"enabled": false,
+			"enabled": false,
-			"responseType": "RUNNERCARD"
+			"responseType": "RUNNERCARD"
-		});
+		});
-	});
+	});
-});
+});
-// ---------------
+// ---------------
-describe('POST /api/cards/bulk successfully', () => {
+describe('POST /api/cards/bulk successfully', () => {
-	it('creating a single new bulk card should return 200', async () => {
+	it('creating a single new bulk card should return 200', async () => {
-		const res = await axios.post(base + '/api/cards/bulk?count=1', {}, axios_config);
+		const res = await axios.post(base + '/api/cards/bulk?count=1', {}, axios_config);
-		expect(res.status).toEqual(200);
+		expect(res.status).toEqual(200);
-		expect(res.headers['content-type']).toContain("application/json");
+		expect(res.headers['content-type']).toContain("application/json");
-	});
+	});
-	it('creating 50 new bulk card should return 200', async () => {
+	it('creating a single new bulk card and letting the system return it should return 200', async () => {
-		const res = await axios.post(base + '/api/cards/bulk?count=50', {}, axios_config);
+		const res = await axios.post(base + '/api/cards/bulk?count=1&returnCards=true', {}, axios_config);
-		expect(res.status).toEqual(200);
+		expect(res.status).toEqual(200);
-		expect(res.headers['content-type']).toContain("application/json");
+		expect(res.headers['content-type']).toContain("application/json");
-	});
+		expect(res.data[0].id).toBeDefined();
-	it('creating 250 new bulk card should return 200', async () => {
+	});
-		const res = await axios.post(base + '/api/cards/bulk?count=250', {}, axios_config);
+	it('creating 50 new bulk card should return 200', async () => {
-		expect(res.status).toEqual(200);
+		const res = await axios.post(base + '/api/cards/bulk?count=50', {}, axios_config);
-		expect(res.headers['content-type']).toContain("application/json");
+		expect(res.status).toEqual(200);
-	});
+		expect(res.headers['content-type']).toContain("application/json");
-	it('creating 2000 new bulk card should return 200', async () => {
+	});
-		const res = await axios.post(base + '/api/cards/bulk?count=2000', {}, axios_config);
+	it('creating 50 new bulk cards and letting the system return it should return 200', async () => {
-		expect(res.status).toEqual(200);
+		const res = await axios.post(base + '/api/cards/bulk?count=50&returnCards=true', {}, axios_config);
-		expect(res.headers['content-type']).toContain("application/json");
+		expect(res.status).toEqual(200);
-	});
+		expect(res.headers['content-type']).toContain("application/json");
+		expect(res.data.length).toEqual(50);
+	});
+	it('creating 250 new bulk card should return 200', async () => {
+		const res = await axios.post(base + '/api/cards/bulk?count=250', {}, axios_config);
+		expect(res.status).toEqual(200);
+		expect(res.headers['content-type']).toContain("application/json");
+	});
+	it('creating 2000 new bulk card should return 200', async () => {
+		const res = await axios.post(base + '/api/cards/bulk?count=2000', {}, axios_config);
+		expect(res.status).toEqual(200);
+		expect(res.headers['content-type']).toContain("application/json");
+	});
 });