Merge pull request #140 from IZIVIA/fix/#138-add-partner-id-on-get-credentials-roles

lilgallon · web-flow · commit 6050bab8a08a · 2024-10-31T16:57:09.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
@@ -24,6 +24,11 @@ open class CredentialsServerService(
     ): OcpiResponseBody<Credentials> = OcpiResponseBody.of {
         getCredentials(
             serverToken = token,
+            partnerId = partnerRepository.getPartnerIdByCredentialsServerToken(token)
+                ?: partnerRepository.getPartnerIdByCredentialsTokenA(credentialsTokenA = token)
+                ?: throw OcpiClientInvalidParametersException(
+                    "Invalid token ($token) - should be either a TokenA or a ServerToken",
+                ),
         )
     }
 
@@ -61,16 +66,17 @@ open class CredentialsServerService(
             debugHeaders = debugHeaders,
         )
 
+        // Remove token A because it is useless from now on
+        partnerRepository.invalidateCredentialsTokenA(partnerId = partnerId)
+
         // Return Credentials objet to sender with the token C inside (which is for us the server token)
         getCredentials(
             serverToken = partnerRepository.saveCredentialsServerToken(
                 partnerId = partnerId,
                 credentialsServerToken = generateUUIDv4Token(),
             ),
-        ).also {
-            // Remove token A because it is useless from now on
-            partnerRepository.invalidateCredentialsTokenA(partnerId = partnerId)
-        }
+            partnerId = partnerId,
+        )
     }
 
     override suspend fun put(
@@ -109,6 +115,7 @@ open class CredentialsServerService(
                 partnerId = partnerId,
                 credentialsServerToken = generateUUIDv4Token(),
             ),
+            partnerId = partnerId,
         )
     }
 
@@ -218,9 +225,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
`@@ -24,6 +24,11 @@ open class CredentialsServerService(`
`24`	`24`	`): OcpiResponseBody<Credentials> = OcpiResponseBody.of {`
`25`	`25`	`getCredentials(`
`26`	`26`	`serverToken = token,`
	`27`	`+ partnerId = partnerRepository.getPartnerIdByCredentialsServerToken(token)`
	`28`	`+ ?: partnerRepository.getPartnerIdByCredentialsTokenA(credentialsTokenA = token)`
	`29`	`+ ?: throw OcpiClientInvalidParametersException(`
	`30`	`+ "Invalid token ($token) - should be either a TokenA or a ServerToken",`
	`31`	`+ ),`
`27`	`32`	`)`
`28`	`33`	`}`
`29`	`34`
`@@ -61,16 +66,17 @@ open class CredentialsServerService(`
`61`	`66`	`debugHeaders = debugHeaders,`
`62`	`67`	`)`
`63`	`68`
	`69`	`+ // Remove token A because it is useless from now on`
	`70`	`+ partnerRepository.invalidateCredentialsTokenA(partnerId = partnerId)`
	`71`	`+`
`64`	`72`	`// Return Credentials objet to sender with the token C inside (which is for us the server token)`
`65`	`73`	`getCredentials(`
`66`	`74`	`serverToken = partnerRepository.saveCredentialsServerToken(`
`67`	`75`	`partnerId = partnerId,`
`68`	`76`	`credentialsServerToken = generateUUIDv4Token(),`
`69`	`77`	`),`
`70`		`- ).also {`
`71`		`- // Remove token A because it is useless from now on`
`72`		`- partnerRepository.invalidateCredentialsTokenA(partnerId = partnerId)`
`73`		`- }`
	`78`	`+ partnerId = partnerId,`
	`79`	`+ )`
`74`	`80`	`}`
`75`	`81`
`76`	`82`	`override suspend fun put(`
`@@ -109,6 +115,7 @@ open class CredentialsServerService(`
`109`	`115`	`partnerId = partnerId,`
`110`	`116`	`credentialsServerToken = generateUUIDv4Token(),`
`111`	`117`	`),`
	`118`	`+ partnerId = partnerId,`
`112`	`119`	`)`
`113`	`120`	`}`
`114`	`121`
`@@ -218,9 +225,9 @@ open class CredentialsServerService(`
`218`	`225`	`partnerRepository.saveEndpoints(partnerId = partnerId, endpoints = versionDetail.endpoints)`
`219`	`226`	`}`
`220`	`227`
`221`		`- private suspend fun getCredentials(serverToken: String): Credentials = Credentials(`
	`228`	`+ private suspend fun getCredentials(serverToken: String, partnerId: String): Credentials = Credentials(`
`222`	`229`	`token = serverToken,`
`223`	`230`	`url = serverVersionsUrlProvider(),`
`224`		`- roles = credentialsRoleRepository.getCredentialsRoles(),`
	`231`	`+ roles = credentialsRoleRepository.getCredentialsRoles(partnerId),`
`225`	`232`	`)`
`226`	`233`	`}`