1624: Fix formatting

digitalfabrik · Nov 27, 2024 · 4487008 · 4487008
1 parent ced9c12
commit 4487008
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/administration/src/project-configs/showcase/config.ts b/administration/src/project-configs/showcase/config.ts
@@ -11,6 +11,7 @@ const config: ProjectConfig = {
   applicationFeature: {
     applicationJsonToPersonalData,
     applicationJsonToCardQuery,
+    applicationUsableWithApiToken: true,
   },
   staticQrCodesEnabled: false,
   card: {

diff --git a/backend/src/main/kotlin/app/ehrenamtskarte/backend/auth/service/Authorizer.kt b/backend/src/main/kotlin/app/ehrenamtskarte/backend/auth/service/Authorizer.kt
@@ -7,8 +7,6 @@ import app.ehrenamtskarte.backend.common.webservice.KOBLENZ_PASS_PROJECT
 import app.ehrenamtskarte.backend.projects.database.ProjectEntity
 import app.ehrenamtskarte.backend.projects.database.Projects
 import app.ehrenamtskarte.backend.regions.database.RegionEntity
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
-import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.transactions.transaction
 
 object Authorizer {
@@ -58,7 +56,7 @@ object Authorizer {
 
     fun mayViewUsersInRegion(user: AdministratorEntity?, region: RegionEntity): Boolean {
         return (user?.role == Role.REGION_ADMIN.db_value && user.regionId == region.id) ||
-                mayViewUsersInProject(user, region.projectId.value)
+            mayViewUsersInProject(user, region.projectId.value)
     }
 
     fun maySendMailsInRegion(user: AdministratorEntity, regionId: Int): Boolean {
@@ -157,13 +155,13 @@ object Authorizer {
     fun mayAddApiTokensInProject(user: AdministratorEntity): Boolean {
         return transaction {
             (
-                    user.role == Role.PROJECT_ADMIN.db_value && ProjectEntity.find { Projects.project eq KOBLENZ_PASS_PROJECT }
+                user.role == Role.PROJECT_ADMIN.db_value && ProjectEntity.find { Projects.project eq KOBLENZ_PASS_PROJECT }
+                    .single().id.value == user.projectId.value
+                ) ||
+                (
+                    user.role == Role.EXTERNAL_VERIFIED_API_USER.db_value && ProjectEntity.find { Projects.project eq EAK_BAYERN_PROJECT }
                         .single().id.value == user.projectId.value
-                    ) ||
-                    (
-                            user.role == Role.EXTERNAL_VERIFIED_API_USER.db_value && ProjectEntity.find { Projects.project eq EAK_BAYERN_PROJECT }
-                                .single().id.value == user.projectId.value
-                            )
+                    )
         }
     }
 
@@ -177,7 +175,7 @@ object Authorizer {
         return transaction {
             ProjectEntity.find { Projects.project eq KOBLENZ_PASS_PROJECT }
                 .single().id.value == user.projectId.value &&
-                    user.role == Role.PROJECT_ADMIN.db_value
+                user.role == Role.PROJECT_ADMIN.db_value
         }
     }
 }