Compare commits
	
		
			41 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						
						
							
						
						8e6d67428c
	
				 | 
					
					
						|||
| 
						
						
							
						
						7ffb7523aa
	
				 | 
					
					
						|||
| 
						
						
							
						
						f4bf309821
	
				 | 
					
					
						|||
| 
						
						
							
						
						02b1cb9904
	
				 | 
					
					
						|||
| 
						
						
							
						
						7697acff82
	
				 | 
					
					
						|||
| 
						
						
							
						
						bacfc437f9
	
				 | 
					
					
						|||
| 
						
						
							
						
						9875b4f392
	
				 | 
					
					
						|||
| 
						
						
							
						
						ce9b765b81
	
				 | 
					
					
						|||
| 
						
						
							
						
						2ab6e985e3
	
				 | 
					
					
						|||
| 
						
						
							
						
						d06f6a4407
	
				 | 
					
					
						|||
| 
						
						
							
						
						a50d72f2f5
	
				 | 
					
					
						|||
| 
						
						
							
						
						4723d9738e
	
				 | 
					
					
						|||
| 
						
						
							
						
						1a478bd784
	
				 | 
					
					
						|||
| 
						
						
							
						
						284cb0f8b3
	
				 | 
					
					
						|||
| 
						
						
							
						
						6e63c57936
	
				 | 
					
					
						|||
| 
						
						
							
						
						30b61db2c1
	
				 | 
					
					
						|||
| 
						
						
							
						
						8237d5f210
	
				 | 
					
					
						|||
| 
						
						
							
						
						03e0a29096
	
				 | 
					
					
						|||
| 
						
						
							
						
						a6afba93e2
	
				 | 
					
					
						|||
| 
						
						
							
						
						a41758cd9c
	
				 | 
					
					
						|||
| 
						
						
							
						
						d6755ed134
	
				 | 
					
					
						|||
| 
						
						
							
						
						599c75fc00
	
				 | 
					
					
						|||
| 
						
						
							
						
						bb213f001e
	
				 | 
					
					
						|||
| 
						
						
							
						
						5415cd38a7
	
				 | 
					
					
						|||
| 
						
						
							
						
						175ba52ffa
	
				 | 
					
					
						|||
| 
						
						
							
						
						5c5000a218
	
				 | 
					
					
						|||
| 
						
						
							
						
						d559d04031
	
				 | 
					
					
						|||
| 
						
						
							
						
						2af682d1dd
	
				 | 
					
					
						|||
| 
						
						
							
						
						30905e481c
	
				 | 
					
					
						|||
| 
						
						
							
						
						752d405bda
	
				 | 
					
					
						|||
| 
						
						
							
						
						8fa4ed7c33
	
				 | 
					
					
						|||
| 
						
						
							
						
						c4201e9a68
	
				 | 
					
					
						|||
| 
						
						
							
						
						78dcad0857
	
				 | 
					
					
						|||
| 
						
						
							
						
						93e0cdf577
	
				 | 
					
					
						|||
| 
						
						
							
						
						6efcd94726
	
				 | 
					
					
						|||
| 
						
						
							
						
						2e271bcd52
	
				 | 
					
					
						|||
| 
						
						
							
						
						ebde8c6ffd
	
				 | 
					
					
						|||
| a3639dd89b | |||
| 
						
						
							
						
						0a43f1bb5b
	
				 | 
					
					
						|||
| 
						
						
							
						
						8c6fdb2239
	
				 | 
					
					
						|||
| 
						
						
							
						
						c0d5af5d7a
	
				 | 
					
					
						
							
								
								
									
										33
									
								
								.gitea/workflows/release.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										33
									
								
								.gitea/workflows/release.yml
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,33 @@
 | 
			
		||||
name: Build release images
 | 
			
		||||
on:
 | 
			
		||||
  push:
 | 
			
		||||
    tags:
 | 
			
		||||
      - "*.*.*"
 | 
			
		||||
 | 
			
		||||
jobs:
 | 
			
		||||
  build-container:
 | 
			
		||||
    runs-on: ubuntu-latest
 | 
			
		||||
    steps:
 | 
			
		||||
      - name: Checkout
 | 
			
		||||
        uses: actions/checkout@v4
 | 
			
		||||
      - name: Set up Node.js
 | 
			
		||||
        uses: actions/setup-node@v4
 | 
			
		||||
        with:
 | 
			
		||||
          node-version: 19
 | 
			
		||||
      - run: npm i -g pnpm@10.7 && pnpm i
 | 
			
		||||
      - run: pnpm licenses:export
 | 
			
		||||
      - name: Login to registry
 | 
			
		||||
        uses: docker/login-action@v3
 | 
			
		||||
        with:
 | 
			
		||||
          registry: registry.odit.services
 | 
			
		||||
          username: ${{ vars.REGISTRY_USERNAME }}
 | 
			
		||||
          password: ${{ secrets.REGISTRY_PASSWORD }}
 | 
			
		||||
      - name: Set up Docker Buildx
 | 
			
		||||
        uses: docker/setup-buildx-action@v3
 | 
			
		||||
      - name: Build and push
 | 
			
		||||
        uses: docker/build-push-action@v6
 | 
			
		||||
        with:
 | 
			
		||||
          push: true
 | 
			
		||||
          tags: |
 | 
			
		||||
            ${{ vars.REGISTRY }}/lfk/backend:${{ github.ref_name }}
 | 
			
		||||
          platforms: linux/amd64,linux/arm64
 | 
			
		||||
							
								
								
									
										3
									
								
								.vscode/settings.json
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.vscode/settings.json
									
									
									
									
										vendored
									
									
								
							@@ -9,8 +9,7 @@
 | 
			
		||||
    "[typescript]": {
 | 
			
		||||
        "editor.defaultFormatter": "vscode.typescript-language-features",
 | 
			
		||||
        "editor.codeActionsOnSave": {
 | 
			
		||||
            "source.organizeImports": true,
 | 
			
		||||
            // "source.fixAll": true
 | 
			
		||||
            "source.organizeImports": "explicit"
 | 
			
		||||
        }
 | 
			
		||||
    },
 | 
			
		||||
    "javascript.preferences.quoteStyle": "single",
 | 
			
		||||
 
 | 
			
		||||
@@ -1,33 +0,0 @@
 | 
			
		||||
steps:
 | 
			
		||||
  - name: build latest
 | 
			
		||||
    image: woodpeckerci/plugin-docker-buildx
 | 
			
		||||
    settings:
 | 
			
		||||
      repo: registry.odit.services/lfk/backend
 | 
			
		||||
      tags:
 | 
			
		||||
        - latest
 | 
			
		||||
      registry: registry.odit.services
 | 
			
		||||
      platforms: linux/amd64,linux/arm64
 | 
			
		||||
      cache_from: registry.odit.services/lfk/backend:dev
 | 
			
		||||
      username:
 | 
			
		||||
        from_secret: odit-registry-builder-username
 | 
			
		||||
      password:
 | 
			
		||||
        from_secret: odit-registry-builder-password
 | 
			
		||||
    when:
 | 
			
		||||
      branch: main
 | 
			
		||||
  - name: build dev
 | 
			
		||||
    image: woodpeckerci/plugin-docker-buildx
 | 
			
		||||
    settings:
 | 
			
		||||
      repo: registry.odit.services/lfk/backend
 | 
			
		||||
      tags:
 | 
			
		||||
        - dev
 | 
			
		||||
      registry: registry.odit.services
 | 
			
		||||
      platforms: linux/amd64,linux/arm64
 | 
			
		||||
      cache_from: registry.odit.services/lfk/backend:dev
 | 
			
		||||
      username:
 | 
			
		||||
        from_secret: odit-registry-builder-username
 | 
			
		||||
      password:
 | 
			
		||||
        from_secret: odit-registry-builder-password
 | 
			
		||||
    when:
 | 
			
		||||
      branch: dev
 | 
			
		||||
when:
 | 
			
		||||
  event: push
 | 
			
		||||
@@ -1,17 +0,0 @@
 | 
			
		||||
steps:
 | 
			
		||||
  - name: build tag
 | 
			
		||||
    image: woodpeckerci/plugin-docker-buildx
 | 
			
		||||
    settings:
 | 
			
		||||
      repo: registry.odit.services/lfk/backend
 | 
			
		||||
      tags:
 | 
			
		||||
        - "${CI_COMMIT_TAG}"
 | 
			
		||||
      registry: registry.odit.services
 | 
			
		||||
      platforms: linux/amd64,linux/arm64
 | 
			
		||||
      cache_from: registry.odit.services/lfk/backend:dev
 | 
			
		||||
      username:
 | 
			
		||||
        from_secret: odit-registry-builder-username
 | 
			
		||||
      password:
 | 
			
		||||
        from_secret: odit-registry-builder-password
 | 
			
		||||
when:
 | 
			
		||||
  event:
 | 
			
		||||
    - tag
 | 
			
		||||
							
								
								
									
										131
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										131
									
								
								CHANGELOG.md
									
									
									
									
									
								
							@@ -2,13 +2,144 @@
 | 
			
		||||
 | 
			
		||||
All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 | 
			
		||||
 | 
			
		||||
#### [1.4.0](https://git.odit.services/lfk/backend/compare/1.3.12...1.4.0)
 | 
			
		||||
 | 
			
		||||
