Merge pull request 'Release 0.8.0' (#176) from dev into main

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

CHANGELOG.md

@@ -2,16 +2,30 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
+#### [v0.7.1](https://git.odit.services/lfk/backend/compare/v0.7.1...v0.7.1)
+
+- 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)
+- 🧾New changelog file version [CI SKIP] [skip ci] [`3ef3a94`](https://git.odit.services/lfk/backend/commit/3ef3a94b20c1abf6fd2f19472e5f448b4c72bd7f)
-- Tests now keep the group [`f3d73d5`](https://git.odit.services/lfk/backend/commit/f3d73d53467a4d00011d280c24e1e12fbb8e443d)
 - 🚀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)

src/tests/selfservice/selfservice_delete.spec.ts

@@ -14,236 +14,53 @@ beforeAll(async () => {
         validateStatus: undefined
     };
 });
-
-describe('register invalid citizen', () => {
-    it('registering as citizen without mail should return 406', async () => {
-        const res = await axios.post(base + '/api/runners/register', {
-            "firstname": "string",
-            "middlename": "string",
-            "lastname": "string",
-        }, axios_config);
-        expect(res.status).toEqual(406);
-        expect(res.headers['content-type']).toContain("application/json");
-    });
-    it('registering as citizen with invalid mail should return 400', async () => {
-        const res = await axios.post(base + '/api/runners/register', {
-            "firstname": "string",
-            "middlename": "string",
-            "lastname": "string",
-            "email": "user"
-        }, axios_config);
-        expect(res.status).toEqual(400);
-        expect(res.headers['content-type']).toContain("application/json");
-    });
-    it('registering as citizen without fist name should return 400', async () => {
-        const res = await axios.post(base + '/api/runners/register', {
-            "middlename": "string",
-            "lastname": "string",
-            "email": "user@example.com"
-        }, axios_config);
-        expect(res.status).toEqual(400);
-        expect(res.headers['content-type']).toContain("application/json");
-    });
-    it('registering as citizen without last name should return 400', async () => {
-        const res = await axios.post(base + '/api/runners/register', {
-            "firstname": "string",
-            "middlename": "string",
-            "email": "user@example.com"
-        }, axios_config);
-        expect(res.status).toEqual(400);
-        expect(res.headers['content-type']).toContain("application/json");
-    });
-    it('registering as citizen with invalid mail should return 400', async () => {
-        const res = await axios.post(base + '/api/runners/register', {
-            "firstname": "string",
-            "middlename": "string",
-            "lastname": "string",
-            "phone": "peter",
-            "email": "user@example.com"
-        }, axios_config);
-        expect(res.status).toEqual(400);
-        expect(res.headers['content-type']).toContain("application/json");
-    });
-});
 // ---------------
