fix(credentials): add partnerId on getCredentialsRoles

jggrimal · jggrimal · commit aa0571db7088 · 2024-10-31T16:37:04.000+01:00
diff --git a/ocpi-toolkit-2.2.1/src/main/kotlin/com/izivia/ocpi/toolkit/modules/credentials/repositories/CredentialsRoleRepository.kt b/ocpi-toolkit-2.2.1/src/main/kotlin/com/izivia/ocpi/toolkit/modules/credentials/repositories/CredentialsRoleRepository.kt
@@ -3,5 +3,5 @@ package com.izivia.ocpi.toolkit.modules.credentials.repositories
 import com.izivia.ocpi.toolkit.modules.credentials.domain.CredentialRole
 
 interface CredentialsRoleRepository {
-    suspend fun getCredentialsRoles(): List<CredentialRole>
+    suspend fun getCredentialsRoles(partnerId: String): List<CredentialRole>
 }
diff --git a/ocpi-toolkit-2.2.1/src/main/kotlin/com/izivia/ocpi/toolkit/modules/credentials/services/CredentialsClientService.kt b/ocpi-toolkit-2.2.1/src/main/kotlin/com/izivia/ocpi/toolkit/modules/credentials/services/CredentialsClientService.kt
@@ -99,7 +99,7 @@ open class CredentialsClientService(
             credentials = Credentials(
                 token = serverToken,
                 url = clientVersionsEndpointUrl,
-                roles = clientCredentialsRoleRepository.getCredentialsRoles(),
+                roles = clientCredentialsRoleRepository.getCredentialsRoles(partnerId),
             ),
             debugHeaders = emptyMap(),
         ).let {
@@ -148,7 +148,7 @@ open class CredentialsClientService(
             credentials = Credentials(
                 token = credentialsServerToken,
                 url = clientVersionsEndpointUrl,
-                roles = clientCredentialsRoleRepository.getCredentialsRoles(),
+                roles = clientCredentialsRoleRepository.getCredentialsRoles(partnerId),
             ),
             debugHeaders = emptyMap(),
         ).let {
diff --git a/ocpi-toolkit-2.2.1/src/main/kotlin/com/izivia/ocpi/toolkit/modules/credentials/services/CredentialsServerService.kt b/ocpi-toolkit-2.2.1/src/main/kotlin/com/izivia/ocpi/toolkit/modules/credentials/services/CredentialsServerService.kt
@@ -5,7 +5,9 @@ import com.izivia.ocpi.toolkit.modules.credentials.CredentialsInterface
 import com.izivia.ocpi.toolkit.modules.credentials.domain.Credentials
 import com.izivia.ocpi.toolkit.modules.credentials.repositories.CredentialsRoleRepository
 import com.izivia.ocpi.toolkit.modules.credentials.repositories.PartnerRepository
-import com.izivia.ocpi.toolkit.modules.versions.domain.*
+import com.izivia.ocpi.toolkit.modules.versions.domain.Version
+import com.izivia.ocpi.toolkit.modules.versions.domain.VersionDetails
+import com.izivia.ocpi.toolkit.modules.versions.domain.VersionNumber
 import com.izivia.ocpi.toolkit.transport.TransportClientBuilder
 import com.izivia.ocpi.toolkit.transport.domain.HttpMethod
 import com.izivia.ocpi.toolkit.transport.domain.HttpRequest
@@ -24,6 +26,8 @@ open class CredentialsServerService(
     ): OcpiResponseBody<Credentials> = OcpiResponseBody.of {
         getCredentials(
             serverToken = token,
+            partnerRepository.getPartnerIdByCredentialsServerToken(token)
+                ?: throw OcpiClientInvalidParametersException("Invalid ServerToken ($token)"),
         )
     }
 
@@ -36,7 +40,7 @@ open class CredentialsServerService(
         // It can happen when a partner unregister, then registers with its clientToken (which is the serverToken
         // for us)
         val partnerId = partnerRepository.getPartnerIdByCredentialsServerToken(token)
-            // If we could not find a partner with this serverToken, then, it means that it's probably a tokenA
+        // If we could not find a partner with this serverToken, then, it means that it's probably a tokenA
             ?: partnerRepository.getPartnerIdByCredentialsTokenA(credentialsTokenA = token)
             ?: throw OcpiClientInvalidParametersException(
                 "Invalid token ($token) - should be either a TokenA or a ServerToken",
@@ -70,6 +74,7 @@ open class CredentialsServerService(
                 partnerId = partnerId,
                 credentialsServerToken = generateUUIDv4Token(),
             ),
+            partnerId = partnerId,
         )
     }
 
@@ -109,6 +114,7 @@ open class CredentialsServerService(
                 partnerId = partnerId,
                 credentialsServerToken = generateUUIDv4Token(),
             ),
+            partnerId = partnerId,
         )
     }
 