- feat(donations): Implement response type to indicate possible missing donor [`f4bf309`](https://git.odit.services/lfk/backend/commit/f4bf309821c140f2bc0ae8b6d96c7458fcc80978)
 | 
			
		||||
- wip [`9875b4f`](https://git.odit.services/lfk/backend/commit/9875b4f3926e04b502e7af64c17f54fd3c1d8e3e)
 | 
			
		||||
- refactor(donations): Make anon prepaid [`02b1cb9`](https://git.odit.services/lfk/backend/commit/02b1cb9904cc593faeac025ae302a8684f650f5e)
 | 
			
		||||
- fix(donations): Move donor over to the types that need it [`7697acf`](https://git.odit.services/lfk/backend/commit/7697acff82b23d0c05dbbd17fee6e70eb1b7061c)
 | 
			
		||||
 | 
			
		||||
#### [1.3.12](https://git.odit.services/lfk/backend/compare/1.3.11...1.3.12)
 | 
			
		||||
 | 
			
		||||
> 28 April 2025
 | 
			
		||||
 | 
			
		||||
- chore(release): 1.3.12 [`bacfc43`](https://git.odit.services/lfk/backend/commit/bacfc437f97cac6a20c32b79ae2d6391466f78a6)
 | 
			
		||||
- refactor: make Donation.donor optional [`2ab6e98`](https://git.odit.services/lfk/backend/commit/2ab6e985e356f0f3d8637d81630d191cc11b8806)
 | 
			
		||||
- refactor(config): improve consola error logs [`ce9b765`](https://git.odit.services/lfk/backend/commit/ce9b765b81b014623e79ce64d8d835f1f86cecf3)
 | 
			
		||||
 | 
			
		||||
#### [1.3.11](https://git.odit.services/lfk/backend/compare/1.3.10...1.3.11)
 | 
			
		||||
 | 
			
		||||
> 17 April 2025
 | 
			
		||||
 | 
			
		||||
- feat(RunnerController): add selfservice_links parameter to getRunners method [`a50d72f`](https://git.odit.services/lfk/backend/commit/a50d72f2f5281b8c28ca64a0970161a35a7af95a)
 | 
			
		||||
- chore(release): 1.3.11 [`d06f6a4`](https://git.odit.services/lfk/backend/commit/d06f6a44072971d1853411b255f9b49eb423b3a2)
 | 
			
		||||
 | 
			
		||||
#### [1.3.10](https://git.odit.services/lfk/backend/compare/1.3.9...1.3.10)
 | 
			
		||||
 | 
			
		||||
> 11 April 2025
 | 
			
		||||
 | 
			
		||||
- chore(release): 1.3.10 [`4723d97`](https://git.odit.services/lfk/backend/commit/4723d9738eacd63fb41f23c628fbe4181bd126de)
 | 
			
		||||
- feat(RunnerController.getAll): debug created_via query param filter [`1a478bd`](https://git.odit.services/lfk/backend/commit/1a478bd784e01b9d5a1c6635d1004a9535c9a0e9)
 | 
			
		||||
 | 
			
		||||
#### [1.3.9](https://git.odit.services/lfk/backend/compare/1.3.8...1.3.9)
 | 
			
		||||
 | 
			
		||||
> 9 April 2025
 | 
			
		||||
 | 
			
		||||
- feat(RunnerController.getAll): add created_via query param filter [`6e63c57`](https://git.odit.services/lfk/backend/commit/6e63c57936f06a29da5f1a94b1141d51b75df5f0)
 | 
			
		||||
- chore(release): 1.3.9 [`284cb0f`](https://git.odit.services/lfk/backend/commit/284cb0f8b3955d0d65c2b36d2ec427a39752ffe7)
 | 
			
		||||
 | 
			
		||||
#### [1.3.8](https://git.odit.services/lfk/backend/compare/1.3.7...1.3.8)
 | 
			
		||||
 | 
			
		||||
> 9 April 2025
 | 
			
		||||
 | 
			
		||||
- feat(RunnerCardController): putByCode [`8237d5f`](https://git.odit.services/lfk/backend/commit/8237d5f21067c0872a7eff7c8d1506edf44ec10c)
 | 
			
		||||
- chore(release): 1.3.8 [`30b61db`](https://git.odit.services/lfk/backend/commit/30b61db2c160c019bac381f26cefdc6524ea465e)
 | 
			
		||||
 | 
			
		||||
#### [1.3.7](https://git.odit.services/lfk/backend/compare/1.3.6...1.3.7)
 | 
			
		||||
 | 
			
		||||
> 8 April 2025
 | 
			
		||||
 | 
			
		||||
- feat(stats): Publish runners by kiosk stat [`a6afba9`](https://git.odit.services/lfk/backend/commit/a6afba93e243ca419c282a16cad023d06d864e0e)
 | 
			
		||||
- chore(release): 1.3.7 [`03e0a29`](https://git.odit.services/lfk/backend/commit/03e0a290965648579956ac1f8e8542c97a667ed8)
 | 
			
		||||
 | 
			
		||||
#### [1.3.6](https://git.odit.services/lfk/backend/compare/1.3.5...1.3.6)
 | 
			
		||||
 | 
			
		||||
> 8 April 2025
 | 
			
		||||
 | 
			
		||||
- chore(release): 1.3.6 [`a41758c`](https://git.odit.services/lfk/backend/commit/a41758cd9c83105c3a4b407744bafe2f0f6fb48a)
 | 
			
		||||
- feat(runners): Allow created via being set via api [`d6755ed`](https://git.odit.services/lfk/backend/commit/d6755ed134071df635bc9d5821ceb2396c0f1d22)
 | 
			
		||||
- fix(participant): Switch to correct type [`599c75f`](https://git.odit.services/lfk/backend/commit/599c75fc00217eaec3cc87c0de50d059bdde685f)
 | 
			
		||||
 | 
			
		||||
#### [1.3.5](https://git.odit.services/lfk/backend/compare/1.3.4...1.3.5)
 | 
			
		||||
 | 
			
		||||
> 8 April 2025
 | 
			
		||||
 | 
			
		||||
- feat(runners): Generate selfservice urls on runner if requested or create/update/get single [`5415cd3`](https://git.odit.services/lfk/backend/commit/5415cd38a727e76632a01a4d2634a1777df5542c)
 | 
			
		||||
- chore(release): 1.3.5 [`bb213f0`](https://git.odit.services/lfk/backend/commit/bb213f001eff2157abf8741128f624f9cc991afe)
 | 
			
		||||
 | 
			
		||||
#### [1.3.4](https://git.odit.services/lfk/backend/compare/1.3.3...1.3.4)
 | 
			
		||||
 | 
			
		||||
> 28 March 2025
 | 
			
		||||
 | 
			
		||||
- feat: add runnersViaSelfservice to statsControllerGet [`5c5000a`](https://git.odit.services/lfk/backend/commit/5c5000a218b47815e6846ac8b857dcd1995bfa6f)
 | 
			
		||||
- chore(release): 1.3.4 [`175ba52`](https://git.odit.services/lfk/backend/commit/175ba52ffae8e6ba1fdc1603ac2f5eba15602046)
 | 
			
		||||
 | 
			
		||||
#### [1.3.3](https://git.odit.services/lfk/backend/compare/v1.3.2...1.3.3)
 | 
			
		||||
 | 
			
		||||
> 28 March 2025
 | 
			
		||||
 | 
			
		||||
- chore(release): 1.3.3 [`d559d04`](https://git.odit.services/lfk/backend/commit/d559d0403191c703fd6da0e3f3dab53eec9258c0)
 | 
			
		||||
- ci: remove "v" prefix from tags [`2af682d`](https://git.odit.services/lfk/backend/commit/2af682d1dd09df496eb9f3a9111c50c0c4117356)
 | 
			
		||||
 | 
			
		||||
#### [v1.3.2](https://git.odit.services/lfk/backend/compare/v1.3.1...v1.3.2)
 | 
			
		||||
 | 
			
		||||
> 28 March 2025
 | 
			
		||||
 | 
			
		||||
- chore(release): v1.3.2 [`30905e4`](https://git.odit.services/lfk/backend/commit/30905e481c69cfe62b4261544b4277de3a1a43c2)
 | 
			
		||||
- ci: pnpm@10.7 [`752d405`](https://git.odit.services/lfk/backend/commit/752d405bda9129f3cd288a956d5444cab316c2af)
 | 
			
		||||
 | 
			
		||||
#### [v1.3.1](https://git.odit.services/lfk/backend/compare/1.3.0...v1.3.1)
 | 
			
		||||
 | 
			
		||||
> 28 March 2025
 | 
			
		||||
 | 
			
		||||
- fix: TypeError: Cannot read properties of undefined (reading 'filter') - when trying to delete a org/team with runners [`#210`](https://git.odit.services/lfk/backend/issues/210)
 | 
			
		||||
- pnpm@10.7, node@23, argon->@node-rs/argon2 [`78dcad0`](https://git.odit.services/lfk/backend/commit/78dcad085794c93829499dd550a786c38d6186f5)
 | 
			
		||||
- chore(release): v1.3.1 [`8fa4ed7`](https://git.odit.services/lfk/backend/commit/8fa4ed7c3319c3e56a71701ba266ceda64d2ef69)
 | 
			
		||||
 | 
			
		||||
#### [1.3.0](https://git.odit.services/lfk/backend/compare/1.2.1...1.3.0)
 | 
			
		||||
 | 
			
		||||
> 28 March 2025
 | 
			
		||||
 | 
			
		||||
- feat: created_via for tracking how runners got into the system [`#212`](https://git.odit.services/lfk/backend/pull/212)
 | 
			
		||||
- feat: created_via for tracking how runners got into the system (#212) [`#211`](https://git.odit.services/lfk/backend/issues/211)
 | 
			
		||||
- ci: move to gitea workflows [`ebde8c6`](https://git.odit.services/lfk/backend/commit/ebde8c6ffd8b17c6752da8c4d8eb3095105f6132)
 | 
			
		||||
- chore(release): v1.3.0 [`93e0cdf`](https://git.odit.services/lfk/backend/commit/93e0cdf577654898b2d63790d91598c458a2db59)
 | 
			
		||||
- build: docker "AS" casing [`0a43f1b`](https://git.odit.services/lfk/backend/commit/0a43f1bb5b26d3acb0d4d91648473f0dc55e8637)
 | 
			
		||||
- ci: change release commit message [`6efcd94`](https://git.odit.services/lfk/backend/commit/6efcd94726957b8c527820f1a9b0130151ce22f1)
 | 
			
		||||
- refactor(RunnerController.remove): only load necessary relations [`8c6fdb2`](https://git.odit.services/lfk/backend/commit/8c6fdb22390218e385780fadb3bdaf32148ac054)
 | 
			
		||||
- refactor(RunnerTeamController.remove): only load necessary relations [`c0d5af5`](https://git.odit.services/lfk/backend/commit/c0d5af5d7ab44cfdf19014e0d774fb560d08f6d7)
 | 
			
		||||
- fix: add .created_via to ResponseParticipant constructor [`2e271bc`](https://git.odit.services/lfk/backend/commit/2e271bcd52f02ab7449cd15916b0afc86e8b0a90)
 | 
			
		||||
 | 
			
		||||
#### [1.2.1](https://git.odit.services/lfk/backend/compare/1.2.0...1.2.1)
 | 
			
		||||
 | 
			
		||||
> 11 December 2024
 | 
			
		||||
 | 
			
		||||
- refactor: allow selfservice link every 30s [`07bf28b`](https://git.odit.services/lfk/backend/commit/07bf28b14458849930748ce041fb65e572759482)
 | 
			
		||||
- chore(release): 1.2.1 [`4008a5e`](https://git.odit.services/lfk/backend/commit/4008a5ee720b212bac9cba64417058bf4526060b)
 | 
			
		||||
 | 
			
		||||
#### [1.2.0](https://git.odit.services/lfk/backend/compare/v1.1.4...1.2.0)
 | 
			
		||||
 | 
			
		||||
> 11 December 2024
 | 
			
		||||
 | 
			
		||||
- refactor: move to new mailer [`0f4c8b2`](https://git.odit.services/lfk/backend/commit/0f4c8b2051cae17fbdd7e02017ad5b41c61e210c)
 | 
			
		||||
- refactor(ci): Switch to new woodpecker [`b3a73b2`](https://git.odit.services/lfk/backend/commit/b3a73b25e80a0466ff83e43481271fc0cd499a0d)
 | 
			
		||||
- feat: middlename [`6eff243`](https://git.odit.services/lfk/backend/commit/6eff2438035b368eb45931fad9402a6cb942b350)
 | 
			
		||||
- SELFSERVICE_URL [`765ef84`](https://git.odit.services/lfk/backend/commit/765ef849035ca4f8b2253bb76d15be8e9a3e6763)
 | 
			
		||||
- FRONTEND_URL env [`296ba8d`](https://git.odit.services/lfk/backend/commit/296ba8ddab1dba46f8201829d9a7e5fc1c88c0f8)
 | 
			
		||||
- chore: update readme [`d842c14`](https://git.odit.services/lfk/backend/commit/d842c14240fb4a7f70c66143bbe877f8168ef6d4)
 | 
			
		||||
- chore(release): 1.2.0 [`6764bf8`](https://git.odit.services/lfk/backend/commit/6764bf80eac832d186e688319d8a959543a1495f)
 | 
			
		||||
- Merge pull request 'refactor: move to new mailer' (#209) from refactor/new-mailer into dev [`bda1f97`](https://git.odit.services/lfk/backend/commit/bda1f971d1a14ea403439533c7ae31280c7df167)
 | 
			
		||||
 | 
			
		||||
#### [v1.1.4](https://git.odit.services/lfk/backend/compare/v1.1.3...v1.1.4)
 | 
			
		||||
 | 
			
		||||
> 20 November 2024
 | 
			
		||||
 | 
			
		||||
- build: package lock [`50dd703`](https://git.odit.services/lfk/backend/commit/50dd703a1bd276a607cc10a087c7e90fd880847a)
 | 
			
		||||
- fix(deps): Bump sqlite3 [`cd3cd81`](https://git.odit.services/lfk/backend/commit/cd3cd81360777e8bc4d78e861354e58c8da79cc7)
 | 
			
		||||
- feat(ci)!: Switch to woodpecker [`3192365`](https://git.odit.services/lfk/backend/commit/3192365793fae59f2b89e3231db298654f0a28e9)
 | 
			
		||||
- fix(deps): Bumped argon2 to latest version for arm support [`cf48c00`](https://git.odit.services/lfk/backend/commit/cf48c00ddb2ac33263549876928db50ae152c12d)
 | 
			
		||||
- fix: updated README for pnpm, typos [`5082b1b`](https://git.odit.services/lfk/backend/commit/5082b1b8b1c0ae9e8ffa9c71c4d7923fd9223c87)
 | 
			
		||||
- 🚀Bumped version to v1.1.4 [`a54cb28`](https://git.odit.services/lfk/backend/commit/a54cb287a4323ac8de77f51711cc6c52ec290859)
 | 
			
		||||
- ci: drop lfk-client-node [`075d484`](https://git.odit.services/lfk/backend/commit/075d484f1169bfc5c5b68cb9712116b0e270b471)
 | 
			
		||||
- fix(dependencies): Switch back to previous class-validator version to produce a working build [`74d334f`](https://git.odit.services/lfk/backend/commit/74d334f9b747a77115bd9b97729ef1120822e128)
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										10
									
								
								Dockerfile
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								Dockerfile
									
									
									
									
									
								
							@@ -1,10 +1,12 @@
 | 
			
		||||
# Typescript Build
 | 
			
		||||
FROM registry.odit.services/hub/library/node:21.1.0-alpine3.18 as build
 | 
			
		||||
FROM registry.odit.services/hub/library/node:23.10.0-alpine3.21 AS build
 | 
			
		||||
ARG NPM_REGISTRY_URL=https://registry.npmjs.org
 | 
			
		||||
WORKDIR /app
 | 
			
		||||
 | 
			
		||||
COPY package.json ./
 | 
			
		||||
RUN npm config set registry $NPM_REGISTRY_URL && npm i -g pnpm@8
 | 
			
		||||
COPY pnpm-workspace.yaml ./
 | 
			
		||||
COPY pnpm-lock.yaml ./
 | 
			
		||||
RUN npm config set registry $NPM_REGISTRY_URL && npm i -g pnpm@10.7
 | 
			
		||||
RUN mkdir /pnpm && pnpm config set store-dir /pnpm && pnpm i
 | 
			
		||||
 | 
			
		||||
COPY tsconfig.json ormconfig.js ./
 | 
			
		||||
@@ -14,9 +16,11 @@ RUN pnpm run build \
 | 
			
		||||
    && pnpm i --production --prefer-offline
 | 
			
		||||
 | 
			
		||||
# final image
 | 
			
		||||
FROM registry.odit.services/hub/library/node:21.1.0-alpine3.18 as final
 | 
			
		||||
FROM registry.odit.services/hub/library/node:23.10.0-alpine3.21 AS final
 | 
			
		||||
WORKDIR /app
 | 
			
		||||
COPY --from=build /app/package.json /app/package.json
 | 
			
		||||
COPY --from=build /app/pnpm-lock.yaml /app/pnpm-lock.yaml
 | 
			
		||||
COPY --from=build /app/pnpm-workspace.yaml /app/pnpm-workspace.yaml
 | 
			
		||||
COPY --from=build /app/ormconfig.js /app/ormconfig.js
 | 
			
		||||
COPY --from=build /app/dist /app/dist
 | 
			
		||||
COPY --from=build /app/node_modules /app/node_modules
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,3 @@
 | 
			
		||||
version: "3"
 | 
			
		||||
services:
 | 
			
		||||
  backend_server:
 | 
			
		||||
    build: .
 | 
			
		||||
@@ -14,7 +13,7 @@ services:
 | 
			
		||||
      DB_NAME: ./db.sqlite
 | 
			
		||||
      NODE_ENV: production
 | 
			
		||||
      POSTALCODE_COUNTRYCODE: DE
 | 
			
		||||
      SEED_TEST_DATA: "false"
 | 
			
		||||
      SEED_TEST_DATA: "true"
 | 
			
		||||
      MAILER_URL: https://dev.lauf-fuer-kaya.de/mailer
 | 
			
		||||
      MAILER_KEY: asdasd
 | 
			
		||||
      # APP_PORT: 4010
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										59
									
								
								licenses.md
									
									
									
									
									
								
							
							
						
						
									
										59
									
								
								licenses.md
									
									
									
									
									
								
							@@ -1,3 +1,32 @@
 | 
			
		||||
# @node-rs/argon2
 | 
			
		||||
**Author**: undefined
 | 
			
		||||
**Repo**: [object Object]
 | 
			
		||||
**License**: MIT
 | 
			
		||||
**Description**: RustCrypto: Argon2 binding for Node.js
 | 
			
		||||
## License Text
 | 
			
		||||
MIT License
 | 
			
		||||
 | 
			
		||||
Copyright (c) 2020-present LongYinan
 | 
			
		||||
 | 
			
		||||
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.
 | 
			
		||||
 
 | 
			
		||||
 | 
			
		||||
# @odit/class-validator-jsonschema
 | 
			
		||||
**Author**: Aleksi Pekkala <aleksipekkala@gmail.com>
 | 
			
		||||
**Repo**: git@github.com:epiphone/class-validator-jsonschema.git
 | 
			
		||||
@@ -27,36 +56,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 | 
			
		||||
SOFTWARE.
 | 
			
		||||
 
 | 
			
		||||
 | 
			
		||||
# argon2
 | 
			
		||||
**Author**: Ranieri Althoff <ranisalt+argon2@gmail.com>
 | 
			
		||||
**Repo**: [object Object]
 | 
			
		||||
**License**: MIT
 | 
			
		||||
**Description**: An Argon2 library for Node
 | 
			
		||||
## License Text
 | 
			
		||||
The MIT License (MIT)
 | 
			
		||||
 | 
			
		||||
Copyright (c) 2015 Ranieri Althoff
 | 
			
		||||
 | 
			
		||||
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.
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
 | 
			
		||||
# axios
 | 
			
		||||
**Author**: Matt Zabriskie
 | 
			
		||||
**Repo**: [object Object]
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										17
									
								
								package.json
									
									
									
									
									
								
							
							
						
						
									
										17
									
								
								package.json
									
									
									
									
									
								
							@@ -1,11 +1,8 @@
 | 
			
		||||
{
 | 
			
		||||
  "name": "@odit/lfk-backend",
 | 
			
		||||
  "version": "1.2.1",
 | 
			
		||||
  "version": "1.4.0",
 | 
			
		||||
  "main": "src/app.ts",
 | 
			
		||||
  "repository": "https://git.odit.services/lfk/backend",
 | 
			
		||||
  "engines": {
 | 
			
		||||
    "pnpm": "8"
 | 
			
		||||
  },
 | 
			
		||||
  "author": {
 | 
			
		||||
    "name": "ODIT.Services",
 | 
			
		||||
    "email": "info@odit.services",
 | 
			
		||||
@@ -25,8 +22,8 @@
 | 
			
		||||
  ],
 | 
			
		||||
  "license": "CC-BY-NC-SA-4.0",
 | 
			
		||||
  "dependencies": {
 | 
			
		||||
    "@node-rs/argon2": "^2.0.2",
 | 
			
		||||
    "@odit/class-validator-jsonschema": "2.1.1",
 | 
			
		||||
    "argon2": "0.31.2",
 | 
			
		||||
    "axios": "0.21.1",
 | 
			
		||||
    "body-parser": "1.19.0",
 | 
			
		||||
    "check-password-strength": "2.0.2",
 | 
			
		||||
@@ -46,7 +43,7 @@
 | 
			
		||||
    "reflect-metadata": "0.1.13",
 | 
			
		||||
    "routing-controllers": "0.9.0-alpha.6",
 | 
			
		||||
    "routing-controllers-openapi": "2.2.0",
 | 
			
		||||
    "sqlite3": "5.1.6",
 | 
			
		||||
    "sqlite3": "5.1.7",
 | 
			
		||||
    "typeorm": "0.2.30",
 | 
			
		||||
    "typeorm-routing-controllers-extensions": "0.2.0",
 | 
			
		||||
    "typeorm-seeding": "1.6.1",
 | 
			
		||||
@@ -94,12 +91,12 @@
 | 
			
		||||
    "git": {
 | 
			
		||||
      "commit": true,
 | 
			
		||||
      "requireCleanWorkingDir": false,
 | 
			
		||||
      "commitMessage": "🚀Bumped version to v${version}",
 | 
			
		||||
      "commitMessage": "chore(release): ${version}",
 | 
			
		||||
      "requireBranch": "dev",
 | 
			
		||||
      "push": true,
 | 
			
		||||
      "tag": true,
 | 
			
		||||
      "tagName": "v${version}",
 | 
			
		||||
      "tagAnnotation": "v${version}"
 | 
			
		||||
      "tagName": "${version}",
 | 
			
		||||
      "tagAnnotation": "${version}"
 | 
			
		||||
    },
 | 
			
		||||
    "npm": {
 | 
			
		||||
      "publish": false
 | 
			
		||||
@@ -114,4 +111,4 @@
 | 
			
		||||
      "docs/*"
 | 
			
		||||
    ]
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										10304
									
								
								pnpm-lock.yaml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										10304
									
								
								pnpm-lock.yaml
									
									
									
										generated
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										2
									
								
								pnpm-workspace.yaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										2
									
								
								pnpm-workspace.yaml
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,2 @@
 | 
			
		||||
onlyBuiltDependencies:
 | 
			
		||||
  - sqlite3
 | 
			
		||||
@@ -1,3 +1,4 @@
 | 
			
		||||
import consola from 'consola';
 | 
			
		||||
import { config as configDotenv } from 'dotenv';
 | 
			
		||||
import { CountryCode } from 'libphonenumber-js';
 | 
			
		||||
import ValidatorJS from 'validator';
 | 
			
		||||
@@ -20,12 +21,15 @@ export const config = {
 | 
			
		||||
}
 | 
			
		||||
let errors = 0
 | 
			
		||||
if (typeof config.internal_port !== "number") {
 | 
			
		||||
    consola.error("Error: APP_PORT is not a number")
 | 
			
		||||
    errors++
 | 
			
		||||
}
 | 
			
		||||
if (typeof config.development !== "boolean") {
 | 
			
		||||
    consola.error("Error: NODE_ENV is not a boolean")
 | 
			
		||||
    errors++
 | 
			
		||||
}
 | 
			
		||||
if (config.mailer_url == "" || config.mailer_key == "") {
 | 
			
		||||
    consola.error("Error: invalid mailer config")
 | 
			
		||||
    errors++;
 | 
			
		||||
}
 | 
			
		||||
function getPhoneCodeLocale(): CountryCode {
 | 
			
		||||
 
 | 
			
		||||
@@ -4,6 +4,7 @@ import { Repository, getConnectionManager } from 'typeorm';
 | 
			
		||||
import { DonationIdsNotMatchingError, DonationNotFoundError } from '../errors/DonationErrors';
 | 
			
		||||
import { DonorNotFoundError } from '../errors/DonorErrors';
 | 
			
		||||
import { RunnerNotFoundError } from '../errors/RunnerErrors';
 | 
			
		||||
import { CreateAnonymousDonation } from '../models/actions/create/CreateAnonymousDonation';
 | 
			
		||||
import { CreateDistanceDonation } from '../models/actions/create/CreateDistanceDonation';
 | 
			
		||||
import { CreateFixedDonation } from '../models/actions/create/CreateFixedDonation';
 | 
			
		||||
import { UpdateDistanceDonation } from '../models/actions/update/UpdateDistanceDonation';
 | 
			
		||||
@@ -11,6 +12,7 @@ import { UpdateFixedDonation } from '../models/actions/update/UpdateFixedDonatio
 | 
			
		||||
import { DistanceDonation } from '../models/entities/DistanceDonation';
 | 
			
		||||
import { Donation } from '../models/entities/Donation';
 | 
			
		||||
import { FixedDonation } from '../models/entities/FixedDonation';
 | 
			
		||||
import { ResponseAnonymousDonation } from '../models/responses/ResponseAnonymousDonation';
 | 
			
		||||
import { ResponseDistanceDonation } from '../models/responses/ResponseDistanceDonation';
 | 
			
		||||
import { ResponseDonation } from '../models/responses/ResponseDonation';
 | 
			
		||||
import { ResponseEmpty } from '../models/responses/ResponseEmpty';
 | 
			
		||||
@@ -35,6 +37,7 @@ export class DonationController {
 | 
			
		||||
	@Authorized("DONATION:GET")
 | 
			
		||||
	@ResponseSchema(ResponseDonation, { isArray: true })
 | 
			
		||||
	@ResponseSchema(ResponseDistanceDonation, { isArray: true })
 | 
			
		||||
	@ResponseSchema(ResponseAnonymousDonation, { isArray: true })
 | 
			
		||||
	@OpenAPI({ description: 'Lists all donations (fixed or distance based) from all donors. <br> This includes the donations\'s runner\'s distance ran(if distance donation).' })
 | 
			
		||||
	async getAll(@QueryParam("page", { required: false }) page: number, @QueryParam("page_size", { required: false }) page_size: number = 100) {
 | 
			
		||||
		let responseDonations: ResponseDonation[] = new Array<ResponseDonation>();
 | 
			
		||||
@@ -56,6 +59,7 @@ export class DonationController {
 | 
			
		||||
	@Authorized("DONATION:GET")
 | 
			
		||||
	@ResponseSchema(ResponseDonation)
 | 
			
		||||
	@ResponseSchema(ResponseDistanceDonation)
 | 
			
		||||
	@ResponseSchema(ResponseAnonymousDonation)
 | 
			
		||||
	@ResponseSchema(DonationNotFoundError, { statusCode: 404 })
 | 
			
		||||
	@OnUndefined(DonationNotFoundError)
 | 
			
		||||
	@OpenAPI({ description: 'Lists all information about the donation whose id got provided. This includes the donation\'s runner\'s distance ran (if distance donation).' })
 | 
			
		||||
@@ -76,6 +80,17 @@ export class DonationController {
 | 
			
		||||
		return (await this.donationRepository.findOne({ id: donation.id }, { relations: ['donor'] })).toResponse();
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	@Post('/anonymous')
 | 
			
		||||
	@Authorized("DONATION:CREATE")
 | 
			
		||||
	@ResponseSchema(ResponseDonation)
 | 
			
		||||
	@ResponseSchema(DonorNotFoundError, { statusCode: 404 })
 | 
			
		||||
	@OpenAPI({ description: 'Create a anonymous donation' })
 | 
			
		||||
	async postAnonymous(@Body({ validate: true }) createDonation: CreateAnonymousDonation) {
 | 
			
		||||
		let donation = await createDonation.toEntity();
 | 
			
		||||
		donation = await this.fixedDonationRepository.save(donation);
 | 
			
		||||
		return (await this.donationRepository.findOne({ id: donation.id })).toResponse();
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	@Post('/distance')
 | 
			
		||||
	@Authorized("DONATION:CREATE")
 | 
			
		||||
	@ResponseSchema(ResponseDistanceDonation)
 | 
			
		||||
 
 | 
			
		||||
@@ -5,6 +5,7 @@ import { RunnerCardHasScansError, RunnerCardIdsNotMatchingError, RunnerCardNotFo
 | 
			
		||||
import { RunnerNotFoundError } from '../errors/RunnerErrors';
 | 
			
		||||
import { CreateRunnerCard } from '../models/actions/create/CreateRunnerCard';
 | 
			
		||||
import { UpdateRunnerCard } from '../models/actions/update/UpdateRunnerCard';
 | 
			
		||||
import { UpdateRunnerCardByCode } from '../models/actions/update/UpdateRunnerCardByCode';
 | 
			
		||||
import { RunnerCard } from '../models/entities/RunnerCard';
 | 
			
		||||
import { ResponseEmpty } from '../models/responses/ResponseEmpty';
 | 
			
		||||
import { ResponseRunnerCard } from '../models/responses/ResponseRunnerCard';
 | 
			
		||||
@@ -112,6 +113,28 @@ export class RunnerCardController {
 | 
			
		||||
		return (await this.cardRepository.findOne({ id: id }, { relations: ['runner', 'runner.group', 'runner.group.parentGroup'] })).toResponse();
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	@Put('/:code')
 | 
			
		||||
	@Authorized("CARD:UPDATE")
 | 
			
		||||
	@ResponseSchema(ResponseRunnerCard)
 | 
			
		||||
	@ResponseSchema(RunnerCardNotFoundError, { statusCode: 404 })
 | 
			
		||||
	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
 | 
			
		||||
	@ResponseSchema(RunnerCardIdsNotMatchingError, { statusCode: 406 })
 | 
			
		||||
	@OpenAPI({ description: "Update the card whose code you provided." })
 | 
			
		||||
	async putByCode(@Param('code') code: string, @Body({ validate: true }) card: UpdateRunnerCardByCode) {
 | 
			
		||||
		let oldCard = await this.cardRepository.findOne({ code: code });
 | 
			
		||||
 | 
			
		||||
		if (!oldCard) {
 | 
			
		||||
			throw new RunnerCardNotFoundError();
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		if (oldCard.code != card.code) {
 | 
			
		||||
			throw new RunnerCardIdsNotMatchingError();
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		await this.cardRepository.save(await card.update(oldCard));
 | 
			
		||||
		return (await this.cardRepository.findOne({ code: code }, { relations: ['runner', 'runner.group', 'runner.group.parentGroup'] })).toResponse();
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	@Delete('/:id')
 | 
			
		||||
	@Authorized("CARD:DELETE")
 | 
			
		||||
	@ResponseSchema(ResponseRunnerCard)
 | 
			
		||||
 
 | 
			
		||||
@@ -30,10 +30,11 @@ export class RunnerController {
 | 
			
		||||
	@Authorized("RUNNER:GET")
 | 
			
		||||
	@ResponseSchema(ResponseRunner, { isArray: true })
 | 
			
		||||
	@OpenAPI({ description: 'Lists all runners from all teams/orgs. <br> This includes the runner\'s group and distance ran.' })
 | 
			
		||||
	async getAll(@QueryParam("page", { required: false }) page: number, @QueryParam("page_size", { required: false }) page_size: number = 100) {
 | 
			
		||||
	async getAll(@QueryParam("page", { required: false }) page: number, @QueryParam("page_size", { required: false }) page_size: number = 100, @QueryParam("created_via", { required: false }) created_via: string = "all", @QueryParam("selfservice_links", { required: false }) selfservice_links: boolean = false) {
 | 
			
		||||
		let responseRunners: ResponseRunner[] = new Array<ResponseRunner>();
 | 
			
		||||
		let runners: Array<Runner>;
 | 
			
		||||
 | 
			
		||||
		console.log("call to RunnerController.getAll() with page: " + page + " and page_size: " + page_size + " and created_via: " + created_via + " and selfservice_links: " + selfservice_links);
 | 
			
		||||
		if (page != undefined) {
 | 
			
		||||
			runners = await this.runnerRepository.find({ relations: ['scans', 'group', 'group.parentGroup', 'scans.track'], skip: page * page_size, take: page_size });
 | 
			
		||||
		} else {
 | 
			
		||||
@@ -41,7 +42,13 @@ export class RunnerController {
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		runners.forEach(runner => {
 | 
			
		||||
			responseRunners.push(new ResponseRunner(runner));
 | 
			
		||||
			if (created_via === "all") {
 | 
			
		||||
				responseRunners.push(new ResponseRunner(runner, selfservice_links));
 | 
			
		||||
			} else {
 | 
			
		||||
				if (runner.created_via === created_via) {
 | 
			
		||||
					responseRunners.push(new ResponseRunner(runner, selfservice_links));
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
		});
 | 
			
		||||
		return responseRunners;
 | 
			
		||||
	}
 | 
			
		||||
@@ -55,7 +62,7 @@ export class RunnerController {
 | 
			
		||||
	async getOne(@Param('id') id: number) {
 | 
			
		||||
		let runner = await this.runnerRepository.findOne({ id: id }, { relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards'] })
 | 
			
		||||
		if (!runner) { throw new RunnerNotFoundError(); }
 | 
			
		||||
		return new ResponseRunner(runner);
 | 
			
		||||
		return new ResponseRunner(runner, true);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	@Get('/:id/scans')
 | 
			
		||||
@@ -98,7 +105,7 @@ export class RunnerController {
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		runner = await this.runnerRepository.save(runner)
 | 
			
		||||
		return new ResponseRunner(await this.runnerRepository.findOne(runner, { relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards'] }));
 | 
			
		||||
		return new ResponseRunner(await this.runnerRepository.findOne(runner, { relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards'] }), true);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	@Put('/:id')
 | 
			
		||||
@@ -119,7 +126,7 @@ export class RunnerController {
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		await this.runnerRepository.save(await runner.update(oldRunner));
 | 
			
		||||
		return new ResponseRunner(await this.runnerRepository.findOne({ id: id }, { relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards'] }));
 | 
			
		||||
		return new ResponseRunner(await this.runnerRepository.findOne({ id: id }, { relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards'] }), true);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	@Delete('/:id')
 | 
			
		||||
@@ -132,7 +139,7 @@ export class RunnerController {
 | 
			
		||||
	async remove(@Param("id") id: number, @QueryParam("force") force: boolean) {
 | 
			
		||||
		let runner = await this.runnerRepository.findOne({ id: id });
 | 
			
		||||
		if (!runner) { return null; }
 | 
			
		||||
		const responseRunner = await this.runnerRepository.findOne(runner, { relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards'] });
 | 
			
		||||
		const responseRunner = await this.runnerRepository.findOne(runner);
 | 
			
		||||
 | 
			
		||||
		if (!runner) {
 | 
			
		||||
			throw new RunnerNotFoundError();
 | 
			
		||||
 
 | 
			
		||||
@@ -62,13 +62,13 @@ export class RunnerOrganizationController {
 | 
			
		||||
	@ResponseSchema(ResponseRunner, { isArray: true })
 | 
			
		||||
	@ResponseSchema(RunnerOrganizationNotFoundError, { statusCode: 404 })
 | 
			
		||||
	@OpenAPI({ description: 'Lists all runners from this org and it\'s teams (if you don\'t provide the ?onlyDirect=true param). <br> This includes the runner\'s group and distance ran.' })
 | 
			
		||||
	async getRunners(@Param('id') id: number, @QueryParam('onlyDirect') onlyDirect: boolean) {
 | 
			
		||||
	async getRunners(@Param('id') id: number, @QueryParam('onlyDirect') onlyDirect: boolean, @QueryParam("selfservice_links", { required: false }) selfservice_links: boolean = false) {
 | 
			
		||||
		let responseRunners: ResponseRunner[] = new Array<ResponseRunner>();
 | 
			
		||||
		let runners: Runner[];
 | 
			
		||||
		if (!onlyDirect) { runners = (await this.runnerOrganizationRepository.findOne({ id: id }, { relations: ['runners', 'runners.group', 'runners.group.parentGroup', 'runners.scans', 'runners.scans.track', 'teams', 'teams.runners', 'teams.runners.group', 'teams.runners.group.parentGroup', 'teams.runners.scans', 'teams.runners.scans.track'] })).allRunners; }
 | 
			
		||||
		else { runners = (await this.runnerOrganizationRepository.findOne({ id: id }, { relations: ['runners', 'runners.group', 'runners.group.parentGroup', 'runners.scans', 'runners.scans.track'] })).runners; }
 | 
			
		||||
		runners.forEach(runner => {
 | 
			
		||||
			responseRunners.push(new ResponseRunner(runner));
 | 
			
		||||
			responseRunners.push(new ResponseRunner(runner, selfservice_links));
 | 
			
		||||
		});
 | 
			
		||||
		return responseRunners;
 | 
			
		||||
	}
 | 
			
		||||
 
 | 
			
		||||
@@ -60,11 +60,11 @@ export class RunnerTeamController {
 | 
			
		||||
	@ResponseSchema(ResponseRunner, { isArray: true })
 | 
			
		||||
	@ResponseSchema(RunnerTeamNotFoundError, { statusCode: 404 })
 | 
			
		||||
	@OpenAPI({ description: 'Lists all runners from this team. <br> This includes the runner\'s group and distance ran.' })
 | 
			
		||||
	async getRunners(@Param('id') id: number) {
 | 
			
		||||
	async getRunners(@Param('id') id: number, @QueryParam("selfservice_links", { required: false }) selfservice_links: boolean = false) {
 | 
			
		||||
		let responseRunners: ResponseRunner[] = new Array<ResponseRunner>();
 | 
			
		||||
		const runners = (await this.runnerTeamRepository.findOne({ id: id }, { relations: ['runners', 'runners.group', 'runners.group.parentGroup', 'runners.scans', 'runners.scans.track'] })).runners;
 | 
			
		||||
		runners.forEach(runner => {
 | 
			
		||||
			responseRunners.push(new ResponseRunner(runner));
 | 
			
		||||
			responseRunners.push(new ResponseRunner(runner, selfservice_links));
 | 
			
		||||
		});
 | 
			
		||||
		return responseRunners;
 | 
			
		||||
	}
 | 
			
		||||
@@ -119,7 +119,7 @@ export class RunnerTeamController {
 | 
			
		||||
	async remove(@Param("id") id: number, @QueryParam("force") force: boolean) {
 | 
			
		||||
		let team = await this.runnerTeamRepository.findOne({ id: id });
 | 
			
		||||
		if (!team) { return null; }
 | 
			
		||||
		let runnerTeam = await this.runnerTeamRepository.findOne(team, { relations: ['parentGroup', 'contact', 'runners'] });
 | 
			
		||||
		let runnerTeam = await this.runnerTeamRepository.findOne(team, { relations: ['runners'] });
 | 
			
		||||
 | 
			
		||||
		if (!force) {
 | 
			
		||||
			if (runnerTeam.runners.length != 0) {
 | 
			
		||||
 
 | 
			
		||||
@@ -23,6 +23,8 @@ export class StatsController {
 | 
			
		||||
    @OpenAPI({ description: "A very basic stats endpoint providing basic counters for a dashboard or simmilar" })
 | 
			
		||||
    async get() {
 | 
			
		||||
        const connection = getConnection();
 | 
			
		||||
        const runnersViaSelfservice = await connection.getRepository(Runner).count({ where: { created_via: "selfservice" } });
 | 
			
		||||
        const runnersViaKiosk = await connection.getRepository(Runner).count({ where: { created_via: "kiosk" } });
 | 
			
		||||
        const runners = await connection.getRepository(Runner).count();
 | 
			
		||||
        const teams = await connection.getRepository(RunnerTeam).count();
 | 
			
		||||
        const orgs = await connection.getRepository(RunnerOrganization).count();
 | 
			
		||||
@@ -41,7 +43,7 @@ export class StatsController {
 | 
			
		||||
        let donations = await connection.getRepository(Donation).find({ relations: ['runner', 'runner.scans', 'runner.scans.track'] });
 | 
			
		||||
        const donors = await connection.getRepository(Donor).count();
 | 
			
		||||
 | 
			
		||||
        return new ResponseStats(runners, teams, orgs, users, scans, donations, distace, donors)
 | 
			
		||||
        return new ResponseStats(runnersViaSelfservice, runners, teams, orgs, users, scans, donations, distace, donors, runnersViaKiosk)
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Get("/runners/distance")
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
import * as argon2 from "argon2";
 | 
			
		||||
import { verify } from '@node-rs/argon2';
 | 
			
		||||
import { Request, Response } from 'express';
 | 
			
		||||
import { getConnectionManager } from 'typeorm';
 | 
			
		||||
import { ScanStation } from '../models/entities/ScanStation';
 | 
			
		||||
@@ -58,7 +58,7 @@ const ScanAuth = async (req: Request, res: Response, next: () => void) => {
 | 
			
		||||
        if (station.enabled == false) {
 | 
			
		||||
            res.status(401).send({ http_code: 401, short: "station_disabled", message: "Station is disabled." });
 | 
			
		||||
        }
 | 
			
		||||
        if (!(await argon2.verify(station.key, provided_token))) {
 | 
			
		||||
        if (!(await verify(station.key, provided_token))) {
 | 
			
		||||
            res.status(401).send({ http_code: 401, short: "invalid_token", message: "Api token non-existent or invalid syntax." });
 | 
			
		||||
            return;
 | 
			
		||||
        }
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
import * as argon2 from "argon2";
 | 
			
		||||
import { verify } from '@node-rs/argon2';
 | 
			
		||||
import { Request, Response } from 'express';
 | 
			
		||||
import { getConnectionManager } from 'typeorm';
 | 
			
		||||
import { StatsClient } from '../models/entities/StatsClient';
 | 
			
		||||
@@ -55,7 +55,7 @@ const StatsAuth = async (req: Request, res: Response, next: () => void) => {
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
    else {
 | 
			
		||||
        if (!(await argon2.verify(client.key, provided_token))) {
 | 
			
		||||
        if (!(await verify(client.key, provided_token))) {
 | 
			
		||||
            res.status(401).send("Api token invalid.");
 | 
			
		||||
            return;
 | 
			
		||||
        }
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
import * as argon2 from "argon2";
 | 
			
		||||
import { hash } from '@node-rs/argon2';
 | 
			
		||||
import { IsNotEmpty, IsOptional, IsString } from 'class-validator';
 | 
			
		||||
import * as jsonwebtoken from 'jsonwebtoken';
 | 
			
		||||
import { getConnectionManager } from 'typeorm';
 | 
			
		||||
@@ -49,7 +49,7 @@ export class ResetPassword {
 | 
			
		||||
        if (found_user.refreshTokenCount !== decoded["refreshTokenCount"]) { throw new RefreshTokenCountInvalidError(); }
 | 
			
		||||
 | 
			
		||||
        found_user.refreshTokenCount = found_user.refreshTokenCount + 1;
 | 
			
		||||
        found_user.password = await argon2.hash(this.password + found_user.uuid);
 | 
			
		||||
        found_user.password = await hash(this.password + found_user.uuid);
 | 
			
		||||
        await getConnectionManager().get().getRepository(User).save(found_user);
 | 
			
		||||
 | 
			
		||||
        return "password reset successfull";
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										29
									
								
								src/models/actions/create/CreateAnonymousDonation.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										29
									
								
								src/models/actions/create/CreateAnonymousDonation.ts
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,29 @@
 | 
			
		||||
import { IsInt, IsPositive } from 'class-validator';
 | 
			
		||||
import { FixedDonation } from '../../entities/FixedDonation';
 | 
			
		||||
import { CreateDonation } from './CreateDonation';
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * This class is used to create a new FixedDonation entity from a json body (post request).
 | 
			
		||||
 */
 | 
			
		||||
export class CreateAnonymousDonation extends CreateDonation {
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * The donation's amount.
 | 
			
		||||
     * The unit is your currency's smallest unit (default: euro cent).
 | 
			
		||||
     */
 | 
			
		||||
    @IsInt()
 | 
			
		||||
    @IsPositive()
 | 
			
		||||
    amount: number;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * Creates a new FixedDonation entity from this.
 | 
			
		||||
     */
 | 
			
		||||
    public async toEntity(): Promise<FixedDonation> {
 | 
			
		||||
        let newDonation = new FixedDonation;
 | 
			
		||||
 | 
			
		||||
        newDonation.amount = this.amount;
 | 
			
		||||
        newDonation.paidAmount = this.amount;
 | 
			
		||||
 | 
			
		||||
        return newDonation;
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
import * as argon2 from "argon2";
 | 
			
		||||
import { verify } from '@node-rs/argon2';
 | 
			
		||||
import { IsEmail, IsNotEmpty, IsOptional, IsString } from 'class-validator';
 | 
			
		||||
import { getConnectionManager } from 'typeorm';
 | 
			
		||||
import { InvalidCredentialsError, PasswordNeededError, UserDisabledError, UserNotFoundError } from '../../../errors/AuthError';
 | 
			
		||||
@@ -56,7 +56,7 @@ export class CreateAuth {
 | 
			
		||||
            throw new UserNotFoundError();
 | 
			
		||||
        }
 | 
			
		||||
        if (found_user.enabled == false) { throw new UserDisabledError(); }
 | 
			
		||||
        if (!(await argon2.verify(found_user.password, this.password + found_user.uuid))) {
 | 
			
		||||
        if (!(await verify(found_user.password, this.password + found_user.uuid))) {
 | 
			
		||||
            throw new InvalidCredentialsError();
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -10,6 +10,20 @@ import { CreateDonation } from './CreateDonation';
 | 
			
		||||
 */
 | 
			
		||||
export class CreateDistanceDonation extends CreateDonation {
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * The donation's associated donor's id.
 | 
			
		||||
     * This is important to link donations to donors.
 | 
			
		||||
     */
 | 
			
		||||
    @IsInt()
 | 
			
		||||
    @IsPositive()
 | 
			
		||||
    donor: number;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * The donation's paid amount in the smalles unit of your currency (default: euro cent).
 | 
			
		||||
     */
 | 
			
		||||
    @IsInt()
 | 
			
		||||
    paidAmount?: number;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * The donation's associated runner's id.
 | 
			
		||||
     * This is important to link the runner's distance ran to the donation.
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,5 @@
 | 
			
		||||
import { IsInt, IsOptional, IsPositive } from 'class-validator';
 | 
			
		||||
import { Exclude } from 'class-transformer';
 | 
			
		||||
import { getConnection } from 'typeorm';
 | 
			
		||||
import { DonorNotFoundError } from '../../../errors/DonorErrors';
 | 
			
		||||
import { Donation } from '../../entities/Donation';
 | 
			
		||||
import { Donor } from '../../entities/Donor';
 | 
			
		||||
 | 
			
		||||
@@ -8,19 +7,10 @@ import { Donor } from '../../entities/Donor';
 | 
			
		||||
 * This class is used to create a new Donation entity from a json body (post request).
 | 
			
		||||
 */
 | 
			
		||||
export abstract class CreateDonation {
 | 
			
		||||
    /**
 | 
			
		||||
     * The donation's associated donor's id.
 | 
			
		||||
     * This is important to link donations to donors.
 | 
			
		||||
     */
 | 
			
		||||
    @IsInt()
 | 
			
		||||
    @IsPositive()
 | 
			
		||||
    @Exclude()
 | 
			
		||||
    donor: number;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * The donation's paid amount in the smalles unit of your currency (default: euro cent).
 | 
			
		||||
     */
 | 
			
		||||
    @IsInt()
 | 
			
		||||
    @IsOptional()
 | 
			
		||||
    @Exclude()
 | 
			
		||||
    paidAmount?: number;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
@@ -33,9 +23,6 @@ export abstract class CreateDonation {
 | 
			
		||||
     */
 | 
			
		||||
    public async getDonor(): Promise<Donor> {
 | 
			
		||||
        const donor = await getConnection().getRepository(Donor).findOne({ id: this.donor });
 | 
			
		||||
        if (!donor) {
 | 
			
		||||
            throw new DonorNotFoundError();
 | 
			
		||||
        }
 | 
			
		||||
        return donor;
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
@@ -6,6 +6,21 @@ import { CreateDonation } from './CreateDonation';
 | 
			
		||||
 * This class is used to create a new FixedDonation entity from a json body (post request).
 | 
			
		||||
 */
 | 
			
		||||
export class CreateFixedDonation extends CreateDonation {
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * The donation's associated donor's id.
 | 
			
		||||
     * This is important to link donations to donors.
 | 
			
		||||
     */
 | 
			
		||||
    @IsInt()
 | 
			
		||||
    @IsPositive()
 | 
			
		||||
    donor: number;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * The donation's paid amount in the smalles unit of your currency (default: euro cent).
 | 
			
		||||
     */
 | 
			
		||||
    @IsInt()
 | 
			
		||||
    paidAmount?: number;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * The donation's amount.
 | 
			
		||||
     * The unit is your currency's smallest unit (default: euro cent).
 | 
			
		||||
 
 | 
			
		||||
@@ -50,4 +50,11 @@ export abstract class CreateParticipant {
 | 
			
		||||
    @IsOptional()
 | 
			
		||||
    @IsObject()
 | 
			
		||||
    address?: Address;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * how the participant got into the system
 | 
			
		||||
     */
 | 
			
		||||
    @IsOptional()
 | 
			
		||||
    @IsString()
 | 
			
		||||
    created_via?: string;
 | 
			
		||||
}
 | 
			
		||||
@@ -32,6 +32,9 @@ export class CreateRunner extends CreateParticipant {
 | 
			
		||||
        newRunner.email = this.email;
 | 
			
		||||
        newRunner.group = await this.getGroup();
 | 
			
		||||
        newRunner.address = this.address;
 | 
			
		||||
        if (this.created_via) {
 | 
			
		||||
            newRunner.created_via = this.created_via;
 | 
			
		||||
        }
 | 
			
		||||
        Address.validate(newRunner.address);
 | 
			
		||||
 | 
			
		||||
        return newRunner;
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
import * as argon2 from "argon2";
 | 
			
		||||
import { hash } from '@node-rs/argon2';
 | 
			
		||||
import { IsBoolean, IsInt, IsOptional, IsPositive, IsString } from 'class-validator';
 | 
			
		||||
import crypto from 'crypto';
 | 
			
		||||
import { getConnection } from 'typeorm';
 | 
			
		||||
@@ -44,7 +44,7 @@ export class CreateScanStation {
 | 
			
		||||
 | 
			
		||||
        let newUUID = uuid.v4().toUpperCase();
 | 
			
		||||
        newStation.prefix = crypto.createHash("sha3-512").update(newUUID).digest('hex').substring(0, 7).toUpperCase();
 | 
			
		||||
        newStation.key = await argon2.hash(newStation.prefix + "." + newUUID);
 | 
			
		||||
        newStation.key = await hash(newStation.prefix + "." + newUUID);
 | 
			
		||||
        newStation.cleartextkey = newStation.prefix + "." + newUUID;
 | 
			
		||||
 | 
			
		||||
        return newStation;
 | 
			
		||||
 
 | 
			
		||||
@@ -26,6 +26,7 @@ export class CreateSelfServiceCitizenRunner extends CreateParticipant {
 | 
			
		||||
    public async toEntity(): Promise<Runner> {
 | 
			
		||||
        let newRunner: Runner = new Runner();
 | 
			
		||||
 | 
			
		||||
        newRunner.created_via = "selfservice";
 | 
			
		||||
        newRunner.firstname = this.firstname;
 | 
			
		||||
        newRunner.middlename = this.middlename;
 | 
			
		||||
        newRunner.lastname = this.lastname;
 | 
			
		||||
 
 | 
			
		||||
@@ -28,6 +28,7 @@ export class CreateSelfServiceRunner extends CreateParticipant {
 | 
			
		||||
    public async toEntity(group: RunnerGroup): Promise<Runner> {
 | 
			
		||||
        let newRunner: Runner = new Runner();
 | 
			
		||||
 | 
			
		||||
        newRunner.created_via = "selfservice";
 | 
			
		||||
        newRunner.firstname = this.firstname;
 | 
			
		||||
        newRunner.middlename = this.middlename;
 | 
			
		||||
        newRunner.lastname = this.lastname;
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
import * as argon2 from "argon2";
 | 
			
		||||
import { hash } from '@node-rs/argon2';
 | 
			
		||||
import { IsOptional, IsString } from 'class-validator';
 | 
			
		||||
import crypto from 'crypto';
 | 
			
		||||
import * as uuid from 'uuid';
 | 
			
		||||
@@ -25,7 +25,7 @@ export class CreateStatsClient {
 | 
			
		||||
 | 
			
		||||
        let newUUID = uuid.v4().toUpperCase();
 | 
			
		||||
        newClient.prefix = crypto.createHash("sha3-512").update(newUUID).digest('hex').substring(0, 7).toUpperCase();
 | 
			
		||||
        newClient.key = await argon2.hash(newClient.prefix + "." + newUUID);
 | 
			
		||||
        newClient.key = await hash(newClient.prefix + "." + newUUID);
 | 
			
		||||
        newClient.cleartextkey = newClient.prefix + "." + newUUID;
 | 
			
		||||
 | 
			
		||||
        return newClient;
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
import * as argon2 from "argon2";
 | 
			
		||||
import { hash } from "@node-rs/argon2";
 | 
			
		||||
import { passwordStrength } from "check-password-strength";
 | 
			
		||||
import { IsBoolean, IsEmail, IsNotEmpty, IsOptional, IsPhoneNumber, IsString, IsUrl } from 'class-validator';
 | 
			
		||||
import { getConnectionManager } from 'typeorm';
 | 
			
		||||
@@ -110,7 +110,7 @@ export class CreateUser {
 | 
			
		||||
        newUser.lastname = this.lastname
 | 
			
		||||
        newUser.uuid = uuid.v4()
 | 
			
		||||
        newUser.phone = this.phone
 | 
			
		||||
        newUser.password = await argon2.hash(this.password + newUser.uuid);
 | 
			
		||||
        newUser.password = await hash(this.password + newUser.uuid);
 | 
			
		||||
        newUser.groups = await this.getGroups();
 | 
			
		||||
        newUser.enabled = this.enabled;
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										50
									
								
								src/models/actions/update/UpdateRunnerCardByCode.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										50
									
								
								src/models/actions/update/UpdateRunnerCardByCode.ts
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,50 @@
 | 
			
		||||
import { IsBoolean, IsInt, IsNotEmpty, IsOptional, IsString } from 'class-validator';
 | 
			
		||||
import { getConnection } from 'typeorm';
 | 
			
		||||
import { RunnerNotFoundError } from '../../../errors/RunnerErrors';
 | 
			
		||||
import { Runner } from '../../entities/Runner';
 | 
			
		||||
import { RunnerCard } from '../../entities/RunnerCard';
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * This class is used to update a RunnerCard entity (via put request).
 | 
			
		||||
 */
 | 
			
		||||
export class UpdateRunnerCardByCode {
 | 
			
		||||
    /**
 | 
			
		||||
     * The card's code.
 | 
			
		||||
     */
 | 
			
		||||
    @IsString()
 | 
			
		||||
    @IsNotEmpty()
 | 
			
		||||
    code?: string;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * The runner's id.
 | 
			
		||||
     */
 | 
			
		||||
    @IsInt()
 | 
			
		||||
    @IsOptional()
 | 
			
		||||
    runner?: number;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * Is the updated card enabled (for fraud reasons)?
 | 
			
		||||
     * Default: true
 | 
			
		||||
     */
 | 
			
		||||
    @IsBoolean()
 | 
			
		||||
    enabled: boolean = true;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * Creates a new RunnerCard entity from this.
 | 
			
		||||
     */
 | 
			
		||||
    public async update(card: RunnerCard): Promise<RunnerCard> {
 | 
			
		||||
        card.enabled = this.enabled;
 | 
			
		||||
        card.runner = await this.getRunner();
 | 
			
		||||
 | 
			
		||||
        return card;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    public async getRunner(): Promise<Runner> {
 | 
			
		||||
        if (!this.runner) { return null; }
 | 
			
		||||
        const runner = await getConnection().getRepository(Runner).findOne({ id: this.runner });
 | 
			
		||||
        if (!runner) {
 | 
			
		||||
            throw new RunnerNotFoundError();
 | 
			
		||||
        }
 | 
			
		||||
        return runner;
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
import * as argon2 from "argon2";
 | 
			
		||||
import { hash } from '@node-rs/argon2';
 | 
			
		||||
import { passwordStrength } from "check-password-strength";
 | 
			
		||||
import { IsBoolean, IsEmail, IsInt, IsNotEmpty, IsOptional, IsPhoneNumber, IsString, IsUrl } from 'class-validator';
 | 
			
		||||
import { getConnectionManager } from 'typeorm';
 | 
			
		||||
@@ -111,7 +111,7 @@ export class UpdateUser {
 | 
			
		||||
            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.password = await hash(this.password + user.uuid);
 | 
			
		||||
            user.refreshTokenCount = user.refreshTokenCount + 1;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,5 @@
 | 
			
		||||
import {
 | 
			
		||||
  IsInt,
 | 
			
		||||
  IsNotEmpty
 | 
			
		||||
  IsInt
 | 
			
		||||
} from "class-validator";
 | 
			
		||||
import { Column, Entity, ManyToOne, PrimaryGeneratedColumn, TableInheritance } from "typeorm";
 | 
			
		||||
import { ResponseDonation } from '../responses/ResponseDonation';
 | 
			
		||||
@@ -24,7 +23,6 @@ export abstract class Donation {
 | 
			
		||||
  /**
 | 
			
		||||
   * The donations's donor.
 | 
			
		||||
   */
 | 
			
		||||
  @IsNotEmpty()
 | 
			
		||||
  @ManyToOne(() => Donor, donor => donor.donations)
 | 
			
		||||
  donor: Donor;
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -75,6 +75,14 @@ export abstract class Participant {
 | 
			
		||||
  @IsEmail()
 | 
			
		||||
  email?: string;
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
   * how the participant got into the system
 | 
			
		||||
   */
 | 
			
		||||
  @Column({ nullable: true, default: "backend" })
 | 
			
		||||
  @IsOptional()
 | 
			
		||||
  @IsString()
 | 
			
		||||
  created_via?: string;
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
   * Turns this entity into it's response class.
 | 
			
		||||
   */
 | 
			
		||||
 
 | 
			
		||||
@@ -57,7 +57,10 @@ export class Runner extends Participant {
 | 
			
		||||
   * This is implemented here to avoid duplicate code in other files.
 | 
			
		||||
   */
 | 
			
		||||
  public get validScans(): Scan[] {
 | 
			
		||||
    return this.scans.filter(scan => scan.valid == true);
 | 
			
		||||
    if (this.scans) {
 | 
			
		||||
      return this.scans.filter(scan => scan.valid == true);
 | 
			
		||||
    }
 | 
			
		||||
    return []
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
@@ -81,6 +84,6 @@ export class Runner extends Participant {
 | 
			
		||||
   * Turns this entity into it's response class.
 | 
			
		||||
   */
 | 
			
		||||
  public toResponse(): ResponseRunner {
 | 
			
		||||
    return new ResponseRunner(this);
 | 
			
		||||
    return new ResponseRunner(this, true);
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										58
									
								
								src/models/responses/ResponseAnonymousDonation.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										58
									
								
								src/models/responses/ResponseAnonymousDonation.ts
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,58 @@
 | 
			
		||||
import { IsInt, IsPositive } from "class-validator";
 | 
			
		||||
import { Donation } from '../entities/Donation';
 | 
			
		||||
import { DonationStatus } from '../enums/DonationStatus';
 | 
			
		||||
import { ResponseObjectType } from '../enums/ResponseObjectType';
 | 
			
		||||
import { IResponse } from './IResponse';
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Defines the donation response.
 | 
			
		||||
*/
 | 
			
		||||
export class ResponseAnonymousDonation implements IResponse {
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
    * The responseType.
 | 
			
		||||
    * This contains the type of class/entity this response contains.
 | 
			
		||||
    */
 | 
			
		||||
    responseType: ResponseObjectType = ResponseObjectType.DONATION;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
    * The donation's payment status.
 | 
			
		||||
    * Provides you with a quick indicator of it's payment status.
 | 
			
		||||
    */
 | 
			
		||||
    status: DonationStatus;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * The donation's id.
 | 
			
		||||
     */
 | 
			
		||||
    @IsInt()
 | 
			
		||||
    @IsPositive()
 | 
			
		||||
    id: number;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * The donation's amount in the smalles unit of your currency (default: euro cent).
 | 
			
		||||
     */
 | 
			
		||||
    @IsInt()
 | 
			
		||||
    amount: number;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * The donation's paid amount in the smalles unit of your currency (default: euro cent).
 | 
			
		||||
     */
 | 
			
		||||
    @IsInt()
 | 
			
		||||
    paidAmount: number;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * Creates a ResponseDonation object from a scan.
 | 
			
		||||
     * @param donation The donation the response shall be build for.
 | 
			
		||||
     */
 | 
			
		||||
    public constructor(donation: Donation) {
 | 
			
		||||
        this.id = donation.id;
 | 
			
		||||
        this.amount = donation.amount;
 | 
			
		||||
        this.paidAmount = donation.paidAmount || 0;
 | 
			
		||||
        if (this.paidAmount < this.amount) {
 | 
			
		||||
            this.status = DonationStatus.OPEN;
 | 
			
		||||
        }
 | 
			
		||||
        else {
 | 
			
		||||
            this.status = DonationStatus.PAID;
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
@@ -50,6 +50,12 @@ export abstract class ResponseParticipant implements IResponse {
 | 
			
		||||
    @IsString()
 | 
			
		||||
    email?: string;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * how the participant got into the system
 | 
			
		||||
     */
 | 
			
		||||
    @IsString()
 | 
			
		||||
    created_via?: string;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * The participant's address.
 | 
			
		||||
     */
 | 
			
		||||
@@ -64,6 +70,7 @@ export abstract class ResponseParticipant implements IResponse {
 | 
			
		||||
    public constructor(participant: Participant) {
 | 
			
		||||
        this.id = participant.id;
 | 
			
		||||
        this.firstname = participant.firstname;
 | 
			
		||||
        this.created_via = participant.created_via;
 | 
			
		||||
        this.middlename = participant.middlename;
 | 
			
		||||
        this.lastname = participant.lastname;
 | 
			
		||||
        this.phone = participant.phone;
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,10 @@
 | 
			
		||||
import {
 | 
			
		||||
    IsInt,
 | 
			
		||||
    IsObject
 | 
			
		||||
    IsObject,
 | 
			
		||||
    IsOptional,
 | 
			
		||||
    IsString
 | 
			
		||||
} from "class-validator";
 | 
			
		||||
import { JwtCreator } from '../../jwtcreator';
 | 
			
		||||
import { Runner } from '../entities/Runner';
 | 
			
		||||
import { ResponseObjectType } from '../enums/ResponseObjectType';
 | 
			
		||||
import { IResponse } from './IResponse';
 | 
			
		||||
@@ -30,14 +33,26 @@ export class ResponseRunner extends ResponseParticipant implements IResponse {
 | 
			
		||||
    @IsObject()
 | 
			
		||||
    group: ResponseRunnerGroup;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * A selfservice link for our new runner.
 | 
			
		||||
     */
 | 
			
		||||
    @IsOptional()
 | 
			
		||||
    @IsString()
 | 
			
		||||
    selfserviceLink: string;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * Creates a ResponseRunner object from a runner.
 | 
			
		||||
     * @param runner The user the response shall be build for.
 | 
			
		||||
     */
 | 
			
		||||
    public constructor(runner: Runner) {
 | 
			
		||||
    public constructor(runner: Runner, generateSelfServiceLink: boolean = false) {
 | 
			
		||||
        super(runner);
 | 
			
		||||
        if (!runner.scans) { this.distance = 0 }
 | 
			
		||||
        else { this.distance = runner.validScans.reduce((sum, current) => sum + current.distance, 0); }
 | 
			
		||||
        if (runner.group) { this.group = runner.group.toResponse(); }
 | 
			
		||||
 | 
			
		||||
        if (generateSelfServiceLink) {
 | 
			
		||||
            const token = JwtCreator.createSelfService(runner);
 | 
			
		||||
            this.selfserviceLink = `${process.env.SELFSERVICE_URL}/profile/${token}`;
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -16,6 +16,18 @@ export class ResponseStats implements IResponse {
 | 
			
		||||
    */
 | 
			
		||||
    responseType: ResponseObjectType = ResponseObjectType.STATS;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * The amount of runners registered via selfservice.
 | 
			
		||||
     */
 | 
			
		||||
    @IsInt()
 | 
			
		||||
    runnersViaSelfservice: number;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * The amount of runners registered via kiosk.
 | 
			
		||||
     */
 | 
			
		||||
    @IsInt()
 | 
			
		||||
    runnersViaKiosk: number;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * The amount of runners registered in the system.
 | 
			
		||||
     */
 | 
			
		||||
@@ -84,14 +96,16 @@ export class ResponseStats implements IResponse {
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * Creates a new stats response containing some basic statistics for a dashboard or public display.
 | 
			
		||||
     * @param runners Array containing all runners - the following relations have to be resolved: scans, scans.track
 | 
			
		||||
     * @param teams Array containing all teams - no relations have to be resolved.
 | 
			
		||||
     * @param orgs Array containing all orgs - no relations have to be resolved.
 | 
			
		||||
     * @param users Array containing all users - no relations have to be resolved.
 | 
			
		||||
     * @param scans Array containing all scans - no relations have to be resolved.
 | 
			
		||||
     * @param runnersViaSelfservice number of runners registered via selfservice
 | 
			
		||||
     * @param runners number of runners
 | 
			
		||||
     * @param teams number of teams - no relations have to be resolved.
 | 
			
		||||
     * @param orgs number of orgs - no relations have to be resolved.
 | 
			
		||||
     * @param users number of users - no relations have to be resolved.
 | 
			
		||||
     * @param scans number of scans - no relations have to be resolved.
 | 
			
		||||
     * @param donations Array containing all donations - the following relations have to be resolved: runner, runner.scans, runner.scans.track
 | 
			
		||||
     */
 | 
			
		||||
    public constructor(runners: number, teams: number, orgs: number, users: number, scans: number, donations: Donation[], distance: number, donors: number) {
 | 
			
		||||
    public constructor(runnersViaSelfservice: number, runners: number, teams: number, orgs: number, users: number, scans: number, donations: Donation[], distance: number, donors: number, runnersViaKiosk: number) {
 | 
			
		||||
        this.runnersViaSelfservice = runnersViaSelfservice;
 | 
			
		||||
        this.total_runners = runners;
 | 
			
		||||
        this.total_teams = teams;
 | 
			
		||||
        this.total_orgs = orgs;
 | 
			
		||||
@@ -103,5 +117,6 @@ export class ResponseStats implements IResponse {
 | 
			
		||||
        this.average_donation = this.total_donation / this.total_donations
 | 
			
		||||
        this.total_donors = donors;
 | 
			
		||||
        this.average_distance = this.total_distance / this.total_runners;
 | 
			
		||||
        this.runnersViaKiosk = runnersViaKiosk;
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
import * as argon2 from "argon2";
 | 
			
		||||
import { hash } from '@node-rs/argon2';
 | 
			
		||||
import { Connection } from 'typeorm';
 | 
			
		||||
import { Factory, Seeder } from 'typeorm-seeding';
 | 
			
		||||
import * as uuid from 'uuid';
 | 
			
		||||
@@ -33,7 +33,7 @@ export default class SeedUsers implements Seeder {
 | 
			
		||||
        initialUser.lastname = "demo";
 | 
			
		||||
        initialUser.username = "demo";
 | 
			
		||||
        initialUser.uuid = uuid.v4();
 | 
			
		||||
        initialUser.password = await argon2.hash("demo" + initialUser.uuid);
 | 
			
		||||
        initialUser.password = await hash("demo" + initialUser.uuid);
 | 
			
		||||
        initialUser.email = "demo@dev.lauf-fuer-kaya.de"
 | 
			
		||||
        initialUser.groups = [group];
 | 
			
		||||
        return await connection.getRepository(User).save(initialUser);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user