Mrc 5295- Role create endpoint

api/app/src/main/kotlin/packit/controllers/LoginController.kt

@@ -6,8 +6,8 @@ import org.springframework.validation.annotation.Validated
 import org.springframework.web.bind.annotation.*
 import packit.AppConfig
 import packit.exceptions.PackitException
-import packit.model.LoginWithPassword
-import packit.model.LoginWithToken
+import packit.model.dto.LoginWithPassword
+import packit.model.dto.LoginWithToken
 import packit.service.BasicLoginService
 import packit.service.GithubAPILoginService
 

api/app/src/main/kotlin/packit/controllers/PacketController.kt

@@ -4,10 +4,10 @@ import org.springframework.core.io.ByteArrayResource
 import org.springframework.data.domain.Page
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.*
-import packit.model.PacketGroupSummary
 import packit.model.PacketMetadata
 import packit.model.PageablePayload
 import packit.model.dto.PacketDto
+import packit.model.dto.PacketGroupSummary
 import packit.model.toDto
 import packit.service.PacketService
 

api/app/src/main/kotlin/packit/controllers/RoleController.kt

@@ -0,0 +1,25 @@
+package packit.controllers
+
+import org.springframework.http.ResponseEntity
+import org.springframework.security.access.prepost.PreAuthorize
+import org.springframework.stereotype.Controller
+import org.springframework.validation.annotation.Validated
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import packit.model.dto.CreateRole
+import packit.service.RoleService
+
+@Controller
+@PreAuthorize("hasAuthority('user.manage')")
+@RequestMapping("/role")
+class RoleController(private val roleService: RoleService)
+{
+    @PostMapping()
+    fun createRole(@RequestBody @Validated createRole: CreateRole): ResponseEntity<Map<String, String?>>
+    {
+        roleService.createRole(createRole)
+
+        return ResponseEntity.ok(mapOf("message" to "Role created"))
+    }
+}

api/app/src/main/kotlin/packit/controllers/UserController.kt

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RequestMapping
 import packit.AppConfig
 import packit.exceptions.PackitException
-import packit.model.CreateBasicUser
+import packit.model.dto.CreateBasicUser
 import packit.service.UserService
 
 @Controller

api/app/src/main/kotlin/packit/model/Packet.kt

@@ -25,8 +25,7 @@ class Packet(
         inverseJoinColumns = [JoinColumn(name = "tag_id")]
     )
     var tags: MutableList<Tag> = mutableListOf(),
-
-    @OneToMany(mappedBy = "packet")
+    @OneToMany(mappedBy = "packet", cascade = [CascadeType.ALL])
     var rolePermissions: MutableList<RolePermission> = mutableListOf()
 )
 

api/app/src/main/kotlin/packit/model/Permission.kt