@@ -218,9 +224,9 @@ open class CredentialsServerService(
         partnerRepository.saveEndpoints(partnerId = partnerId, endpoints = versionDetail.endpoints)
     }
 
-    private suspend fun getCredentials(serverToken: String): Credentials = Credentials(
+    private suspend fun getCredentials(serverToken: String, partnerId: String): Credentials = Credentials(
         token = serverToken,
         url = serverVersionsUrlProvider(),
-        roles = credentialsRoleRepository.getCredentialsRoles(),
+        roles = credentialsRoleRepository.getCredentialsRoles(partnerId),
     )
 }
diff --git a/ocpi-toolkit-2.2.1/src/test/kotlin/com/izivia/ocpi/toolkit/samples/credentials/CredentialsReceiver.kt b/ocpi-toolkit-2.2.1/src/test/kotlin/com/izivia/ocpi/toolkit/samples/credentials/CredentialsReceiver.kt
@@ -42,7 +42,7 @@ fun main() {
             service = CredentialsServerService(
                 partnerRepository = receiverPlatformRepository,
                 credentialsRoleRepository = object : CredentialsRoleRepository {
-                    override suspend fun getCredentialsRoles(): List<CredentialRole> = listOf(
+                    override suspend fun getCredentialsRoles(partnerId: String): List<CredentialRole> = listOf(
                         CredentialRole(
                             role = Role.EMSP,
                             businessDetails = BusinessDetails(name = "Receiver", website = null, logo = null),
diff --git a/ocpi-toolkit-2.2.1/src/test/kotlin/com/izivia/ocpi/toolkit/samples/credentials/CredentialsSender.kt b/ocpi-toolkit-2.2.1/src/test/kotlin/com/izivia/ocpi/toolkit/samples/credentials/CredentialsSender.kt
@@ -58,7 +58,7 @@ fun main() {
         clientPartnerRepository = senderPlatformRepository,
         clientVersionsRepository = senderVersionsRepository,
         clientCredentialsRoleRepository = object : CredentialsRoleRepository {
-            override suspend fun getCredentialsRoles(): List<CredentialRole> = listOf(
+            override suspend fun getCredentialsRoles(partnerId: String): List<CredentialRole> = listOf(
                 CredentialRole(
                     role = Role.CPO,
                     businessDetails = BusinessDetails(name = "Sender", website = null, logo = null),
diff --git a/ocpi-toolkit-2.2.1/src/test/kotlin/com/izivia/ocpi/toolkit/tests/integration/CredentialsIntegrationTests.kt b/ocpi-toolkit-2.2.1/src/test/kotlin/com/izivia/ocpi/toolkit/tests/integration/CredentialsIntegrationTests.kt
@@ -65,7 +65,7 @@ class CredentialsIntegrationTests : BaseServerIntegrationTest() {
                 service = CredentialsServerService(
                     partnerRepository = receiverPlatformRepo,
                     credentialsRoleRepository = object : CredentialsRoleRepository {
-                        override suspend fun getCredentialsRoles(): List<CredentialRole> = listOf(
+                        override suspend fun getCredentialsRoles(partnerId: String): List<CredentialRole> = listOf(
                             CredentialRole(
                                 role = Role.EMSP,
                                 businessDetails = BusinessDetails(name = "Receiver", website = null, logo = null),
@@ -135,7 +135,7 @@ class CredentialsIntegrationTests : BaseServerIntegrationTest() {
             clientPartnerRepository = PartnerMongoRepository(collection = senderServerSetupResult.partnerCollection),
             clientVersionsRepository = VersionsCacheRepository(baseUrl = senderServerSetupResult.transport.baseUrl),
             clientCredentialsRoleRepository = object : CredentialsRoleRepository {
-                override suspend fun getCredentialsRoles(): List<CredentialRole> = listOf(
+                override suspend fun getCredentialsRoles(partnerId: String): List<CredentialRole> = listOf(
                     CredentialRole(
                         role = Role.CPO,
                         businessDetails = BusinessDetails(name = "Sender", website = null, logo = null),

Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@ package com.izivia.ocpi.toolkit.modules.credentials.repositories`
`3`	`3`	`import com.izivia.ocpi.toolkit.modules.credentials.domain.CredentialRole`
`4`	`4`
`5`	`5`	`interface CredentialsRoleRepository {`
`6`		`- suspend fun getCredentialsRoles(): List<CredentialRole>`
	`6`	`+ suspend fun getCredentialsRoles(partnerId: String): List<CredentialRole>`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,9 @@ import com.izivia.ocpi.toolkit.modules.credentials.CredentialsInterface`
`5`	`5`	`import com.izivia.ocpi.toolkit.modules.credentials.domain.Credentials`
`6`	`6`	`import com.izivia.ocpi.toolkit.modules.credentials.repositories.CredentialsRoleRepository`
`7`	`7`	`import com.izivia.ocpi.toolkit.modules.credentials.repositories.PartnerRepository`
`8`		`-import com.izivia.ocpi.toolkit.modules.versions.domain.*`
	`8`	`+import com.izivia.ocpi.toolkit.modules.versions.domain.Version`
	`9`	`+import com.izivia.ocpi.toolkit.modules.versions.domain.VersionDetails`
	`10`	`+import com.izivia.ocpi.toolkit.modules.versions.domain.VersionNumber`
`9`	`11`	`import com.izivia.ocpi.toolkit.transport.TransportClientBuilder`
`10`	`12`	`import com.izivia.ocpi.toolkit.transport.domain.HttpMethod`
`11`	`13`	`import com.izivia.ocpi.toolkit.transport.domain.HttpRequest`
`@@ -24,6 +26,8 @@ open class CredentialsServerService(`
`24`	`26`	`): OcpiResponseBody<Credentials> = OcpiResponseBody.of {`
`25`	`27`	`getCredentials(`
`26`	`28`	`serverToken = token,`
	`29`	`+ partnerRepository.getPartnerIdByCredentialsServerToken(token)`
	`30`	`+ ?: throw OcpiClientInvalidParametersException("Invalid ServerToken ($token)"),`
`27`	`31`	`)`
`28`	`32`	`}`
`29`	`33`
`@@ -36,7 +40,7 @@ open class CredentialsServerService(`
`36`	`40`	`// It can happen when a partner unregister, then registers with its clientToken (which is the serverToken`
`37`	`41`	`// for us)`
`38`	`42`	`val partnerId = partnerRepository.getPartnerIdByCredentialsServerToken(token)`
`39`		`- // If we could not find a partner with this serverToken, then, it means that it's probably a tokenA`
	`43`	`+ // If we could not find a partner with this serverToken, then, it means that it's probably a tokenA`
`40`	`44`	`?: partnerRepository.getPartnerIdByCredentialsTokenA(credentialsTokenA = token)`
`41`	`45`	`?: throw OcpiClientInvalidParametersException(`
`42`	`46`	`"Invalid token ($token) - should be either a TokenA or a ServerToken",`
`@@ -70,6 +74,7 @@ open class CredentialsServerService(`
`70`	`74`	`partnerId = partnerId,`
`71`	`75`	`credentialsServerToken = generateUUIDv4Token(),`
`72`	`76`	`),`
	`77`	`+ partnerId = partnerId,`
`73`	`78`	`)`
`74`	`79`	`}`
`75`	`80`
`@@ -109,6 +114,7 @@ open class CredentialsServerService(`
`109`	`114`	`partnerId = partnerId,`
`110`	`115`	`credentialsServerToken = generateUUIDv4Token(),`
`111`	`116`	`),`
	`117`	`+ partnerId = partnerId,`
`112`	`118`	`)`
`113`	`119`	`}`
`114`	`120`
`@@ -218,9 +224,9 @@ open class CredentialsServerService(`
`218`	`224`	`partnerRepository.saveEndpoints(partnerId = partnerId, endpoints = versionDetail.endpoints)`
`219`	`225`	`}`
`220`	`226`
`221`		`- private suspend fun getCredentials(serverToken: String): Credentials = Credentials(`
	`227`	`+ private suspend fun getCredentials(serverToken: String, partnerId: String): Credentials = Credentials(`
`222`	`228`	`token = serverToken,`
`223`	`229`	`url = serverVersionsUrlProvider(),`
`224`		`- roles = credentialsRoleRepository.getCredentialsRoles(),`
	`230`	`+ roles = credentialsRoleRepository.getCredentialsRoles(partnerId),`
`225`	`231`	`)`
`226`	`232`	`}`