diff --git a/dataset/src/integrationTest/kotlin/com/cosmotech/dataset/service/DatasetServiceIntegrationTest.kt b/dataset/src/integrationTest/kotlin/com/cosmotech/dataset/service/DatasetServiceIntegrationTest.kt index 303ce8b36..b2916f9c3 100644 --- a/dataset/src/integrationTest/kotlin/com/cosmotech/dataset/service/DatasetServiceIntegrationTest.kt +++ b/dataset/src/integrationTest/kotlin/com/cosmotech/dataset/service/DatasetServiceIntegrationTest.kt @@ -154,7 +154,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { connectorSaved = connectorApiService.registerConnector(makeConnector()) organization = makeOrganizationWithRole() - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) dataset = makeDatasetWithRole() datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) dataset2 = makeDataset() @@ -172,7 +172,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { @Test fun `test Dataset CRUD`() { - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) val registeredDataset2 = datasetApiService.createDataset(organizationSaved.id!!, dataset2) @@ -196,7 +196,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { @Test fun `test Dataset - findByOrganizationIdAndDatasetId`() { - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) logger.info("Fetch dataset...") @@ -209,7 +209,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { @Test fun `test Dataset - findByOrganizationIdAndDatasetId wrong dataset id`() { - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) logger.info("Fetch dataset...") @@ -222,7 +222,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { fun `can delete dataset when user is not the owner and is Platform Admin`() { logger.info("Register dataset : ${dataset.id}...") - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) assertNotNull(datasetSaved) logger.info("Change current user...") @@ -242,7 +242,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { fun `can not delete dataset when user is not the owner and not Platform Admin`() { logger.info("Register dataset : ${dataset.id}...") - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) assertNotNull(datasetSaved) logger.info("Change current user...") @@ -259,7 +259,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { fun `can update dataset owner when user is not the owner and is Platform Admin`() { logger.info("Register dataset : ${dataset.id}...") - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) assertNotNull(datasetSaved) logger.info("Change current user...") @@ -282,7 +282,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { fun `cannot update dataset owner when user is not the owner and is not Platform Admin`() { logger.info("Register dataset : ${dataset.id}...") - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) assertNotNull(datasetSaved) logger.info("Change current user...") @@ -336,7 +336,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { @Test fun `test find All Datasets as Platform Admin`() { - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val numberOfDatasets = 20 val defaultPageSize = csmPlatformProperties.twincache.dataset.defaultPageSize val expectedPageSize = 15 @@ -368,7 +368,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { @Test fun `test find All Datasets as Organization User`() { - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val numberOfDatasets = 20 val defaultPageSize = csmPlatformProperties.twincache.dataset.defaultPageSize val expectedSize = 15 @@ -399,7 +399,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { @Test fun `PROD-12947 - test find All Datasets as Organization User`() { - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) // Create a dataset that current user should not see because he does not have permission to val numberOfDatasets = 200 @@ -421,7 +421,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { // Create a dataset that current user should not see because it has been created under another // organization - val newOrganization = organizationApiService.registerOrganization(makeOrganizationWithRole()) + val newOrganization = organizationApiService.createOrganization(makeOrganizationWithRole()) val datasetNotReachableByCurrentUserBecausePartOfAnotherOrganization = datasetApiService.createDataset( newOrganization.id!!, makeDatasetWithRole(organizationId = newOrganization.id!!)) @@ -441,7 +441,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { @Test fun `PROD-12947 - test find All Datasets as Platform Admin`() { - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) // Create a dataset that current user should not see because he does not have permission to val numberOfDatasets = 20 @@ -463,7 +463,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { // Create a dataset that current user should not see because it has been created under another // organization - val newOrganization = organizationApiService.registerOrganization(makeOrganizationWithRole()) + val newOrganization = organizationApiService.createOrganization(makeOrganizationWithRole()) val datasetNotReachableByCurrentUserBecausePartOfAnotherOrganization = datasetApiService.createDataset( newOrganization.id!!, makeDatasetWithRole(organizationId = newOrganization.id!!)) @@ -479,7 +479,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { } @Test fun `test find All Datasets with wrong pagination params`() { - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) datasetApiService.createDataset(organizationSaved.id!!, dataset) logger.info("Should throw IllegalArgumentException when page and size are zeros") @@ -505,7 +505,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { "loading nodes: Double=2, Single=1, Users=9 & relationships: Double=2, Single=1, Follows=2") val file = this::class.java.getResource("/integrationTest.zip")?.file val resource = ByteArrayResource(File(file!!).readBytes()) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) dataset = makeDatasetWithRole() datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) datasetApiService.updateDataset( @@ -600,7 +600,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { fun `Twingraph CRUD test`() { logger.info("Create Nodes") - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) val nodeStart = datasetApiService.createTwingraphEntities( @@ -694,7 +694,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { @Test fun `test get security endpoint`() { - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) // should return the current security val datasetSecurity = @@ -704,7 +704,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { @Test fun `test set default security endpoint`() { - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) // should update the default security and assert it worked val datasetDefaultSecurity = @@ -716,7 +716,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { @Test fun `test uploadTwingraph status`() { - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) dataset.apply { sourceType = DatasetSourceType.File } datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) val file = this::class.java.getResource("/integrationTest.zip")?.file @@ -741,7 +741,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { @Test fun `test uploadTwingraph fail set dataset status to error`() { - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) dataset.apply { sourceType = DatasetSourceType.File } datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) val file = this::class.java.getResource("/brokenGraph.zip")?.file @@ -767,7 +767,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { @Test fun `access control list shouldn't contain more than one time each user on creation`() { connectorSaved = connectorApiService.registerConnector(makeConnector()) - organizationSaved = organizationApiService.registerOrganization(makeOrganizationWithRole()) + organizationSaved = organizationApiService.createOrganization(makeOrganizationWithRole()) val brokenDataset = Dataset( name = "dataset", @@ -787,7 +787,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { @Test fun `access control list shouldn't contain more than one time each user on ACL addition`() { connectorSaved = connectorApiService.registerConnector(makeConnector()) - organizationSaved = organizationApiService.registerOrganization(makeOrganizationWithRole()) + organizationSaved = organizationApiService.createOrganization(makeOrganizationWithRole()) val workingDataset = makeDatasetWithRole("dataset", sourceType = DatasetSourceType.None) val datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, workingDataset) @@ -801,7 +801,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { @Test fun `reupload a twingraph in dataset with source type File`() { - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) dataset.apply { sourceType = DatasetSourceType.File } datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -838,7 +838,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { @Test fun `rollback endpoint call should fail if status is not ERROR`() { - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) datasetSaved = @@ -870,7 +870,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { fun `status should go back to normal on rollback endpoint call`() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER organization = makeOrganizationWithRole("organization") - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) dataset = makeDatasetWithRole(sourceType = DatasetSourceType.File) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -910,8 +910,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() { DynamicTest.dynamicTest("Test RBAC refreshDataset : $sourceType") { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER organizationSaved = - organizationApiService.registerOrganization( - makeOrganizationWithRole("organization")) + organizationApiService.createOrganization(makeOrganizationWithRole("organization")) val parentDataset = datasetApiService.createDataset( organizationSaved.id!!, makeDatasetWithRole(sourceType = sourceType)) diff --git a/dataset/src/integrationTest/kotlin/com/cosmotech/dataset/service/DatasetServiceRBACTest.kt b/dataset/src/integrationTest/kotlin/com/cosmotech/dataset/service/DatasetServiceRBACTest.kt index 9ce759909..23bc05752 100644 --- a/dataset/src/integrationTest/kotlin/com/cosmotech/dataset/service/DatasetServiceRBACTest.kt +++ b/dataset/src/integrationTest/kotlin/com/cosmotech/dataset/service/DatasetServiceRBACTest.kt @@ -159,7 +159,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -198,7 +198,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(role = ROLE_ADMIN) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -237,7 +237,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -282,7 +282,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole() - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -334,7 +334,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -378,7 +378,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole() - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -421,7 +421,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole() every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -456,7 +456,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -497,7 +497,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole() - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -544,7 +544,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -589,7 +589,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole() - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -640,7 +640,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -677,7 +677,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole() - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -714,7 +714,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -753,7 +753,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole() - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -798,7 +798,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole() datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -842,7 +842,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole() datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -879,7 +879,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -916,7 +916,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole() - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -953,7 +953,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -992,7 +992,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole() - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -1031,7 +1031,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -1070,7 +1070,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole() - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -1109,7 +1109,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN, sourceType = DatasetSourceType.Twincache) val datasetParentSaved = @@ -1158,7 +1158,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole() - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role, sourceType = DatasetSourceType.Twincache) val datasetParentSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -1213,7 +1213,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -1253,7 +1253,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole() - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -1292,7 +1292,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole() datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -1333,7 +1333,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -1375,7 +1375,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole() - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -1417,7 +1417,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -1457,7 +1457,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole() - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -1497,7 +1497,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -1536,7 +1536,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole() - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -1575,7 +1575,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -1614,7 +1614,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole() - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -1659,7 +1659,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN, sourceType = DatasetSourceType.File) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -1701,7 +1701,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole() - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role, sourceType = DatasetSourceType.File) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) val fileName = this::class.java.getResource("/integrationTest.zip")?.file @@ -1748,7 +1748,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -1789,7 +1789,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole() - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -1830,7 +1830,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN, sourceType = DatasetSourceType.None) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -1869,7 +1869,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole() - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -1908,7 +1908,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -1953,7 +1953,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole() - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -1998,7 +1998,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -2037,7 +2037,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole() - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -2076,7 +2076,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -2115,7 +2115,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole() - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() @@ -2154,7 +2154,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -2191,7 +2191,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole() - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -2228,7 +2228,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = ROLE_ADMIN) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -2266,7 +2266,7 @@ class DatasetServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole() - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDatasetWithRole(role = role) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) diff --git a/dataset/src/test/kotlin/com/cosmotech/dataset/service/DatasetServiceImplTests.kt b/dataset/src/test/kotlin/com/cosmotech/dataset/service/DatasetServiceImplTests.kt index c456d67d7..1e616e3d1 100644 --- a/dataset/src/test/kotlin/com/cosmotech/dataset/service/DatasetServiceImplTests.kt +++ b/dataset/src/test/kotlin/com/cosmotech/dataset/service/DatasetServiceImplTests.kt @@ -540,7 +540,7 @@ class DatasetServiceImplTests { fun `test downloadGraph as Admin - should throw exception if data not found`() { every { organizationService.getVerifiedOrganization(ORGANIZATION_ID) } returns Organization() every { getCurrentAuthenticatedRoles(any()) } returns listOf("Platform.Admin") - every { organizationService.findOrganizationById(any()) } returns mockk() + every { organizationService.getOrganization(any()) } returns mockk() every { unifiedJedis.exists(any()) } returns false assertThrows { diff --git a/doc/Apis/OrganizationApi.md b/doc/Apis/OrganizationApi.md index b151b00d6..38ce8b2cd 100644 --- a/doc/Apis/OrganizationApi.md +++ b/doc/Apis/OrganizationApi.md @@ -4,25 +4,50 @@ All URIs are relative to *http://localhost* | Method | HTTP request | Description | |------------- | ------------- | -------------| -| [**addOrganizationAccessControl**](OrganizationApi.md#addOrganizationAccessControl) | **POST** /organizations/{organization_id}/security/access | Add a control access to the Organization | -| [**findAllOrganizations**](OrganizationApi.md#findAllOrganizations) | **GET** /organizations | List all Organizations | -| [**findOrganizationById**](OrganizationApi.md#findOrganizationById) | **GET** /organizations/{organization_id} | Get the details of an Organization | -| [**getAllPermissions**](OrganizationApi.md#getAllPermissions) | **GET** /organizations/permissions | Get all permissions per components | +| [**createOrganization**](OrganizationApi.md#createOrganization) | **POST** /organizations | create a new organization | +| [**createOrganizationAccessControl**](OrganizationApi.md#createOrganizationAccessControl) | **POST** /organizations/{organization_id}/security/access | Add a control access to the Organization | +| [**deleteOrganization**](OrganizationApi.md#deleteOrganization) | **DELETE** /organizations/{organization_id} | delete an organization | +| [**deleteOrganizationAccessControl**](OrganizationApi.md#deleteOrganizationAccessControl) | **DELETE** /organizations/{organization_id}/security/access/{identity_id} | Remove the specified access from the given Organization | +| [**getOrganization**](OrganizationApi.md#getOrganization) | **GET** /organizations/{organization_id} | Get the details of an Organization | | [**getOrganizationAccessControl**](OrganizationApi.md#getOrganizationAccessControl) | **GET** /organizations/{organization_id}/security/access/{identity_id} | Get a control access for the Organization | | [**getOrganizationPermissions**](OrganizationApi.md#getOrganizationPermissions) | **GET** /organizations/{organization_id}/permissions/{role} | Get the Organization permissions by given role | | [**getOrganizationSecurity**](OrganizationApi.md#getOrganizationSecurity) | **GET** /organizations/{organization_id}/security | Get the Organization security information | -| [**getOrganizationSecurityUsers**](OrganizationApi.md#getOrganizationSecurityUsers) | **GET** /organizations/{organization_id}/security/users | Get the Organization security users list | -| [**registerOrganization**](OrganizationApi.md#registerOrganization) | **POST** /organizations | Register a new organization | -| [**removeOrganizationAccessControl**](OrganizationApi.md#removeOrganizationAccessControl) | **DELETE** /organizations/{organization_id}/security/access/{identity_id} | Remove the specified access from the given Organization | -| [**setOrganizationDefaultSecurity**](OrganizationApi.md#setOrganizationDefaultSecurity) | **POST** /organizations/{organization_id}/security/default | Set the Organization default security | -| [**unregisterOrganization**](OrganizationApi.md#unregisterOrganization) | **DELETE** /organizations/{organization_id} | Unregister an organization | +| [**listOrganizationSecurityUsers**](OrganizationApi.md#listOrganizationSecurityUsers) | **GET** /organizations/{organization_id}/security/users | Get the Organization security users list | +| [**listOrganizations**](OrganizationApi.md#listOrganizations) | **GET** /organizations | List all Organizations | +| [**listPermissions**](OrganizationApi.md#listPermissions) | **GET** /organizations/permissions | Get all permissions per components | | [**updateOrganization**](OrganizationApi.md#updateOrganization) | **PATCH** /organizations/{organization_id} | Update an Organization | | [**updateOrganizationAccessControl**](OrganizationApi.md#updateOrganizationAccessControl) | **PATCH** /organizations/{organization_id}/security/access/{identity_id} | Update the specified access to User for an Organization | +| [**updateOrganizationDefaultSecurity**](OrganizationApi.md#updateOrganizationDefaultSecurity) | **POST** /organizations/{organization_id}/security/default | Update the Organization default security | - -# **addOrganizationAccessControl** -> OrganizationAccessControl addOrganizationAccessControl(organization\_id, OrganizationAccessControl) + +# **createOrganization** +> Organization createOrganization(Organization) + +create a new organization + +### Parameters + +|Name | Type | Description | Notes | +|------------- | ------------- | ------------- | -------------| +| **Organization** | [**Organization**](../Models/Organization.md)| the Organization to create | | + +### Return type + +[**Organization**](../Models/Organization.md) + +### Authorization + +[oAuth2AuthCode](../README.md#oAuth2AuthCode) + +### HTTP request headers + +- **Content-Type**: application/json, application/yaml +- **Accept**: application/json + + +# **createOrganizationAccessControl** +> OrganizationAccessControl createOrganizationAccessControl(organization\_id, OrganizationAccessControl) Add a control access to the Organization @@ -46,22 +71,21 @@ Add a control access to the Organization - **Content-Type**: application/json, application/yaml - **Accept**: application/json - -# **findAllOrganizations** -> List findAllOrganizations(page, size) + +# **deleteOrganization** +> deleteOrganization(organization\_id) -List all Organizations +delete an organization ### Parameters |Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **page** | **Integer**| page number to query (first page is at index 0) | [optional] [default to null] | -| **size** | **Integer**| amount of result by page | [optional] [default to null] | +| **organization\_id** | **String**| the Organization identifier | [default to null] | ### Return type -[**List**](../Models/Organization.md) +null (empty response body) ### Authorization @@ -70,23 +94,24 @@ List all Organizations ### HTTP request headers - **Content-Type**: Not defined -- **Accept**: application/json +- **Accept**: Not defined - -# **findOrganizationById** -> Organization findOrganizationById(organization\_id) + +# **deleteOrganizationAccessControl** +> deleteOrganizationAccessControl(organization\_id, identity\_id) -Get the details of an Organization +Remove the specified access from the given Organization ### Parameters |Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| | **organization\_id** | **String**| the Organization identifier | [default to null] | +| **identity\_id** | **String**| the User identifier | [default to null] | ### Return type -[**Organization**](../Models/Organization.md) +null (empty response body) ### Authorization @@ -95,20 +120,23 @@ Get the details of an Organization ### HTTP request headers - **Content-Type**: Not defined -- **Accept**: application/json +- **Accept**: Not defined - -# **getAllPermissions** -> List getAllPermissions() + +# **getOrganization** +> Organization getOrganization(organization\_id) -Get all permissions per components +Get the details of an Organization ### Parameters -This endpoint does not need any parameter. + +|Name | Type | Description | Notes | +|------------- | ------------- | ------------- | -------------| +| **organization\_id** | **String**| the Organization identifier | [default to null] | ### Return type -[**List**](../Models/ComponentRolePermissions.md) +[**Organization**](../Models/Organization.md) ### Authorization @@ -196,9 +224,9 @@ Get the Organization security information - **Content-Type**: Not defined - **Accept**: application/json - -# **getOrganizationSecurityUsers** -> List getOrganizationSecurityUsers(organization\_id) + +# **listOrganizationSecurityUsers** +> List listOrganizationSecurityUsers(organization\_id) Get the Organization security users list @@ -221,21 +249,22 @@ Get the Organization security users list - **Content-Type**: Not defined - **Accept**: application/json - -# **registerOrganization** -> Organization registerOrganization(Organization) + +# **listOrganizations** +> List listOrganizations(page, size) -Register a new organization +List all Organizations ### Parameters |Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **Organization** | [**Organization**](../Models/Organization.md)| the Organization to register | | +| **page** | **Integer**| page number to query (first page is at index 0) | [optional] [default to null] | +| **size** | **Integer**| amount of result by page | [optional] [default to null] | ### Return type -[**Organization**](../Models/Organization.md) +[**List**](../Models/Organization.md) ### Authorization @@ -243,25 +272,21 @@ Register a new organization ### HTTP request headers -- **Content-Type**: application/json, application/yaml +- **Content-Type**: Not defined - **Accept**: application/json - -# **removeOrganizationAccessControl** -> removeOrganizationAccessControl(organization\_id, identity\_id) + +# **listPermissions** +> List listPermissions() -Remove the specified access from the given Organization +Get all permissions per components ### Parameters - -|Name | Type | Description | Notes | -|------------- | ------------- | ------------- | -------------| -| **organization\_id** | **String**| the Organization identifier | [default to null] | -| **identity\_id** | **String**| the User identifier | [default to null] | +This endpoint does not need any parameter. ### Return type -null (empty response body) +[**List**](../Models/ComponentRolePermissions.md) ### Authorization @@ -270,24 +295,24 @@ null (empty response body) ### HTTP request headers - **Content-Type**: Not defined -- **Accept**: Not defined +- **Accept**: application/json - -# **setOrganizationDefaultSecurity** -> OrganizationSecurity setOrganizationDefaultSecurity(organization\_id, OrganizationRole) + +# **updateOrganization** +> Organization updateOrganization(organization\_id, Organization) -Set the Organization default security +Update an Organization ### Parameters |Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| | **organization\_id** | **String**| the Organization identifier | [default to null] | -| **OrganizationRole** | [**OrganizationRole**](../Models/OrganizationRole.md)| This change the organization default security. The default security is the role assigned to any person not on the Access Control List. If the default security is None, then nobody outside of the ACL can access the organization. | | +| **Organization** | [**Organization**](../Models/Organization.md)| the new Organization details. This endpoint can't be used to update security | | ### Return type -[**OrganizationSecurity**](../Models/OrganizationSecurity.md) +[**Organization**](../Models/Organization.md) ### Authorization @@ -298,47 +323,23 @@ Set the Organization default security - **Content-Type**: application/json, application/yaml - **Accept**: application/json - -# **unregisterOrganization** -> unregisterOrganization(organization\_id) - -Unregister an organization - -### Parameters - -|Name | Type | Description | Notes | -|------------- | ------------- | ------------- | -------------| -| **organization\_id** | **String**| the Organization identifier | [default to null] | - -### Return type - -null (empty response body) - -### Authorization - -[oAuth2AuthCode](../README.md#oAuth2AuthCode) - -### HTTP request headers - -- **Content-Type**: Not defined -- **Accept**: Not defined - - -# **updateOrganization** -> Organization updateOrganization(organization\_id, Organization) + +# **updateOrganizationAccessControl** +> OrganizationAccessControl updateOrganizationAccessControl(organization\_id, identity\_id, OrganizationRole) -Update an Organization +Update the specified access to User for an Organization ### Parameters |Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| | **organization\_id** | **String**| the Organization identifier | [default to null] | -| **Organization** | [**Organization**](../Models/Organization.md)| the new Organization details. This endpoint can't be used to update security | | +| **identity\_id** | **String**| the User identifier | [default to null] | +| **OrganizationRole** | [**OrganizationRole**](../Models/OrganizationRole.md)| The new Organization Access Control | | ### Return type -[**Organization**](../Models/Organization.md) +[**OrganizationAccessControl**](../Models/OrganizationAccessControl.md) ### Authorization @@ -346,26 +347,25 @@ Update an Organization ### HTTP request headers -- **Content-Type**: application/json, application/yaml +- **Content-Type**: application/json - **Accept**: application/json - -# **updateOrganizationAccessControl** -> OrganizationAccessControl updateOrganizationAccessControl(organization\_id, identity\_id, OrganizationRole) + +# **updateOrganizationDefaultSecurity** +> OrganizationSecurity updateOrganizationDefaultSecurity(organization\_id, OrganizationRole) -Update the specified access to User for an Organization +Update the Organization default security ### Parameters |Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| | **organization\_id** | **String**| the Organization identifier | [default to null] | -| **identity\_id** | **String**| the User identifier | [default to null] | -| **OrganizationRole** | [**OrganizationRole**](../Models/OrganizationRole.md)| The new Organization Access Control | | +| **OrganizationRole** | [**OrganizationRole**](../Models/OrganizationRole.md)| This change the organization default security. The default security is the role assigned to any person not on the Access Control List. If the default security is None, then nobody outside of the ACL can access the organization. | | ### Return type -[**OrganizationAccessControl**](../Models/OrganizationAccessControl.md) +[**OrganizationSecurity**](../Models/OrganizationSecurity.md) ### Authorization @@ -373,6 +373,6 @@ Update the specified access to User for an Organization ### HTTP request headers -- **Content-Type**: application/json +- **Content-Type**: application/json, application/yaml - **Accept**: application/json diff --git a/doc/README.md b/doc/README.md index fa925ac3a..4bb49469c 100644 --- a/doc/README.md +++ b/doc/README.md @@ -42,20 +42,20 @@ All URIs are relative to *http://localhost* *DatasetApi* | [**updateDatasetAccessControl**](Apis/DatasetApi.md#updatedatasetaccesscontrol) | **PATCH** /organizations/{organization_id}/datasets/{dataset_id}/security/access/{identity_id} | Update the specified access to User for a Dataset | *DatasetApi* | [**updateTwingraphEntities**](Apis/DatasetApi.md#updatetwingraphentities) | **PATCH** /organizations/{organization_id}/datasets/{dataset_id}/twingraph/{type} | Update entities in a graph instance | *DatasetApi* | [**uploadTwingraph**](Apis/DatasetApi.md#uploadtwingraph) | **POST** /organizations/{organization_id}/datasets/{dataset_id} | Upload data from zip file to dataset's twingraph | -| *OrganizationApi* | [**addOrganizationAccessControl**](Apis/OrganizationApi.md#addorganizationaccesscontrol) | **POST** /organizations/{organization_id}/security/access | Add a control access to the Organization | -*OrganizationApi* | [**findAllOrganizations**](Apis/OrganizationApi.md#findallorganizations) | **GET** /organizations | List all Organizations | -*OrganizationApi* | [**findOrganizationById**](Apis/OrganizationApi.md#findorganizationbyid) | **GET** /organizations/{organization_id} | Get the details of an Organization | -*OrganizationApi* | [**getAllPermissions**](Apis/OrganizationApi.md#getallpermissions) | **GET** /organizations/permissions | Get all permissions per components | +| *OrganizationApi* | [**createOrganization**](Apis/OrganizationApi.md#createorganization) | **POST** /organizations | create a new organization | +*OrganizationApi* | [**createOrganizationAccessControl**](Apis/OrganizationApi.md#createorganizationaccesscontrol) | **POST** /organizations/{organization_id}/security/access | Add a control access to the Organization | +*OrganizationApi* | [**deleteOrganization**](Apis/OrganizationApi.md#deleteorganization) | **DELETE** /organizations/{organization_id} | delete an organization | +*OrganizationApi* | [**deleteOrganizationAccessControl**](Apis/OrganizationApi.md#deleteorganizationaccesscontrol) | **DELETE** /organizations/{organization_id}/security/access/{identity_id} | Remove the specified access from the given Organization | +*OrganizationApi* | [**getOrganization**](Apis/OrganizationApi.md#getorganization) | **GET** /organizations/{organization_id} | Get the details of an Organization | *OrganizationApi* | [**getOrganizationAccessControl**](Apis/OrganizationApi.md#getorganizationaccesscontrol) | **GET** /organizations/{organization_id}/security/access/{identity_id} | Get a control access for the Organization | *OrganizationApi* | [**getOrganizationPermissions**](Apis/OrganizationApi.md#getorganizationpermissions) | **GET** /organizations/{organization_id}/permissions/{role} | Get the Organization permissions by given role | *OrganizationApi* | [**getOrganizationSecurity**](Apis/OrganizationApi.md#getorganizationsecurity) | **GET** /organizations/{organization_id}/security | Get the Organization security information | -*OrganizationApi* | [**getOrganizationSecurityUsers**](Apis/OrganizationApi.md#getorganizationsecurityusers) | **GET** /organizations/{organization_id}/security/users | Get the Organization security users list | -*OrganizationApi* | [**registerOrganization**](Apis/OrganizationApi.md#registerorganization) | **POST** /organizations | Register a new organization | -*OrganizationApi* | [**removeOrganizationAccessControl**](Apis/OrganizationApi.md#removeorganizationaccesscontrol) | **DELETE** /organizations/{organization_id}/security/access/{identity_id} | Remove the specified access from the given Organization | -*OrganizationApi* | [**setOrganizationDefaultSecurity**](Apis/OrganizationApi.md#setorganizationdefaultsecurity) | **POST** /organizations/{organization_id}/security/default | Set the Organization default security | -*OrganizationApi* | [**unregisterOrganization**](Apis/OrganizationApi.md#unregisterorganization) | **DELETE** /organizations/{organization_id} | Unregister an organization | +*OrganizationApi* | [**listOrganizationSecurityUsers**](Apis/OrganizationApi.md#listorganizationsecurityusers) | **GET** /organizations/{organization_id}/security/users | Get the Organization security users list | +*OrganizationApi* | [**listOrganizations**](Apis/OrganizationApi.md#listorganizations) | **GET** /organizations | List all Organizations | +*OrganizationApi* | [**listPermissions**](Apis/OrganizationApi.md#listpermissions) | **GET** /organizations/permissions | Get all permissions per components | *OrganizationApi* | [**updateOrganization**](Apis/OrganizationApi.md#updateorganization) | **PATCH** /organizations/{organization_id} | Update an Organization | *OrganizationApi* | [**updateOrganizationAccessControl**](Apis/OrganizationApi.md#updateorganizationaccesscontrol) | **PATCH** /organizations/{organization_id}/security/access/{identity_id} | Update the specified access to User for an Organization | +*OrganizationApi* | [**updateOrganizationDefaultSecurity**](Apis/OrganizationApi.md#updateorganizationdefaultsecurity) | **POST** /organizations/{organization_id}/security/default | Update the Organization default security | | *RunApi* | [**deleteRun**](Apis/RunApi.md#deleterun) | **DELETE** /organizations/{organization_id}/workspaces/{workspace_id}/runners/{runner_id}/runs/{run_id} | Delete a run | *RunApi* | [**getRun**](Apis/RunApi.md#getrun) | **GET** /organizations/{organization_id}/workspaces/{workspace_id}/runners/{runner_id}/runs/{run_id} | Get the details of a run | *RunApi* | [**getRunLogs**](Apis/RunApi.md#getrunlogs) | **GET** /organizations/{organization_id}/workspaces/{workspace_id}/runners/{runner_id}/runs/{run_id}/logs | get the logs for the Run | diff --git a/organization/src/integrationTest/kotlin/com/cosmotech/organization/service/OrganizationServiceIntegrationTest.kt b/organization/src/integrationTest/kotlin/com/cosmotech/organization/service/OrganizationServiceIntegrationTest.kt index 5f2c73fb1..2d654d934 100644 --- a/organization/src/integrationTest/kotlin/com/cosmotech/organization/service/OrganizationServiceIntegrationTest.kt +++ b/organization/src/integrationTest/kotlin/com/cosmotech/organization/service/OrganizationServiceIntegrationTest.kt @@ -104,20 +104,20 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { } @Test - fun `findAllOrganizations with correct values`() { + fun `listOrganizations with correct values`() { val numberOfOrganizationToCreate = 20 val defaultPageSize = csmPlatformProperties.twincache.organization.defaultPageSize batchOrganizationCreation(numberOfOrganizationToCreate) - testFindAllOrganizations(null, null, numberOfOrganizationToCreate) - testFindAllOrganizations(0, null, defaultPageSize) - testFindAllOrganizations(0, 10, 10) - testFindAllOrganizations(1, 200, 0) - testFindAllOrganizations(1, 15, 5) + testlistOrganizations(null, null, numberOfOrganizationToCreate) + testlistOrganizations(0, null, defaultPageSize) + testlistOrganizations(0, 10, 10) + testlistOrganizations(1, 200, 0) + testlistOrganizations(1, 15, 5) } @Test - fun `findAllOrganizations with correct values and RBAC for current user`() { + fun `listOrganizations with correct values and RBAC for current user`() { runAsDifferentOrganizationUser() val numberOfOrganizationCreated = createOrganizationsWithAllCombinationOfRole(TEST_USER_ID) @@ -130,7 +130,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { } @Test - fun `findAllOrganizations with correct values and no RBAC for current user`() { + fun `listOrganizations with correct values and no RBAC for current user`() { runAsDifferentOrganizationUser() val numberOfOrganizationCreated = createOrganizationsWithAllCombinationOfRole(OTHER_TEST_USER_ID) @@ -146,50 +146,50 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { } @Test - fun `findAllOrganizations with wrong values`() { - testFindAllOrganizationsWithWrongValues() + fun `listOrganizations with wrong values`() { + testlistOrganizationsWithWrongValues() } @Test - fun `findOrganizationById as resource admin`() { + fun `getOrganization as resource admin`() { val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization("o-connector-test-1")) - assertNotNull(organizationApiService.findOrganizationById(organizationRegistered.id!!)) + organizationApiService.createOrganization(createTestOrganization("o-connector-test-1")) + assertNotNull(organizationApiService.getOrganization(organizationRegistered.id!!)) } @Test - fun `findOrganizationById as not resource admin`() { - testFindOrganizationByIdAsNotOwner(false, null, null, null, true) { runAsOrganizationUser() } + fun `getOrganization as not resource admin`() { + testgetOrganizationAsNotOwner(false, null, null, null, true) { runAsOrganizationUser() } } @Test - fun `findOrganizationById as not resource admin but with READ role`() { - testFindOrganizationByIdAsNotOwner(true, TEST_USER_ID, ROLE_NONE, ROLE_USER, false) { + fun `getOrganization as not resource admin but with READ role`() { + testgetOrganizationAsNotOwner(true, TEST_USER_ID, ROLE_NONE, ROLE_USER, false) { runAsOrganizationUser() } } @Test - fun `findOrganizationById as not resource admin but with WRITE role`() { - testFindOrganizationByIdAsNotOwner(true, TEST_USER_ID, ROLE_NONE, ROLE_EDITOR, false) { + fun `getOrganization as not resource admin but with WRITE role`() { + testgetOrganizationAsNotOwner(true, TEST_USER_ID, ROLE_NONE, ROLE_EDITOR, false) { runAsOrganizationUser() } } @Test - fun `findOrganizationById as not resource admin but with NONE role`() { - testFindOrganizationByIdAsNotOwner(true, TEST_USER_ID, ROLE_NONE, ROLE_NONE, true) { + fun `getOrganization as not resource admin but with NONE role`() { + testgetOrganizationAsNotOwner(true, TEST_USER_ID, ROLE_NONE, ROLE_NONE, true) { runAsOrganizationUser() } } @Test - fun `registerOrganization with minimal values`() { + fun `createOrganization with minimal values`() { assertDoesNotThrow { val name = "o-connector-test-1" val organizationToRegister = createTestOrganization(name) val organizationRegistered = - organizationApiService.registerOrganization(organizationToRegister) + organizationApiService.createOrganization(organizationToRegister) assertEquals( OrganizationSecurity( default = ROLE_NONE, @@ -201,27 +201,27 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { } @Test - fun `registerOrganization without required organization name`() { + fun `createOrganization without required organization name`() { assertThrows { - organizationApiService.registerOrganization(createTestOrganization("")) + organizationApiService.createOrganization(createTestOrganization("")) } } @Test - fun `registerOrganization with null required organization name`() { + fun `createOrganization with null required organization name`() { assertThrows { - organizationApiService.registerOrganization(Organization(name = null)) + organizationApiService.createOrganization(Organization(name = null)) } } @Test - fun `registerOrganization with security values`() { + fun `createOrganization with security values`() { assertDoesNotThrow { val name = "o-connector-test-1" val organizationToRegister = createTestOrganizationWithSimpleSecurity(name, OTHER_TEST_USER_ID, ROLE_USER, ROLE_NONE) val organizationRegistered = - organizationApiService.registerOrganization(organizationToRegister) + organizationApiService.createOrganization(organizationToRegister) assertEquals( OrganizationSecurity( default = ROLE_USER, @@ -235,47 +235,47 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { } @Test - fun `unregisterOrganization as resource admin`() { + fun `deleteOrganization as resource admin`() { assertDoesNotThrow { val name = "o-connector-test-1" val organizationToRegister = createTestOrganization(name) val organizationRegistered = - organizationApiService.registerOrganization(organizationToRegister) - organizationApiService.unregisterOrganization(organizationRegistered.id!!) + organizationApiService.createOrganization(organizationToRegister) + organizationApiService.deleteOrganization(organizationRegistered.id!!) } } @Test - fun `unregisterOrganization unexisting organization `() { + fun `deleteOrganization unexisting organization `() { assertThrows { - organizationApiService.unregisterOrganization("o-connector-test-1") + organizationApiService.deleteOrganization("o-connector-test-1") } } @Test - fun `unregisterOrganization no DELETE permission `() { + fun `deleteOrganization no DELETE permission `() { assertThrows { val name = "o-connector-test-1" val organizationToRegister = createTestOrganizationWithSimpleSecurity( name, OTHER_TEST_USER_ID, ROLE_USER, ROLE_ADMIN) val organizationRegistered = - organizationApiService.registerOrganization(organizationToRegister) - organizationApiService.unregisterOrganization(organizationRegistered.id!!) + organizationApiService.createOrganization(organizationToRegister) + organizationApiService.deleteOrganization(organizationRegistered.id!!) } } @Test - fun `unregisterOrganization not as resource admin but DELETE permission `() { + fun `deleteOrganization not as resource admin but DELETE permission `() { assertDoesNotThrow { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationToRegister = createTestOrganizationWithSimpleSecurity(name, TEST_USER_ID, ROLE_NONE, ROLE_ADMIN) val organizationRegistered = - organizationApiService.registerOrganization(organizationToRegister) + organizationApiService.createOrganization(organizationToRegister) runAsOrganizationUser() - organizationApiService.unregisterOrganization(organizationRegistered.id!!) + organizationApiService.deleteOrganization(organizationRegistered.id!!) } } @@ -284,7 +284,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { assertDoesNotThrow { val name = "o-connector-test-1" val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) organizationRegistered.name = "my-new-name" organizationApiService.updateOrganization( @@ -292,7 +292,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { assertEquals( organizationRegistered, - organizationApiService.findOrganizationById(organizationRegistered.id!!)) + organizationApiService.getOrganization(organizationRegistered.id!!)) } } @@ -301,7 +301,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { assertDoesNotThrow { val name = "o-connector-test-1" val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) organizationRegistered.security = OrganizationSecurity( @@ -312,12 +312,12 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationRegistered.id!!, organizationRegistered) // Organization Security cannot be updated via updateOrganization endpoint - // setOrganizationDefaultSecurity or - // addOrganizationAccessControl/updateOrganizationAccessControl/removeOrganizationAccessControl + // updateOrganizationDefaultSecurity or + // createOrganizationAccessControl/updateOrganizationAccessControl/deleteOrganizationAccessControl // Should be used instead assertNotEquals( organizationRegistered, - organizationApiService.findOrganizationById(organizationRegistered.id!!)) + organizationApiService.getOrganization(organizationRegistered.id!!)) } } @@ -327,7 +327,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( createTestOrganizationWithSimpleSecurity( name, TEST_USER_ID, ROLE_NONE, ROLE_EDITOR)) @@ -339,7 +339,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { assertEquals( organizationRegistered, - organizationApiService.findOrganizationById(organizationRegistered.id!!)) + organizationApiService.getOrganization(organizationRegistered.id!!)) } } @@ -349,7 +349,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) runAsOrganizationUser() organizationApiService.updateOrganization( organizationRegistered.id!!, organizationRegistered) @@ -357,7 +357,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { } @Test - fun getAllPermissions() { + fun listPermissions() { val mapAllPermissions = listOf( ComponentRolePermissions( @@ -438,7 +438,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { PERMISSION_WRITE_SECURITY, PERMISSION_DELETE), ))) - assertEquals(mapAllPermissions, organizationApiService.getAllPermissions()) + assertEquals(mapAllPermissions, organizationApiService.listPermissions()) } @Test @@ -446,7 +446,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { assertDoesNotThrow { val name = "o-connector-test-1" val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) var organizationUserPermissions = organizationApiService.getOrganizationPermissions( organizationRegistered.id!!, ROLE_VIEWER) @@ -492,7 +492,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( createTestOrganizationWithSimpleSecurity(name, TEST_USER_ID, ROLE_NONE, ROLE_USER)) runAsOrganizationUser() var organizationUserPermissions = @@ -540,7 +540,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) runAsOrganizationUser() organizationApiService.getOrganizationPermissions(organizationRegistered.id!!, ROLE_VIEWER) } @@ -551,7 +551,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { assertDoesNotThrow { val name = "o-connector-test-1" val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) assertNotNull(organizationApiService.getOrganizationSecurity(organizationRegistered.id!!)) } } @@ -569,7 +569,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( createTestOrganizationWithSimpleSecurity(name, TEST_USER_ID, ROLE_NONE, ROLE_USER)) runAsOrganizationUser() assertNotNull(organizationApiService.getOrganizationSecurity(organizationRegistered.id!!)) @@ -582,7 +582,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( createTestOrganizationWithSimpleSecurity(name, TEST_USER_ID, ROLE_NONE, ROLE_NONE)) runAsOrganizationUser() organizationApiService.getOrganizationSecurity(organizationRegistered.id!!) @@ -590,14 +590,14 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { } @Test - fun `setOrganizationDefaultSecurity as resource admin and existing role`() { + fun `updateOrganizationDefaultSecurity as resource admin and existing role`() { assertDoesNotThrow { val name = "o-connector-test-1" val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) val defaultRoleCreated = organizationRegistered.security?.default assertNotNull( - organizationApiService.setOrganizationDefaultSecurity( + organizationApiService.updateOrganizationDefaultSecurity( organizationRegistered.id!!, OrganizationRole(ROLE_ADMIN))) val defaultRoleUpdated = organizationApiService.getOrganizationSecurity(organizationRegistered.id!!).default @@ -606,28 +606,28 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { } @Test - fun `setOrganizationDefaultSecurity as resource admin and non-existing role`() { + fun `updateOrganizationDefaultSecurity as resource admin and non-existing role`() { assertThrows { val name = "o-connector-test-1" val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) - organizationApiService.setOrganizationDefaultSecurity( + organizationApiService.createOrganization(createTestOrganization(name)) + organizationApiService.updateOrganizationDefaultSecurity( organizationRegistered.id!!, OrganizationRole(UNKNOWN_IDENTIFIER)) } } @Test - fun `setOrganizationDefaultSecurity as not resource admin and WRITE_SECURITY_PERMISSION`() { + fun `updateOrganizationDefaultSecurity as not resource admin and WRITE_SECURITY_PERMISSION`() { assertDoesNotThrow { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( createTestOrganizationWithSimpleSecurity(name, TEST_USER_ID, ROLE_NONE, ROLE_ADMIN)) val defaultRoleCreated = organizationRegistered.security?.default runAsOrganizationUser() assertNotNull( - organizationApiService.setOrganizationDefaultSecurity( + organizationApiService.updateOrganizationDefaultSecurity( organizationRegistered.id!!, OrganizationRole(ROLE_ADMIN))) val defaultRoleUpdated = organizationApiService.getOrganizationSecurity(organizationRegistered.id!!).default @@ -636,15 +636,15 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { } @Test - fun `setOrganizationDefaultSecurity as not resource admin and no WRITE_SECURITY_PERMISSION`() { + fun `updateOrganizationDefaultSecurity as not resource admin and no WRITE_SECURITY_PERMISSION`() { assertThrows { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( createTestOrganizationWithSimpleSecurity(name, TEST_USER_ID, ROLE_NONE, ROLE_USER)) runAsOrganizationUser() - organizationApiService.setOrganizationDefaultSecurity( + organizationApiService.updateOrganizationDefaultSecurity( organizationRegistered.id!!, OrganizationRole(ROLE_ADMIN)) } } @@ -654,7 +654,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { assertDoesNotThrow { val name = "o-connector-test-1" val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) val organizationRole = organizationApiService.getOrganizationAccessControl( organizationRegistered.id!!, TEST_USER_ID) @@ -669,7 +669,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { assertThrows { val name = "o-connector-test-1" val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) organizationApiService.getOrganizationAccessControl(organizationRegistered.id!!, "UNKOWN") } } @@ -680,7 +680,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( createTestOrganizationWithSimpleSecurity(name, TEST_USER_ID, ROLE_NONE, ROLE_USER)) runAsOrganizationUser() val organizationRole = @@ -698,7 +698,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( createTestOrganizationWithSimpleSecurity(name, TEST_USER_ID, ROLE_NONE, ROLE_USER)) runAsOrganizationUser() organizationApiService.getOrganizationAccessControl( @@ -712,7 +712,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( createTestOrganizationWithSimpleSecurity(name, TEST_USER_ID, ROLE_NONE, ROLE_NONE)) runAsOrganizationUser() organizationApiService.getOrganizationAccessControl( @@ -721,18 +721,18 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { } @Test - fun `addOrganizationAccessControl as resource admin`() { + fun `createOrganizationAccessControl as resource admin`() { assertDoesNotThrow { val name = "o-connector-test-1" val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) assertThrows { organizationApiService.getOrganizationAccessControl( organizationRegistered.id!!, OTHER_TEST_USER_ID) } val otherUserACL = OrganizationAccessControl(id = OTHER_TEST_USER_ID, role = ROLE_VIEWER) assertNotNull( - organizationApiService.addOrganizationAccessControl( + organizationApiService.createOrganizationAccessControl( organizationRegistered.id!!, otherUserACL)) val otherUserACLRetrieved = @@ -743,25 +743,25 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { } @Test - fun `addOrganizationAccessControl as resource admin (ROLE_NONE)`() { + fun `createOrganizationAccessControl as resource admin (ROLE_NONE)`() { assertThrows { val name = "o-connector-test-1" val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) val otherUserACL = OrganizationAccessControl(id = OTHER_TEST_USER_ID, role = ROLE_NONE) - organizationApiService.addOrganizationAccessControl( + organizationApiService.createOrganizationAccessControl( organizationRegistered.id!!, otherUserACL) } } @Test - fun `addOrganizationAccessControl as not resource admin and PERMISSION_WRITE_SECURITY`() { + fun `createOrganizationAccessControl as not resource admin and PERMISSION_WRITE_SECURITY`() { assertDoesNotThrow { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( createTestOrganizationWithSimpleSecurity(name, TEST_USER_ID, ROLE_NONE, ROLE_ADMIN)) runAsOrganizationUser() assertThrows { @@ -770,7 +770,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { } val otherUserACL = OrganizationAccessControl(id = TEST_ADMIN_USER_ID, role = ROLE_VIEWER) assertNotNull( - organizationApiService.addOrganizationAccessControl( + organizationApiService.createOrganizationAccessControl( organizationRegistered.id!!, otherUserACL)) val otherUserACLRetrieved = @@ -781,12 +781,12 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { } @Test - fun `addOrganizationAccessControl as not resource admin and no PERMISSION_WRITE_SECURITY`() { + fun `createOrganizationAccessControl as not resource admin and no PERMISSION_WRITE_SECURITY`() { assertThrows { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( createTestOrganizationWithSimpleSecurity(name, TEST_USER_ID, ROLE_NONE, ROLE_USER)) runAsOrganizationUser() assertThrows { @@ -794,7 +794,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationRegistered.id!!, TEST_ADMIN_USER_ID) } val otherUserACL = OrganizationAccessControl(id = TEST_ADMIN_USER_ID, role = ROLE_VIEWER) - organizationApiService.addOrganizationAccessControl( + organizationApiService.createOrganizationAccessControl( organizationRegistered.id!!, otherUserACL) } } @@ -804,7 +804,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { assertThrows { val name = "o-connector-test-1" val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) organizationApiService.updateOrganizationAccessControl( organizationRegistered.id!!, TEST_USER_ID, OrganizationRole(role = ROLE_VIEWER)) } @@ -815,9 +815,9 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { assertDoesNotThrow { val name = "o-connector-test-1" val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) - organizationApiService.addOrganizationAccessControl( + organizationApiService.createOrganizationAccessControl( organizationRegistered.id!!, OrganizationAccessControl(id = OTHER_TEST_USER_ID, role = ROLE_VIEWER)) @@ -840,7 +840,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { assertThrows { val name = "o-connector-test-1" val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) organizationApiService.updateOrganizationAccessControl( organizationRegistered.id!!, TEST_USER_ID, OrganizationRole(role = ROLE_NONE)) @@ -852,7 +852,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { assertThrows { val name = "o-connector-test-1" val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) organizationApiService.updateOrganizationAccessControl( organizationRegistered.id!!, UNKNOWN_IDENTIFIER, OrganizationRole(role = ROLE_EDITOR)) @@ -864,7 +864,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { assertThrows { val name = "o-connector-test-1" val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) organizationApiService.updateOrganizationAccessControl( organizationRegistered.id!!, TEST_USER_ID, OrganizationRole(role = UNKNOWN_IDENTIFIER)) @@ -877,9 +877,9 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) - organizationApiService.addOrganizationAccessControl( + organizationApiService.createOrganizationAccessControl( organizationRegistered.id!!, OrganizationAccessControl(id = TEST_USER_ID, role = ROLE_ADMIN)) @@ -904,9 +904,9 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) - organizationApiService.addOrganizationAccessControl( + organizationApiService.createOrganizationAccessControl( organizationRegistered.id!!, OrganizationAccessControl(id = TEST_USER_ID, role = ROLE_VIEWER)) @@ -923,9 +923,9 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) - organizationApiService.addOrganizationAccessControl( + organizationApiService.createOrganizationAccessControl( organizationRegistered.id!!, OrganizationAccessControl(id = TEST_USER_ID, role = ROLE_VIEWER)) @@ -937,15 +937,16 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { } @Test - fun `removeOrganizationAccessControl as resource admin`() { + fun `deleteOrganizationAccessControl as resource admin`() { val name = "o-connector-test-1" val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) val otherUserACL = OrganizationAccessControl(id = OTHER_TEST_USER_ID, role = ROLE_VIEWER) - organizationApiService.addOrganizationAccessControl(organizationRegistered.id!!, otherUserACL) + organizationApiService.createOrganizationAccessControl( + organizationRegistered.id!!, otherUserACL) - organizationApiService.removeOrganizationAccessControl( + organizationApiService.deleteOrganizationAccessControl( organizationRegistered.id!!, OTHER_TEST_USER_ID) assertThrows { organizationApiService.getOrganizationAccessControl( @@ -954,17 +955,18 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { } @Test - fun `removeOrganizationAccessControl as not resource admin, WRITE_SECURITY permission`() { + fun `deleteOrganizationAccessControl as not resource admin, WRITE_SECURITY permission`() { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) val otherUserACL = OrganizationAccessControl(id = TEST_USER_ID, role = ROLE_ADMIN) - organizationApiService.addOrganizationAccessControl(organizationRegistered.id!!, otherUserACL) + organizationApiService.createOrganizationAccessControl( + organizationRegistered.id!!, otherUserACL) runAsOrganizationUser() - organizationApiService.removeOrganizationAccessControl( + organizationApiService.deleteOrganizationAccessControl( organizationRegistered.id!!, OTHER_TEST_USER_ID) assertThrows { organizationApiService.getOrganizationAccessControl( @@ -973,56 +975,57 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { } @Test - fun `removeOrganizationAccessControl as not resource admin, no WRITE_SECURITY permission`() { + fun `deleteOrganizationAccessControl as not resource admin, no WRITE_SECURITY permission`() { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) val otherUserACL = OrganizationAccessControl(id = TEST_USER_ID, role = ROLE_VIEWER) - organizationApiService.addOrganizationAccessControl(organizationRegistered.id!!, otherUserACL) + organizationApiService.createOrganizationAccessControl( + organizationRegistered.id!!, otherUserACL) runAsOrganizationUser() assertThrows { - organizationApiService.removeOrganizationAccessControl( + organizationApiService.deleteOrganizationAccessControl( organizationRegistered.id!!, OTHER_TEST_USER_ID) } } @Test - fun `getOrganizationSecurityUsers as resource admin`() { + fun `listOrganizationSecurityUsers as resource admin`() { val name = "o-connector-test-1" val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) val orgaUsers = - organizationApiService.getOrganizationSecurityUsers(organizationRegistered.id!!) + organizationApiService.listOrganizationSecurityUsers(organizationRegistered.id!!) assertEquals(listOf(TEST_USER_ID), orgaUsers) } @Test - fun `getOrganizationSecurityUsers as not resource admin, READ_SECURITY permission`() { + fun `listOrganizationSecurityUsers as not resource admin, READ_SECURITY permission`() { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( createTestOrganizationWithSimpleSecurity(name, TEST_USER_ID, ROLE_NONE, ROLE_USER)) runAsOrganizationUser() val orgaUsers = - organizationApiService.getOrganizationSecurityUsers(organizationRegistered.id!!) + organizationApiService.listOrganizationSecurityUsers(organizationRegistered.id!!) assertEquals(listOf(TEST_USER_ID, OTHER_TEST_USER_ID), orgaUsers) } @Test - fun `getOrganizationSecurityUsers as not resource admin, no READ_SECURITY permission`() { + fun `listOrganizationSecurityUsers as not resource admin, no READ_SECURITY permission`() { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( createTestOrganizationWithSimpleSecurity(name, TEST_USER_ID, ROLE_NONE, ROLE_NONE)) runAsOrganizationUser() assertThrows { - organizationApiService.getOrganizationSecurityUsers(organizationRegistered.id!!) + organizationApiService.listOrganizationSecurityUsers(organizationRegistered.id!!) } } @@ -1030,7 +1033,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { fun `testVerifyPermissionsAndReturnOrganization`() { val name = "o-connector-test-1" val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) assertDoesNotThrow { val organizationVerified = organizationApiService.getVerifiedOrganization(organizationRegistered.id!!) @@ -1043,7 +1046,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( createTestOrganizationWithSimpleSecurity(name, TEST_USER_ID, ROLE_NONE, ROLE_NONE)) runAsOrganizationUser() assertThrows { @@ -1059,11 +1062,11 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { } @Test - fun `As a viewer, I can only see my information in security property for findOrganizationById`() { + fun `As a viewer, I can only see my information in security property for getOrganization`() { val organization = makeOrganization(role = ROLE_VIEWER) - var organizationSaved = organizationApiService.registerOrganization(organization) + var organizationSaved = organizationApiService.createOrganization(organization) - organizationSaved = organizationApiService.findOrganizationById(organizationSaved.id!!) + organizationSaved = organizationApiService.getOrganization(organizationSaved.id!!) assertEquals( OrganizationSecurity( default = ROLE_NONE, @@ -1073,11 +1076,11 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { } @Test - fun `As a viewer, I can only see my information in security property for findAllOrganizations`() { + fun `As a viewer, I can only see my information in security property for listOrganizations`() { val organization = makeOrganization(role = ROLE_VIEWER) - organizationApiService.registerOrganization(organization) + organizationApiService.createOrganization(organization) - val organizations = organizationApiService.findAllOrganizations(null, null) + val organizations = organizationApiService.listOrganizations(null, null) organizations.forEach { assertEquals( OrganizationSecurity( @@ -1102,11 +1105,11 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val defaultPageSize = csmPlatformProperties.twincache.organization.defaultPageSize batchOrganizationCreation(numberOfOrganizationToCreate) - testFindAllOrganizations(null, null, numberOfOrganizationToCreate) - testFindAllOrganizations(0, null, defaultPageSize) - testFindAllOrganizations(0, 10, 10) - testFindAllOrganizations(1, 200, 0) - testFindAllOrganizations(1, 15, 5) + testlistOrganizations(null, null, numberOfOrganizationToCreate) + testlistOrganizations(0, null, defaultPageSize) + testlistOrganizations(0, 10, 10) + testlistOrganizations(1, 200, 0) + testlistOrganizations(1, 15, 5) } @Test @@ -1131,28 +1134,28 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { @Test fun `find All Organizations with wrong values`() { - testFindAllOrganizationsWithWrongValues() + testlistOrganizationsWithWrongValues() } @Test - fun `findOrganizationById as resource admin`() { + fun `getOrganization as resource admin`() { val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization("o-connector-test-1")) - assertNotNull(organizationApiService.findOrganizationById(organizationRegistered.id!!)) + organizationApiService.createOrganization(createTestOrganization("o-connector-test-1")) + assertNotNull(organizationApiService.getOrganization(organizationRegistered.id!!)) } @Test - fun `findOrganizationById as not resource admin`() { - testFindOrganizationByIdAsNotOwner(false, null, null, null, false) { runAsPlatformAdmin() } + fun `getOrganization as not resource admin`() { + testgetOrganizationAsNotOwner(false, null, null, null, false) { runAsPlatformAdmin() } } @Test - fun `registerOrganization with minimal values`() { + fun `createOrganization with minimal values`() { assertDoesNotThrow { val name = "o-connector-test-1" val organizationToRegister = createTestOrganization(name) val organizationRegistered = - organizationApiService.registerOrganization(organizationToRegister) + organizationApiService.createOrganization(organizationToRegister) assertEquals( OrganizationSecurity( default = ROLE_NONE, @@ -1165,27 +1168,27 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { } @Test - fun `registerOrganization with null required organization name`() { + fun `createOrganization with null required organization name`() { assertThrows { - organizationApiService.registerOrganization(Organization(name = null)) + organizationApiService.createOrganization(Organization(name = null)) } } @Test - fun `registerOrganization without required organization name`() { + fun `createOrganization without required organization name`() { assertThrows { - organizationApiService.registerOrganization(createTestOrganization("")) + organizationApiService.createOrganization(createTestOrganization("")) } } @Test - fun `registerOrganization with security values`() { + fun `createOrganization with security values`() { assertDoesNotThrow { val name = "o-connector-test-1" val organizationToRegister = createTestOrganizationWithSimpleSecurity(name, OTHER_TEST_USER_ID, ROLE_USER, ROLE_NONE) val organizationRegistered = - organizationApiService.registerOrganization(organizationToRegister) + organizationApiService.createOrganization(organizationToRegister) assertEquals( OrganizationSecurity( default = ROLE_USER, @@ -1199,34 +1202,34 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { } @Test - fun `unregisterOrganization as resource admin`() { + fun `deleteOrganization as resource admin`() { assertDoesNotThrow { val name = "o-connector-test-1" val organizationToRegister = createTestOrganization(name) val organizationRegistered = - organizationApiService.registerOrganization(organizationToRegister) - organizationApiService.unregisterOrganization(organizationRegistered.id!!) + organizationApiService.createOrganization(organizationToRegister) + organizationApiService.deleteOrganization(organizationRegistered.id!!) } } @Test - fun `unregisterOrganization unexisting organization `() { + fun `deleteOrganization unexisting organization `() { assertThrows { - organizationApiService.unregisterOrganization("o-connector-test-1") + organizationApiService.deleteOrganization("o-connector-test-1") } } @Test - fun `unregisterOrganization as not resource admin `() { + fun `deleteOrganization as not resource admin `() { assertDoesNotThrow { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationToRegister = createTestOrganizationWithSimpleSecurity(name, TEST_ADMIN_USER_ID, ROLE_NONE, ROLE_NONE) val organizationRegistered = - organizationApiService.registerOrganization(organizationToRegister) + organizationApiService.createOrganization(organizationToRegister) runAsPlatformAdmin() - organizationApiService.unregisterOrganization(organizationRegistered.id!!) + organizationApiService.deleteOrganization(organizationRegistered.id!!) } } @@ -1235,7 +1238,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { assertDoesNotThrow { val name = "o-connector-test-1" val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) organizationRegistered.name = "my-new-name" organizationApiService.updateOrganization( @@ -1243,7 +1246,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { assertEquals( organizationRegistered, - organizationApiService.findOrganizationById(organizationRegistered.id!!)) + organizationApiService.getOrganization(organizationRegistered.id!!)) } } @@ -1252,7 +1255,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { assertDoesNotThrow { val name = "o-connector-test-1" val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) organizationRegistered.security = OrganizationSecurity( @@ -1263,12 +1266,12 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { organizationRegistered.id!!, organizationRegistered) // Organization Security cannot be updated via updateOrganization endpoint - // setOrganizationDefaultSecurity or - // addOrganizationAccessControl/updateOrganizationAccessControl/removeOrganizationAccessControl + // updateOrganizationDefaultSecurity or + // createOrganizationAccessControl/updateOrganizationAccessControl/deleteOrganizationAccessControl // Should be used instead assertNotEquals( organizationRegistered, - organizationApiService.findOrganizationById(organizationRegistered.id!!)) + organizationApiService.getOrganization(organizationRegistered.id!!)) } } @@ -1278,7 +1281,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( createTestOrganizationWithSimpleSecurity( name, TEST_ADMIN_USER_ID, ROLE_NONE, ROLE_EDITOR)) @@ -1290,7 +1293,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { assertEquals( organizationRegistered, - organizationApiService.findOrganizationById(organizationRegistered.id!!)) + organizationApiService.getOrganization(organizationRegistered.id!!)) } } @@ -1300,7 +1303,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) runAsPlatformAdmin() organizationApiService.updateOrganization( organizationRegistered.id!!, organizationRegistered) @@ -1308,7 +1311,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { } @Test - fun getAllPermissions() { + fun listPermissions() { val mapAllPermissions = listOf( ComponentRolePermissions( @@ -1389,7 +1392,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { PERMISSION_WRITE_SECURITY, PERMISSION_DELETE), ))) - assertEquals(mapAllPermissions, organizationApiService.getAllPermissions()) + assertEquals(mapAllPermissions, organizationApiService.listPermissions()) } @Test @@ -1397,7 +1400,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { assertDoesNotThrow { val name = "o-connector-test-1" val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) var organizationUserPermissions = organizationApiService.getOrganizationPermissions( organizationRegistered.id!!, ROLE_VIEWER) @@ -1443,7 +1446,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( createTestOrganizationWithSimpleSecurity( name, TEST_USER_ID, ROLE_NONE, ROLE_VIEWER)) runAsPlatformAdmin() @@ -1492,7 +1495,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( createTestOrganizationWithSimpleSecurity( name, TEST_USER_ID, ROLE_NONE, ROLE_VIEWER)) runAsPlatformAdmin() @@ -1540,7 +1543,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { assertDoesNotThrow { val name = "o-connector-test-1" val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) assertNotNull(organizationApiService.getOrganizationSecurity(organizationRegistered.id!!)) } } @@ -1555,7 +1558,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { @Test fun `getOrganizationSecurity with no security organization`() { assertThrows { - organizationApiService.registerOrganization(createTestOrganization(name = "org1")) + organizationApiService.createOrganization(createTestOrganization(name = "org1")) organizationApiService.getOrganizationSecurity("org1") } } @@ -1566,7 +1569,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( createTestOrganizationWithSimpleSecurity( name, TEST_USER_ID, ROLE_NONE, ROLE_VIEWER)) runAsPlatformAdmin() @@ -1580,7 +1583,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( createTestOrganizationWithSimpleSecurity( name, TEST_ADMIN_USER_ID, ROLE_NONE, ROLE_NONE)) runAsPlatformAdmin() @@ -1589,14 +1592,14 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { } @Test - fun `setOrganizationDefaultSecurity as resource admin and existing role`() { + fun `updateOrganizationDefaultSecurity as resource admin and existing role`() { assertDoesNotThrow { val name = "o-connector-test-1" val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) val defaultRoleCreated = organizationRegistered.security?.default assertNotNull( - organizationApiService.setOrganizationDefaultSecurity( + organizationApiService.updateOrganizationDefaultSecurity( organizationRegistered.id!!, OrganizationRole(ROLE_ADMIN))) val defaultRoleUpdated = organizationApiService.getOrganizationSecurity(organizationRegistered.id!!).default @@ -1605,27 +1608,27 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { } @Test - fun `setOrganizationDefaultSecurity as resource admin and non-existing role`() { + fun `updateOrganizationDefaultSecurity as resource admin and non-existing role`() { assertThrows { val name = "o-connector-test-1" val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) - organizationApiService.setOrganizationDefaultSecurity( + organizationApiService.createOrganization(createTestOrganization(name)) + organizationApiService.updateOrganizationDefaultSecurity( organizationRegistered.id!!, OrganizationRole(UNKNOWN_IDENTIFIER)) } } @Test - fun `setOrganizationDefaultSecurity as not resource admin`() { + fun `updateOrganizationDefaultSecurity as not resource admin`() { assertDoesNotThrow { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) val defaultRoleCreated = organizationRegistered.security?.default runAsPlatformAdmin() assertNotNull( - organizationApiService.setOrganizationDefaultSecurity( + organizationApiService.updateOrganizationDefaultSecurity( organizationRegistered.id!!, OrganizationRole(ROLE_ADMIN))) val defaultRoleUpdated = organizationApiService.getOrganizationSecurity(organizationRegistered.id!!).default @@ -1634,18 +1637,18 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { } @Test - fun `setOrganizationDefaultSecurity as not resource admin and no WRITE_SECURITY_PERMISSION`() { + fun `updateOrganizationDefaultSecurity as not resource admin and no WRITE_SECURITY_PERMISSION`() { assertDoesNotThrow { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( createTestOrganizationWithSimpleSecurity( name, TEST_ADMIN_USER_ID, ROLE_NONE, ROLE_NONE)) val defaultRoleCreated = organizationRegistered.security?.default runAsPlatformAdmin() assertNotNull( - organizationApiService.setOrganizationDefaultSecurity( + organizationApiService.updateOrganizationDefaultSecurity( organizationRegistered.id!!, OrganizationRole(ROLE_ADMIN))) val defaultRoleUpdated = organizationApiService.getOrganizationSecurity(organizationRegistered.id!!).default @@ -1658,7 +1661,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { assertDoesNotThrow { val name = "o-connector-test-1" val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) val organizationRole = organizationApiService.getOrganizationAccessControl( organizationRegistered.id!!, TEST_ADMIN_USER_ID) @@ -1673,7 +1676,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { assertThrows { val name = "o-connector-test-1" val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) organizationApiService.getOrganizationAccessControl(organizationRegistered.id!!, "UNKOWN") } } @@ -1684,7 +1687,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( createTestOrganizationWithSimpleSecurity( name, TEST_ADMIN_USER_ID, ROLE_NONE, ROLE_VIEWER)) runAsPlatformAdmin() @@ -1703,7 +1706,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( createTestOrganizationWithSimpleSecurity( name, TEST_ADMIN_USER_ID, ROLE_NONE, ROLE_VIEWER)) runAsPlatformAdmin() @@ -1718,7 +1721,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( createTestOrganizationWithSimpleSecurity( name, TEST_ADMIN_USER_ID, ROLE_NONE, ROLE_NONE)) runAsPlatformAdmin() @@ -1733,7 +1736,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( createTestOrganizationWithSimpleSecurity( name, TEST_ADMIN_USER_ID, ROLE_NONE, ROLE_NONE)) runAsPlatformAdmin() @@ -1747,18 +1750,18 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { } @Test - fun `addOrganizationAccessControl as resource admin`() { + fun `createOrganizationAccessControl as resource admin`() { assertDoesNotThrow { val name = "o-connector-test-1" val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) assertThrows { organizationApiService.getOrganizationAccessControl( organizationRegistered.id!!, OTHER_TEST_USER_ID) } val otherUserACL = OrganizationAccessControl(id = OTHER_TEST_USER_ID, role = ROLE_VIEWER) assertNotNull( - organizationApiService.addOrganizationAccessControl( + organizationApiService.createOrganizationAccessControl( organizationRegistered.id!!, otherUserACL)) val otherUserACLRetrieved = @@ -1769,25 +1772,25 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { } @Test - fun `addOrganizationAccessControl as resource admin (ROLE_NONE)`() { + fun `createOrganizationAccessControl as resource admin (ROLE_NONE)`() { assertThrows { val name = "o-connector-test-1" val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) val otherUserACL = OrganizationAccessControl(id = OTHER_TEST_USER_ID, role = ROLE_NONE) - organizationApiService.addOrganizationAccessControl( + organizationApiService.createOrganizationAccessControl( organizationRegistered.id!!, otherUserACL) } } @Test - fun `addOrganizationAccessControl as not resource admin and PERMISSION_WRITE_SECURITY`() { + fun `createOrganizationAccessControl as not resource admin and PERMISSION_WRITE_SECURITY`() { assertDoesNotThrow { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( createTestOrganizationWithSimpleSecurity( name, TEST_ADMIN_USER_ID, ROLE_NONE, ROLE_ADMIN)) runAsPlatformAdmin() @@ -1797,7 +1800,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { } val otherUserACL = OrganizationAccessControl(id = TEST_USER_ID, role = ROLE_VIEWER) assertNotNull( - organizationApiService.addOrganizationAccessControl( + organizationApiService.createOrganizationAccessControl( organizationRegistered.id!!, otherUserACL)) val otherUserACLRetrieved = @@ -1808,12 +1811,12 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { } @Test - fun `addOrganizationAccessControl as not resource admin and no PERMISSION_WRITE_SECURITY`() { + fun `createOrganizationAccessControl as not resource admin and no PERMISSION_WRITE_SECURITY`() { assertDoesNotThrow { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( createTestOrganizationWithSimpleSecurity( name, TEST_ADMIN_USER_ID, ROLE_NONE, ROLE_NONE)) runAsPlatformAdmin() @@ -1823,7 +1826,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { } val otherUserACL = OrganizationAccessControl(id = TEST_USER_ID, role = ROLE_VIEWER) assertNotNull( - organizationApiService.addOrganizationAccessControl( + organizationApiService.createOrganizationAccessControl( organizationRegistered.id!!, otherUserACL)) val otherUserACLRetrieved = @@ -1838,7 +1841,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { assertThrows { val name = "o-connector-test-1" val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) organizationApiService.updateOrganizationAccessControl( organizationRegistered.id!!, TEST_ADMIN_USER_ID, OrganizationRole(role = ROLE_VIEWER)) } @@ -1849,9 +1852,9 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { assertDoesNotThrow { val name = "o-connector-test-1" val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) - organizationApiService.addOrganizationAccessControl( + organizationApiService.createOrganizationAccessControl( organizationRegistered.id!!, OrganizationAccessControl(id = OTHER_TEST_USER_ID, role = ROLE_VIEWER)) @@ -1874,7 +1877,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { assertThrows { val name = "o-connector-test-1" val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) organizationApiService.updateOrganizationAccessControl( organizationRegistered.id!!, TEST_USER_ID, OrganizationRole(role = ROLE_NONE)) @@ -1886,7 +1889,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { assertThrows { val name = "o-connector-test-1" val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) organizationApiService.updateOrganizationAccessControl( organizationRegistered.id!!, UNKNOWN_IDENTIFIER, OrganizationRole(role = ROLE_EDITOR)) @@ -1898,7 +1901,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { assertThrows { val name = "o-connector-test-1" val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) organizationApiService.updateOrganizationAccessControl( organizationRegistered.id!!, TEST_USER_ID, OrganizationRole(role = UNKNOWN_IDENTIFIER)) @@ -1911,9 +1914,9 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) - organizationApiService.addOrganizationAccessControl( + organizationApiService.createOrganizationAccessControl( organizationRegistered.id!!, OrganizationAccessControl(id = TEST_ADMIN_USER_ID, role = ROLE_ADMIN)) @@ -1938,9 +1941,9 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) - organizationApiService.addOrganizationAccessControl( + organizationApiService.createOrganizationAccessControl( organizationRegistered.id!!, OrganizationAccessControl(id = TEST_ADMIN_USER_ID, role = ROLE_VIEWER)) @@ -1965,9 +1968,9 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) - organizationApiService.addOrganizationAccessControl( + organizationApiService.createOrganizationAccessControl( organizationRegistered.id!!, OrganizationAccessControl(id = TEST_USER_ID, role = ROLE_VIEWER)) @@ -1979,15 +1982,16 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { } @Test - fun `removeOrganizationAccessControl as resource admin`() { + fun `deleteOrganizationAccessControl as resource admin`() { val name = "o-connector-test-1" val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) val otherUserACL = OrganizationAccessControl(id = OTHER_TEST_USER_ID, role = ROLE_VIEWER) - organizationApiService.addOrganizationAccessControl(organizationRegistered.id!!, otherUserACL) + organizationApiService.createOrganizationAccessControl( + organizationRegistered.id!!, otherUserACL) - organizationApiService.removeOrganizationAccessControl( + organizationApiService.deleteOrganizationAccessControl( organizationRegistered.id!!, OTHER_TEST_USER_ID) assertThrows { organizationApiService.getOrganizationAccessControl( @@ -1996,17 +2000,18 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { } @Test - fun `removeOrganizationAccessControl as not resource admin, WRITE_SECURITY permission`() { + fun `deleteOrganizationAccessControl as not resource admin, WRITE_SECURITY permission`() { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) val otherUserACL = OrganizationAccessControl(id = TEST_USER_ID, role = ROLE_ADMIN) - organizationApiService.addOrganizationAccessControl(organizationRegistered.id!!, otherUserACL) + organizationApiService.createOrganizationAccessControl( + organizationRegistered.id!!, otherUserACL) runAsPlatformAdmin() - organizationApiService.removeOrganizationAccessControl( + organizationApiService.deleteOrganizationAccessControl( organizationRegistered.id!!, OTHER_TEST_USER_ID) assertThrows { organizationApiService.getOrganizationAccessControl( @@ -2015,17 +2020,18 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { } @Test - fun `removeOrganizationAccessControl as not resource admin, no WRITE_SECURITY permission`() { + fun `deleteOrganizationAccessControl as not resource admin, no WRITE_SECURITY permission`() { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) val otherUserACL = OrganizationAccessControl(id = TEST_USER_ID, role = ROLE_ADMIN) - organizationApiService.addOrganizationAccessControl(organizationRegistered.id!!, otherUserACL) + organizationApiService.createOrganizationAccessControl( + organizationRegistered.id!!, otherUserACL) runAsPlatformAdmin() - organizationApiService.removeOrganizationAccessControl( + organizationApiService.deleteOrganizationAccessControl( organizationRegistered.id!!, OTHER_TEST_USER_ID) assertThrows { organizationApiService.getOrganizationAccessControl( @@ -2034,39 +2040,39 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { } @Test - fun `getOrganizationSecurityUsers as resource admin`() { + fun `listOrganizationSecurityUsers as resource admin`() { val name = "o-connector-test-1" val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) val orgaUsers = - organizationApiService.getOrganizationSecurityUsers(organizationRegistered.id!!) + organizationApiService.listOrganizationSecurityUsers(organizationRegistered.id!!) assertEquals(listOf(TEST_ADMIN_USER_ID), orgaUsers) } @Test - fun `getOrganizationSecurityUsers as not resource admin, READ_SECURITY permission`() { + fun `listOrganizationSecurityUsers as not resource admin, READ_SECURITY permission`() { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( createTestOrganizationWithSimpleSecurity(name, TEST_USER_ID, ROLE_NONE, ROLE_VIEWER)) runAsPlatformAdmin() val orgaUsers = - organizationApiService.getOrganizationSecurityUsers(organizationRegistered.id!!) + organizationApiService.listOrganizationSecurityUsers(organizationRegistered.id!!) assertEquals(listOf(TEST_USER_ID, OTHER_TEST_USER_ID), orgaUsers) } @Test - fun `getOrganizationSecurityUsers as not resource admin, no READ_SECURITY permission`() { + fun `listOrganizationSecurityUsers as not resource admin, no READ_SECURITY permission`() { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( createTestOrganizationWithSimpleSecurity(name, TEST_USER_ID, ROLE_NONE, ROLE_NONE)) runAsPlatformAdmin() val orgaUsers = - organizationApiService.getOrganizationSecurityUsers(organizationRegistered.id!!) + organizationApiService.listOrganizationSecurityUsers(organizationRegistered.id!!) assertEquals(listOf(TEST_USER_ID, OTHER_TEST_USER_ID), orgaUsers) } @@ -2083,7 +2089,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { OrganizationAccessControl(TEST_USER_ID, ROLE_ADMIN), OrganizationAccessControl(TEST_USER_ID, ROLE_EDITOR)))) assertThrows { - organizationApiService.registerOrganization(brokenOrganization) + organizationApiService.createOrganization(brokenOrganization) } } @@ -2097,10 +2103,10 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { default = ROLE_NONE, accessControlList = mutableListOf(OrganizationAccessControl(TEST_USER_ID, ROLE_ADMIN)))) - val organizationSaved = organizationApiService.registerOrganization(workingOrganization) + val organizationSaved = organizationApiService.createOrganization(workingOrganization) assertThrows { - organizationApiService.addOrganizationAccessControl( + organizationApiService.createOrganizationAccessControl( organizationSaved.id!!, OrganizationAccessControl(TEST_USER_ID, ROLE_EDITOR)) } } @@ -2109,7 +2115,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { fun `testVerifyPermissionsAndReturnOrganization`() { val name = "o-connector-test-1" val organizationRegistered = - organizationApiService.registerOrganization(createTestOrganization(name)) + organizationApiService.createOrganization(createTestOrganization(name)) assertDoesNotThrow { val organizationVerified = organizationApiService.getVerifiedOrganization(organizationRegistered.id!!) @@ -2122,7 +2128,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { val name = "o-connector-test-1" runAsDifferentOrganizationUser() val organizationRegistered = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( createTestOrganizationWithSimpleSecurity(name, TEST_USER_ID, ROLE_NONE, ROLE_NONE)) runAsPlatformAdmin() assertDoesNotThrow { @@ -2146,32 +2152,31 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { ) { val defaultPageSize = csmPlatformProperties.twincache.organization.defaultPageSize - testFindAllOrganizations(null, null, numberOfOrganizationReachableByTestUser) - testFindAllOrganizations(0, null, defaultPageSize) - testFindAllOrganizations( - 0, numberOfOrganizationCreated, numberOfOrganizationReachableByTestUser) - testFindAllOrganizations(1, 200, 0) - testFindAllOrganizations(1, 15, 15) + testlistOrganizations(null, null, numberOfOrganizationReachableByTestUser) + testlistOrganizations(0, null, defaultPageSize) + testlistOrganizations(0, numberOfOrganizationCreated, numberOfOrganizationReachableByTestUser) + testlistOrganizations(1, 200, 0) + testlistOrganizations(1, 15, 15) } - private fun testFindAllOrganizationsWithWrongValues() { + private fun testlistOrganizationsWithWrongValues() { logger.info("Should throw IllegalArgumentException when page and size are zeros") - assertThrows { organizationApiService.findAllOrganizations(0, 0) } + assertThrows { organizationApiService.listOrganizations(0, 0) } logger.info("Should throw IllegalArgumentException when page is negative") - assertThrows { organizationApiService.findAllOrganizations(-1, 10) } + assertThrows { organizationApiService.listOrganizations(-1, 10) } logger.info("Should throw IllegalArgumentException when size is negative") - assertThrows { organizationApiService.findAllOrganizations(0, -1) } + assertThrows { organizationApiService.listOrganizations(0, -1) } } - private fun testFindOrganizationByIdAsNotOwner( + private fun testgetOrganizationAsNotOwner( hasUserSecurity: Boolean, userId: String?, defaultRole: String?, userRole: String?, throwException: Boolean, - runFindOrganizationByIdAs: () -> Unit + rungetOrganizationAs: () -> Unit ) { runAsDifferentOrganizationUser() val organizationId = "o-connector-test-1" @@ -2182,12 +2187,12 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { } else { createTestOrganization(organizationId) } - val organizationRegistered = organizationApiService.registerOrganization(organization) + val organizationRegistered = organizationApiService.createOrganization(organization) - runFindOrganizationByIdAs() + rungetOrganizationAs() if (throwException) { assertThrows { - (organizationApiService.findOrganizationById(organizationRegistered.id!!)) + (organizationApiService.getOrganization(organizationRegistered.id!!)) } } else { assertNotNull(organizationRegistered) @@ -2224,7 +2229,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { logger.info("Creating $numberOfOrganizationToCreate connectors...") IntRange(1, numberOfOrganizationToCreate).forEach { val newOrganization = createTestOrganization("o-connector-test-$it") - organizationApiService.registerOrganization(newOrganization) + organizationApiService.createOrganization(newOrganization) } } @@ -2248,7 +2253,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { userId, defaultSecurity, securityRole) - organizationApiService.registerOrganization(organization) + organizationApiService.createOrganization(organization) numberOfOrganizationCreated++ } } @@ -2294,8 +2299,8 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() { OrganizationAccessControl(id = userName, role = role)))) } - internal fun testFindAllOrganizations(page: Int?, size: Int?, expectedResultSize: Int) { - val organizationList = organizationApiService.findAllOrganizations(page, size) + internal fun testlistOrganizations(page: Int?, size: Int?, expectedResultSize: Int) { + val organizationList = organizationApiService.listOrganizations(page, size) logger.info("Organization list retrieved contains : ${organizationList.size} elements") assertEquals(expectedResultSize, organizationList.size) } diff --git a/organization/src/integrationTest/kotlin/com/cosmotech/organization/service/OrganizationServiceRBACTest.kt b/organization/src/integrationTest/kotlin/com/cosmotech/organization/service/OrganizationServiceRBACTest.kt index a9a748c51..f6a98ee52 100644 --- a/organization/src/integrationTest/kotlin/com/cosmotech/organization/service/OrganizationServiceRBACTest.kt +++ b/organization/src/integrationTest/kotlin/com/cosmotech/organization/service/OrganizationServiceRBACTest.kt @@ -85,16 +85,16 @@ class OrganizationServiceRBACTest : CsmRedisTestBase() { ) .map { (role, shouldThrow) -> DynamicTest.dynamicTest("Test RBAC findAllOrganizations : $role") { - organizationApiService.registerOrganization( + organizationApiService.createOrganization( mockOrganizationWithRole(id = TEST_USER_MAIL, role = role)) - val organizations = organizationApiService.findAllOrganizations(null, null) + val organizations = organizationApiService.listOrganizations(null, null) assertEquals(shouldThrow, organizations.size) } } @TestFactory - fun `test RBAC findOrganizationById`() = + fun `test RBAC getOrganization`() = mapOf( ROLE_VIEWER to false, ROLE_EDITOR to false, @@ -104,30 +104,28 @@ class OrganizationServiceRBACTest : CsmRedisTestBase() { ROLE_ADMIN to false, ) .map { (role, shouldThrow) -> - DynamicTest.dynamicTest("Test RBAC findOrganizationById : $role") { + DynamicTest.dynamicTest("Test RBAC getOrganization : $role") { every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL val organization = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( mockOrganizationWithRole(TEST_USER_MAIL, role)) if (shouldThrow) { val exception = assertThrows { - organizationApiService.findOrganizationById(organization.id!!) + organizationApiService.getOrganization(organization.id!!) } assertEquals( "RBAC ${organization.id!!} - User does not have permission $PERMISSION_READ", exception.message) } else { - assertDoesNotThrow { - organizationApiService.findOrganizationById(organization.id!!) - } + assertDoesNotThrow { organizationApiService.getOrganization(organization.id!!) } } } } @TestFactory - fun `test RBAC unregisterOrganization`() = + fun `test RBAC deleteOrganization`() = mapOf( ROLE_VIEWER to true, ROLE_EDITOR to true, @@ -137,23 +135,21 @@ class OrganizationServiceRBACTest : CsmRedisTestBase() { ROLE_ADMIN to false, ) .map { (role, shouldThrow) -> - DynamicTest.dynamicTest("Test RBAC unregisterOrganization : $role") { + DynamicTest.dynamicTest("Test RBAC deleteOrganization : $role") { val organization = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( mockOrganizationWithRole(TEST_USER_MAIL, role)) if (shouldThrow) { val exception = assertThrows { - organizationApiService.unregisterOrganization(organization.id!!) + organizationApiService.deleteOrganization(organization.id!!) } assertEquals( "RBAC ${organization.id!!} - User does not have permission $PERMISSION_DELETE", exception.message) } else { - assertDoesNotThrow { - organizationApiService.unregisterOrganization(organization.id!!) - } + assertDoesNotThrow { organizationApiService.deleteOrganization(organization.id!!) } } } } @@ -171,7 +167,7 @@ class OrganizationServiceRBACTest : CsmRedisTestBase() { .map { (role, shouldThrow) -> DynamicTest.dynamicTest("Test RBAC updateOrganization : $role") { val organization = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( mockOrganizationWithRole(id = TEST_USER_MAIL, role = role)) if (shouldThrow) { @@ -206,7 +202,7 @@ class OrganizationServiceRBACTest : CsmRedisTestBase() { .map { (role, shouldThrow) -> DynamicTest.dynamicTest("Test RBAC getOrganizationPermissions : $role") { val organization = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( mockOrganizationWithRole(TEST_USER_MAIL, role)) if (shouldThrow) { @@ -237,7 +233,7 @@ class OrganizationServiceRBACTest : CsmRedisTestBase() { .map { (role, shouldThrow) -> DynamicTest.dynamicTest("Test RBAC getOrganizationSecurity : $role") { val organization = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( mockOrganizationWithRole(TEST_USER_MAIL, role)) if (shouldThrow) { @@ -257,7 +253,7 @@ class OrganizationServiceRBACTest : CsmRedisTestBase() { } @TestFactory - fun `test RBAC setOrganizationDefaultSecurity`() = + fun `test RBAC updateOrganizationDefaultSecurity`() = mapOf( ROLE_VIEWER to true, ROLE_EDITOR to true, @@ -267,15 +263,15 @@ class OrganizationServiceRBACTest : CsmRedisTestBase() { ROLE_ADMIN to false, ) .map { (role, shouldThrow) -> - DynamicTest.dynamicTest("Test RBAC setOrganizationDefaultSecurity : $role") { + DynamicTest.dynamicTest("Test RBAC updateOrganizationDefaultSecurity : $role") { val organization = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( mockOrganizationWithRole(TEST_USER_MAIL, role)) if (shouldThrow) { val exception = assertThrows { - organizationApiService.setOrganizationDefaultSecurity( + organizationApiService.updateOrganizationDefaultSecurity( organization.id!!, OrganizationRole(role)) } assertEquals( @@ -283,7 +279,7 @@ class OrganizationServiceRBACTest : CsmRedisTestBase() { exception.message) } else { assertDoesNotThrow { - organizationApiService.setOrganizationDefaultSecurity( + organizationApiService.updateOrganizationDefaultSecurity( organization.id!!, OrganizationRole(role)) } } @@ -291,7 +287,7 @@ class OrganizationServiceRBACTest : CsmRedisTestBase() { } @TestFactory - fun `test RBAC addOrganizationAccessControl`() = + fun `test RBAC createOrganizationAccessControl`() = mapOf( ROLE_VIEWER to true, ROLE_EDITOR to true, @@ -301,15 +297,15 @@ class OrganizationServiceRBACTest : CsmRedisTestBase() { ROLE_ADMIN to false, ) .map { (role, shouldThrow) -> - DynamicTest.dynamicTest("Test RBAC addOrganizationAccessControl : $role") { + DynamicTest.dynamicTest("Test RBAC createOrganizationAccessControl : $role") { val organization = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( mockOrganizationWithRole(TEST_USER_MAIL, role)) if (shouldThrow) { val exception = assertThrows { - organizationApiService.addOrganizationAccessControl( + organizationApiService.createOrganizationAccessControl( organization.id!!, OrganizationAccessControl("id", role)) } assertEquals( @@ -317,7 +313,7 @@ class OrganizationServiceRBACTest : CsmRedisTestBase() { exception.message) } else { assertDoesNotThrow { - organizationApiService.addOrganizationAccessControl( + organizationApiService.createOrganizationAccessControl( organization.id!!, OrganizationAccessControl("id", role)) } } @@ -337,7 +333,7 @@ class OrganizationServiceRBACTest : CsmRedisTestBase() { .map { (role, shouldThrow) -> DynamicTest.dynamicTest("Test RBAC getOrganizationAccessControl : $role") { val organization = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( mockOrganizationWithRole(TEST_USER_MAIL, role)) if (shouldThrow) { @@ -359,7 +355,7 @@ class OrganizationServiceRBACTest : CsmRedisTestBase() { } @TestFactory - fun `test RBAC removeOrganizationAccessControl`() = + fun `test RBAC deleteOrganizationAccessControl`() = mapOf( ROLE_VIEWER to true, ROLE_EDITOR to true, @@ -369,15 +365,15 @@ class OrganizationServiceRBACTest : CsmRedisTestBase() { ROLE_ADMIN to false, ) .map { (role, shouldThrow) -> - DynamicTest.dynamicTest("Test RBAC removeOrganizationAccessControl : $role") { + DynamicTest.dynamicTest("Test RBAC deleteOrganizationAccessControl : $role") { val organization = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( mockOrganizationWithRole(TEST_USER_MAIL, role)) if (shouldThrow) { val exception = assertThrows { - organizationApiService.removeOrganizationAccessControl( + organizationApiService.deleteOrganizationAccessControl( organization.id!!, TEST_USER_MAIL) } assertEquals( @@ -385,7 +381,7 @@ class OrganizationServiceRBACTest : CsmRedisTestBase() { exception.message) } else { assertDoesNotThrow { - organizationApiService.removeOrganizationAccessControl( + organizationApiService.deleteOrganizationAccessControl( organization.id!!, TEST_USER_MAIL) } } @@ -405,7 +401,7 @@ class OrganizationServiceRBACTest : CsmRedisTestBase() { .map { (role, shouldThrow) -> DynamicTest.dynamicTest("Test RBAC updateOrganizationAccessControl : $role") { val organization = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( mockOrganizationWithRole(TEST_USER_MAIL, role)) if (shouldThrow) { @@ -427,7 +423,7 @@ class OrganizationServiceRBACTest : CsmRedisTestBase() { } @TestFactory - fun `test RBAC getOrganizationSecurityUsers`() = + fun `test RBAC listOrganizationSecurityUsers`() = mapOf( ROLE_VIEWER to true, ROLE_EDITOR to false, @@ -437,22 +433,22 @@ class OrganizationServiceRBACTest : CsmRedisTestBase() { ROLE_ADMIN to false, ) .map { (role, shouldThrow) -> - DynamicTest.dynamicTest("Test RBAC getOrganizationSecurityUsers : $role") { + DynamicTest.dynamicTest("Test RBAC listOrganizationSecurityUsers : $role") { val organization = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( mockOrganizationWithRole(TEST_USER_MAIL, role)) if (shouldThrow) { val exception = assertThrows { - organizationApiService.getOrganizationSecurityUsers(organization.id!!) + organizationApiService.listOrganizationSecurityUsers(organization.id!!) } assertEquals( "RBAC ${organization.id!!} - User does not have permission $PERMISSION_READ_SECURITY", exception.message) } else { assertDoesNotThrow { - organizationApiService.getOrganizationSecurityUsers(organization.id!!) + organizationApiService.listOrganizationSecurityUsers(organization.id!!) } } } diff --git a/organization/src/main/kotlin/com/cosmotech/organization/service/OrganizationServiceImpl.kt b/organization/src/main/kotlin/com/cosmotech/organization/service/OrganizationServiceImpl.kt index 9d84e3b7d..3ffdd7d99 100644 --- a/organization/src/main/kotlin/com/cosmotech/organization/service/OrganizationServiceImpl.kt +++ b/organization/src/main/kotlin/com/cosmotech/organization/service/OrganizationServiceImpl.kt @@ -40,7 +40,7 @@ class OrganizationServiceImpl( private val organizationRepository: OrganizationRepository ) : CsmPhoenixService(), OrganizationApiServiceInterface { - override fun findAllOrganizations(page: Int?, size: Int?): List { + override fun listOrganizations(page: Int?, size: Int?): List { val defaultPageSize = csmPlatformProperties.twincache.organization.defaultPageSize val pageable = constructPageRequest(page, size, defaultPageSize) val isAdmin = csmAdmin.verifyCurrentRolesAdmin() @@ -71,11 +71,11 @@ class OrganizationServiceImpl( return result } - override fun findOrganizationById(organizationId: String): Organization { + override fun getOrganization(organizationId: String): Organization { return updateSecurityVisibility(getVerifiedOrganization(organizationId, PERMISSION_READ)) } - override fun registerOrganization(organization: Organization): Organization { + override fun createOrganization(organization: Organization): Organization { logger.trace("Registering organization: {}", organization) if (organization.name.isNullOrBlank()) { @@ -91,7 +91,7 @@ class OrganizationServiceImpl( return organizationRepository.save(createdOrganization) } - override fun unregisterOrganization(organizationId: String) { + override fun deleteOrganization(organizationId: String) { val organization = getVerifiedOrganization(organizationId, PERMISSION_DELETE) organizationRepository.delete(organization) this.eventPublisher.publishEvent(OrganizationUnregistered(this, organizationId)) @@ -122,7 +122,7 @@ class OrganizationServiceImpl( } } - override fun getAllPermissions(): List { + override fun listPermissions(): List { return getAllRolesDefinition().mapNotNull { ComponentRolePermissions(it.key, it.value) } } @@ -137,7 +137,7 @@ class OrganizationServiceImpl( ?: throw CsmResourceNotFoundException("RBAC not defined for ${organization.id}") } - override fun setOrganizationDefaultSecurity( + override fun updateOrganizationDefaultSecurity( organizationId: String, organizationRole: OrganizationRole ): OrganizationSecurity { @@ -157,13 +157,13 @@ class OrganizationServiceImpl( return OrganizationAccessControl(rbacAccessControl.id, rbacAccessControl.role) } - override fun addOrganizationAccessControl( + override fun createOrganizationAccessControl( organizationId: String, organizationAccessControl: OrganizationAccessControl ): OrganizationAccessControl { val organization = getVerifiedOrganization(organizationId, PERMISSION_WRITE_SECURITY) - val users = getOrganizationSecurityUsers(organizationId) + val users = listOrganizationSecurityUsers(organizationId) if (users.contains(organizationAccessControl.id)) { throw IllegalArgumentException("User is already in this Organization security") } @@ -196,14 +196,14 @@ class OrganizationServiceImpl( return OrganizationAccessControl(rbacAccessControl.id, rbacAccessControl.role) } - override fun removeOrganizationAccessControl(organizationId: String, identityId: String) { + override fun deleteOrganizationAccessControl(organizationId: String, identityId: String) { val organization = getVerifiedOrganization(organizationId, PERMISSION_WRITE_SECURITY) val rbacSecurity = csmRbac.removeUser(organization.getRbac(), identityId) organization.setRbac(rbacSecurity) organizationRepository.save(organization) } - override fun getOrganizationSecurityUsers(organizationId: String): List { + override fun listOrganizationSecurityUsers(organizationId: String): List { val organization = getVerifiedOrganization(organizationId, PERMISSION_READ_SECURITY) return csmRbac.getUsers(organization.getRbac()) } diff --git a/organization/src/main/openapi/organization.yaml b/organization/src/main/openapi/organization.yaml index c312e008d..6d5c633ea 100644 --- a/organization/src/main/openapi/organization.yaml +++ b/organization/src/main/openapi/organization.yaml @@ -14,12 +14,12 @@ tags: paths: /organizations: post: - operationId: registerOrganization + operationId: createOrganization tags: - organization - summary: Register a new organization + summary: create a new organization requestBody: - description: the Organization to register + description: the Organization to create required: true content: application/json: @@ -48,7 +48,7 @@ paths: "400": description: Bad request get: - operationId: findAllOrganizations + operationId: listOrganizations parameters: - name: page in: query @@ -87,7 +87,7 @@ paths: schema: type: string get: - operationId: findOrganizationById + operationId: getOrganization tags: - organization summary: Get the details of an Organization @@ -146,10 +146,10 @@ paths: "404": description: the Organization specified is unknown or you don't have access to it delete: - operationId: unregisterOrganization + operationId: deleteOrganization tags: - organization - summary: Unregister an organization + summary: delete an organization responses: "204": description: Request succeeded @@ -158,7 +158,7 @@ paths: /organizations/permissions: get: - operationId: getAllPermissions + operationId: listPermissions tags: - organization summary: Get all permissions per components @@ -244,10 +244,10 @@ paths: schema: type: string post: - operationId: setOrganizationDefaultSecurity + operationId: updateOrganizationDefaultSecurity tags: - organization - summary: Set the Organization default security + summary: Update the Organization default security requestBody: description: This change the organization default security. The default security is the role assigned to any person not on the Access Control List. @@ -289,7 +289,7 @@ paths: schema: type: string post: - operationId: addOrganizationAccessControl + operationId: createOrganizationAccessControl tags: - organization summary: Add a control access to the Organization @@ -382,7 +382,7 @@ paths: "404": description: The Organization specified is unknown or you don't have access to it delete: - operationId: removeOrganizationAccessControl + operationId: deleteOrganizationAccessControl tags: - organization summary: Remove the specified access from the given Organization @@ -401,7 +401,7 @@ paths: schema: type: string get: - operationId: getOrganizationSecurityUsers + operationId: listOrganizationSecurityUsers tags: - organization summary: Get the Organization security users list @@ -544,14 +544,14 @@ components: - id: "bob@mycosmocompany.com" role: "editor" BreweryOrganizationAccessControl: - summary: Set an access control. - description: Set an access control for a user to an organization. + summary: Update an access control. + description: Update an access control for a user to an organization. value: id: "bob@mycompany.com" role: "editor" BreweryOrganizationRole: - summary: Set an Organization Role. - description: Set an role for a user to an organization. + summary: Update an Organization Role. + description: Update an role for a user to an organization. value: role: "editor" CosmoThreeUsers: @@ -668,4 +668,3 @@ components: - validate - write_security - delete - diff --git a/organization/src/test/kotlin/com/cosmotech/organization/service/OrganizationServiceImplTests.kt b/organization/src/test/kotlin/com/cosmotech/organization/service/OrganizationServiceImplTests.kt index 1da3b9921..0be802e86 100644 --- a/organization/src/test/kotlin/com/cosmotech/organization/service/OrganizationServiceImplTests.kt +++ b/organization/src/test/kotlin/com/cosmotech/organization/service/OrganizationServiceImplTests.kt @@ -168,7 +168,7 @@ class OrganizationServiceImplTests { .map { (role, shouldThrow) -> rbacTest("Test RBAC read: $role", role, shouldThrow) { every { organizationRepository.findByIdOrNull(any()) } returns it - organizationApiService.findOrganizationById(it.id!!) + organizationApiService.getOrganization(it.id!!) } } @@ -185,7 +185,7 @@ class OrganizationServiceImplTests { rbacTest("Test RBAC unregister : $role", role, shouldThrow) { every { organizationRepository.findByIdOrNull(any()) } returns it every { organizationRepository.delete(any()) } returns Unit - organizationApiService.unregisterOrganization(it.id!!) + organizationApiService.deleteOrganization(it.id!!) } } @@ -236,7 +236,8 @@ class OrganizationServiceImplTests { rbacTest("Test RBAC setOrganizationDefaultSecurity : $role", role, shouldThrow) { every { organizationRepository.findByIdOrNull(any()) } returns it every { organizationRepository.save(any()) } returns it - organizationApiService.setOrganizationDefaultSecurity(it.id!!, OrganizationRole(role)) + organizationApiService.updateOrganizationDefaultSecurity( + it.id!!, OrganizationRole(role)) } } @@ -269,7 +270,7 @@ class OrganizationServiceImplTests { rbacTest("Test RBAC addOrganizationAccessControl : $role", role, shouldThrow) { every { organizationRepository.findByIdOrNull(any()) } returns it every { organizationRepository.save(any()) } returns it - organizationApiService.addOrganizationAccessControl( + organizationApiService.createOrganizationAccessControl( it.id!!, OrganizationAccessControl("id", "viewer")) } } @@ -305,7 +306,7 @@ class OrganizationServiceImplTests { rbacTest("Test RBAC removeOrganizationAccessControl : $role", role, shouldThrow) { every { organizationRepository.findByIdOrNull(any()) } returns it every { organizationRepository.save(any()) } returns it - organizationApiService.removeOrganizationAccessControl(it.id!!, "2$USER_ID") + organizationApiService.deleteOrganizationAccessControl(it.id!!, "2$USER_ID") } } @@ -321,7 +322,7 @@ class OrganizationServiceImplTests { .map { (role, shouldThrow) -> rbacTest("Test RBAC get users with role : $role", role, shouldThrow) { every { organizationRepository.findByIdOrNull(any()) } returns it - organizationApiService.getOrganizationSecurityUsers(it.id!!) + organizationApiService.listOrganizationSecurityUsers(it.id!!) } } diff --git a/run/src/integrationTest/kotlin/com/cosmotech/run/service/RunServiceIntegrationTest.kt b/run/src/integrationTest/kotlin/com/cosmotech/run/service/RunServiceIntegrationTest.kt index 8bf921b16..e15467746 100644 --- a/run/src/integrationTest/kotlin/com/cosmotech/run/service/RunServiceIntegrationTest.kt +++ b/run/src/integrationTest/kotlin/com/cosmotech/run/service/RunServiceIntegrationTest.kt @@ -141,7 +141,7 @@ class RunServiceIntegrationTest : CsmRunTestBase() { connectorSaved = connectorApiService.registerConnector(connector) organization = mockOrganization("Organization") - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) dataset = mockDataset(organizationSaved.id!!, "Dataset", connectorSaved) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) diff --git a/run/src/main/kotlin/com/cosmotech/run/RunContainerFactory.kt b/run/src/main/kotlin/com/cosmotech/run/RunContainerFactory.kt index cb99acc08..56c85487f 100644 --- a/run/src/main/kotlin/com/cosmotech/run/RunContainerFactory.kt +++ b/run/src/main/kotlin/com/cosmotech/run/RunContainerFactory.kt @@ -103,7 +103,7 @@ class RunContainerFactory( workflowType: String, runId: String ): StartInfo { - val organization = organizationService.findOrganizationById(organizationId) + val organization = organizationService.getOrganization(organizationId) val workspace = workspaceService.findWorkspaceById(organizationId, workspaceId) if (workspace.solution.solutionId == null) throw CsmClientException( diff --git a/runner/src/integrationTest/kotlin/com/cosmotech/runner/service/RunnerServiceIntegrationTest.kt b/runner/src/integrationTest/kotlin/com/cosmotech/runner/service/RunnerServiceIntegrationTest.kt index 89ddb5fe1..8d303bd50 100644 --- a/runner/src/integrationTest/kotlin/com/cosmotech/runner/service/RunnerServiceIntegrationTest.kt +++ b/runner/src/integrationTest/kotlin/com/cosmotech/runner/service/RunnerServiceIntegrationTest.kt @@ -159,7 +159,7 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { connectorSaved = connectorApiService.registerConnector(connector) organization = makeOrganization("Organization") - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) dataset = makeDataset(organizationSaved.id!!, "Dataset", connectorSaved) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -791,8 +791,7 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { @Test fun `access control list shouldn't contain more than one time each user on creation`() { - organizationSaved = - organizationApiService.registerOrganization(makeOrganization("organization")) + organizationSaved = organizationApiService.createOrganization(makeOrganization("organization")) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, makeSolution()) workspaceSaved = workspaceApiService.createWorkspace(organizationSaved.id!!, makeWorkspace()) val brokenRunner = @@ -812,8 +811,7 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { @Test fun `access control list can't add an existing user`() { - organizationSaved = - organizationApiService.registerOrganization(makeOrganization("organization")) + organizationSaved = organizationApiService.createOrganization(makeOrganization("organization")) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, makeSolution()) workspaceSaved = workspaceApiService.createWorkspace(organizationSaved.id!!, makeWorkspace()) val workingRunner = makeRunner() @@ -842,8 +840,7 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { @Test fun `access control list can't update a non-existing user`() { - organizationSaved = - organizationApiService.registerOrganization(makeOrganization("organization")) + organizationSaved = organizationApiService.createOrganization(makeOrganization("organization")) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, makeSolution()) workspaceSaved = workspaceApiService.createWorkspace(organizationSaved.id!!, makeWorkspace()) val workingRunner = makeRunner() @@ -1044,7 +1041,7 @@ class RunnerServiceIntegrationTest : CsmRedisTestBase() { @Test fun `As a viewer, I can only see my information in security property for listRunners`() { every { getCurrentAccountIdentifier(any()) } returns defaultName - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) materializeTwingraph() solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) diff --git a/runner/src/integrationTest/kotlin/com/cosmotech/runner/service/RunnerServiceRBACTest.kt b/runner/src/integrationTest/kotlin/com/cosmotech/runner/service/RunnerServiceRBACTest.kt index 9a2783f30..964ea7bfc 100644 --- a/runner/src/integrationTest/kotlin/com/cosmotech/runner/service/RunnerServiceRBACTest.kt +++ b/runner/src/integrationTest/kotlin/com/cosmotech/runner/service/RunnerServiceRBACTest.kt @@ -139,7 +139,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = role) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -203,7 +203,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -264,7 +264,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -328,7 +328,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, role) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -392,7 +392,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = role) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -454,7 +454,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, role) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -522,7 +522,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -584,7 +584,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -649,7 +649,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = role) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -713,7 +713,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, role) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -777,7 +777,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -841,7 +841,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -901,7 +901,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -965,7 +965,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = role) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -1031,7 +1031,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, role) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -1097,7 +1097,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -1163,7 +1163,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = role) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -1227,7 +1227,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -1299,7 +1299,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = role) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -1381,7 +1381,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, role) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -1463,7 +1463,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -1545,7 +1545,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -1623,7 +1623,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -1711,7 +1711,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = role) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -1776,7 +1776,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, role) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -1841,7 +1841,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -1906,7 +1906,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -1967,7 +1967,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -2038,7 +2038,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = role) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -2102,7 +2102,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, role) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -2166,7 +2166,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -2230,7 +2230,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -2290,7 +2290,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -2360,7 +2360,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = role) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -2431,7 +2431,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, role) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -2502,7 +2502,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -2573,7 +2573,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -2639,7 +2639,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -2715,7 +2715,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = role) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -2787,7 +2787,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, role) var datasetSaved = @@ -2861,7 +2861,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset( organizationSaved.id!!, connectorSaved, id = "unknown_user@test.com", role = ROLE_NONE) @@ -2923,7 +2923,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -2994,7 +2994,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -3061,7 +3061,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -3138,7 +3138,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = role) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -3205,7 +3205,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, role) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -3272,7 +3272,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -3339,7 +3339,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -3402,7 +3402,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -3475,7 +3475,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = role) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -3543,7 +3543,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, role) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -3617,7 +3617,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -3685,7 +3685,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -3749,7 +3749,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -3823,7 +3823,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = role) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -3901,7 +3901,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, role) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -3979,7 +3979,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -4057,7 +4057,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -4131,7 +4131,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -4215,7 +4215,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = role) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -4280,7 +4280,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, role) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -4345,7 +4345,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -4410,7 +4410,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) @@ -4471,7 +4471,7 @@ class RunnerServiceRBACTest : CsmRedisTestBase() { val connector = makeConnector() val connectorSaved = connectorApiService.registerConnector(connector) val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - val organizationSaved = organizationApiService.registerOrganization(organization) + val organizationSaved = organizationApiService.createOrganization(organization) val dataset = makeDataset(organizationSaved.id!!, connectorSaved, TEST_USER_MAIL, ROLE_ADMIN) var datasetSaved = datasetApiService.createDataset(organizationSaved.id!!, dataset) diff --git a/runner/src/main/kotlin/com/cosmotech/runner/service/RunnerService.kt b/runner/src/main/kotlin/com/cosmotech/runner/service/RunnerService.kt index de8480b36..fc2aec71c 100644 --- a/runner/src/main/kotlin/com/cosmotech/runner/service/RunnerService.kt +++ b/runner/src/main/kotlin/com/cosmotech/runner/service/RunnerService.kt @@ -79,7 +79,7 @@ class RunnerService( } fun inOrganization(organizationId: String): RunnerService = apply { - this.organization = organizationApiService.findOrganizationById(organizationId) + this.organization = organizationApiService.getOrganization(organizationId) } fun inWorkspace(workspaceId: String): RunnerService = apply { diff --git a/solution/src/integrationTest/kotlin/com/cosmotech/solution/service/SolutionServiceIntegrationTest.kt b/solution/src/integrationTest/kotlin/com/cosmotech/solution/service/SolutionServiceIntegrationTest.kt index 48c85ab1f..07acca2b9 100644 --- a/solution/src/integrationTest/kotlin/com/cosmotech/solution/service/SolutionServiceIntegrationTest.kt +++ b/solution/src/integrationTest/kotlin/com/cosmotech/solution/service/SolutionServiceIntegrationTest.kt @@ -80,7 +80,7 @@ class SolutionServiceIntegrationTest : CsmRedisTestBase() { rediSearchIndexer.createIndexFor(Solution::class.java) organization = makeOrganization("Organization test") - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) solution = makeSolution(organizationSaved.id!!) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) @@ -488,8 +488,7 @@ class SolutionServiceIntegrationTest : CsmRedisTestBase() { @Test fun `access control list shouldn't contain more than one time each user on creation`() { - organizationSaved = - organizationApiService.registerOrganization(makeOrganization("organization")) + organizationSaved = organizationApiService.createOrganization(makeOrganization("organization")) val brokenSolution = Solution( name = "solution", @@ -507,8 +506,7 @@ class SolutionServiceIntegrationTest : CsmRedisTestBase() { @Test fun `access control list shouldn't contain more than one time each user on ACL addition`() { - organizationSaved = - organizationApiService.registerOrganization(makeOrganization("organization")) + organizationSaved = organizationApiService.createOrganization(makeOrganization("organization")) val workingSolution = makeSolution() solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, workingSolution) diff --git a/solution/src/integrationTest/kotlin/com/cosmotech/solution/service/SolutionServiceRBACTest.kt b/solution/src/integrationTest/kotlin/com/cosmotech/solution/service/SolutionServiceRBACTest.kt index f2521fc42..62de640cc 100644 --- a/solution/src/integrationTest/kotlin/com/cosmotech/solution/service/SolutionServiceRBACTest.kt +++ b/solution/src/integrationTest/kotlin/com/cosmotech/solution/service/SolutionServiceRBACTest.kt @@ -106,7 +106,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) @@ -143,7 +143,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = role) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) @@ -179,7 +179,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { DynamicTest.dynamicTest("Test RBAC findAllSolutions : $role") { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER organizationSaved = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( makeOrganizationWithRole( organizationId = "id", id = TEST_USER_MAIL, role = role)) solutionApiService.createSolution( @@ -217,7 +217,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL @@ -253,7 +253,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) @@ -289,7 +289,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = role) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) @@ -326,7 +326,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) @@ -366,7 +366,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = role) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) @@ -407,7 +407,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) @@ -449,7 +449,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = role) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) @@ -492,7 +492,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) @@ -530,7 +530,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = role) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) @@ -569,7 +569,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) @@ -607,7 +607,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = role) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) @@ -646,7 +646,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) @@ -684,7 +684,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = role) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) @@ -723,7 +723,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) @@ -767,7 +767,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = role) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) @@ -811,7 +811,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) @@ -851,7 +851,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = role) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) @@ -892,7 +892,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) @@ -930,7 +930,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = role) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) @@ -969,7 +969,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) @@ -1011,7 +1011,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = role) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) @@ -1055,7 +1055,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) @@ -1094,7 +1094,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = role) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) @@ -1132,7 +1132,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) @@ -1172,7 +1172,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = role) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) @@ -1213,7 +1213,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) @@ -1251,7 +1251,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = role) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) @@ -1290,7 +1290,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) @@ -1328,7 +1328,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = role) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) @@ -1366,7 +1366,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) @@ -1406,7 +1406,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(id = TEST_USER_MAIL, role = role) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) @@ -1446,7 +1446,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(organizationSaved.id!!, TEST_USER_MAIL, role = ROLE_ADMIN) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) @@ -1484,7 +1484,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(organizationSaved.id!!, TEST_USER_MAIL, role = role) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) @@ -1523,7 +1523,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = role) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(organizationSaved.id!!, TEST_USER_MAIL, role = ROLE_ADMIN) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) @@ -1562,7 +1562,7 @@ class SolutionServiceRBACTest : CsmRedisTestBase() { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organization = makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) val solution = makeSolutionWithRole(organizationSaved.id!!, TEST_USER_MAIL, role = role) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) diff --git a/workspace/src/integrationTest/kotlin/com/cosmotech/workspace/service/WorkspaceServiceIntegrationTest.kt b/workspace/src/integrationTest/kotlin/com/cosmotech/workspace/service/WorkspaceServiceIntegrationTest.kt index cbf26c8d0..896b41053 100644 --- a/workspace/src/integrationTest/kotlin/com/cosmotech/workspace/service/WorkspaceServiceIntegrationTest.kt +++ b/workspace/src/integrationTest/kotlin/com/cosmotech/workspace/service/WorkspaceServiceIntegrationTest.kt @@ -102,7 +102,7 @@ class WorkspaceServiceIntegrationTest : CsmRedisTestBase() { rediSearchIndexer.createIndexFor(Dataset::class.java) organization = makeOrganization("Organization test") - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) solution = makeSolution(organizationSaved.id!!) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) @@ -331,8 +331,7 @@ class WorkspaceServiceIntegrationTest : CsmRedisTestBase() { @Test fun `access control list shouldn't contain more than one time each user on creation`() { - organizationSaved = - organizationApiService.registerOrganization(makeOrganization("organization")) + organizationSaved = organizationApiService.createOrganization(makeOrganization("organization")) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, makeSolution()) val brokenWorkspace = Workspace( @@ -353,8 +352,7 @@ class WorkspaceServiceIntegrationTest : CsmRedisTestBase() { @Test fun `access control list shouldn't contain more than one time each user on ACL addition`() { - organizationSaved = - organizationApiService.registerOrganization(makeOrganization("organization")) + organizationSaved = organizationApiService.createOrganization(makeOrganization("organization")) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, makeSolution()) val workingWorkspace = makeWorkspace() workspaceSaved = workspaceApiService.createWorkspace(organizationSaved.id!!, workingWorkspace) @@ -444,7 +442,7 @@ class WorkspaceServiceIntegrationTest : CsmRedisTestBase() { organization = makeOrganization( id = "Organization test", userName = CONNECTED_DEFAULT_USER, role = ROLE_VIEWER) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) solution = makeSolution(userName = CONNECTED_DEFAULT_USER, role = ROLE_VIEWER) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) dataset = makeDataset() @@ -468,7 +466,7 @@ class WorkspaceServiceIntegrationTest : CsmRedisTestBase() { organization = makeOrganization( id = "Organization test", userName = CONNECTED_DEFAULT_USER, role = ROLE_VIEWER) - organizationSaved = organizationApiService.registerOrganization(organization) + organizationSaved = organizationApiService.createOrganization(organization) solution = makeSolution(userName = CONNECTED_DEFAULT_USER, role = ROLE_VIEWER) solutionSaved = solutionApiService.createSolution(organizationSaved.id!!, solution) dataset = makeDataset() diff --git a/workspace/src/integrationTest/kotlin/com/cosmotech/workspace/service/WorkspaceServiceRBACTest.kt b/workspace/src/integrationTest/kotlin/com/cosmotech/workspace/service/WorkspaceServiceRBACTest.kt index 5344a8272..66c8a49b1 100644 --- a/workspace/src/integrationTest/kotlin/com/cosmotech/workspace/service/WorkspaceServiceRBACTest.kt +++ b/workspace/src/integrationTest/kotlin/com/cosmotech/workspace/service/WorkspaceServiceRBACTest.kt @@ -113,7 +113,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { DynamicTest.dynamicTest("Test RBAC findAllWorkspaces : $role") { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organizationSaved = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( makeOrganizationWithRole(id = TEST_USER_MAIL, role = role)) val solutionSaved = solutionApiService.createSolution( @@ -156,7 +156,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { DynamicTest.dynamicTest("Test RBAC createWorkspace : $role") { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organizationSaved = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( makeOrganizationWithRole(id = TEST_USER_MAIL, role = role)) val solutionSaved = solutionApiService.createSolution( @@ -217,7 +217,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { DynamicTest.dynamicTest("Test Organization RBAC findWorkspaceById : $role") { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organizationSaved = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( makeOrganizationWithRole(id = TEST_USER_MAIL, role = role)) val solutionSaved = solutionApiService.createSolution( @@ -268,7 +268,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { DynamicTest.dynamicTest("Test Workspace RBAC findWorkspaceById : $role") { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organizationSaved = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN)) val solutionSaved = solutionApiService.createSolution( @@ -313,7 +313,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { DynamicTest.dynamicTest("Test Organization RBAC deleteWorkspace : $role") { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organizationSaved = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( makeOrganizationWithRole(id = TEST_USER_MAIL, role = role)) val solutionSaved = solutionApiService.createSolution( @@ -358,7 +358,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { DynamicTest.dynamicTest("Test Workspace RBAC deleteWorkspace : $role") { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organizationSaved = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN)) val solutionSaved = solutionApiService.createSolution( @@ -403,7 +403,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { DynamicTest.dynamicTest("Test Organization RBAC updateWorkspace : $role") { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organizationSaved = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( makeOrganizationWithRole(id = TEST_USER_MAIL, role = role)) val solutionSaved = solutionApiService.createSolution( @@ -461,7 +461,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { DynamicTest.dynamicTest("Test Workspace RBAC updateWorkspace : $role") { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organizationSaved = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN)) val solutionSaved = solutionApiService.createSolution( @@ -519,7 +519,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { DynamicTest.dynamicTest("Test Organization RBAC findAllWorkspaceFiles : $role") { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organizationSaved = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( makeOrganizationWithRole(id = TEST_USER_MAIL, role = role)) val solutionSaved = solutionApiService.createSolution( @@ -565,7 +565,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { DynamicTest.dynamicTest("Test Workspace RBAC findAllWorkspaceFiles : $role") { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organizationSaved = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN)) val solutionSaved = solutionApiService.createSolution( @@ -611,7 +611,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { DynamicTest.dynamicTest("Test Organization RBAC uploadWorkspaceFile : $role") { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organizationSaved = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( makeOrganizationWithRole(id = TEST_USER_MAIL, role = role)) val solutionSaved = solutionApiService.createSolution( @@ -659,7 +659,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { DynamicTest.dynamicTest("Test Workspace RBAC uploadWorkspaceFile : $role") { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organizationSaved = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN)) val solutionSaved = solutionApiService.createSolution( @@ -707,7 +707,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { DynamicTest.dynamicTest("Test Organization RBAC deleteAllWorkspaceFiles : $role") { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organizationSaved = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( makeOrganizationWithRole(id = TEST_USER_MAIL, role = role)) val solutionSaved = solutionApiService.createSolution( @@ -753,7 +753,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { DynamicTest.dynamicTest("Test Workspace RBAC deleteAllWorkspaceFiles : $role") { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organizationSaved = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN)) val solutionSaved = solutionApiService.createSolution( @@ -799,7 +799,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { DynamicTest.dynamicTest("Test Organization RBAC downloadWorkspaceFile : $role") { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organizationSaved = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( makeOrganizationWithRole(id = TEST_USER_MAIL, role = role)) val solutionSaved = solutionApiService.createSolution( @@ -853,7 +853,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { DynamicTest.dynamicTest("Test Workspace RBAC downloadWorkspaceFile : $role") { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organizationSaved = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN)) val solutionSaved = solutionApiService.createSolution( @@ -907,7 +907,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { DynamicTest.dynamicTest("Test Organization RBAC deleteWorkspaceFile : $role") { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organizationSaved = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( makeOrganizationWithRole(id = TEST_USER_MAIL, role = role)) val solutionSaved = solutionApiService.createSolution( @@ -953,7 +953,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { DynamicTest.dynamicTest("Test Workspace RBAC deleteWorkspaceFile : $role") { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organizationSaved = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN)) val solutionSaved = solutionApiService.createSolution( @@ -999,7 +999,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { DynamicTest.dynamicTest("Test Organization RBAC getWorkspacePermissions : $role") { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organizationSaved = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( makeOrganizationWithRole(id = TEST_USER_MAIL, role = role)) val solutionSaved = solutionApiService.createSolution( @@ -1045,7 +1045,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { DynamicTest.dynamicTest("Test Workspace RBAC getWorkspacePermissions : $role") { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organizationSaved = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN)) val solutionSaved = solutionApiService.createSolution( @@ -1091,7 +1091,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { DynamicTest.dynamicTest("Test Organization RBAC getWorkspaceSecurity : $role") { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organizationSaved = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( makeOrganizationWithRole(id = TEST_USER_MAIL, role = role)) val solutionSaved = solutionApiService.createSolution( @@ -1137,7 +1137,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { DynamicTest.dynamicTest("Test Workspace RBAC getWorkspaceSecurity : $role") { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organizationSaved = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN)) val solutionSaved = solutionApiService.createSolution( @@ -1183,7 +1183,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { DynamicTest.dynamicTest("Test Organization RBAC setWorkspaceDefaultSecurity : $role") { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organizationSaved = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( makeOrganizationWithRole(id = TEST_USER_MAIL, role = role)) val solutionSaved = solutionApiService.createSolution( @@ -1229,7 +1229,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { DynamicTest.dynamicTest("Test Workspace RBAC setWorkspaceDefaultSecurity : $role") { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organizationSaved = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN)) val solutionSaved = solutionApiService.createSolution( @@ -1275,7 +1275,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { DynamicTest.dynamicTest("Test Organization RBAC addWorkspaceAccessControl : $role") { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organizationSaved = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( makeOrganizationWithRole(id = TEST_USER_MAIL, role = role)) val solutionSaved = solutionApiService.createSolution( @@ -1325,7 +1325,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { DynamicTest.dynamicTest("Test Workspace RBAC addWorkspaceAccessControl : $role") { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organizationSaved = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN)) val solutionSaved = solutionApiService.createSolution( @@ -1375,7 +1375,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { DynamicTest.dynamicTest("Test Organization RBAC getWorkspaceAccessControl : $role") { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organizationSaved = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( makeOrganizationWithRole(id = TEST_USER_MAIL, role = role)) val solutionSaved = solutionApiService.createSolution( @@ -1421,7 +1421,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { DynamicTest.dynamicTest("Test Workspace RBAC getWorkspaceAccessControl : $role") { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organizationSaved = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN)) val solutionSaved = solutionApiService.createSolution( @@ -1467,7 +1467,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { DynamicTest.dynamicTest("Test Organization RBAC removeWorkspaceAccessControl : $role") { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organizationSaved = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( makeOrganizationWithRole(id = TEST_USER_MAIL, role = role)) val solutionSaved = solutionApiService.createSolution( @@ -1513,7 +1513,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { DynamicTest.dynamicTest("Test Workspace RBAC removeWorkspaceAccessControl : $role") { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organizationSaved = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN)) val solutionSaved = solutionApiService.createSolution( @@ -1559,7 +1559,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { DynamicTest.dynamicTest("Test Organization RBAC updateWorkspaceAccessControl : $role") { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organizationSaved = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( makeOrganizationWithRole(id = TEST_USER_MAIL, role = role)) val solutionSaved = solutionApiService.createSolution( @@ -1611,7 +1611,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { DynamicTest.dynamicTest("Test Workspace RBAC updateWorkspaceAccessControl : $role") { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organizationSaved = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN)) val solutionSaved = solutionApiService.createSolution( @@ -1663,7 +1663,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { DynamicTest.dynamicTest("Test Organization RBAC getWorkspaceSecurityUsers : $role") { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organizationSaved = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( makeOrganizationWithRole(id = TEST_USER_MAIL, role = role)) val solutionSaved = solutionApiService.createSolution( @@ -1709,7 +1709,7 @@ class WorkspaceServiceRBACTest : CsmRedisTestBase() { DynamicTest.dynamicTest("Test Workspace RBAC getWorkspaceSecurityUsers : $role") { every { getCurrentAccountIdentifier(any()) } returns CONNECTED_ADMIN_USER val organizationSaved = - organizationApiService.registerOrganization( + organizationApiService.createOrganization( makeOrganizationWithRole(id = TEST_USER_MAIL, role = ROLE_ADMIN)) val solutionSaved = solutionApiService.createSolution( diff --git a/workspace/src/test/kotlin/com/cosmotech/workspace/service/WorkspaceServiceImplTests.kt b/workspace/src/test/kotlin/com/cosmotech/workspace/service/WorkspaceServiceImplTests.kt index baf78e76c..7082c66e8 100644 --- a/workspace/src/test/kotlin/com/cosmotech/workspace/service/WorkspaceServiceImplTests.kt +++ b/workspace/src/test/kotlin/com/cosmotech/workspace/service/WorkspaceServiceImplTests.kt @@ -265,7 +265,7 @@ class WorkspaceServiceImplTests { val organization = mockOrganization(ORGANIZATION_ID) organization.security = OrganizationSecurity(ROLE_ADMIN, mutableListOf()) - every { organizationService.findOrganizationById(ORGANIZATION_ID) } returns organization + every { organizationService.getOrganization(ORGANIZATION_ID) } returns organization val workspace = Workspace( key = "my-workspace-key",