-describe('register citizen valid', () => {
+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('registering as citizen with all params should return 200', async () => {
+    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",
-            "middlename": "string",
             "lastname": "string",
-            "email": "user@example.com",
+            "email": "user@example.com"
-            "phone": "+4909132123456",
-            "address": {
-                address1: "Teststreet 1",
-                address2: "Testapartement",
-                postalcode: "91074",
-                city: "Herzo",
-                country: "Germany"
-            }
         }, 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);
-describe('register invalid company', () => {
-    let added_org;
-    it('creating a new org with just a name and registration enabled should return 200', async () => {
-        const res = await axios.post(base + '/api/organizations', {
-            "name": "test123",
-            "registrationEnabled": true
-        }, axios_config);
-        added_org = res.data;
-        expect(res.status).toEqual(200);
-        expect(res.headers['content-type']).toContain("application/json")
-    });
-    it('registering with bs token should return 404', async () => {
-        const res = await axios.post(base + '/api/runners/register/4040404', {
-            "firstname": "string",
-            "middlename": "string",
-            "lastname": "string",
-        }, axios_config);
-        expect(res.status).toEqual(404);
-        expect(res.headers['content-type']).toContain("application/json");
-    });
-    it('registering without firstname should return 400', async () => {
-        const res = await axios.post(base + '/api/runners/register/' + added_org.registrationKey, {
-            "middlename": "string",
-            "lastname": "string",
-        }, axios_config);
-        expect(res.status).toEqual(400);
-        expect(res.headers['content-type']).toContain("application/json");
-    });
-    it('registering without lastname should return 400', async () => {
-        const res = await axios.post(base + '/api/runners/register/' + added_org.registrationKey, {
-            "middlename": "string",
-            "firstname": "string",
-        }, axios_config);
-        expect(res.status).toEqual(400);
-        expect(res.headers['content-type']).toContain("application/json");
-    });
-    it('registering with bs mail should return 400', async () => {
-        const res = await axios.post(base + '/api/runners/register/' + added_org.registrationKey, {
-            "firstname": "string",
-            "middlename": "string",
-            "lastname": "string",
-            "email": "true"
-        }, axios_config);
-        expect(res.status).toEqual(400);
-        expect(res.headers['content-type']).toContain("application/json");
-    });
-    it('registering with invalid team should return 404', async () => {
-        const res = await axios.post(base + '/api/runners/register/' + added_org.registrationKey, {
-            "firstname": "string",
-            "lastname": "string",
-            "team": 9999999999999999999999
-        }, axios_config);
-        expect(res.status).toEqual(404);
-        expect(res.headers['content-type']).toContain("application/json");
-    });
-});
-// ---------------
-describe('register valid company', () => {
-    let added_org;
-    let added_team;
-    it('creating a new org with just a name and registration enabled should return 200', async () => {
-        const res = await axios.post(base + '/api/organizations', {
-            "name": "test123",
-            "registrationEnabled": true
-        }, axios_config);
-        added_org = res.data;
-        expect(res.status).toEqual(200);
-        expect(res.headers['content-type']).toContain("application/json")
-    });
-    it('creating a new team with a parent org should return 200', async () => {
-        const res = await axios.post(base + '/api/teams', {
-            "name": "test_team",
-            "parentGroup": added_org.id
-        }, axios_config);
-        added_team = res.data;
-        expect(res.status).toEqual(200);
-        expect(res.headers['content-type']).toContain("application/json")
-    });
-    it('registering with minimal params should return 200', async () => {
-        const res = await axios.post(base + '/api/runners/register/' + added_org.registrationKey, {
-            "firstname": "string",
-            "lastname": "string",
-        }, axios_config);
-        expect(res.status).toEqual(200);
-        expect(res.headers['content-type']).toContain("application/json");
-    });
-    it('registering with all params except team should return 200', async () => {
-        const res = await axios.post(base + '/api/runners/register/' + added_org.registrationKey, {
-            "firstname": "string",
-            "middlename": "string",
-            "lastname": "string",
-            "email": "user@example.com",
-            "phone": "+4909132123456",
-            "address": {
-                address1: "Teststreet 1",
-                address2: "Testapartement",
-                postalcode: "91074",
-                city: "Herzo",
-                country: "Germany"
-            }
-        }, axios_config);
-        expect(res.status).toEqual(200);
-        expect(res.headers['content-type']).toContain("application/json");
-    });
-    it('registering with minimal params and team should return 200', async () => {
-        const res = await axios.post(base + '/api/runners/register/' + added_org.registrationKey, {
-            "firstname": "string",
-            "lastname": "string",
-            "team": added_team.id
-        }, axios_config);
-        expect(res.status).toEqual(200);
-        expect(res.headers['content-type']).toContain("application/json");
-    });
-    it('registering with all params except team should return 200', async () => {
-        const res = await axios.post(base + '/api/runners/register/' + added_org.registrationKey, {
-            "firstname": "string",
-            "middlename": "string",
-            "lastname": "string",
-            "email": "user@example.com",
-            "phone": "+4909132123456",
-            "address": {
-                address1: "Teststreet 1",
-                address2: "Testapartement",
-                postalcode: "91074",
-                city: "Herzo",
-                country: "Germany"
-            }
-        }, axios_config);
-        expect(res.status).toEqual(200);
-        expect(res.headers['content-type']).toContain("application/json");
-    });
-    it('registering with all params and team should return 200', async () => {
-        const res = await axios.post(base + '/api/runners/register/' + added_org.registrationKey, {
-            "firstname": "string",
-            "middlename": "string",
-            "lastname": "string",
-            "email": "user@example.com",
-            "phone": "+4909132123456",
-            "address": {
-                address1: "Teststreet 1",
-                address2: "Testapartement",
-                postalcode: "91074",
-                city: "Herzo",
-                country: "Germany"
-            },
-            "team": added_team.id
-        }, 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);
     });
 });

src/tests/selfservice/selfservice_register.spec.ts

@@ -14,52 +14,236 @@ beforeAll(async () => {
         validateStatus: undefined
     };
 });
-// ---------------
+
-describe('delete selfservice runner invalid', () => {
+describe('register invalid citizen', () => {
-    let added_runner;
+    it('registering as citizen without mail should return 406', async () => {
-    it('registering as citizen with minimal params should return 200', async () => {
         const res = await axios.post(base + '/api/runners/register', {
             "firstname": "string",
+            "middlename": "string",
+            "lastname": "string",
+        }, axios_config);
+        expect(res.status).toEqual(406);
+        expect(res.headers['content-type']).toContain("application/json");
+    });
+    it('registering as citizen with invalid mail should return 400', async () => {
+        const res = await axios.post(base + '/api/runners/register', {
+            "firstname": "string",
+            "middlename": "string",
+            "lastname": "string",
+            "email": "user"
+        }, axios_config);
+        expect(res.status).toEqual(400);
+        expect(res.headers['content-type']).toContain("application/json");
+    });
+    it('registering as citizen without fist name should return 400', async () => {
+        const res = await axios.post(base + '/api/runners/register', {
+            "middlename": "string",
             "lastname": "string",
             "email": "user@example.com"
         }, axios_config);
-        added_runner = res.data;
+        expect(res.status).toEqual(400);
-        expect(res.status).toEqual(200);
         expect(res.headers['content-type']).toContain("application/json");
     });
-    it('delete with valid jwt should return 200', async () => {
+    it('registering as citizen without last name should return 400', async () => {
-        const res = await axios.delete(base + '/api/runners/me/' + added_runner.token, axios_config);
+        const res = await axios.post(base + '/api/runners/register', {
-        expect(res.status).toEqual(200);
+            "firstname": "string",
+            "middlename": "string",
+            "email": "user@example.com"
+        }, axios_config);
+        expect(res.status).toEqual(400);
         expect(res.headers['content-type']).toContain("application/json");
     });
-    it('delete with valid jwt but non-existant runner should return 200', async () => {
+    it('registering as citizen with invalid mail should return 400', async () => {
-        const res = await axios.delete(base + '/api/runners/me/' + added_runner.token, axios_config);
+        const res = await axios.post(base + '/api/runners/register', {
-        expect(res.status).toEqual(404);
+            "firstname": "string",
-        expect(res.headers['content-type']).toContain("application/json");
+            "middlename": "string",
-    });
+            "lastname": "string",
-    it('delete with invalid jwt should return 401', async () => {
+            "phone": "peter",
-        const res = await axios.delete(base + '/api/runners/me/123.123', axios_config);
+            "email": "user@example.com"
-        expect(res.status).toEqual(401);
+        }, axios_config);
+        expect(res.status).toEqual(400);
         expect(res.headers['content-type']).toContain("application/json");
     });
 });
 // ---------------
-describe('delete selfservice runner valid', () => {
+describe('register citizen 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 () => {
+    it('registering as citizen with all params should return 200', async () => {
-        const res = await axios.delete(base + '/api/runners/me/' + added_runner.token, axios_config);
+        const res = await axios.post(base + '/api/runners/register', {
+            "firstname": "string",
+            "middlename": "string",
+            "lastname": "string",
+            "email": "user@example.com",
+            "phone": "+4909132123456",
+            "address": {
+                address1: "Teststreet 1",
+                address2: "Testapartement",
+                postalcode: "91074",
+                city: "Herzo",
+                country: "Germany"
+            }
+        }, axios_config);
+        expect(res.status).toEqual(200);
+        expect(res.headers['content-type']).toContain("application/json");
+    });
+});
+// ---------------
+describe('register invalid company', () => {
+    let added_org;
+    it('creating a new org with just a name and registration enabled should return 200', async () => {
+        const res = await axios.post(base + '/api/organizations', {
+            "name": "test123",
+            "registrationEnabled": true
+        }, axios_config);
+        added_org = res.data;
+        expect(res.status).toEqual(200);
+        expect(res.headers['content-type']).toContain("application/json")
+    });
+    it('registering with bs token should return 404', async () => {
+        const res = await axios.post(base + '/api/runners/register/4040404', {
+            "firstname": "string",
+            "middlename": "string",
+            "lastname": "string",
+        }, axios_config);
+        expect(res.status).toEqual(404);
+        expect(res.headers['content-type']).toContain("application/json");
+    });
+    it('registering without firstname should return 400', async () => {
+        const res = await axios.post(base + '/api/runners/register/' + added_org.registrationKey, {
+            "middlename": "string",
+            "lastname": "string",
+        }, axios_config);
+        expect(res.status).toEqual(400);
+        expect(res.headers['content-type']).toContain("application/json");
+    });
+    it('registering without lastname should return 400', async () => {
+        const res = await axios.post(base + '/api/runners/register/' + added_org.registrationKey, {
+            "middlename": "string",
+            "firstname": "string",
+        }, axios_config);
+        expect(res.status).toEqual(400);
+        expect(res.headers['content-type']).toContain("application/json");
+    });
+    it('registering with bs mail should return 400', async () => {
+        const res = await axios.post(base + '/api/runners/register/' + added_org.registrationKey, {
+            "firstname": "string",
+            "middlename": "string",
+            "lastname": "string",
+            "email": "true"
+        }, axios_config);
+        expect(res.status).toEqual(400);
+        expect(res.headers['content-type']).toContain("application/json");
+    });
+    it('registering with invalid team should return 404', async () => {
+        const res = await axios.post(base + '/api/runners/register/' + added_org.registrationKey, {
+            "firstname": "string",
+            "lastname": "string",
+            "team": 9999999999999999999999
+        }, axios_config);
+        expect(res.status).toEqual(404);
+        expect(res.headers['content-type']).toContain("application/json");
+    });
+});
+// ---------------
+describe('register valid company', () => {
+    let added_org;
+    let added_team;
+    it('creating a new org with just a name and registration enabled should return 200', async () => {
+        const res = await axios.post(base + '/api/organizations', {
+            "name": "test123",
+            "registrationEnabled": true
+        }, axios_config);
+        added_org = res.data;
+        expect(res.status).toEqual(200);
+        expect(res.headers['content-type']).toContain("application/json")
+    });
+    it('creating a new team with a parent org should return 200', async () => {
+        const res = await axios.post(base + '/api/teams', {
+            "name": "test_team",
+            "parentGroup": added_org.id
+        }, axios_config);
+        added_team = res.data;
+        expect(res.status).toEqual(200);
+        expect(res.headers['content-type']).toContain("application/json")
+    });
+    it('registering with minimal params should return 200', async () => {
+        const res = await axios.post(base + '/api/runners/register/' + added_org.registrationKey, {
+            "firstname": "string",
+            "lastname": "string",
+        }, axios_config);
+        expect(res.status).toEqual(200);
+        expect(res.headers['content-type']).toContain("application/json");
+    });
+    it('registering with all params except team should return 200', async () => {
+        const res = await axios.post(base + '/api/runners/register/' + added_org.registrationKey, {
+            "firstname": "string",
+            "middlename": "string",
+            "lastname": "string",
+            "email": "user@example.com",
+            "phone": "+4909132123456",
+            "address": {
+                address1: "Teststreet 1",
+                address2: "Testapartement",
+                postalcode: "91074",
+                city: "Herzo",
+                country: "Germany"
+            }
+        }, axios_config);
+        expect(res.status).toEqual(200);
+        expect(res.headers['content-type']).toContain("application/json");
+    });
+    it('registering with minimal params and team should return 200', async () => {
+        const res = await axios.post(base + '/api/runners/register/' + added_org.registrationKey, {
+            "firstname": "string",
+            "lastname": "string",
+            "team": added_team.id
+        }, axios_config);
+        expect(res.status).toEqual(200);
+        expect(res.headers['content-type']).toContain("application/json");
+    });
+    it('registering with all params except team should return 200', async () => {
+        const res = await axios.post(base + '/api/runners/register/' + added_org.registrationKey, {
+            "firstname": "string",
+            "middlename": "string",
+            "lastname": "string",
+            "email": "user@example.com",
+            "phone": "+4909132123456",
+            "address": {
+                address1: "Teststreet 1",
+                address2: "Testapartement",
+                postalcode: "91074",
+                city: "Herzo",
+                country: "Germany"
+            }
+        }, axios_config);
+        expect(res.status).toEqual(200);
+        expect(res.headers['content-type']).toContain("application/json");
+    });
+    it('registering with all params and team should return 200', async () => {
+        const res = await axios.post(base + '/api/runners/register/' + added_org.registrationKey, {
+            "firstname": "string",
+            "middlename": "string",
+            "lastname": "string",
+            "email": "user@example.com",
+            "phone": "+4909132123456",
+            "address": {
+                address1: "Teststreet 1",
+                address2: "Testapartement",
+                postalcode: "91074",
+                city: "Herzo",
+                country: "Germany"
+            },
+            "team": added_team.id
+        }, axios_config);
         expect(res.status).toEqual(200);
         expect(res.headers['content-type']).toContain("application/json");
-        expect(res.data).toEqual(added_runner);
     });
 });