@@ -7,7 +7,7 @@ import jakarta.persistence.*
 class Permission(
     var name: String,
     var description: String,
-    @OneToMany(mappedBy = "permission")
+    @OneToMany(mappedBy = "permission", cascade = [CascadeType.ALL])
     var rolePermissions: MutableList<RolePermission> = mutableListOf(),
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

api/app/src/main/kotlin/packit/model/Role.kt

@@ -7,7 +7,7 @@ import jakarta.persistence.*
 class Role(
     var name: String,
     var isUsername: Boolean = false,
-    @OneToMany(mappedBy = "role", fetch = FetchType.EAGER)
+    @OneToMany(mappedBy = "role", fetch = FetchType.EAGER, cascade = [CascadeType.ALL])
     var rolePermissions: MutableList<RolePermission> = mutableListOf(),
     @ManyToMany(mappedBy = "roles", fetch = FetchType.LAZY)
     var users: MutableList<User> = mutableListOf(),

api/app/src/main/kotlin/packit/model/Tag.kt

@@ -8,7 +8,7 @@ class Tag(
     val name: String,
     @ManyToMany(mappedBy = "tags")
     var packets: MutableList<Packet> = mutableListOf(),
-    @OneToMany(mappedBy = "tag")
+    @OneToMany(mappedBy = "tag", cascade = [CascadeType.ALL])
     var rolePermissions: MutableList<RolePermission> = mutableListOf(),
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

api/app/src/main/kotlin/packit/model/CreateBasicUser.kt → api/app/src/main/kotlin/packit/model/dto/CreateBasicUser.kt

@@ -1,4 +1,4 @@
-package packit.model
+package packit.model.dto
 
 import jakarta.validation.constraints.Email
 import jakarta.validation.constraints.Size

api/app/src/main/kotlin/packit/model/dto/CreateRole.kt

@@ -0,0 +1,9 @@
+package packit.model.dto
+
+import org.jetbrains.annotations.NotNull
+
+data class CreateRole(
+    @field:NotNull
+    val name: String,
+    val permissionNames: List<String> = listOf()
+)

api/app/src/main/kotlin/packit/model/LoginWithPassword.kt → api/app/src/main/kotlin/packit/model/dto/LoginWithPassword.kt

@@ -1,4 +1,4 @@
-package packit.model
+package packit.model.dto
 
 import org.jetbrains.annotations.NotNull
 

api/app/src/main/kotlin/packit/model/LoginWithToken.kt → api/app/src/main/kotlin/packit/model/dto/LoginWithToken.kt

@@ -1,4 +1,4 @@
-package packit.model
+package packit.model.dto
 
 import org.jetbrains.annotations.NotNull
 

api/app/src/main/kotlin/packit/model/OutpackMetadata.kt → api/app/src/main/kotlin/packit/model/dto/OutpackMetadata.kt

@@ -1,4 +1,6 @@
-package packit.model
+package packit.model.dto
+
+import packit.model.TimeMetadata
 
 data class OutpackMetadata(
     val id: String,

api/app/src/main/kotlin/packit/model/PacketGroupSummary.kt → api/app/src/main/kotlin/packit/model/dto/PacketGroupSummary.kt

@@ -1,4 +1,4 @@
-package packit.model
+package packit.model.dto
 
 // Projection class for PacketRepository.findPacketGroupSummaryByName
 interface PacketGroupSummary

api/app/src/main/kotlin/packit/repository/PacketRepository.kt

@@ -6,7 +6,7 @@ import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.data.jpa.repository.Query
 import org.springframework.stereotype.Repository
 import packit.model.Packet
-import packit.model.PacketGroupSummary
+import packit.model.dto.PacketGroupSummary
 
 @Repository
 interface PacketRepository : JpaRepository<Packet, String>

api/app/src/main/kotlin/packit/repository/PermissionRepository.kt

@@ -6,3 +6,6 @@ import packit.model.Permission
 
 @Repository
 interface PermissionRepository : JpaRepository<Permission, Int>
+{
+    fun findByNameIn(names: List<String>): List<Permission>
+}

api/app/src/main/kotlin/packit/repository/RoleRepository.kt

@@ -8,6 +8,6 @@ import packit.model.Role
 interface RoleRepository : JpaRepository<Role, Int>
 {
     fun findByName(name: String): Role?
-
     fun existsByName(name: String): Boolean
+    fun findByNameIn(names: List<String>): List<Role>
 }

api/app/src/main/kotlin/packit/service/BasicLoginService.kt

@@ -5,7 +5,7 @@ import org.springframework.security.authentication.AuthenticationManager
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken
 import org.springframework.stereotype.Component
 import packit.exceptions.PackitException
-import packit.model.LoginWithPassword
+import packit.model.dto.LoginWithPassword
 import packit.security.profile.BasicUserDetails
 import packit.security.provider.JwtIssuer
 

api/app/src/main/kotlin/packit/service/GithubAPILoginService.kt

@@ -5,7 +5,7 @@ import org.springframework.stereotype.Component
 import packit.AppConfig
 import packit.clients.GithubUserClient
 import packit.exceptions.PackitException
-import packit.model.LoginWithToken
+import packit.model.dto.LoginWithToken
 import packit.security.profile.UserPrincipal
 import packit.security.provider.JwtIssuer
 

api/app/src/main/kotlin/packit/service/OutpackServerClient.kt

@@ -12,9 +12,9 @@ import org.springframework.web.client.HttpStatusCodeException
 import org.springframework.web.client.RestTemplate
 import packit.AppConfig
 import packit.exceptions.PackitException
-import packit.model.OutpackMetadata
 import packit.model.OutpackResponse
 import packit.model.PacketMetadata
+import packit.model.dto.OutpackMetadata
 import java.net.URI
 
 interface OutpackServer

api/app/src/main/kotlin/packit/service/BasePacketService.kt → api/app/src/main/kotlin/packit/service/PacketService.kt

@@ -11,7 +11,11 @@ import org.springframework.http.MediaType
 import org.springframework.stereotype.Service
 import packit.contentTypes
 import packit.exceptions.PackitException
-import packit.model.*
+import packit.model.Packet
+import packit.model.PacketGroup
+import packit.model.PacketMetadata
+import packit.model.PageablePayload
+import packit.model.dto.PacketGroupSummary
 import packit.repository.PacketGroupRepository
 import packit.repository.PacketRepository
 import java.security.MessageDigest

api/app/src/main/kotlin/packit/service/PermissionService.kt

@@ -0,0 +1,29 @@
+package packit.service
+
+import org.springframework.http.HttpStatus
+import org.springframework.stereotype.Service
+import packit.exceptions.PackitException
+import packit.model.Permission
+import packit.repository.PermissionRepository
+
+interface PermissionService
+{
+    fun checkMatchingPermissions(permissionsToCheck: List<String>): List<Permission>
+}
+
+@Service
+class BasePermissionService(
+    private val permissionRepository: PermissionRepository
+) : PermissionService
+{
+    override fun checkMatchingPermissions(permissionsToCheck: List<String>): List<Permission>
+    {
+        val matchedPermissions = permissionRepository.findByNameIn(permissionsToCheck)
+
+        if (matchedPermissions.size != permissionsToCheck.size)
+        {
+            throw PackitException("invalidPermissionsProvided", HttpStatus.BAD_REQUEST)
+        }
+        return matchedPermissions
+    }
+}

api/app/src/main/kotlin/packit/service/RoleService.kt

@@ -5,22 +5,25 @@ import org.springframework.security.core.GrantedAuthority
 import org.springframework.security.core.authority.SimpleGrantedAuthority
 import org.springframework.stereotype.Service
 import packit.exceptions.PackitException
+import packit.model.Permission
 import packit.model.Role
 import packit.model.RolePermission
+import packit.model.dto.CreateRole
 import packit.repository.RoleRepository
 
 interface RoleService
 {
     fun getUsernameRole(username: String): Role
     fun getAdminRole(): Role
-    fun saveRole(roleName: String)
     fun checkMatchingRoles(rolesToCheck: List<String>): List<Role>
     fun getGrantedAuthorities(roles: List<Role>): MutableList<GrantedAuthority>
+    fun createRole(createRole: CreateRole)
 }
 
 @Service
 class BaseRoleService(
-    private val roleRepository: RoleRepository
+    private val roleRepository: RoleRepository,
+    private val permissionService: PermissionService
 ) : RoleService
 {
     override fun getUsernameRole(username: String): Role
@@ -40,26 +43,34 @@ class BaseRoleService(
             ?: throw PackitException("adminRoleNotFound", HttpStatus.INTERNAL_SERVER_ERROR)
     }
 
-    override fun saveRole(roleName: String)
+    override fun createRole(createRole: CreateRole)
+    {
+        val permissions = permissionService.checkMatchingPermissions(createRole.permissionNames)
+
+        saveRole(createRole.name, permissions)
+    }
+
+    internal fun saveRole(roleName: String, permissions: List<Permission> = listOf())
     {
         if (roleRepository.existsByName(roleName))
         {
             throw PackitException("roleAlreadyExists")
         }
         val role = Role(name = roleName)
+        role.rolePermissions = permissions.map { RolePermission(permission = it, role = role) }
+            .toMutableList()
         roleRepository.save(role)
     }
 
     override fun checkMatchingRoles(rolesToCheck: List<String>): List<Role>
     {
-        val allRoles = roleRepository.findAll()
-        val foundRoles = rolesToCheck.mapNotNull { name -> allRoles.find { it.name == name } }
+        val matchedRoles = roleRepository.findByNameIn(rolesToCheck)
 
-        if (foundRoles.size != rolesToCheck.size)
+        if (matchedRoles.size != rolesToCheck.size)
         {
             throw PackitException("invalidRolesProvided", HttpStatus.BAD_REQUEST)
         }
-        return foundRoles
+        return matchedRoles
     }
 
     /**

api/app/src/main/kotlin/packit/service/UserService.kt

@@ -4,8 +4,8 @@ import org.springframework.http.HttpStatus
 import org.springframework.security.crypto.password.PasswordEncoder
 import org.springframework.stereotype.Service
 import packit.exceptions.PackitException
-import packit.model.CreateBasicUser
 import packit.model.User
+import packit.model.dto.CreateBasicUser
 import packit.repository.UserRepository
 import java.time.Instant
 

api/app/src/main/resources/errorBundle.properties

@@ -10,6 +10,7 @@ githubLoginDisabled=GitHub login is disabled
 basicLoginDisabled=Basic login is disabled
 insufficientPrivileges=You do not have sufficient privileges for attempted action
 invalidRolesProvided=Invalid roles provided
+invalidPermissionsProvided=Invalid permissions provided
 userAlreadyExists=User already exists
 userNotFound=User not found
 roleAlreadyExists=Role already exists

api/app/src/test/kotlin/packit/integration/controllers/LoginControllerTest.kt

@@ -12,9 +12,9 @@ import org.springframework.http.*
 import org.springframework.security.crypto.password.PasswordEncoder
 import org.springframework.test.context.TestPropertySource
 import packit.integration.IntegrationTest
-import packit.model.LoginWithPassword
-import packit.model.LoginWithToken
 import packit.model.User
+import packit.model.dto.LoginWithPassword
+import packit.model.dto.LoginWithToken
 import packit.repository.UserRepository
 import kotlin.test.assertEquals
 

api/app/src/test/kotlin/packit/integration/controllers/RoleControllerTest.kt

@@ -0,0 +1,66 @@
+package packit.integration.controllers
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import org.junit.jupiter.api.Test
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.http.HttpStatus
+import org.springframework.test.context.jdbc.Sql
+import packit.integration.IntegrationTest
+import packit.integration.WithAuthenticatedUser
+import packit.model.dto.CreateRole
+import packit.repository.RoleRepository
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+
+@Sql("/delete-test-users.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
+class RoleControllerTest : IntegrationTest()
+{
+    @Autowired
+    private lateinit var roleRepository: RoleRepository
+    private val createTestRoleBody = ObjectMapper().writeValueAsString(
+        CreateRole(
+            name = "testRole",
+            permissionNames = listOf("packet.run", "packet.read")
+        )
+    )
+
+    @Test
+    @WithAuthenticatedUser(authorities = ["user.manage"])
+    fun `users with manage authority can create roles`()
+    {
+        val result = restTemplate.postForEntity(
+            "/role",
+            getTokenizedHttpEntity(data = createTestRoleBody),
+            String::class.java
+        )
+
+        assertSuccess(result)
+        assertNotNull(roleRepository.findByName("testRole"))
+    }
+
+    @Test
+    @WithAuthenticatedUser(authorities = ["none"])
+    fun `user without user manage permission cannot create roles`()
+    {
+        val result = restTemplate.postForEntity(
+            "/role",
+            getTokenizedHttpEntity(data = createTestRoleBody),
+            String::class.java
+        )
+
+        assertEquals(result.statusCode, HttpStatus.UNAUTHORIZED)
+    }
+
+    @Test
+    @WithAuthenticatedUser(authorities = ["user.manage"])
+    fun `reject request if createRole body is invalid`()
+    {
+        val result = restTemplate.postForEntity(
+            "/role",
+            getTokenizedHttpEntity(data = "{}"),
+            String::class.java
+        )
+
+        assertEquals(result.statusCode, HttpStatus.BAD_REQUEST)
+    }
+}