Compare commits
	
		
			102 Commits
		
	
	
		
			v0.7.1
			...
			87f444c30d
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 87f444c30d | |||
| 4a73eab134 | |||
| f8baca5ab2 | |||
| 10221b9f2e | |||
| 1d8c8c8e9c | |||
| 4603a84f16 | |||
| 2cd8f3f7f3 | |||
| 107eeeae7f | |||
| b8767b8bd4 | |||
| bf686e89e0 | |||
| 6163f0a90b | |||
| 8f0f795a70 | |||
| 22cae39bd3 | |||
| 0b07a53ed2 | |||
| d4a02e7db2 | |||
| b9a7dc84f0 | |||
| 7111068361 | |||
| 63964fbf2c | |||
| cbcb829fbd | |||
| 057ae0d797 | |||
| 257f320ee3 | |||
| 7b15c2d88b | |||
| 988f17a795 | |||
| 4471e57438 | |||
| 51daf969cf | |||
| cb71fcd13b | |||
| a6a526dc5d | |||
| dd6d799c84 | |||
| e89e07d0fc | |||
| c28843c405 | |||
| 4834a6698b | |||
| 69afd4d587 | |||
| 24d152fdc8 | |||
| 4279e43743 | |||
| d837654617 | |||
| 0767943721 | |||
| ca87774767 | |||
| f693f2cde9 | |||
| d70c5b1bbc | |||
| 71e3d0efe2 | |||
| b517dff8a8 | |||
| 114c246ace | |||
| d7703c9e07 | |||
| dc3071f7d2 | |||
| 5fb355f450 | |||
| 33c13de32c | |||
| 1be073a4fa | |||
| b0d8249452 | |||
| 7af883f271 | |||
| f5433076b0 | |||
| 6aafe4a6ae | |||
| bdeeb03645 | |||
| 675c8762e8 | |||
| 89e392473c | |||
| 6c9b91d75a | |||
| 8c00aefd6c | |||
| 3afd785a54 | |||
| 8099999e2c | |||
| a139554e05 | |||
| 0290b0e5f5 | |||
| 0f7fa990d4 | |||
| 2f568c9cb8 | |||
| 1cb2dc9d53 | |||
| 6005b0661f | |||
| 5a36c8dcae | |||
| 58f4d2151f | |||
| 95135ddc89 | |||
| a7fe1e1759 | |||
| 56a5f41686 | |||
| c23b4d907f | |||
| bd7b81efe7 | |||
| 274a146b9b | |||
| 5a3fc5b2bd | |||
| 070560e863 | |||
| 536900091a | |||
| 8154e715bb | |||
| 4c6665062f | |||
| cb3ea9b1eb | |||
| 7a64f23937 | |||
| 96ba25ec6c | |||
| e6a8ebcb5b | |||
| 888cab5898 | |||
| 383a8095b8 | |||
| 63f6526e4f | |||
| b24e24ff7d | |||
| 9ce35d8eb7 | |||
| 48a87e8936 | |||
| b8c28ebb08 | |||
| 5daaa3a73c | |||
| 24c38cce26 | |||
| bd00f4f8d5 | |||
| 03d76e6d0b | |||
| 3f8e8ce3a6 | |||
| c9bd6de476 | |||
| e702118d4d | |||
| 97159dd9f8 | |||
| 942d9dbc76 | |||
| 88844e1a44 | |||
| 20aeed8778 | |||
| ccb7ae29a3 | |||
| dcb12b0ac2 | |||
| dd1258333e | 
| @@ -22,7 +22,7 @@ get: | ||||
| --- | ||||
| kind: pipeline | ||||
| type: kubernetes | ||||
| name: tests:node_latest | ||||
| name: tests:node_14.15.1-alpine3.12 | ||||
| clone: | ||||
|   disable: true | ||||
| steps: | ||||
| @@ -32,7 +32,7 @@ steps: | ||||
|       - git clone $DRONE_REMOTE_URL . | ||||
|       - git checkout $DRONE_SOURCE_BRANCH | ||||
|   - name: run tests | ||||
|     image: node:latest | ||||
|     image: node:14.15.1-alpine3.12 | ||||
|     commands: | ||||
|       - yarn | ||||
|       - yarn test:ci | ||||
|   | ||||
							
								
								
									
										107
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										107
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -2,16 +2,119 @@ | ||||
|  | ||||
| All notable changes to this project will be documented in this file. Dates are displayed in UTC. | ||||
|  | ||||
| #### [v0.10.1](https://git.odit.services/lfk/backend/compare/v0.10.0...v0.10.1) | ||||
|  | ||||
| - Merge pull request 'Release 0.10.1' (#189) from dev into main [`e89e07d`](https://git.odit.services/lfk/backend/commit/e89e07d0fc99f14148b01204fb8ed39e2da77e38) | ||||
| - 🧾New changelog file version [CI SKIP] [skip ci] [`69afd4d`](https://git.odit.services/lfk/backend/commit/69afd4d5877401eb46df430f43a7feb273abda1e) | ||||
| - 🚀Bumped version to v0.10.1 [`24d152f`](https://git.odit.services/lfk/backend/commit/24d152fdc8fe17fffa2f2a718d7145ba8a91d79c) | ||||
| - New class: ResponseSelfServiceDonor [`d70c5b1`](https://git.odit.services/lfk/backend/commit/d70c5b1bbc9f02782f8755b6929e2d3458e10221) | ||||
| - 🧾New changelog file version [CI SKIP] [skip ci] [`4279e43`](https://git.odit.services/lfk/backend/commit/4279e4374304887e8db40eab77763b20bbce91a1) | ||||
| - Removed duplicate openapi statement [`4834a66`](https://git.odit.services/lfk/backend/commit/4834a6698b0958602421c1478a95fec7edda910b) | ||||
| - Switched selfservice donation.donor from string to object [`0767943`](https://git.odit.services/lfk/backend/commit/0767943721b6964d542f580c541e744f86444ac6) | ||||
| - Adjusted runner property names [`ca87774`](https://git.odit.services/lfk/backend/commit/ca87774767807a2c4bc869b0de95cc73832a8405) | ||||
| - 🧾New changelog file version [CI SKIP] [skip ci] [`71e3d0e`](https://git.odit.services/lfk/backend/commit/71e3d0efe2cbde47aea0f26cb5a8b5cd3312707d) | ||||
| - 🧾New changelog file version [CI SKIP] [skip ci] [`c28843c`](https://git.odit.services/lfk/backend/commit/c28843c405dc4fd06a10f0fb85814acede15a769) | ||||
| - Merge pull request 'Selfservice donations reformatting feature/187-selfservice_donation' (#188) from feature/187-selfservice_donation into dev [`d837654`](https://git.odit.services/lfk/backend/commit/d837654617f7de5d055ffb06c65e2cd52f65c604) | ||||
| - Added new responsetype for new class [`f693f2c`](https://git.odit.services/lfk/backend/commit/f693f2cde9a04147155aea4de5d52e1d19d722ca) | ||||
|  | ||||
| #### [v0.10.0](https://git.odit.services/lfk/backend/compare/v0.9.2...v0.10.0) | ||||
|  | ||||
| > 1 April 2021 | ||||
|  | ||||
| - Merge pull request 'Release 0.10.0' (#186) from dev into main [`b517dff`](https://git.odit.services/lfk/backend/commit/b517dff8a82c960836d9f0be90fd89f3ba2fae7d) | ||||
| - 🚀Bumped version to v0.10.0 [`dc3071f`](https://git.odit.services/lfk/backend/commit/dc3071f7d2be298f0bb02d86ec67ed1125cd3b49) | ||||
| - 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) | ||||
| - 🧾New changelog file version [CI SKIP] [skip ci] [`5fb355f`](https://git.odit.services/lfk/backend/commit/5fb355f450f19e96d3671b1a46e94d564495942b) | ||||
| - 🧾New changelog file version [CI SKIP] [skip ci] [`114c246`](https://git.odit.services/lfk/backend/commit/114c246aceba566cc0dd6daab51a77b951b031cc) | ||||
| - 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 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) | ||||
| - Updated auth test to comply with the new pw requirements [`63f6526`](https://git.odit.services/lfk/backend/commit/63f6526e4f59621edbf1fad59fc569b4bd6acbf2) | ||||
| - Added user deletion tests [`e6a8ebc`](https://git.odit.services/lfk/backend/commit/e6a8ebcb5b4f430254da4afe159141b21d8da0ed) | ||||
| - Added user creation valid tests [`383a809`](https://git.odit.services/lfk/backend/commit/383a8095b8286d51fb2fb24ae2fd0156230e56ab) | ||||
| - 📖New license file version [CI SKIP] [skip ci] [`bd7b81e`](https://git.odit.services/lfk/backend/commit/bd7b81efe795c02512c87f3b5dd5eec796580144) | ||||
| - Added password errors [`24c38cc`](https://git.odit.services/lfk/backend/commit/24c38cce26da41ccf375e1ccf04afa1868aad8df) | ||||
| - 🧾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) | ||||
| - 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) | ||||
|  | ||||
| #### [v0.8.0](https://git.odit.services/lfk/backend/compare/v0.7.1...v0.8.0) | ||||
|  | ||||
| > 26 March 2021 | ||||
|  | ||||
| - Merge pull request 'Release 0.8.0' (#176) from dev into main [`3f8e8ce`](https://git.odit.services/lfk/backend/commit/3f8e8ce3a66a943801c0c8e17885e71feeee744f) | ||||
| - 🧾New changelog file version [CI SKIP] [skip ci] [`c9bd6de`](https://git.odit.services/lfk/backend/commit/c9bd6de4762fec04e1e02cd3b667838d05ef39a7) | ||||
| - Merge pull request 'Selfservice deletion feature/174-selfservice_deletion' (#175) from feature/174-selfservice_deletion into dev [`e702118`](https://git.odit.services/lfk/backend/commit/e702118d4d80e362e41bb88c74343d50530d1338) | ||||
| - Added tests for the new endpoint [`20aeed8`](https://git.odit.services/lfk/backend/commit/20aeed87780247dc6401bba725801fc1874e50b5) | ||||
| - Removed param from test [`97159dd`](https://git.odit.services/lfk/backend/commit/97159dd9f81aed080c174a3eb8da9e66dfea9b10) | ||||
| - Added selfservice deletion endpoint [`dcb12b0`](https://git.odit.services/lfk/backend/commit/dcb12b0ac289f8df148ba10ae6389727c16f53fd) | ||||
| - 🧾New changelog file version [CI SKIP] [skip ci] [`88844e1`](https://git.odit.services/lfk/backend/commit/88844e1a44d87a7dc253bf9aedf2fb3f6cdd1cfe) | ||||
| - Fixed response bug [`ccb7ae2`](https://git.odit.services/lfk/backend/commit/ccb7ae29a39387c0f2762861565dc22996a2493a) | ||||
| - Updated old hint [`dd12583`](https://git.odit.services/lfk/backend/commit/dd1258333ef67243f8a8df97c176ec5a054a5e3b) | ||||
|  | ||||
| #### [v0.7.1](https://git.odit.services/lfk/backend/compare/v0.7.0...v0.7.1) | ||||
|  | ||||
| > 26 March 2021 | ||||
|  | ||||
| - Merge pull request 'Release 0.7.1' (#173) from dev into main [`e76a9ce`](https://git.odit.services/lfk/backend/commit/e76a9cef956b00de7bbb11b6d863d4f33e3d5a34) | ||||
| - Revert "Set timeout even higher b/c sqlite just kills itself during these tests" [`f159252`](https://git.odit.services/lfk/backend/commit/f159252651942e442026dbcaae09b242e05d8204) | ||||
| - Set timeout even higher b/c sqlite just kills itself during these tests [`6ab6099`](https://git.odit.services/lfk/backend/commit/6ab60998d4f716aded93bb3b5d15594fc5e0434a) | ||||
| - Adjusted jest timeout to mitigate sqlite from invalidateing all tests⏱ [`30d220b`](https://git.odit.services/lfk/backend/commit/30d220bc36a28f224406e49ed27ff3f6b4f409e9) | ||||
| - 🧾New changelog file version [CI SKIP] [skip ci] [`963253c`](https://git.odit.services/lfk/backend/commit/963253cbc84ed07af13ed0925952ec1b7dcc53ad) | ||||
| - Now resolveing runnercards [`24aff3b`](https://git.odit.services/lfk/backend/commit/24aff3bac458a9886ca40163484bc72733dc766a) | ||||
| - Tests now keep the group [`f3d73d5`](https://git.odit.services/lfk/backend/commit/f3d73d53467a4d00011d280c24e1e12fbb8e443d) | ||||
| - 🧾New changelog file version [CI SKIP] [skip ci] [`3ef3a94`](https://git.odit.services/lfk/backend/commit/3ef3a94b20c1abf6fd2f19472e5f448b4c72bd7f) | ||||
| - 🚀Bumped version to v0.7.1 [`135852e`](https://git.odit.services/lfk/backend/commit/135852eb9a91010a4ab972ba9efc7b71dfe4d68f) | ||||
| - Merge pull request 'RESPONSERUNNERCARD fix bugfix/171-responserunnercards' (#172) from bugfix/171-responserunnercards into dev [`539a650`](https://git.odit.services/lfk/backend/commit/539a6509b17cfd373eef8e443eaa7d41168ac7a9) | ||||
| - Now resolveing runnercards [`24aff3b`](https://git.odit.services/lfk/backend/commit/24aff3bac458a9886ca40163484bc72733dc766a) | ||||
| - Tests now keep the group [`f3d73d5`](https://git.odit.services/lfk/backend/commit/f3d73d53467a4d00011d280c24e1e12fbb8e443d) | ||||
| - 🧾New changelog file version [CI SKIP] [skip ci] [`ce63043`](https://git.odit.services/lfk/backend/commit/ce63043887769e1f92a8c064d6647e0deb81b7fa) | ||||
|  | ||||
| #### [v0.7.0](https://git.odit.services/lfk/backend/compare/v0.6.4...v0.7.0) | ||||
|   | ||||
| @@ -11,8 +11,12 @@ services: | ||||
|       DB_PORT: bla | ||||
|       DB_USER: bla | ||||
|       DB_PASSWORD: bla | ||||
|       DB_NAME: dev.sqlite | ||||
|       DB_NAME: ./db.sqlite | ||||
|       NODE_ENV: production | ||||
|       POSTALCODE_COUNTRYCODE: DE | ||||
|       SEED_TEST_DATA: "false" | ||||
|       MAILER_URL: https://dev.lauf-fuer-kaya.de/mailer | ||||
|       MAILER_KEY: asdasd | ||||
|       # APP_PORT: 4010 | ||||
|       # DB_TYPE: postgres | ||||
|       # DB_HOST: backend_db | ||||
|   | ||||
							
								
								
									
										29
									
								
								licenses.md
									
									
									
									
									
								
							
							
						
						
									
										29
									
								
								licenses.md
									
									
									
									
									
								
							| @@ -115,6 +115,35 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE | ||||
| SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||||
|   | ||||
|  | ||||
| # check-password-strength | ||||
| **Author**: deanilvincent | ||||
| **Repo**: [object Object] | ||||
| **License**: MIT | ||||
| **Description**: A NPM Password strength checker based from Javascript RegExp. Check passphrase if it's "Weak", "Medium" or "Strong" | ||||
| ## License Text | ||||
| MIT License | ||||
|  | ||||
| Copyright (c) 2020 Mark Deanil Vicente | ||||
|  | ||||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||||
| of this software and associated documentation files (the "Software"), to deal | ||||
| in the Software without restriction, including without limitation the rights | ||||
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||||
| copies of the Software, and to permit persons to whom the Software is | ||||
| furnished to do so, subject to the following conditions: | ||||
|  | ||||
| The above copyright notice and this permission notice shall be included in all | ||||
| copies or substantial portions of the Software. | ||||
|  | ||||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||||
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||||
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||||
| SOFTWARE. | ||||
|   | ||||
|  | ||||
| # class-transformer | ||||
| **Author**: [object Object] | ||||
| **Repo**: [object Object] | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| { | ||||
|   "name": "@odit/lfk-backend", | ||||
|   "version": "0.7.1", | ||||
|   "version": "0.10.1", | ||||
|   "main": "src/app.ts", | ||||
|   "repository": "https://git.odit.services/lfk/backend", | ||||
|   "author": { | ||||
| @@ -26,6 +26,7 @@ | ||||
|     "argon2": "^0.27.1", | ||||
|     "axios": "^0.21.1", | ||||
|     "body-parser": "^1.19.0", | ||||
|     "check-password-strength": "^2.0.2", | ||||
|     "class-transformer": "0.3.1", | ||||
|     "class-validator": "^0.13.1", | ||||
|     "consola": "^2.15.0", | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| import { Body, CurrentUser, Delete, Get, JsonController, OnUndefined, Put, QueryParam } from 'routing-controllers'; | ||||
| import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi'; | ||||
| import { getConnectionManager, Repository } from 'typeorm'; | ||||
| import { UserDeletionNotConfirmedError, UserIdsNotMatchingError, UsernameContainsIllegalCharacterError, UserNotFoundError } from '../errors/UserErrors'; | ||||
| import { PasswordMustContainLowercaseLetterError, PasswordMustContainNumberError, PasswordMustContainUppercaseLetterError, PasswordTooShortError, UserDeletionNotConfirmedError, UserIdsNotMatchingError, UsernameContainsIllegalCharacterError, UserNotFoundError } from '../errors/UserErrors'; | ||||
| import { UpdateUser } from '../models/actions/update/UpdateUser'; | ||||
| import { User } from '../models/entities/User'; | ||||
| import { ResponseUser } from '../models/responses/ResponseUser'; | ||||
| @@ -48,6 +48,10 @@ export class MeController { | ||||
| 	@ResponseSchema(UserNotFoundError, { statusCode: 404 }) | ||||
| 	@ResponseSchema(UserIdsNotMatchingError, { statusCode: 406 }) | ||||
| 	@ResponseSchema(UsernameContainsIllegalCharacterError, { statusCode: 406 }) | ||||
| 	@ResponseSchema(PasswordMustContainUppercaseLetterError, { statusCode: 406 }) | ||||
| 	@ResponseSchema(PasswordMustContainLowercaseLetterError, { statusCode: 406 }) | ||||
| 	@ResponseSchema(PasswordMustContainNumberError, { statusCode: 406 }) | ||||
| 	@ResponseSchema(PasswordTooShortError, { statusCode: 406 }) | ||||
| 	@OpenAPI({ description: "Update the yourself. <br> You can't edit your own permissions or group memberships here - Please use the /api/users/:id enpoint instead. <br> Please remember that ids can't be changed." }) | ||||
| 	async put(@CurrentUser() currentUser: User, @Body({ validate: true }) updateUser: UpdateUser) { | ||||
| 		let oldUser = await this.userRepository.findOne({ id: currentUser.id }, { relations: ['groups'] }); | ||||
|   | ||||
| @@ -1,121 +1,131 @@ | ||||
| import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers'; | ||||
| import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi'; | ||||
| import { getConnectionManager, Repository } from 'typeorm'; | ||||
| import { RunnerCardHasScansError, RunnerCardIdsNotMatchingError, RunnerCardNotFoundError } from '../errors/RunnerCardErrors'; | ||||
| import { RunnerNotFoundError } from '../errors/RunnerErrors'; | ||||
| import { CreateRunnerCard } from '../models/actions/create/CreateRunnerCard'; | ||||
| import { UpdateRunnerCard } from '../models/actions/update/UpdateRunnerCard'; | ||||
| import { RunnerCard } from '../models/entities/RunnerCard'; | ||||
| import { ResponseEmpty } from '../models/responses/ResponseEmpty'; | ||||
| import { ResponseRunnerCard } from '../models/responses/ResponseRunnerCard'; | ||||
| import { ScanController } from './ScanController'; | ||||
|  | ||||
| @JsonController('/cards') | ||||
| @OpenAPI({ security: [{ "AuthToken": [] }, { "RefreshTokenCookie": [] }] }) | ||||
| export class RunnerCardController { | ||||
| 	private cardRepository: Repository<RunnerCard>; | ||||
|  | ||||
| 	/** | ||||
| 	 * Gets the repository of this controller's model/entity. | ||||
| 	 */ | ||||
| 	constructor() { | ||||
| 		this.cardRepository = getConnectionManager().get().getRepository(RunnerCard); | ||||
| 	} | ||||
|  | ||||
| 	@Get() | ||||
| 	@Authorized("CARD:GET") | ||||
| 	@ResponseSchema(ResponseRunnerCard, { isArray: true }) | ||||
| 	@OpenAPI({ description: 'Lists all card.' }) | ||||
| 	async getAll() { | ||||
| 		let responseCards: ResponseRunnerCard[] = new Array<ResponseRunnerCard>(); | ||||
| 		const cards = await this.cardRepository.find({ relations: ['runner', 'runner.group', 'runner.group.parentGroup'] }); | ||||
| 		cards.forEach(card => { | ||||
| 			responseCards.push(new ResponseRunnerCard(card)); | ||||
| 		}); | ||||
| 		return responseCards; | ||||
| 	} | ||||
|  | ||||
| 	@Get('/:id') | ||||
| 	@Authorized("CARD:GET") | ||||
| 	@ResponseSchema(ResponseRunnerCard) | ||||
| 	@ResponseSchema(RunnerCardNotFoundError, { statusCode: 404 }) | ||||
| 	@OnUndefined(RunnerCardNotFoundError) | ||||
| 	@OpenAPI({ description: "Lists all information about the card whose id got provided." }) | ||||
| 	async getOne(@Param('id') id: number) { | ||||
| 		let card = await this.cardRepository.findOne({ id: id }, { relations: ['runner', 'runner.group', 'runner.group.parentGroup'] }); | ||||
| 		if (!card) { throw new RunnerCardNotFoundError(); } | ||||
| 		return card.toResponse(); | ||||
| 	} | ||||
|  | ||||
| 	@Post('/bulk') | ||||
| 	@Authorized("CARD:CREATE") | ||||
| 	@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." }) | ||||
| 	async postBlancoBulk(@QueryParam("count") count: number) { | ||||
| 		let createPromises = new Array<any>(); | ||||
| 		for (let index = 0; index < count; index++) { | ||||
| 			createPromises.push(this.cardRepository.save({ runner: null, enabled: true })) | ||||
| 		} | ||||
| 		await Promise.all(createPromises); | ||||
| 		let response = new ResponseEmpty(); | ||||
| 		response.response = `Created ${count} new blanco cards.` | ||||
| 		return response; | ||||
| 	} | ||||
|  | ||||
| 	@Post() | ||||
| 	@Authorized("CARD:CREATE") | ||||
| 	@ResponseSchema(ResponseRunnerCard) | ||||
| 	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 }) | ||||
| 	@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 card = await createCard.toEntity(); | ||||
| 		card = await this.cardRepository.save(card); | ||||
| 		return (await this.cardRepository.findOne({ id: card.id }, { relations: ['runner', 'runner.group', 'runner.group.parentGroup'] })).toResponse(); | ||||
| 	} | ||||
|  | ||||
| 	@Put('/:id') | ||||
| 	@Authorized("CARD:UPDATE") | ||||
| 	@ResponseSchema(ResponseRunnerCard) | ||||
| 	@ResponseSchema(RunnerCardNotFoundError, { statusCode: 404 }) | ||||
| 	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 }) | ||||
| 	@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) { | ||||
| 		let oldCard = await this.cardRepository.findOne({ id: id }); | ||||
|  | ||||
| 		if (!oldCard) { | ||||
| 			throw new RunnerCardNotFoundError(); | ||||
| 		} | ||||
|  | ||||
| 		if (oldCard.id != card.id) { | ||||
| 			throw new RunnerCardIdsNotMatchingError(); | ||||
| 		} | ||||
|  | ||||
| 		await this.cardRepository.save(await card.update(oldCard)); | ||||
| 		return (await this.cardRepository.findOne({ id: id }, { relations: ['runner', 'runner.group', 'runner.group.parentGroup'] })).toResponse(); | ||||
| 	} | ||||
|  | ||||
| 	@Delete('/:id') | ||||
| 	@Authorized("CARD:DELETE") | ||||
| 	@ResponseSchema(ResponseRunnerCard) | ||||
| 	@ResponseSchema(ResponseEmpty, { statusCode: 204 }) | ||||
| 	@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)." }) | ||||
| 	async remove(@Param("id") id: number, @QueryParam("force") force: boolean) { | ||||
| 		let card = await this.cardRepository.findOne({ id: id }); | ||||
| 		if (!card) { return null; } | ||||
|  | ||||
| 		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(); | ||||
| 	} | ||||
| import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers'; | ||||
| import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi'; | ||||
| import { getConnectionManager, Repository } from 'typeorm'; | ||||
| import { RunnerCardHasScansError, RunnerCardIdsNotMatchingError, RunnerCardNotFoundError } from '../errors/RunnerCardErrors'; | ||||
| import { RunnerNotFoundError } from '../errors/RunnerErrors'; | ||||
| import { CreateRunnerCard } from '../models/actions/create/CreateRunnerCard'; | ||||
| import { UpdateRunnerCard } from '../models/actions/update/UpdateRunnerCard'; | ||||
| import { RunnerCard } from '../models/entities/RunnerCard'; | ||||
| import { ResponseEmpty } from '../models/responses/ResponseEmpty'; | ||||
| import { ResponseRunnerCard } from '../models/responses/ResponseRunnerCard'; | ||||
| import { ScanController } from './ScanController'; | ||||
|  | ||||
| @JsonController('/cards') | ||||
| @OpenAPI({ security: [{ "AuthToken": [] }, { "RefreshTokenCookie": [] }] }) | ||||
| export class RunnerCardController { | ||||
| 	private cardRepository: Repository<RunnerCard>; | ||||
|  | ||||
| 	/** | ||||
| 	 * Gets the repository of this controller's model/entity. | ||||
| 	 */ | ||||
| 	constructor() { | ||||
| 		this.cardRepository = getConnectionManager().get().getRepository(RunnerCard); | ||||
| 	} | ||||
|  | ||||
| 	@Get() | ||||
| 	@Authorized("CARD:GET") | ||||
| 	@ResponseSchema(ResponseRunnerCard, { isArray: true }) | ||||
| 	@OpenAPI({ description: 'Lists all card.' }) | ||||
| 	async getAll() { | ||||
| 		let responseCards: ResponseRunnerCard[] = new Array<ResponseRunnerCard>(); | ||||
| 		const cards = await this.cardRepository.find({ relations: ['runner', 'runner.group', 'runner.group.parentGroup'] }); | ||||
| 		cards.forEach(card => { | ||||
| 			responseCards.push(new ResponseRunnerCard(card)); | ||||
| 		}); | ||||
| 		return responseCards; | ||||
| 	} | ||||
|  | ||||
| 	@Get('/:id') | ||||
| 	@Authorized("CARD:GET") | ||||
| 	@ResponseSchema(ResponseRunnerCard) | ||||
| 	@ResponseSchema(RunnerCardNotFoundError, { statusCode: 404 }) | ||||
| 	@OnUndefined(RunnerCardNotFoundError) | ||||
| 	@OpenAPI({ description: "Lists all information about the card whose id got provided." }) | ||||
| 	async getOne(@Param('id') id: number) { | ||||
| 		let card = await this.cardRepository.findOne({ id: id }, { relations: ['runner', 'runner.group', 'runner.group.parentGroup'] }); | ||||
| 		if (!card) { throw new RunnerCardNotFoundError(); } | ||||
| 		return card.toResponse(); | ||||
| 	} | ||||
|  | ||||
| 	@Post('/bulk') | ||||
| 	@Authorized("CARD:CREATE") | ||||
| 	@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. <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, @QueryParam("returnCards") returnCards: boolean = false) { | ||||
| 		let createPromises = new Array<any>(); | ||||
| 		for (let index = 0; index < count; index++) { | ||||
| 			createPromises.push(this.cardRepository.save({ runner: null, enabled: true })) | ||||
| 		} | ||||
|  | ||||
| 		const cards = await Promise.all(createPromises); | ||||
|  | ||||
| 		if (returnCards) { | ||||
| 			let responseCards: ResponseRunnerCard[] = new Array<ResponseRunnerCard>(); | ||||
| 			for await (let card of cards) { | ||||
| 				let dbCard = await this.cardRepository.findOne({ id: card.id }); | ||||
| 				responseCards.push(new ResponseRunnerCard(dbCard)); | ||||
| 			} | ||||
| 			return responseCards; | ||||
| 		} | ||||
| 		let response = new ResponseEmpty(); | ||||
| 		response.response = `Created ${count} new blanco cards.` | ||||
| 		return response; | ||||
| 	} | ||||
|  | ||||
| 	@Post() | ||||
| 	@Authorized("CARD:CREATE") | ||||
| 	@ResponseSchema(ResponseRunnerCard) | ||||
| 	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 }) | ||||
| 	@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 card = await createCard.toEntity(); | ||||
| 		card = await this.cardRepository.save(card); | ||||
| 		return (await this.cardRepository.findOne({ id: card.id }, { relations: ['runner', 'runner.group', 'runner.group.parentGroup'] })).toResponse(); | ||||
| 	} | ||||
|  | ||||
| 	@Put('/:id') | ||||
| 	@Authorized("CARD:UPDATE") | ||||
| 	@ResponseSchema(ResponseRunnerCard) | ||||
| 	@ResponseSchema(RunnerCardNotFoundError, { statusCode: 404 }) | ||||
| 	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 }) | ||||
| 	@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) { | ||||
| 		let oldCard = await this.cardRepository.findOne({ id: id }); | ||||
|  | ||||
| 		if (!oldCard) { | ||||
| 			throw new RunnerCardNotFoundError(); | ||||
| 		} | ||||
|  | ||||
| 		if (oldCard.id != card.id) { | ||||
| 			throw new RunnerCardIdsNotMatchingError(); | ||||
| 		} | ||||
|  | ||||
| 		await this.cardRepository.save(await card.update(oldCard)); | ||||
| 		return (await this.cardRepository.findOne({ id: id }, { relations: ['runner', 'runner.group', 'runner.group.parentGroup'] })).toResponse(); | ||||
| 	} | ||||
|  | ||||
| 	@Delete('/:id') | ||||
| 	@Authorized("CARD:DELETE") | ||||
| 	@ResponseSchema(ResponseRunnerCard) | ||||
| 	@ResponseSchema(ResponseEmpty, { statusCode: 204 }) | ||||
| 	@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)." }) | ||||
| 	async remove(@Param("id") id: number, @QueryParam("force") force: boolean) { | ||||
| 		let card = await this.cardRepository.findOne({ id: id }); | ||||
| 		if (!card) { return null; } | ||||
|  | ||||
| 		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(); | ||||
| 	} | ||||
| } | ||||
| @@ -1,186 +1,228 @@ | ||||
| import { Request } from "express"; | ||||
| import * as jwt from "jsonwebtoken"; | ||||
| import { Body, Get, JsonController, OnUndefined, Param, Post, QueryParam, Req, UseBefore } from 'routing-controllers'; | ||||
| import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi'; | ||||
| import { getConnectionManager, Repository } from 'typeorm'; | ||||
| import { config } from '../config'; | ||||
| import { InvalidCredentialsError, JwtNotProvidedError } from '../errors/AuthError'; | ||||
| import { MailSendingError } from '../errors/MailErrors'; | ||||
| import { RunnerEmailNeededError, RunnerNotFoundError, RunnerSelfserviceTimeoutError } from '../errors/RunnerErrors'; | ||||
| import { RunnerOrganizationNotFoundError } from '../errors/RunnerOrganizationErrors'; | ||||
| import { ScanStationNotFoundError } from '../errors/ScanStationErrors'; | ||||
| import { JwtCreator } from '../jwtcreator'; | ||||
| import { Mailer } from '../mailer'; | ||||
| import ScanAuth from '../middlewares/ScanAuth'; | ||||
| import { CreateSelfServiceCitizenRunner } from '../models/actions/create/CreateSelfServiceCitizenRunner'; | ||||
| import { CreateSelfServiceRunner } from '../models/actions/create/CreateSelfServiceRunner'; | ||||
| import { Runner } from '../models/entities/Runner'; | ||||
| import { RunnerGroup } from '../models/entities/RunnerGroup'; | ||||
| import { RunnerOrganization } from '../models/entities/RunnerOrganization'; | ||||
| import { ScanStation } from '../models/entities/ScanStation'; | ||||
| import { ResponseEmpty } from '../models/responses/ResponseEmpty'; | ||||
| import { ResponseScanStation } from '../models/responses/ResponseScanStation'; | ||||
| import { ResponseSelfServiceOrganisation } from '../models/responses/ResponseSelfServiceOrganisation'; | ||||
| import { ResponseSelfServiceRunner } from '../models/responses/ResponseSelfServiceRunner'; | ||||
| import { ResponseSelfServiceScan } from '../models/responses/ResponseSelfServiceScan'; | ||||
|  | ||||
| @JsonController() | ||||
| export class RunnerSelfServiceController { | ||||
| 	private runnerRepository: Repository<Runner>; | ||||
| 	private orgRepository: Repository<RunnerOrganization>; | ||||
| 	private stationRepository: Repository<ScanStation>; | ||||
|  | ||||
| 	/** | ||||
| 	 * Gets the repository of this controller's model/entity. | ||||
| 	 */ | ||||
| 	constructor() { | ||||
| 		this.runnerRepository = getConnectionManager().get().getRepository(Runner); | ||||
| 		this.orgRepository = getConnectionManager().get().getRepository(RunnerOrganization); | ||||
| 		this.stationRepository = getConnectionManager().get().getRepository(ScanStation); | ||||
| 	} | ||||
|  | ||||
| 	@Get('/runners/me/:jwt') | ||||
| 	@ResponseSchema(ResponseSelfServiceRunner) | ||||
| 	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 }) | ||||
| 	@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 contact support.' }) | ||||
| 	async get(@Param('jwt') token: string) { | ||||
| 		return (new ResponseSelfServiceRunner(await this.getRunner(token))); | ||||
| 	} | ||||
|  | ||||
| 	@Get('/runners/me/:jwt/scans') | ||||
| 	@ResponseSchema(ResponseSelfServiceScan, { isArray: true }) | ||||
| 	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 }) | ||||
| 	@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.' }) | ||||
| 	async getScans(@Param('jwt') token: string) { | ||||
| 		const scans = (await this.getRunner(token)).scans; | ||||
| 		let responseScans = new Array<ResponseSelfServiceScan>() | ||||
| 		for (let scan of scans) { | ||||
| 			responseScans.push(new ResponseSelfServiceScan(scan)); | ||||
| 		} | ||||
| 		return responseScans; | ||||
| 	} | ||||
|  | ||||
| 	@Get('/stations/me') | ||||
| 	@UseBefore(ScanAuth) | ||||
| 	@ResponseSchema(ResponseScanStation) | ||||
| 	@ResponseSchema(ScanStationNotFoundError, { statusCode: 404 }) | ||||
| 	@OnUndefined(ScanStationNotFoundError) | ||||
| 	@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) { | ||||
| 		let scan = await this.stationRepository.findOne({ id: parseInt(req.headers["station_id"].toString()) }, { relations: ['track'] }) | ||||
| 		if (!scan) { throw new ScanStationNotFoundError(); } | ||||
| 		return scan.toResponse(); | ||||
| 	} | ||||
|  | ||||
| 	@Post('/runners/forgot') | ||||
| 	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 }) | ||||
| 	@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).' }) | ||||
| 	async requestNewToken(@QueryParam('mail') mail: string) { | ||||
| 		if (!mail) { | ||||
| 			throw new RunnerNotFoundError(); | ||||
| 		} | ||||
| 		const runner = await this.runnerRepository.findOne({ email: mail }); | ||||
| 		if (!runner) { throw new RunnerNotFoundError(); } | ||||
|  | ||||
| 		if (runner.resetRequestedTimestamp > (Math.floor(Date.now() / 1000) - 60 * 60 * 24)) { throw new RunnerSelfserviceTimeoutError(); } | ||||
| 		const token = JwtCreator.createSelfService(runner); | ||||
|  | ||||
| 		try { | ||||
| 			await Mailer.sendSelfserviceForgottenMail(runner.email, token, "en") | ||||
| 		} catch (error) { | ||||
| 			throw new MailSendingError(); | ||||
| 		} | ||||
|  | ||||
| 		runner.resetRequestedTimestamp = Math.floor(Date.now() / 1000); | ||||
| 		await this.runnerRepository.save(runner); | ||||
|  | ||||
| 		return { token }; | ||||
| 	} | ||||
|  | ||||
| 	@Post('/runners/register') | ||||
| 	@ResponseSchema(ResponseSelfServiceRunner) | ||||
| 	@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.' }) | ||||
| 	async registerRunner(@Body({ validate: true }) createRunner: CreateSelfServiceCitizenRunner) { | ||||
| 		let runner = await createRunner.toEntity(); | ||||
|  | ||||
| 		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'] })); | ||||
| 		response.token = JwtCreator.createSelfService(runner); | ||||
|  | ||||
| 		try { | ||||
| 			await Mailer.sendSelfserviceWelcomeMail(runner.email, response.token, "en") | ||||
| 		} catch (error) { | ||||
| 			throw new MailSendingError(); | ||||
| 		} | ||||
|  | ||||
| 		return response; | ||||
| 	} | ||||
|  | ||||
| 	@Post('/runners/register/:token') | ||||
| 	@ResponseSchema(ResponseSelfServiceRunner) | ||||
| 	@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.' }) | ||||
| 	async registerOrganizationRunner(@Param('token') token: string, @Body({ validate: true }) createRunner: CreateSelfServiceRunner) { | ||||
| 		const org = await this.getOrgansisation(token); | ||||
|  | ||||
| 		let runner = await createRunner.toEntity(org); | ||||
| 		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'] })); | ||||
| 		response.token = JwtCreator.createSelfService(runner); | ||||
|  | ||||
| 		try { | ||||
| 			await Mailer.sendSelfserviceWelcomeMail(runner.email, response.token, "en") | ||||
| 		} catch (error) { | ||||
| 			throw new MailSendingError(); | ||||
| 		} | ||||
|  | ||||
| 		return response; | ||||
| 	} | ||||
|  | ||||
| 	@Get('/organizations/selfservice/:token') | ||||
| 	@ResponseSchema(ResponseSelfServiceOrganisation, { isArray: false }) | ||||
| 	@ResponseSchema(RunnerOrganizationNotFoundError, { statusCode: 404 }) | ||||
| 	@OpenAPI({ description: 'Get the basic info and teams for a org.' }) | ||||
| 	async getSelfserviceOrg(@Param('token') token: string) { | ||||
| 		const orgid = (await this.getOrgansisation(token)).id; | ||||
| 		const org = await this.orgRepository.findOne({ id: orgid }, { relations: ['teams'] }) | ||||
|  | ||||
| 		return new ResponseSelfServiceOrganisation(<RunnerOrganization>org); | ||||
| 	} | ||||
|  | ||||
| 	/** | ||||
| 	 * Get's a runner by a provided jwt token. | ||||
| 	 * @param token The runner jwt provided by the runner to identitfy themselves. | ||||
| 	 */ | ||||
| 	private async getRunner(token: string): Promise<Runner> { | ||||
| 		if (token == "") { throw new JwtNotProvidedError(); } | ||||
| 		let jwtPayload = undefined | ||||
| 		try { | ||||
| 			jwtPayload = <any>jwt.verify(token, config.jwt_secret); | ||||
| 		} catch (error) { | ||||
| 			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'] }); | ||||
| 		if (!runner) { throw new RunnerNotFoundError() } | ||||
| 		return runner; | ||||
| 	} | ||||
|  | ||||
| 	/** | ||||
| 	 * Get's a runner org by a provided registration api key. | ||||
| 	 * @param token The organization's registration api token. | ||||
| 	 */ | ||||
| 	private async getOrgansisation(token: string): Promise<RunnerGroup> { | ||||
| 		token = Buffer.from(token, 'base64').toString('utf8'); | ||||
|  | ||||
| 		const organization = await this.orgRepository.findOne({ key: token }); | ||||
| 		if (!organization) { throw new RunnerOrganizationNotFoundError; } | ||||
|  | ||||
| 		return organization; | ||||
| 	} | ||||
| import { Request } from "express"; | ||||
| import * as jwt from "jsonwebtoken"; | ||||
| import { Body, Delete, Get, JsonController, OnUndefined, Param, Post, QueryParam, Req, UseBefore } from 'routing-controllers'; | ||||
| import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi'; | ||||
| import { getConnectionManager, Repository } from 'typeorm'; | ||||
| import { config } from '../config'; | ||||
| import { InvalidCredentialsError, JwtNotProvidedError } from '../errors/AuthError'; | ||||
| import { MailSendingError } from '../errors/MailErrors'; | ||||
| import { RunnerEmailNeededError, RunnerHasDistanceDonationsError, RunnerNotFoundError, RunnerSelfserviceTimeoutError } from '../errors/RunnerErrors'; | ||||
| import { RunnerOrganizationNotFoundError } from '../errors/RunnerOrganizationErrors'; | ||||
| import { ScanStationNotFoundError } from '../errors/ScanStationErrors'; | ||||
| import { JwtCreator } from '../jwtcreator'; | ||||
| import { Mailer } from '../mailer'; | ||||
| import ScanAuth from '../middlewares/ScanAuth'; | ||||
| import { CreateSelfServiceCitizenRunner } from '../models/actions/create/CreateSelfServiceCitizenRunner'; | ||||
| import { CreateSelfServiceRunner } from '../models/actions/create/CreateSelfServiceRunner'; | ||||
| import { Runner } from '../models/entities/Runner'; | ||||
| import { RunnerGroup } from '../models/entities/RunnerGroup'; | ||||
| import { RunnerOrganization } from '../models/entities/RunnerOrganization'; | ||||
| import { ScanStation } from '../models/entities/ScanStation'; | ||||
| import { ResponseEmpty } from '../models/responses/ResponseEmpty'; | ||||
| import { ResponseScanStation } from '../models/responses/ResponseScanStation'; | ||||
| import { ResponseSelfServiceOrganisation } from '../models/responses/ResponseSelfServiceOrganisation'; | ||||
| import { ResponseSelfServiceRunner } from '../models/responses/ResponseSelfServiceRunner'; | ||||
| import { ResponseSelfServiceScan } from '../models/responses/ResponseSelfServiceScan'; | ||||
| import { DonationController } from './DonationController'; | ||||
| import { RunnerCardController } from './RunnerCardController'; | ||||
| import { ScanController } from './ScanController'; | ||||
|  | ||||
| @JsonController() | ||||
| export class RunnerSelfServiceController { | ||||
| 	private runnerRepository: Repository<Runner>; | ||||
| 	private orgRepository: Repository<RunnerOrganization>; | ||||
| 	private stationRepository: Repository<ScanStation>; | ||||
|  | ||||
| 	/** | ||||
| 	 * Gets the repository of this controller's model/entity. | ||||
| 	 */ | ||||
| 	constructor() { | ||||
| 		this.runnerRepository = getConnectionManager().get().getRepository(Runner); | ||||
| 		this.orgRepository = getConnectionManager().get().getRepository(RunnerOrganization); | ||||
| 		this.stationRepository = getConnectionManager().get().getRepository(ScanStation); | ||||
| 	} | ||||
|  | ||||
| 	@Get('/runners/me/:jwt') | ||||
| 	@ResponseSchema(ResponseSelfServiceRunner) | ||||
| 	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 }) | ||||
| 	@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.' }) | ||||
| 	async get(@Param('jwt') token: string) { | ||||
| 		return (new ResponseSelfServiceRunner(await this.getRunner(token))); | ||||
| 	} | ||||
|  | ||||
| 	@Delete('/runners/me/:jwt') | ||||
| 	@ResponseSchema(ResponseSelfServiceRunner) | ||||
| 	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 }) | ||||
| 	@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.' }) | ||||
| 	async remove(@Param('jwt') token: string, @QueryParam("force") force: boolean) { | ||||
| 		const responseRunner = await this.getRunner(token); | ||||
| 		let runner = await this.runnerRepository.findOne({ id: responseRunner.id }); | ||||
|  | ||||
| 		if (!runner) { return null; } | ||||
| 		if (!runner) { | ||||
| 			throw new RunnerNotFoundError(); | ||||
| 		} | ||||
|  | ||||
| 		const runnerDonations = (await this.runnerRepository.findOne({ id: runner.id }, { relations: ["distanceDonations"] })).distanceDonations; | ||||
| 		if (runnerDonations.length > 0 && !force) { | ||||
| 			throw new RunnerHasDistanceDonationsError(); | ||||
| 		} | ||||
| 		const donationController = new DonationController(); | ||||
| 		for (let donation of runnerDonations) { | ||||
| 			await donationController.remove(donation.id, force); | ||||
| 		} | ||||
|  | ||||
| 		const runnerCards = (await this.runnerRepository.findOne({ id: runner.id }, { relations: ["cards"] })).cards; | ||||
| 		const cardController = new RunnerCardController; | ||||
| 		for (let card of runnerCards) { | ||||
| 			await cardController.remove(card.id, force); | ||||
| 		} | ||||
|  | ||||
| 		const runnerScans = (await this.runnerRepository.findOne({ id: runner.id }, { relations: ["scans"] })).scans; | ||||
| 		const scanController = new ScanController; | ||||
| 		for (let scan of runnerScans) { | ||||
| 			await scanController.remove(scan.id, force); | ||||
| 		} | ||||
|  | ||||
| 		await this.runnerRepository.delete(runner); | ||||
| 		return new ResponseSelfServiceRunner(responseRunner); | ||||
| 	} | ||||
|  | ||||
| 	@Get('/runners/me/:jwt/scans') | ||||
| 	@ResponseSchema(ResponseSelfServiceScan, { isArray: true }) | ||||
| 	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 }) | ||||
| 	@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.' }) | ||||
| 	async getScans(@Param('jwt') token: string) { | ||||
| 		const scans = (await this.getRunner(token)).scans; | ||||
| 		let responseScans = new Array<ResponseSelfServiceScan>() | ||||
| 		for (let scan of scans) { | ||||
| 			responseScans.push(new ResponseSelfServiceScan(scan)); | ||||
| 		} | ||||
| 		return responseScans; | ||||
| 	} | ||||
|  | ||||
| 	@Get('/stations/me') | ||||
| 	@UseBefore(ScanAuth) | ||||
| 	@ResponseSchema(ResponseScanStation) | ||||
| 	@ResponseSchema(ScanStationNotFoundError, { statusCode: 404 }) | ||||
| 	@OnUndefined(ScanStationNotFoundError) | ||||
| 	@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) { | ||||
| 		let scan = await this.stationRepository.findOne({ id: parseInt(req.headers["station_id"].toString()) }, { relations: ['track'] }) | ||||
| 		if (!scan) { throw new ScanStationNotFoundError(); } | ||||
| 		return scan.toResponse(); | ||||
| 	} | ||||
|  | ||||
| 	@Post('/runners/forgot') | ||||
| 	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 }) | ||||
| 	@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).' }) | ||||
| 	async requestNewToken(@QueryParam('mail') mail: string, @QueryParam("locale") locale: string = "en") { | ||||
| 		if (!mail) { | ||||
| 			throw new RunnerNotFoundError(); | ||||
| 		} | ||||
| 		const runner = await this.runnerRepository.findOne({ email: mail }); | ||||
| 		if (!runner) { throw new RunnerNotFoundError(); } | ||||
|  | ||||
| 		if (runner.resetRequestedTimestamp > (Math.floor(Date.now() / 1000) - 60 * 60 * 24)) { throw new RunnerSelfserviceTimeoutError(); } | ||||
| 		const token = JwtCreator.createSelfService(runner); | ||||
|  | ||||
| 		try { | ||||
| 			await Mailer.sendSelfserviceForgottenMail(runner.email, token, locale) | ||||
| 		} catch (error) { | ||||
| 			throw new MailSendingError(); | ||||
| 		} | ||||
|  | ||||
| 		runner.resetRequestedTimestamp = Math.floor(Date.now() / 1000); | ||||
| 		await this.runnerRepository.save(runner); | ||||
|  | ||||
| 		return { token }; | ||||
| 	} | ||||
|  | ||||
| 	@Post('/runners/register') | ||||
| 	@ResponseSchema(ResponseSelfServiceRunner) | ||||
| 	@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.' }) | ||||
| 	async registerRunner(@Body({ validate: true }) createRunner: CreateSelfServiceCitizenRunner, @QueryParam("locale") locale: string = "en") { | ||||
| 		let runner = await createRunner.toEntity(); | ||||
|  | ||||
| 		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'] })); | ||||
| 		response.token = JwtCreator.createSelfService(runner); | ||||
|  | ||||
| 		try { | ||||
| 			await Mailer.sendSelfserviceWelcomeMail(runner.email, response.token, locale) | ||||
| 		} catch (error) { | ||||
| 			throw new MailSendingError(); | ||||
| 		} | ||||
|  | ||||
| 		return response; | ||||
| 	} | ||||
|  | ||||
| 	@Post('/runners/register/:token') | ||||
| 	@ResponseSchema(ResponseSelfServiceRunner) | ||||
| 	@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.' }) | ||||
| 	async registerOrganizationRunner(@Param('token') token: string, @Body({ validate: true }) createRunner: CreateSelfServiceRunner, @QueryParam("locale") locale: string = "en") { | ||||
| 		const org = await this.getOrgansisation(token); | ||||
|  | ||||
| 		let runner = await createRunner.toEntity(org); | ||||
| 		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'] })); | ||||
| 		response.token = JwtCreator.createSelfService(runner); | ||||
|  | ||||
| 		try { | ||||
| 			await Mailer.sendSelfserviceWelcomeMail(runner.email, response.token, locale) | ||||
| 		} catch (error) { | ||||
| 			throw new MailSendingError(); | ||||
| 		} | ||||
|  | ||||
| 		return response; | ||||
| 	} | ||||
|  | ||||
| 	@Get('/organizations/selfservice/:token') | ||||
| 	@ResponseSchema(ResponseSelfServiceOrganisation, { isArray: false }) | ||||
| 	@ResponseSchema(RunnerOrganizationNotFoundError, { statusCode: 404 }) | ||||
| 	@OpenAPI({ description: 'Get the basic info and teams for a org.' }) | ||||
| 	async getSelfserviceOrg(@Param('token') token: string) { | ||||
| 		const orgid = (await this.getOrgansisation(token)).id; | ||||
| 		const org = await this.orgRepository.findOne({ id: orgid }, { relations: ['teams'] }) | ||||
|  | ||||
| 		return new ResponseSelfServiceOrganisation(<RunnerOrganization>org); | ||||
| 	} | ||||
|  | ||||
| 	/** | ||||
| 	 * Get's a runner by a provided jwt token. | ||||
| 	 * @param token The runner jwt provided by the runner to identitfy themselves. | ||||
| 	 */ | ||||
| 	private async getRunner(token: string): Promise<Runner> { | ||||
| 		if (token == "") { throw new JwtNotProvidedError(); } | ||||
| 		let jwtPayload = undefined | ||||
| 		try { | ||||
| 			jwtPayload = <any>jwt.verify(token, config.jwt_secret); | ||||
| 		} catch (error) { | ||||
| 			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'] }); | ||||
| 		if (!runner) { throw new RunnerNotFoundError() } | ||||
| 		return runner; | ||||
| 	} | ||||
|  | ||||
| 	/** | ||||
| 	 * Get's a runner org by a provided registration api key. | ||||
| 	 * @param token The organization's registration api token. | ||||
| 	 */ | ||||
| 	private async getOrgansisation(token: string): Promise<RunnerGroup> { | ||||
| 		token = Buffer.from(token, 'base64').toString('utf8'); | ||||
|  | ||||
| 		const organization = await this.orgRepository.findOne({ key: token }); | ||||
| 		if (!organization) { throw new RunnerOrganizationNotFoundError; } | ||||
|  | ||||
| 		return organization; | ||||
| 	} | ||||
| } | ||||
| @@ -1,4 +1,4 @@ | ||||
| import { Get, JsonController, UseBefore } from 'routing-controllers'; | ||||
| import { Get, JsonController, QueryParam, UseBefore } from 'routing-controllers'; | ||||
| import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi'; | ||||
| import { getConnection } from 'typeorm'; | ||||
| import StatsAuth from '../middlewares/StatsAuth'; | ||||
| @@ -7,6 +7,7 @@ import { Runner } from '../models/entities/Runner'; | ||||
| import { RunnerOrganization } from '../models/entities/RunnerOrganization'; | ||||
| import { RunnerTeam } from '../models/entities/RunnerTeam'; | ||||
| import { Scan } from '../models/entities/Scan'; | ||||
| import { TrackScan } from '../models/entities/TrackScan'; | ||||
| import { User } from '../models/entities/User'; | ||||
| import { ResponseStats } from '../models/responses/ResponseStats'; | ||||
| import { ResponseStatsOrgnisation } from '../models/responses/ResponseStatsOrganization'; | ||||
| @@ -36,7 +37,10 @@ export class StatsController { | ||||
|     @OpenAPI({ description: "Returns the top ten runners by distance.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] }) | ||||
|     async getTopRunnersByDistance() { | ||||
|         let runners = await getConnection().getRepository(Runner).find({ relations: ['scans', 'group', 'distanceDonations', 'scans.track'] }); | ||||
|         let topRunners = runners.sort((runner1, runner2) => runner1.distance - runner2.distance).slice(0, 9); | ||||
|         if (!runners || runners.length == 0) { | ||||
|             return []; | ||||
|         } | ||||
|         let topRunners = runners.sort((runner1, runner2) => runner2.distance - runner1.distance).slice(0, 10); | ||||
|         let responseRunners: ResponseStatsRunner[] = new Array<ResponseStatsRunner>(); | ||||
|         topRunners.forEach(runner => { | ||||
|             responseRunners.push(new ResponseStatsRunner(runner)); | ||||
| @@ -49,8 +53,11 @@ export class StatsController { | ||||
|     @ResponseSchema(ResponseStatsRunner, { isArray: true }) | ||||
|     @OpenAPI({ description: "Returns the top ten runners by donations.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] }) | ||||
|     async getTopRunnersByDonations() { | ||||
|         let runners = await getConnection().getRepository(Runner).find({ relations: ['scans', 'group', 'distanceDonations', 'scans.track'] }); | ||||
|         let topRunners = runners.sort((runner1, runner2) => runner1.distanceDonationAmount - runner2.distanceDonationAmount).slice(0, 9); | ||||
|         let runners = await getConnection().getRepository(Runner).find({ relations: ['group', 'distanceDonations', 'distanceDonations.runner', 'distanceDonations.runner.scans', 'distanceDonations.runner.scans.track'] }); | ||||
|         if (!runners || runners.length == 0) { | ||||
|             return []; | ||||
|         } | ||||
|         let topRunners = runners.sort((runner1, runner2) => runner2.distanceDonationAmount - runner1.distanceDonationAmount).slice(0, 10); | ||||
|         let responseRunners: ResponseStatsRunner[] = new Array<ResponseStatsRunner>(); | ||||
|         topRunners.forEach(runner => { | ||||
|             responseRunners.push(new ResponseStatsRunner(runner)); | ||||
| @@ -58,6 +65,34 @@ export class StatsController { | ||||
|         return responseRunners; | ||||
|     } | ||||
|  | ||||
|     @Get("/runners/laptime") | ||||
|     @UseBefore(StatsAuth) | ||||
|     @ResponseSchema(ResponseStatsRunner, { isArray: true }) | ||||
|     @OpenAPI({ description: "Returns the top ten runners by fastest laptime on your selected track (track by id).", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] }) | ||||
|     async getTopRunnersByLaptime(@QueryParam("track") track: number) { | ||||
|         let scans = await getConnection().getRepository(TrackScan).find({ relations: ['track', 'runner', 'runner.group', 'runner.scans', 'runner.scans.track', 'runner.distanceDonations'] }); | ||||
|         if (!scans || scans.length == 0) { | ||||
|             return []; | ||||
|         } | ||||
|         scans = scans.filter((s) => { return s.track.id == track && s.valid == true && s.lapTime != 0 }).sort((scan1, scan2) => scan1.lapTime - scan2.lapTime); | ||||
|  | ||||
|         let topScans = new Array<TrackScan>(); | ||||
|         let knownRunners = new Array<number>(); | ||||
|         for (let i = 0; i < scans.length && topScans.length < 10; i++) { | ||||
|             const element = scans[i]; | ||||
|             if (!knownRunners.includes(element.runner.id)) { | ||||
|                 topScans.push(element); | ||||
|                 knownRunners.push(element.runner.id); | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         let responseRunners: ResponseStatsRunner[] = new Array<ResponseStatsRunner>(); | ||||
|         topScans.forEach(scan => { | ||||
|             responseRunners.push(new ResponseStatsRunner(scan.runner, scan.lapTime)); | ||||
|         }); | ||||
|         return responseRunners; | ||||
|     } | ||||
|  | ||||
|     @Get("/scans") | ||||
|     @UseBefore(StatsAuth) | ||||
|     @ResponseSchema(ResponseStatsRunner, { isArray: true }) | ||||
| @@ -72,7 +107,10 @@ export class StatsController { | ||||
|     @OpenAPI({ description: "Returns the top ten teams by distance.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] }) | ||||
|     async getTopTeamsByDistance() { | ||||
|         let teams = await getConnection().getRepository(RunnerTeam).find({ relations: ['runners', 'runners.scans', 'runners.distanceDonations', 'runners.scans.track'] }); | ||||
|         let topTeams = teams.sort((team1, team2) => team1.distance - team2.distance).slice(0, 9); | ||||
|         if (!teams || teams.length == 0) { | ||||
|             return []; | ||||
|         } | ||||
|         let topTeams = teams.sort((team1, team2) => team2.distance - team1.distance).slice(0, 10); | ||||
|         let responseTeams: ResponseStatsTeam[] = new Array<ResponseStatsTeam>(); | ||||
|         topTeams.forEach(team => { | ||||
|             responseTeams.push(new ResponseStatsTeam(team)); | ||||
| @@ -86,7 +124,10 @@ export class StatsController { | ||||
|     @OpenAPI({ description: "Returns the top ten teams by donations.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] }) | ||||
|     async getTopTeamsByDonations() { | ||||
|         let teams = await getConnection().getRepository(RunnerTeam).find({ relations: ['runners', 'runners.scans', 'runners.distanceDonations', 'runners.scans.track'] }); | ||||
|         let topTeams = teams.sort((team1, team2) => team1.distanceDonationAmount - team2.distanceDonationAmount).slice(0, 9); | ||||
|         if (!teams || teams.length == 0) { | ||||
|             return []; | ||||
|         } | ||||
|         let topTeams = teams.sort((team1, team2) => team2.distanceDonationAmount - team1.distanceDonationAmount).slice(0, 10); | ||||
|         let responseTeams: ResponseStatsTeam[] = new Array<ResponseStatsTeam>(); | ||||
|         topTeams.forEach(team => { | ||||
|             responseTeams.push(new ResponseStatsTeam(team)); | ||||
| @@ -100,7 +141,10 @@ export class StatsController { | ||||
|     @OpenAPI({ description: "Returns the top ten organizations by distance.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] }) | ||||
|     async getTopOrgsByDistance() { | ||||
|         let orgs = await getConnection().getRepository(RunnerOrganization).find({ relations: ['runners', 'runners.scans', 'runners.distanceDonations', 'runners.scans.track', 'teams', 'teams.runners', 'teams.runners.scans', 'teams.runners.distanceDonations', 'teams.runners.scans.track'] }); | ||||
|         let topOrgs = orgs.sort((org1, org2) => org1.distance - org2.distance).slice(0, 9); | ||||
|         if (!orgs || orgs.length == 0) { | ||||
|             return []; | ||||
|         } | ||||
|         let topOrgs = orgs.sort((org1, org2) => org2.distance - org1.distance).slice(0, 10); | ||||
|         let responseOrgs: ResponseStatsOrgnisation[] = new Array<ResponseStatsOrgnisation>(); | ||||
|         topOrgs.forEach(org => { | ||||
|             responseOrgs.push(new ResponseStatsOrgnisation(org)); | ||||
| @@ -114,7 +158,10 @@ export class StatsController { | ||||
|     @OpenAPI({ description: "Returns the top ten organizations by donations.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] }) | ||||
|     async getTopOrgsByDonations() { | ||||
|         let orgs = await getConnection().getRepository(RunnerOrganization).find({ relations: ['runners', 'runners.scans', 'runners.distanceDonations', 'runners.scans.track', 'teams', 'teams.runners', 'teams.runners.scans', 'teams.runners.distanceDonations', 'teams.runners.scans.track'] }); | ||||
|         let topOrgs = orgs.sort((org1, org2) => org1.distanceDonationAmount - org2.distanceDonationAmount).slice(0, 9); | ||||
|         if (!orgs || orgs.length == 0) { | ||||
|             return []; | ||||
|         } | ||||
|         let topOrgs = orgs.sort((org1, org2) => org2.distanceDonationAmount - org1.distanceDonationAmount).slice(0, 10); | ||||
|         let responseOrgs: ResponseStatsOrgnisation[] = new Array<ResponseStatsOrgnisation>(); | ||||
|         topOrgs.forEach(org => { | ||||
|             responseOrgs.push(new ResponseStatsOrgnisation(org)); | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers'; | ||||
| import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi'; | ||||
| import { getConnectionManager, Repository } from 'typeorm'; | ||||
| import { UserDeletionNotConfirmedError, UserIdsNotMatchingError, UsernameContainsIllegalCharacterError, UserNotFoundError } from '../errors/UserErrors'; | ||||
| import { PasswordMustContainLowercaseLetterError, PasswordMustContainNumberError, PasswordMustContainUppercaseLetterError, PasswordTooShortError, UserDeletionNotConfirmedError, UserIdsNotMatchingError, UsernameContainsIllegalCharacterError, UserNotFoundError } from '../errors/UserErrors'; | ||||
| import { UserGroupNotFoundError } from '../errors/UserGroupErrors'; | ||||
| import { CreateUser } from '../models/actions/create/CreateUser'; | ||||
| import { UpdateUser } from '../models/actions/update/UpdateUser'; | ||||
| @@ -66,6 +66,10 @@ export class UserController { | ||||
| 	@ResponseSchema(ResponseUser) | ||||
| 	@ResponseSchema(UserGroupNotFoundError, { statusCode: 404 }) | ||||
| 	@ResponseSchema(UsernameContainsIllegalCharacterError, { statusCode: 406 }) | ||||
| 	@ResponseSchema(PasswordMustContainUppercaseLetterError, { statusCode: 406 }) | ||||
| 	@ResponseSchema(PasswordMustContainLowercaseLetterError, { statusCode: 406 }) | ||||
| 	@ResponseSchema(PasswordMustContainNumberError, { statusCode: 406 }) | ||||
| 	@ResponseSchema(PasswordTooShortError, { statusCode: 406 }) | ||||
| 	@OpenAPI({ description: 'Create a new user. <br> If you want to grant permissions to the user you have to create them seperately by posting to /api/permissions after creating the user.' }) | ||||
| 	async post(@Body({ validate: true }) createUser: CreateUser) { | ||||
| 		let user; | ||||
| @@ -85,6 +89,10 @@ export class UserController { | ||||
| 	@ResponseSchema(UserNotFoundError, { statusCode: 404 }) | ||||
| 	@ResponseSchema(UserIdsNotMatchingError, { statusCode: 406 }) | ||||
| 	@ResponseSchema(UsernameContainsIllegalCharacterError, { statusCode: 406 }) | ||||
| 	@ResponseSchema(PasswordMustContainUppercaseLetterError, { statusCode: 406 }) | ||||
| 	@ResponseSchema(PasswordMustContainLowercaseLetterError, { statusCode: 406 }) | ||||
| 	@ResponseSchema(PasswordMustContainNumberError, { statusCode: 406 }) | ||||
| 	@ResponseSchema(PasswordTooShortError, { statusCode: 406 }) | ||||
| 	@OpenAPI({ description: "Update the user whose id you provided. <br> To change the permissions directly granted to the user please use /api/permissions instead. <br> Please remember that ids can't be changed." }) | ||||
| 	async put(@Param('id') id: number, @Body({ validate: true }) updateUser: UpdateUser) { | ||||
| 		let oldUser = await this.userRepository.findOne({ id: id }); | ||||
|   | ||||
| @@ -71,4 +71,33 @@ export class UserDeletionNotConfirmedError extends NotAcceptableError { | ||||
|  | ||||
| 	@IsString() | ||||
| 	message = "You are trying to delete a user! \n If you're sure about doing this: provide the ?force=true query param." | ||||
| } | ||||
|  | ||||
| export class PasswordMustContainUppercaseLetterError extends NotAcceptableError { | ||||
| 	@IsString() | ||||
| 	name = "PasswordMustContainUppercaseLetterError" | ||||
|  | ||||
| 	@IsString() | ||||
| 	message = "Passwords must contain at least one uppercase letter." | ||||
| } | ||||
| export class PasswordMustContainLowercaseLetterError extends NotAcceptableError { | ||||
| 	@IsString() | ||||
| 	name = "PasswordMustContainLowercaseLetterError" | ||||
|  | ||||
| 	@IsString() | ||||
| 	message = "Passwords must contain at least one lowercase letter." | ||||
| } | ||||
| export class PasswordMustContainNumberError extends NotAcceptableError { | ||||
| 	@IsString() | ||||
| 	name = "PasswordMustContainNumberError" | ||||
|  | ||||
| 	@IsString() | ||||
| 	message = "Passwords must contain at least one number." | ||||
| } | ||||
| export class PasswordTooShortError extends NotAcceptableError { | ||||
| 	@IsString() | ||||
| 	name = "PasswordTooShortError" | ||||
|  | ||||
| 	@IsString() | ||||
| 	message = "Passwords must be at least ten characters long." | ||||
| } | ||||
| @@ -1,9 +1,10 @@ | ||||
| import * as argon2 from "argon2"; | ||||
| import { passwordStrength } from "check-password-strength"; | ||||
| import { IsBoolean, IsEmail, IsNotEmpty, IsOptional, IsPhoneNumber, IsString, IsUrl } from 'class-validator'; | ||||
| import { getConnectionManager } from 'typeorm'; | ||||
| import * as uuid from 'uuid'; | ||||
| import { config } from '../../../config'; | ||||
| import { UserEmailNeededError, UsernameContainsIllegalCharacterError } from '../../../errors/UserErrors'; | ||||
| import { PasswordMustContainLowercaseLetterError, PasswordMustContainNumberError, PasswordMustContainUppercaseLetterError, PasswordTooShortError, UserEmailNeededError, UsernameContainsIllegalCharacterError } from '../../../errors/UserErrors'; | ||||
| import { UserGroupNotFoundError } from '../../../errors/UserGroupErrors'; | ||||
| import { User } from '../../entities/User'; | ||||
| import { UserGroup } from '../../entities/UserGroup'; | ||||
| @@ -94,7 +95,13 @@ export class CreateUser { | ||||
|         if (!this.email) { | ||||
|             throw new UserEmailNeededError(); | ||||
|         } | ||||
|         if (this.username.includes("@")) { throw new UsernameContainsIllegalCharacterError(); } | ||||
|         if (this.username?.includes("@")) { throw new UsernameContainsIllegalCharacterError(); } | ||||
|  | ||||
|         let password_strength = passwordStrength(this.password); | ||||
|         if (!password_strength.contains.includes("uppercase")) { throw new PasswordMustContainUppercaseLetterError(); } | ||||
|         if (!password_strength.contains.includes("lowercase")) { throw new PasswordMustContainLowercaseLetterError(); } | ||||
|         if (!password_strength.contains.includes("number")) { throw new PasswordMustContainNumberError(); } | ||||
|         if (!(password_strength.length > 9)) { throw new PasswordTooShortError(); } | ||||
|  | ||||
|         newUser.email = this.email | ||||
|         newUser.username = this.username | ||||
|   | ||||
| @@ -1,12 +1,14 @@ | ||||
| import * as argon2 from "argon2"; | ||||
| import { passwordStrength } from "check-password-strength"; | ||||
| import { IsBoolean, IsEmail, IsInt, IsNotEmpty, IsOptional, IsPhoneNumber, IsString, IsUrl } from 'class-validator'; | ||||
| import { getConnectionManager } from 'typeorm'; | ||||
| import { config } from '../../../config'; | ||||
| import { UserEmailNeededError, UsernameContainsIllegalCharacterError } from '../../../errors/UserErrors'; | ||||
| import { PasswordMustContainLowercaseLetterError, PasswordMustContainNumberError, PasswordMustContainUppercaseLetterError, PasswordTooShortError, UserEmailNeededError, UsernameContainsIllegalCharacterError } from '../../../errors/UserErrors'; | ||||
| import { UserGroupNotFoundError } from '../../../errors/UserGroupErrors'; | ||||
| import { User } from '../../entities/User'; | ||||
| import { UserGroup } from '../../entities/UserGroup'; | ||||
|  | ||||
|  | ||||
| /** | ||||
|  * This class is used to update a User entity (via put request). | ||||
|  */ | ||||
| @@ -104,6 +106,11 @@ export class UpdateUser { | ||||
|         if (this.username.includes("@")) { throw new UsernameContainsIllegalCharacterError(); } | ||||
|  | ||||
|         if (this.password) { | ||||
|             let password_strength = passwordStrength(this.password); | ||||
|             if (!password_strength.contains.includes("uppercase")) { throw new PasswordMustContainUppercaseLetterError(); } | ||||
|             if (!password_strength.contains.includes("lowercase")) { throw new PasswordMustContainLowercaseLetterError(); } | ||||
|             if (!password_strength.contains.includes("number")) { throw new PasswordMustContainNumberError(); } | ||||
|             if (!(password_strength.length > 9)) { throw new PasswordTooShortError(); } | ||||
|             user.password = await argon2.hash(this.password + user.uuid); | ||||
|             user.refreshTokenCount = user.refreshTokenCount + 1; | ||||
|         } | ||||
|   | ||||
| @@ -35,4 +35,5 @@ export enum ResponseObjectType { | ||||
|     USER = 'USER', | ||||
|     USERGROUP = 'USERGROUP', | ||||
|     USERPERMISSIONS = 'USERPERMISSIONS', | ||||
|     SELFSERVICEDONOR = 'SELFSERVICEDONOR' | ||||
| } | ||||
| @@ -2,6 +2,7 @@ import { IsInt, IsNotEmpty, IsPositive } from 'class-validator'; | ||||
| import { DistanceDonation } from '../entities/DistanceDonation'; | ||||
| import { ResponseObjectType } from '../enums/ResponseObjectType'; | ||||
| import { IResponse } from './IResponse'; | ||||
| import { ResponseSelfServiceDonor } from './ResponseSelfServiceDonor'; | ||||
|  | ||||
| /** | ||||
|  * Defines the runner selfservice donation response. | ||||
| @@ -18,7 +19,7 @@ export class ResponseSelfServiceDonation implements IResponse { | ||||
|      * The donation's donor. | ||||
|      */ | ||||
|     @IsNotEmpty() | ||||
|     donor: string; | ||||
|     donor: ResponseSelfServiceDonor; | ||||
|  | ||||
|     /** | ||||
|      * The donation's amount in the smalles unit of your currency (default: euro cent). | ||||
| @@ -35,9 +36,7 @@ export class ResponseSelfServiceDonation implements IResponse { | ||||
|     amountPerDistance: number; | ||||
|  | ||||
|     public constructor(donation: DistanceDonation) { | ||||
|         if (!donation.donor.middlename) { this.donor = donation.donor.firstname + " " + donation.donor.lastname; } | ||||
|         else { this.donor = donation.donor.firstname + " " + donation.donor.middlename + " " + donation.donor.lastname; } | ||||
|  | ||||
|         this.donor = new ResponseSelfServiceDonor(donation.donor); | ||||
|         this.amountPerDistance = donation.amountPerDistance; | ||||
|         this.amount = donation.amount; | ||||
|     } | ||||
|   | ||||
							
								
								
									
										51
									
								
								src/models/responses/ResponseSelfServiceDonor.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										51
									
								
								src/models/responses/ResponseSelfServiceDonor.ts
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,51 @@ | ||||
| import { IsInt, IsString } from "class-validator"; | ||||
| import { Donor } from '../entities/Donor'; | ||||
| import { ResponseObjectType } from '../enums/ResponseObjectType'; | ||||
| import { IResponse } from './IResponse'; | ||||
|  | ||||
| /** | ||||
|  * Defines the donor selfservice response. | ||||
|  * Why? B/C runner's are not allowed to view all information available to admin users. | ||||
| */ | ||||
| export class ResponseSelfServiceDonor implements IResponse { | ||||
|     /** | ||||
|     * The responseType. | ||||
|     * This contains the type of class/entity this response contains. | ||||
|     */ | ||||
|     responseType: ResponseObjectType = ResponseObjectType.SELFSERVICEDONOR; | ||||
|  | ||||
|     /** | ||||
|      * The participant's id. | ||||
|      */ | ||||
|     @IsInt() | ||||
|     id: number; | ||||
|  | ||||
|     /** | ||||
|      * The participant's first name. | ||||
|      */ | ||||
|     @IsString() | ||||
|     firstname: string; | ||||
|  | ||||
|     /** | ||||
|      * The participant's middle name. | ||||
|      */ | ||||
|     @IsString() | ||||
|     middlename?: string; | ||||
|  | ||||
|     /** | ||||
|      * The participant's last name. | ||||
|      */ | ||||
|     @IsString() | ||||
|     lastname: string; | ||||
|  | ||||
|     /** | ||||
|      * Creates a ResponseSelfServiceDonor object from a runner. | ||||
|      * @param donor The donor the response shall be build for. | ||||
|      */ | ||||
|     public constructor(donor: Donor) { | ||||
|         this.id = donor.id; | ||||
|         this.firstname = donor.firstname; | ||||
|         this.middlename = donor.middlename; | ||||
|         this.lastname = donor.lastname; | ||||
|     } | ||||
| } | ||||
| @@ -38,10 +38,10 @@ export class ResponseSelfServiceRunner extends ResponseParticipant implements IR | ||||
|     group: string; | ||||
|  | ||||
|     /** | ||||
|      * The runner's associated donations. | ||||
|      * The runner's associated distance donations. | ||||
|      */ | ||||
|     @IsString() | ||||
|     donations: ResponseSelfServiceDonation[] | ||||
|     distanceDonations: ResponseSelfServiceDonation[] | ||||
|  | ||||
|     /** | ||||
|      * The runner's self-service jwt for auth. | ||||
| @@ -60,7 +60,7 @@ export class ResponseSelfServiceRunner extends ResponseParticipant implements IR | ||||
|         this.distance = runner.distance; | ||||
|         this.donationAmount = runner.distanceDonationAmount; | ||||
|         this.group = this.getTeamString(runner.group); | ||||
|         this.donations = this.getDonations(runner.distanceDonations); | ||||
|         this.distanceDonations = this.getDonations(runner.distanceDonations); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|   | ||||
| @@ -1,6 +1,7 @@ | ||||
| import { | ||||
|     IsInt, | ||||
|     IsObject, | ||||
|     IsOptional, | ||||
|     IsString | ||||
| } from "class-validator"; | ||||
| import { Runner } from '../entities/Runner'; | ||||
| @@ -55,6 +56,13 @@ export class ResponseStatsRunner implements IResponse { | ||||
|     @IsInt() | ||||
|     donationAmount: number; | ||||
|  | ||||
|     /** | ||||
|      * The runner's fastest laptime in seconds. | ||||
|      */ | ||||
|     @IsInt() | ||||
|     @IsOptional() | ||||
|     minLaptime?: number; | ||||
|  | ||||
|     /** | ||||
|      * The runner's group. | ||||
|      */ | ||||
| @@ -65,13 +73,28 @@ export class ResponseStatsRunner implements IResponse { | ||||
|      * Creates a new runner stats response from a runner | ||||
|      * @param runner The runner whoes response shall be generated - the following relations have to be resolved: scans, group, distanceDonations, scans.track | ||||
|      */ | ||||
|     public constructor(runner: Runner) { | ||||
|     public constructor(runner: Runner, laptime?: number) { | ||||
|         this.id = runner.id; | ||||
|         this.firstname = runner.firstname; | ||||
|         this.middlename = runner.middlename; | ||||
|         if (runner.firstname) { | ||||
|             this.middlename = runner.middlename; | ||||
|         } | ||||
|         this.lastname = runner.lastname; | ||||
|         this.distance = runner.distance; | ||||
|         this.donationAmount = runner.distanceDonationAmount; | ||||
|         try { | ||||
|             this.distance = runner.distance; | ||||
|         } | ||||
|         catch { | ||||
|             this.distance = -1; | ||||
|         } | ||||
|         try { | ||||
|             this.donationAmount = runner.distanceDonationAmount; | ||||
|         } | ||||
|         catch { | ||||
|             this.donationAmount = -1; | ||||
|         } | ||||
|         if (laptime) { | ||||
|             this.minLaptime = laptime; | ||||
|         } | ||||
|         this.group = runner.group.toResponse(); | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -1,14 +1,14 @@ | ||||
| import * as argon2 from "argon2"; | ||||
| import { Connection } from 'typeorm'; | ||||
| import { Factory, Seeder } from 'typeorm-seeding'; | ||||
| import * as uuid from 'uuid'; | ||||
| import { CreatePermission } from '../models/actions/create/CreatePermission'; | ||||
| import { CreateUser } from '../models/actions/create/CreateUser'; | ||||
| import { CreateUserGroup } from '../models/actions/create/CreateUserGroup'; | ||||
| import { Permission } from '../models/entities/Permission'; | ||||
| import { User } from '../models/entities/User'; | ||||
| import { UserGroup } from '../models/entities/UserGroup'; | ||||
| import { PermissionAction } from '../models/enums/PermissionAction'; | ||||
| import { PermissionTarget } from '../models/enums/PermissionTargets'; | ||||
|  | ||||
| /** | ||||
|  * Seeds a admin group with a demo user into the database for initial setup and auto recovery. | ||||
|  * We know that the nameing isn't perfectly fitting. Feel free to change it. | ||||
| @@ -16,7 +16,7 @@ import { PermissionTarget } from '../models/enums/PermissionTargets'; | ||||
| export default class SeedUsers implements Seeder { | ||||
|     public async run(factory: Factory, connection: Connection): Promise<any> { | ||||
|         let adminGroup: UserGroup = await this.createAdminGroup(connection); | ||||
|         await this.createUser(connection, adminGroup.id); | ||||
|         await this.createUser(connection, adminGroup); | ||||
|         await this.createPermissions(connection, adminGroup.id); | ||||
|     } | ||||
|  | ||||
| @@ -27,15 +27,16 @@ export default class SeedUsers implements Seeder { | ||||
|         return await connection.getRepository(UserGroup).save(await adminGroup.toEntity()); | ||||
|     } | ||||
|  | ||||
|     public async createUser(connection: Connection, group: number) { | ||||
|         let initialUser = new CreateUser(); | ||||
|     public async createUser(connection: Connection, group: UserGroup) { | ||||
|         let initialUser = new User(); | ||||
|         initialUser.firstname = "demo"; | ||||
|         initialUser.lastname = "demo"; | ||||
|         initialUser.username = "demo"; | ||||
|         initialUser.password = "demo"; | ||||
|         initialUser.uuid = uuid.v4(); | ||||
|         initialUser.password = await argon2.hash("demo" + initialUser.uuid); | ||||
|         initialUser.email = "demo@dev.lauf-fuer-kaya.de" | ||||
|         initialUser.groups = group; | ||||
|         return await connection.getRepository(User).save(await initialUser.toEntity()); | ||||
|         initialUser.groups = [group]; | ||||
|         return await connection.getRepository(User).save(initialUser); | ||||
|     } | ||||
|  | ||||
|     public async createPermissions(connection: Connection, principal: number) { | ||||
|   | ||||
| @@ -11,12 +11,12 @@ beforeAll(async () => { | ||||
|     jest.setTimeout(20000); | ||||
|     const res_login = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||
|     await axios.post(base + '/api/users', { | ||||
|         "firstname": "demo_logout", | ||||
|         "middlename": "demo_logout", | ||||
|         "lastname": "demo_logout", | ||||
|         "username": "demo_logout", | ||||
|         "password": "demo_logout", | ||||
|         "email": "demo_logout@dev.lauf-fuer-kaya.de" | ||||
|         "firstname": "demo_logoutASD123", | ||||
|         "middlename": "demo_logoutASD123", | ||||
|         "lastname": "demo_logoutASD123", | ||||
|         "username": "demo_logoutASD123", | ||||
|         "password": "demo_logoutASD123", | ||||
|         "email": "demo_logoutASD123@dev.lauf-fuer-kaya.de" | ||||
|     }, { | ||||
|         headers: { "authorization": "Bearer " + res_login.data["access_token"] }, | ||||
|         validateStatus: undefined | ||||
| @@ -26,7 +26,7 @@ beforeAll(async () => { | ||||
| describe('POST /api/auth/logout valid', () => { | ||||
|     let refresh_coookie; | ||||
|     it('valid logout with token in cookie should return 200', async () => { | ||||
|         const res_login = await axios.post(base + '/api/auth/login', { username: "demo_logout", password: "demo_logout" }); | ||||
|         const res_login = await axios.post(base + '/api/auth/login', { username: "demo_logoutASD123", password: "demo_logoutASD123" }); | ||||
|         refresh_coookie = res_login.headers["set-cookie"]; | ||||
|         const res = await axios.post(base + '/api/auth/logout', null, { | ||||
|             headers: { "Cookie": refresh_coookie }, | ||||
| @@ -35,7 +35,7 @@ describe('POST /api/auth/logout valid', () => { | ||||
|         expect(res.status).toEqual(200); | ||||
|     }); | ||||
|     it('valid logout with token in body should return 200', async () => { | ||||
|         const res_login = await axios.post(base + '/api/auth/login', { username: "demo_logout", password: "demo_logout" }); | ||||
|         const res_login = await axios.post(base + '/api/auth/login', { username: "demo_logoutASD123", password: "demo_logoutASD123" }); | ||||
|         const res = await axios.post(base + '/api/auth/logout', { token: res_login.data["refresh_token"] }, axios_config); | ||||
|         expect(res.status).toEqual(200); | ||||
|     }); | ||||
|   | ||||
| @@ -11,12 +11,12 @@ beforeAll(async () => { | ||||
|     jest.setTimeout(20000); | ||||
|     const res_login = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||
|     await axios.post(base + '/api/users', { | ||||
|         "firstname": "demo_refresh", | ||||
|         "middlename": "demo_refresh", | ||||
|         "lastname": "demo_refresh", | ||||
|         "username": "demo_refresh", | ||||
|         "password": "demo_refresh", | ||||
|         "email": "demo_refresh@dev.lauf-fuer-kaya.de" | ||||
|         "firstname": "demo_refreshASD312", | ||||
|         "middlename": "demo_refreshASD312", | ||||
|         "lastname": "demo_refreshASD312", | ||||
|         "username": "demo_refreshASD312", | ||||
|         "password": "demo_refreshASD312", | ||||
|         "email": "demo_refreshASD312@dev.lauf-fuer-kaya.de" | ||||
|     }, { | ||||
|         headers: { "authorization": "Bearer " + res_login.data["access_token"] }, | ||||
|         validateStatus: undefined | ||||
| @@ -25,7 +25,7 @@ beforeAll(async () => { | ||||
|  | ||||
| describe('POST /api/auth/refresh valid', () => { | ||||
|     it('valid refresh with token in cookie should return 200', async () => { | ||||
|         const res_login = await axios.post(base + '/api/auth/login', { username: "demo_refresh", password: "demo_refresh" }); | ||||
|         const res_login = await axios.post(base + '/api/auth/login', { username: "demo_refreshASD312", password: "demo_refreshASD312" }); | ||||
|         const res = await axios.post(base + '/api/auth/refresh', null, { | ||||
|             headers: { "Cookie": res_login.headers["set-cookie"] }, | ||||
|             validateStatus: undefined | ||||
| @@ -33,7 +33,7 @@ describe('POST /api/auth/refresh valid', () => { | ||||
|         expect(res.status).toEqual(200); | ||||
|     }); | ||||
|     it('valid refresh with token in body should return 200', async () => { | ||||
|         const res_login = await axios.post(base + '/api/auth/login', { username: "demo_refresh", password: "demo_refresh" }); | ||||
|         const res_login = await axios.post(base + '/api/auth/login', { username: "demo_refreshASD312", password: "demo_refreshASD312" }); | ||||
|         const res = await axios.post(base + '/api/auth/refresh', { token: res_login.data["refresh_token"] }, axios_config); | ||||
|         expect(res.status).toEqual(200); | ||||
|     }); | ||||
|   | ||||
| @@ -11,23 +11,23 @@ beforeAll(async () => { | ||||
|     jest.setTimeout(20000); | ||||
|     const res_login = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||
|     await axios.post(base + '/api/users', { | ||||
|         "firstname": "demo_reset", | ||||
|         "middlename": "demo_reset", | ||||
|         "lastname": "demo_reset", | ||||
|         "username": "demo_reset", | ||||
|         "password": "demo_reset", | ||||
|         "email": "demo_reset1@dev.lauf-fuer-kaya.de" | ||||
|         "firstname": "demo_resetASD312", | ||||
|         "middlename": "demo_resetASD312", | ||||
|         "lastname": "demo_resetASD312", | ||||
|         "username": "demo_resetASD312", | ||||
|         "password": "demo_resetASD312", | ||||
|         "email": "demo_resetASD3121@dev.lauf-fuer-kaya.de" | ||||
|     }, { | ||||
|         headers: { "authorization": "Bearer " + res_login.data["access_token"] }, | ||||
|         validateStatus: undefined | ||||
|     }); | ||||
|     await axios.post(base + '/api/users', { | ||||
|         "firstname": "demo_reset2", | ||||
|         "middlename": "demo_reset2", | ||||
|         "lastname": "demo_reset2", | ||||
|         "username": "demo_reset2", | ||||
|         "password": "demo_reset2", | ||||
|         "email": "demo_reset2@dev.lauf-fuer-kaya.de" | ||||
|         "firstname": "demo_resetASD3122", | ||||
|         "middlename": "demo_resetASD3122", | ||||
|         "lastname": "demo_resetASD3122", | ||||
|         "username": "demo_resetASD3122", | ||||
|         "password": "demo_resetASD3122", | ||||
|         "email": "demo_resetASD3122@dev.lauf-fuer-kaya.de" | ||||
|     }, { | ||||
|         headers: { "authorization": "Bearer " + res_login.data["access_token"] }, | ||||
|         validateStatus: undefined | ||||
| @@ -37,7 +37,7 @@ beforeAll(async () => { | ||||
| describe('POST /api/auth/reset valid', () => { | ||||
|     let reset_token; | ||||
|     it('valid reset token request should return 200 (500 w/o correct auth)', async () => { | ||||
|         const res1 = await axios.post(base + '/api/auth/reset', { email: "demo_reset1@dev.lauf-fuer-kaya.de" }, axios_config); | ||||
|         const res1 = await axios.post(base + '/api/auth/reset', { email: "demo_resetASD3121@dev.lauf-fuer-kaya.de" }, axios_config); | ||||
|         reset_token = res1.data.resetToken; | ||||
|         expect(res1.status).toEqual(200); | ||||
|     }); | ||||
| @@ -45,8 +45,8 @@ describe('POST /api/auth/reset valid', () => { | ||||
| // --------------- | ||||
| describe('POST /api/auth/reset invalid requests', () => { | ||||
|     it('request another password reset before the timeout should return 406', async () => { | ||||
|         const res1 = await axios.post(base + '/api/auth/reset', { email: "demo_reset2@dev.lauf-fuer-kaya.de" }, axios_config); | ||||
|         const res2 = await axios.post(base + '/api/auth/reset', { email: "demo_reset2@dev.lauf-fuer-kaya.de" }, axios_config); | ||||
|         const res1 = await axios.post(base + '/api/auth/reset', { email: "demo_resetASD3122@dev.lauf-fuer-kaya.de" }, axios_config); | ||||
|         const res2 = await axios.post(base + '/api/auth/reset', { email: "demo_resetASD3122@dev.lauf-fuer-kaya.de" }, axios_config); | ||||
|         expect(res2.status).toEqual(406); | ||||
|     }); | ||||
| }); | ||||
|   | ||||
| @@ -1,174 +1,186 @@ | ||||
| import axios from 'axios'; | ||||
| import { config } from '../../config'; | ||||
| const base = "http://localhost:" + config.internal_port | ||||
|  | ||||
| let access_token; | ||||
| let axios_config; | ||||
|  | ||||
| beforeAll(async () => { | ||||
| 	jest.setTimeout(20000); | ||||
| 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||
| 	access_token = res.data["access_token"]; | ||||
| 	axios_config = { | ||||
| 		headers: { "authorization": "Bearer " + access_token }, | ||||
| 		validateStatus: undefined | ||||
| 	}; | ||||
| }); | ||||
|  | ||||
|  | ||||
| describe('POST /api/cards illegally', () => { | ||||
| 	it('non-existant runner input should return 404', async () => { | ||||
| 		const res = await axios.post(base + '/api/cards', { | ||||
| 			"runner": 999999999999999999999999 | ||||
| 		}, axios_config); | ||||
| 		expect(res.status).toEqual(404); | ||||
| 		expect(res.headers['content-type']).toContain("application/json") | ||||
| 	}); | ||||
| }); | ||||
| // --------------- | ||||
| describe('POST /api/cards successfully (without runner)', () => { | ||||
| 	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); | ||||
| 		expect(res.status).toEqual(200); | ||||
| 		expect(res.headers['content-type']).toContain("application/json"); | ||||
| 		delete res.data.id; | ||||
| 		delete res.data.code; | ||||
| 		expect(res.data).toEqual({ | ||||
| 			"runner": null, | ||||
| 			"enabled": true, | ||||
| 			"responseType": "RUNNERCARD" | ||||
| 		}); | ||||
| 	}); | ||||
| 	it('creating a disabled card should return 200', async () => { | ||||
| 		const res = await axios.post(base + '/api/cards', { | ||||
| 			"enabled": false | ||||
| 		}, axios_config); | ||||
| 		expect(res.status).toEqual(200); | ||||
| 		expect(res.headers['content-type']).toContain("application/json"); | ||||
| 		delete res.data.id; | ||||
| 		delete res.data.code; | ||||
| 		expect(res.data).toEqual({ | ||||
| 			"runner": null, | ||||
| 			"enabled": false, | ||||
| 			"responseType": "RUNNERCARD" | ||||
| 		}); | ||||
| 	}); | ||||
| 	it('creating a enabled card should return 200', async () => { | ||||
| 		const res = await axios.post(base + '/api/cards', { | ||||
| 			"enabled": true | ||||
| 		}, axios_config); | ||||
| 		expect(res.status).toEqual(200); | ||||
| 		expect(res.headers['content-type']).toContain("application/json"); | ||||
| 		delete res.data.id; | ||||
| 		delete res.data.code; | ||||
| 		expect(res.data).toEqual({ | ||||
| 			"runner": null, | ||||
| 			"enabled": true, | ||||
| 			"responseType": "RUNNERCARD" | ||||
| 		}); | ||||
| 	}); | ||||
| }); | ||||
| // --------------- | ||||
| describe('POST /api/cards successfully (with runner)', () => { | ||||
| 	let added_org; | ||||
| 	let added_runner; | ||||
| 	it('creating a new org with just a name should return 200', async () => { | ||||
| 		const res1 = await axios.post(base + '/api/organizations', { | ||||
| 			"name": "test123" | ||||
| 		}, axios_config); | ||||
| 		added_org = res1.data | ||||
| 		expect(res1.status).toEqual(200); | ||||
| 		expect(res1.headers['content-type']).toContain("application/json") | ||||
| 	}); | ||||
| 	it('creating a new runner with only needed params should return 200', async () => { | ||||
| 		const res2 = await axios.post(base + '/api/runners', { | ||||
| 			"firstname": "first", | ||||
| 			"lastname": "last", | ||||
| 			"group": added_org.id | ||||
| 		}, axios_config); | ||||
| 		added_runner = res2.data; | ||||
| 		expect(res2.status).toEqual(200); | ||||
| 		expect(res2.headers['content-type']).toContain("application/json") | ||||
| 	}); | ||||
| 	it('creating a card with the minimum amount of parameters should return 200', async () => { | ||||
| 		const res = await axios.post(base + '/api/cards', { | ||||
| 			"runner": added_runner.id | ||||
| 		}, axios_config); | ||||
| 		expect(res.status).toEqual(200); | ||||
| 		expect(res.headers['content-type']).toContain("application/json"); | ||||
| 		delete res.data.id; | ||||
| 		delete res.data.code; | ||||
| 		expect(res.data).toEqual({ | ||||
| 			"runner": added_runner, | ||||
| 			"enabled": true, | ||||
| 			"responseType": "RUNNERCARD" | ||||
| 		}); | ||||
| 	}); | ||||
| 	it('creating a card with runner (no optional params) should return 200', async () => { | ||||
| 		const res = await axios.post(base + '/api/cards', { | ||||
| 			"runner": added_runner.id | ||||
| 		}, axios_config); | ||||
| 		expect(res.status).toEqual(200); | ||||
| 		expect(res.headers['content-type']).toContain("application/json"); | ||||
| 		delete res.data.id; | ||||
| 		delete res.data.code; | ||||
| 		expect(res.data).toEqual({ | ||||
| 			"runner": added_runner, | ||||
| 			"enabled": true, | ||||
| 			"responseType": "RUNNERCARD" | ||||
| 		}); | ||||
| 	}); | ||||
| 	it('creating a enabled card with runner should return 200', async () => { | ||||
| 		const res = await axios.post(base + '/api/cards', { | ||||
| 			"runner": added_runner.id, | ||||
| 			"enabled": true | ||||
| 		}, axios_config); | ||||
| 		expect(res.status).toEqual(200); | ||||
| 		expect(res.headers['content-type']).toContain("application/json"); | ||||
| 		delete res.data.id; | ||||
| 		delete res.data.code; | ||||
| 		expect(res.data).toEqual({ | ||||
| 			"runner": added_runner, | ||||
| 			"enabled": true, | ||||
| 			"responseType": "RUNNERCARD" | ||||
| 		}); | ||||
| 	}); | ||||
| 	it('creating a disabled card with runner should return 200', async () => { | ||||
| 		const res = await axios.post(base + '/api/cards', { | ||||
| 			"runner": added_runner.id, | ||||
| 			"enabled": false | ||||
| 		}, axios_config); | ||||
| 		expect(res.status).toEqual(200); | ||||
| 		expect(res.headers['content-type']).toContain("application/json"); | ||||
| 		delete res.data.id; | ||||
| 		delete res.data.code; | ||||
| 		expect(res.data).toEqual({ | ||||
| 			"runner": added_runner, | ||||
| 			"enabled": false, | ||||
| 			"responseType": "RUNNERCARD" | ||||
| 		}); | ||||
| 	}); | ||||
| }); | ||||
| // --------------- | ||||
| describe('POST /api/cards/bulk successfully', () => { | ||||
| 	it('creating a single new bulk card should return 200', async () => { | ||||
| 		const res = await axios.post(base + '/api/cards/bulk?count=1', {}, axios_config); | ||||
| 		expect(res.status).toEqual(200); | ||||
| 		expect(res.headers['content-type']).toContain("application/json"); | ||||
| 	}); | ||||
| 	it('creating 50 new bulk card should return 200', async () => { | ||||
| 		const res = await axios.post(base + '/api/cards/bulk?count=50', {}, axios_config); | ||||
| 		expect(res.status).toEqual(200); | ||||
| 		expect(res.headers['content-type']).toContain("application/json"); | ||||
| 	}); | ||||
| 	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"); | ||||
| 	}); | ||||
| import axios from 'axios'; | ||||
| import { config } from '../../config'; | ||||
| const base = "http://localhost:" + config.internal_port | ||||
|  | ||||
| let access_token; | ||||
| let axios_config; | ||||
|  | ||||
| beforeAll(async () => { | ||||
| 	jest.setTimeout(20000); | ||||
| 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||
| 	access_token = res.data["access_token"]; | ||||
| 	axios_config = { | ||||
| 		headers: { "authorization": "Bearer " + access_token }, | ||||
| 		validateStatus: undefined | ||||
| 	}; | ||||
| }); | ||||
|  | ||||
|  | ||||
| describe('POST /api/cards illegally', () => { | ||||
| 	it('non-existant runner input should return 404', async () => { | ||||
| 		const res = await axios.post(base + '/api/cards', { | ||||
| 			"runner": 999999999999999999999999 | ||||
| 		}, axios_config); | ||||
| 		expect(res.status).toEqual(404); | ||||
| 		expect(res.headers['content-type']).toContain("application/json") | ||||
| 	}); | ||||
| }); | ||||
| // --------------- | ||||
| describe('POST /api/cards successfully (without runner)', () => { | ||||
| 	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); | ||||
| 		expect(res.status).toEqual(200); | ||||
| 		expect(res.headers['content-type']).toContain("application/json"); | ||||
| 		delete res.data.id; | ||||
| 		delete res.data.code; | ||||
| 		expect(res.data).toEqual({ | ||||
| 			"runner": null, | ||||
| 			"enabled": true, | ||||
| 			"responseType": "RUNNERCARD" | ||||
| 		}); | ||||
| 	}); | ||||
| 	it('creating a disabled card should return 200', async () => { | ||||
| 		const res = await axios.post(base + '/api/cards', { | ||||
| 			"enabled": false | ||||
| 		}, axios_config); | ||||
| 		expect(res.status).toEqual(200); | ||||
| 		expect(res.headers['content-type']).toContain("application/json"); | ||||
| 		delete res.data.id; | ||||
| 		delete res.data.code; | ||||
| 		expect(res.data).toEqual({ | ||||
| 			"runner": null, | ||||
| 			"enabled": false, | ||||
| 			"responseType": "RUNNERCARD" | ||||
| 		}); | ||||
| 	}); | ||||
| 	it('creating a enabled card should return 200', async () => { | ||||
| 		const res = await axios.post(base + '/api/cards', { | ||||
| 			"enabled": true | ||||
| 		}, axios_config); | ||||
| 		expect(res.status).toEqual(200); | ||||
| 		expect(res.headers['content-type']).toContain("application/json"); | ||||
| 		delete res.data.id; | ||||
| 		delete res.data.code; | ||||
| 		expect(res.data).toEqual({ | ||||
| 			"runner": null, | ||||
| 			"enabled": true, | ||||
| 			"responseType": "RUNNERCARD" | ||||
| 		}); | ||||
| 	}); | ||||
| }); | ||||
| // --------------- | ||||
| describe('POST /api/cards successfully (with runner)', () => { | ||||
| 	let added_org; | ||||
| 	let added_runner; | ||||
| 	it('creating a new org with just a name should return 200', async () => { | ||||
| 		const res1 = await axios.post(base + '/api/organizations', { | ||||
| 			"name": "test123" | ||||
| 		}, axios_config); | ||||
| 		added_org = res1.data | ||||
| 		expect(res1.status).toEqual(200); | ||||
| 		expect(res1.headers['content-type']).toContain("application/json") | ||||
| 	}); | ||||
| 	it('creating a new runner with only needed params should return 200', async () => { | ||||
| 		const res2 = await axios.post(base + '/api/runners', { | ||||
| 			"firstname": "first", | ||||
| 			"lastname": "last", | ||||
| 			"group": added_org.id | ||||
| 		}, axios_config); | ||||
| 		added_runner = res2.data; | ||||
| 		expect(res2.status).toEqual(200); | ||||
| 		expect(res2.headers['content-type']).toContain("application/json") | ||||
| 	}); | ||||
| 	it('creating a card with the minimum amount of parameters should return 200', async () => { | ||||
| 		const res = await axios.post(base + '/api/cards', { | ||||
| 			"runner": added_runner.id | ||||
| 		}, axios_config); | ||||
| 		expect(res.status).toEqual(200); | ||||
| 		expect(res.headers['content-type']).toContain("application/json"); | ||||
| 		delete res.data.id; | ||||
| 		delete res.data.code; | ||||
| 		expect(res.data).toEqual({ | ||||
| 			"runner": added_runner, | ||||
| 			"enabled": true, | ||||
| 			"responseType": "RUNNERCARD" | ||||
| 		}); | ||||
| 	}); | ||||
| 	it('creating a card with runner (no optional params) should return 200', async () => { | ||||
| 		const res = await axios.post(base + '/api/cards', { | ||||
| 			"runner": added_runner.id | ||||
| 		}, axios_config); | ||||
| 		expect(res.status).toEqual(200); | ||||
| 		expect(res.headers['content-type']).toContain("application/json"); | ||||
| 		delete res.data.id; | ||||
| 		delete res.data.code; | ||||
| 		expect(res.data).toEqual({ | ||||
| 			"runner": added_runner, | ||||
| 			"enabled": true, | ||||
| 			"responseType": "RUNNERCARD" | ||||
| 		}); | ||||
| 	}); | ||||
| 	it('creating a enabled card with runner should return 200', async () => { | ||||
| 		const res = await axios.post(base + '/api/cards', { | ||||
| 			"runner": added_runner.id, | ||||
| 			"enabled": true | ||||
| 		}, axios_config); | ||||
| 		expect(res.status).toEqual(200); | ||||
| 		expect(res.headers['content-type']).toContain("application/json"); | ||||
| 		delete res.data.id; | ||||
| 		delete res.data.code; | ||||
| 		expect(res.data).toEqual({ | ||||
| 			"runner": added_runner, | ||||
| 			"enabled": true, | ||||
| 			"responseType": "RUNNERCARD" | ||||
| 		}); | ||||
| 	}); | ||||
| 	it('creating a disabled card with runner should return 200', async () => { | ||||
| 		const res = await axios.post(base + '/api/cards', { | ||||
| 			"runner": added_runner.id, | ||||
| 			"enabled": false | ||||
| 		}, axios_config); | ||||
| 		expect(res.status).toEqual(200); | ||||
| 		expect(res.headers['content-type']).toContain("application/json"); | ||||
| 		delete res.data.id; | ||||
| 		delete res.data.code; | ||||
| 		expect(res.data).toEqual({ | ||||
| 			"runner": added_runner, | ||||
| 			"enabled": false, | ||||
| 			"responseType": "RUNNERCARD" | ||||
| 		}); | ||||
| 	}); | ||||
| }); | ||||
| // --------------- | ||||
| describe('POST /api/cards/bulk successfully', () => { | ||||
| 	it('creating a single new bulk card should return 200', async () => { | ||||
| 		const res = await axios.post(base + '/api/cards/bulk?count=1', {}, axios_config); | ||||
| 		expect(res.status).toEqual(200); | ||||
| 		expect(res.headers['content-type']).toContain("application/json"); | ||||
| 	}); | ||||
| 	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=1&returnCards=true', {}, axios_config); | ||||
| 		expect(res.status).toEqual(200); | ||||
| 		expect(res.headers['content-type']).toContain("application/json"); | ||||
| 		expect(res.data[0].id).toBeDefined(); | ||||
| 	}); | ||||
| 	it('creating 50 new bulk card should return 200', async () => { | ||||
| 		const res = await axios.post(base + '/api/cards/bulk?count=50', {}, axios_config); | ||||
| 		expect(res.status).toEqual(200); | ||||
| 		expect(res.headers['content-type']).toContain("application/json"); | ||||
| 	}); | ||||
| 	it('creating 50 new bulk cards and letting the system return it should return 200', async () => { | ||||
| 		const res = await axios.post(base + '/api/cards/bulk?count=50&returnCards=true', {}, axios_config); | ||||
| 		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"); | ||||
| 	}); | ||||
| }); | ||||
| @@ -16,7 +16,7 @@ beforeAll(async () => { | ||||
| }); | ||||
|  | ||||
| // --------------- | ||||
| describe('adding + deletion (non-existant)', () => { | ||||
| describe('deletion (non-existant)', () => { | ||||
|     it('delete', async () => { | ||||
|         const res2 = await axios.delete(base + '/api/organizations/0', axios_config); | ||||
|         expect(res2.status).toEqual(204); | ||||
|   | ||||
							
								
								
									
										66
									
								
								src/tests/selfservice/selfservice_delete.spec.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										66
									
								
								src/tests/selfservice/selfservice_delete.spec.ts
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,66 @@ | ||||
| import axios from 'axios'; | ||||
| import { config } from '../../config'; | ||||
| const base = "http://localhost:" + config.internal_port | ||||
|  | ||||
| let access_token; | ||||
| let axios_config; | ||||
|  | ||||
| beforeAll(async () => { | ||||
|     jest.setTimeout(20000); | ||||
|     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||
|     access_token = res.data["access_token"]; | ||||
|     axios_config = { | ||||
|         headers: { "authorization": "Bearer " + access_token }, | ||||
|         validateStatus: undefined | ||||
|     }; | ||||
| }); | ||||
| // --------------- | ||||
| describe('delete selfservice runner invalid', () => { | ||||
|     let added_runner; | ||||
|     it('registering as citizen with minimal params should return 200', async () => { | ||||
|         const res = await axios.post(base + '/api/runners/register', { | ||||
|             "firstname": "string", | ||||
|             "lastname": "string", | ||||
|             "email": "user@example.com" | ||||
|         }, axios_config); | ||||
|         added_runner = res.data; | ||||
|         expect(res.status).toEqual(200); | ||||
|         expect(res.headers['content-type']).toContain("application/json"); | ||||
|     }); | ||||
|     it('delete with valid jwt should return 200', async () => { | ||||
|         const res = await axios.delete(base + '/api/runners/me/' + added_runner.token, axios_config); | ||||
|         expect(res.status).toEqual(200); | ||||
|         expect(res.headers['content-type']).toContain("application/json"); | ||||
|     }); | ||||
|     it('delete with valid jwt but non-existant runner should return 200', async () => { | ||||
|         const res = await axios.delete(base + '/api/runners/me/' + added_runner.token, axios_config); | ||||
|         expect(res.status).toEqual(404); | ||||
|         expect(res.headers['content-type']).toContain("application/json"); | ||||
|     }); | ||||
|     it('delete with invalid jwt should return 401', async () => { | ||||
|         const res = await axios.delete(base + '/api/runners/me/123.123', axios_config); | ||||
|         expect(res.status).toEqual(401); | ||||
|         expect(res.headers['content-type']).toContain("application/json"); | ||||
|     }); | ||||
| }); | ||||
| // --------------- | ||||
| describe('delete selfservice runner valid', () => { | ||||
|     let added_runner; | ||||
|     it('registering as citizen with minimal params should return 200', async () => { | ||||
|         const res = await axios.post(base + '/api/runners/register', { | ||||
|             "firstname": "string", | ||||
|             "lastname": "string", | ||||
|             "email": "user@example.com" | ||||
|         }, axios_config); | ||||
|         added_runner = res.data; | ||||
|         expect(res.status).toEqual(200); | ||||
|         expect(res.headers['content-type']).toContain("application/json"); | ||||
|     }); | ||||
|     it('delete with valid jwt should return 200', async () => { | ||||
|         const res = await axios.delete(base + '/api/runners/me/' + added_runner.token, axios_config); | ||||
|         expect(res.status).toEqual(200); | ||||
|         expect(res.headers['content-type']).toContain("application/json"); | ||||
|         delete added_runner.token; | ||||
|         expect(res.data).toEqual(added_runner); | ||||
|     }); | ||||
| }); | ||||
							
								
								
									
										97
									
								
								src/tests/stats/stats_get.spec.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										97
									
								
								src/tests/stats/stats_get.spec.ts
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,97 @@ | ||||
| import axios from 'axios'; | ||||
| import { config } from '../../config'; | ||||
| const base = "http://localhost:" + config.internal_port | ||||
|  | ||||
| let axios_config_full; | ||||
| let axios_config_stats; | ||||
|  | ||||
| beforeAll(async () => { | ||||
|     jest.setTimeout(20000); | ||||
|     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||
|     let access_token = res.data["access_token"]; | ||||
|     axios_config_full = { | ||||
|         headers: { "authorization": "Bearer " + access_token }, | ||||
|         validateStatus: undefined | ||||
|     }; | ||||
|     const res2 = await axios.post(base + '/api/statsclients', { username: "demo", password: "demo" }, axios_config_full); | ||||
|     access_token = res2.data["key"]; | ||||
|     axios_config_stats = { | ||||
|         headers: { "authorization": "Bearer " + access_token }, | ||||
|         validateStatus: undefined | ||||
|     }; | ||||
| }); | ||||
|  | ||||
| describe('GET /api/stats/runners/distance w/o auth should return 200', () => { | ||||
|     it('get with invalid token should return 401', async () => { | ||||
|         const res = await axios.get(base + '/api/stats/runners/distance', { | ||||
|             headers: { "authorization": "Bearer 123123123123123123" }, | ||||
|             validateStatus: undefined | ||||
|         }); | ||||
|         expect(res.status).toEqual(401); | ||||
|     }); | ||||
| }); | ||||
| // --------------- | ||||
| describe('GET /api/stats should return 200', () => { | ||||
|     it('get w/o auth should return 200', async () => { | ||||
|         const res = await axios.get(base + '/api/stats', { validateStatus: undefined }); | ||||
|         expect(res.status).toEqual(200); | ||||
|         expect(res.headers['content-type']).toContain("application/json"); | ||||
|     }); | ||||
|     it('get w/ auth should return 200', async () => { | ||||
|         const res = await axios.get(base + '/api/stats', axios_config_stats); | ||||
|         expect(res.status).toEqual(200); | ||||
|         expect(res.headers['content-type']).toContain("application/json"); | ||||
|     }); | ||||
| }); | ||||
| // --------------- | ||||
| describe('GET /api/stats/runners/* should return 200', () => { | ||||
|     it('get by distance w/ auth should return 200', async () => { | ||||
|         const res = await axios.get(base + '/api/stats/runners/distance', axios_config_stats); | ||||
|         expect(res.status).toEqual(200); | ||||
|         expect(res.headers['content-type']).toContain("application/json"); | ||||
|     }); | ||||
|     it('get by donations w/ auth should return 200', async () => { | ||||
|         const res = await axios.get(base + '/api/stats/runners/donations', axios_config_stats); | ||||
|         console.log("################# Runners by donations #################"); | ||||
|         console.log(res.data); | ||||
|         expect(res.status).toEqual(200); | ||||
|         expect(res.headers['content-type']).toContain("application/json"); | ||||
|     }); | ||||
|     it('get by laptime w/ auth should return 200', async () => { | ||||
|         const res = await axios.get(base + '/api/stats/runners/laptime', axios_config_stats); | ||||
|         console.log("################# Runners by laptime #################"); | ||||
|         console.log(res.data); | ||||
|         expect(res.status).toEqual(200); | ||||
|         expect(res.headers['content-type']).toContain("application/json"); | ||||
|     }); | ||||
| }); | ||||
| // --------------- | ||||
| describe('GET /api/stats/teams/* should return 200', () => { | ||||
|     it('get by distance w/ auth should return 200', async () => { | ||||
|         const res = await axios.get(base + '/api/stats/teams/distance', axios_config_stats); | ||||
|         console.log("################# Teams by distance #################"); | ||||
|         console.log(res.data); | ||||
|         expect(res.status).toEqual(200); | ||||
|         expect(res.headers['content-type']).toContain("application/json"); | ||||
|     }); | ||||
|     it('get by donations w/ auth should return 200', async () => { | ||||
|         const res = await axios.get(base + '/api/stats/teams/donations', axios_config_stats); | ||||
|         console.log("################# Teams by donations #################"); | ||||
|         console.log(res.data); | ||||
|         expect(res.status).toEqual(200); | ||||
|         expect(res.headers['content-type']).toContain("application/json"); | ||||
|     }); | ||||
| }); | ||||
| // --------------- | ||||
| describe('GET /api/stats/organizations/* should return 200', () => { | ||||
|     it('get by distance w/ auth should return 200', async () => { | ||||
|         const res = await axios.get(base + '/api/stats/organizations/distance', axios_config_stats); | ||||
|         expect(res.status).toEqual(200); | ||||
|         expect(res.headers['content-type']).toContain("application/json"); | ||||
|     }); | ||||
|     it('get by donations w/ auth should return 200', async () => { | ||||
|         const res = await axios.get(base + '/api/stats/organizations/donations', axios_config_stats); | ||||
|         expect(res.status).toEqual(200); | ||||
|         expect(res.headers['content-type']).toContain("application/json"); | ||||
|     }); | ||||
| }); | ||||
							
								
								
									
										51
									
								
								src/tests/users/user_delete.spec.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										51
									
								
								src/tests/users/user_delete.spec.ts
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,51 @@ | ||||
| import axios from 'axios'; | ||||
| import { config } from '../../config'; | ||||
| const base = "http://localhost:" + config.internal_port | ||||
|  | ||||
| let access_token; | ||||
| let axios_config; | ||||
|  | ||||
| beforeAll(async () => { | ||||
|     jest.setTimeout(20000); | ||||
|     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||
|     access_token = res.data["access_token"]; | ||||
|     axios_config = { | ||||
|         headers: { "authorization": "Bearer " + access_token }, | ||||
|         validateStatus: undefined | ||||
|     }; | ||||
| }); | ||||
|  | ||||
| // --------------- | ||||
| describe('adding + deletion (non-existant)', () => { | ||||
|     it('delete', async () => { | ||||
|         const res2 = await axios.delete(base + '/api/users/0?force=true', axios_config); | ||||
|         expect(res2.status).toEqual(204); | ||||
|     }); | ||||
| }); | ||||
| // --------------- | ||||
| describe('adding + deletion (successfull)', () => { | ||||
|     let added_user | ||||
|     it('valid user creation with minimal parameters should return 200', async () => { | ||||
|         const res = await axios.post(base + '/api/users', { | ||||
|             "firstname": "string", | ||||
|             "middlename": "string", | ||||
|             "lastname": "string", | ||||
|             "email": "demo_123_123_123asdASD@example.com", | ||||
|             "password": "demo_123_123_123asdASD", | ||||
|             "enabled": true | ||||
|         } | ||||
|             , axios_config); | ||||
|         added_user = res.data; | ||||
|         expect(res.status).toEqual(200); | ||||
|     }); | ||||
|     it('delete', async () => { | ||||
|         const res2 = await axios.delete(base + '/api/users/' + added_user.id + "?force=true", axios_config); | ||||
|         expect(res2.status).toEqual(200); | ||||
|         expect(res2.headers['content-type']).toContain("application/json") | ||||
|     }); | ||||
|     it('check if user really was deleted', async () => { | ||||
|         const res3 = await axios.get(base + '/api/users/' + added_user.id, axios_config); | ||||
|         expect(res3.status).toEqual(404); | ||||
|         expect(res3.headers['content-type']).toContain("application/json") | ||||
|     }); | ||||
| }); | ||||
							
								
								
									
										113
									
								
								src/tests/users/user_post.spec.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										113
									
								
								src/tests/users/user_post.spec.ts
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,113 @@ | ||||
| import axios from 'axios'; | ||||
| import { config } from '../../config'; | ||||
|  | ||||
| const base = "http://localhost:" + config.internal_port | ||||
|  | ||||
| let axios_config = {}; | ||||
|  | ||||
| beforeAll(async () => { | ||||
|     jest.setTimeout(20000); | ||||
|     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); | ||||
|     let access_token = res.data["access_token"]; | ||||
|     axios_config = { | ||||
|         headers: { "authorization": "Bearer " + access_token }, | ||||
|         validateStatus: undefined | ||||
|     }; | ||||
| }); | ||||
|  | ||||
| describe('POST /api/users valid', () => { | ||||
|     it('valid user creation with minimal parameters should return 200', async () => { | ||||
|         const res = await axios.post(base + '/api/users', { | ||||
|             "firstname": "demo_createASD123", | ||||
|             "lastname": "demo_createASD123", | ||||
|             "password": "demo_createASD123", | ||||
|             "email": "demo_createASD123@dev.lauf-fuer-kaya.de" | ||||
|         }, axios_config); | ||||
|         expect(res.status).toEqual(200); | ||||
|     }); | ||||
|     it('valid user creation with all parameters should return 200', async () => { | ||||
|         const res = await axios.post(base + '/api/users', { | ||||
|             "firstname": "demo_createASD123_2", | ||||
|             "middlename": "demo_createASD123_2", | ||||
|             "lastname": "demo_createASD123_2", | ||||
|             "username": "demo_createASD123_2", | ||||
|             "password": "demo_createASD123_2", | ||||
|             "email": "demo_createASD123_2@dev.lauf-fuer-kaya.de" | ||||
|         }, axios_config); | ||||
|         expect(res.status).toEqual(200); | ||||
|     }); | ||||
| }); | ||||
| // --------------- | ||||
| describe('POST /api/users invalid -> 400', () => { | ||||
|     it('user creation w/o firstname should return 400', async () => { | ||||
|         const res = await axios.post(base + '/api/users', { | ||||
|             "lastname": "demo_createASD123_3", | ||||
|             "password": "demo_createASD123_3", | ||||
|             "email": "demo_createASD123_3@dev.lauf-fuer-kaya.de" | ||||
|         }, axios_config); | ||||
|         expect(res.status).toEqual(400); | ||||
|     }); | ||||
|     it('user creation w/o lastname should return 400', async () => { | ||||
|         const res = await axios.post(base + '/api/users', { | ||||
|             "firstname": "demo_createASD123_3", | ||||
|             "password": "demo_createASD123_3", | ||||
|             "email": "demo_createASD123_3@dev.lauf-fuer-kaya.de" | ||||
|         }, axios_config); | ||||
|         expect(res.status).toEqual(400); | ||||
|     }); | ||||
|     it('user creation w/o password should return 400', async () => { | ||||
|         const res = await axios.post(base + '/api/users', { | ||||
|             "firstname": "demo_createASD123_3", | ||||
|             "lastname": "demo_createASD123_3", | ||||
|             "email": "demo_createASD123_3@dev.lauf-fuer-kaya.de" | ||||
|         }, axios_config); | ||||
|         expect(res.status).toEqual(400); | ||||
|     }); | ||||
|     it('user creation w/o email should return 400', async () => { | ||||
|         const res = await axios.post(base + '/api/users', { | ||||
|             "firstname": "demo_createASD123_3", | ||||
|             "lastname": "demo_createASD123_3", | ||||
|             "password": "demo_createASD123_3" | ||||
|         }, axios_config); | ||||
|         expect(res.status).toEqual(400); | ||||
|     }); | ||||
| }); | ||||
| // --------------- | ||||
| describe('POST /api/users invalid -> Password errors', () => { | ||||
|     it('user creation w/ invalid password -> No numbers should return 406', async () => { | ||||
|         const res = await axios.post(base + '/api/users', { | ||||
|             "firstname": "demo_createASD123_4", | ||||
|             "lastname": "demo_createASD123_4", | ||||
|             "password": "demo_createASD", | ||||
|             "email": "demo_createASD123_4@dev.lauf-fuer-kaya.de" | ||||
|         }, axios_config); | ||||
|         expect(res.status).toEqual(406); | ||||
|     }); | ||||
|     it('user creation w/ invalid password -> No uppercase should return 406', async () => { | ||||
|         const res = await axios.post(base + '/api/users', { | ||||
|             "firstname": "demo_createASD123_4", | ||||
|             "lastname": "demo_createASD123_4", | ||||
|             "password": "demo_create_4", | ||||
|             "email": "demo_createASD123_4@dev.lauf-fuer-kaya.de" | ||||
|         }, axios_config); | ||||
|         expect(res.status).toEqual(406); | ||||
|     }); | ||||
|     it('user creation w/ invalid password -> No lowercase should return 406', async () => { | ||||
|         const res = await axios.post(base + '/api/users', { | ||||
|             "firstname": "demo_createASD123_4", | ||||
|             "lastname": "demo_createASD123_4", | ||||
|             "password": "DEMO123123ASD", | ||||
|             "email": "demo_createASD123_4@dev.lauf-fuer-kaya.de" | ||||
|         }, axios_config); | ||||
|         expect(res.status).toEqual(406); | ||||
|     }); | ||||
|     it('user creation w/ invalid password -> Too short should return 406', async () => { | ||||
|         const res = await axios.post(base + '/api/users', { | ||||
|             "firstname": "demo_createASD123_4", | ||||
|             "lastname": "demo_createASD123_4", | ||||
|             "password": "1Aa_", | ||||
|             "email": "demo_createASD123_4@dev.lauf-fuer-kaya.de" | ||||
|         }, axios_config); | ||||
|         expect(res.status).toEqual(406); | ||||
|     }); | ||||
| }); | ||||
		Reference in New Issue
	
	Block a user