Merge branch 'dev' into feature/17-automated_tests

src/controllers/AuthController.ts

@@ -26,7 +26,7 @@ export class AuthController {
 		try {
 			auth = await createAuth.toAuth();
 		} catch (error) {
-			return error;
+			throw error;
 		}
 		return auth
 	}

src/controllers/RunnerController.ts

@@ -54,7 +54,7 @@ export class RunnerController {
 		try {
 			runner = await createRunner.toRunner();
 		} catch (error) {
-			return error;
+			throw error;
 		}
 
 		runner = await this.runnerRepository.save(runner)

src/controllers/RunnerOrganisationController.ts

@@ -54,7 +54,7 @@ export class RunnerOrganisationController {
 		try {
 			runnerOrganisation = await createRunnerOrganisation.toRunnerOrganisation();
 		} catch (error) {
-			return error;
+			throw error;
 		}
 
 		runnerOrganisation = await this.runnerOrganisationRepository.save(runnerOrganisation);

src/controllers/RunnerTeamController.ts

@@ -53,7 +53,7 @@ export class RunnerTeamController {
 		try {
 			runnerTeam = await createRunnerTeam.toRunnerTeam();
 		} catch (error) {
-			return error;
+			throw error;
 		}
 
 		runnerTeam = await this.runnerTeamRepository.save(runnerTeam);

src/controllers/UserController.ts

@@ -44,7 +44,7 @@ export class UserController {
 		try {
 			user = await createUser.toUser();
 		} catch (error) {
-			return error;
+			throw error;
 		}
 
 		return this.userRepository.save(user);

src/controllers/UserGroupController.ts

@@ -43,7 +43,7 @@ export class UserGroupController {
 		try {
 			userGroup = await createUserGroup.toUserGroup();
 		} catch (error) {
-			return error;
+			throw error;
 		}
 
 		return this.userGroupsRepository.save(userGroup);

src/models/actions/CreateAuth.ts

@@ -28,13 +28,14 @@ export class CreateAuth {
         if (!this.password) {
             throw new PasswordNeededError()
         }
-        const found_users = await getConnectionManager().get().getRepository(User).find({ where: [{ username: this.username }, { email: this.email }] });
+        const found_users = await getConnectionManager().get().getRepository(User).find({ relations: ['groups', 'permissions'], where: [{ username: this.username }, { email: this.email }] });
         if (found_users.length === 0) {
             throw new UserNotFoundError()
         } else {
             const found_user = found_users[0]
             if (await argon2.verify(found_user.password, this.password + found_user.uuid)) {
                 const timestamp_accesstoken_expiry = Math.floor(Date.now() / 1000) + 5 * 60
+                found_user.permissions = found_user.permissions || []
                 delete found_user.password;
                 newAuth.access_token = jsonwebtoken.sign({
                     userdetails: found_user,

src/models/actions/CreateRunnerTeam.ts

@@ -35,11 +35,7 @@ export class CreateRunnerTeam extends CreateRunnerGroup {
         let newRunnerTeam: RunnerTeam = new RunnerTeam();
 
         newRunnerTeam.name = this.name;
-        try {
+        newRunnerTeam.parentGroup = await this.getParent();
-            newRunnerTeam.parentGroup = await this.getParent();
-        } catch (error) {
-            throw error;
-        }
 
         newRunnerTeam.contact = await this.getContact()
 

src/models/actions/RefreshAuth.ts

@@ -21,13 +21,14 @@ export class RefreshAuth {
         } catch (error) {
             throw new IllegalJWTError()
         }
-        const found_user = await getConnectionManager().get().getRepository(User).findOne({ id: decoded["userid"] });
+        const found_user = await getConnectionManager().get().getRepository(User).findOne({ id: decoded["userid"] }, { relations: ['groups', 'permissions'] });
         if (!found_user) {
             throw new UserNotFoundError()
         }
         if (found_user.refreshTokenCount !== decoded["refreshtokencount"]) {
             throw new RefreshTokenCountInvalidError()
         }
+        found_user.permissions = found_user.permissions || []
         delete found_user.password;
         const timestamp_accesstoken_expiry = Math.floor(Date.now() / 1000) + 5 * 60
         delete found_user.password;