Merge pull request #16 from IZIVIA/fix/#15-use-right-tokens

IZIVIA · Nov 2, 2023 · 486a2f3 · 486a2f3
2 parents a4ea337 + 3766c0e
commit 486a2f3
Show file tree

Hide file tree

Showing 49 changed files with 514 additions and 370 deletions.
diff --git a/ocpi-toolkit-2.1.1-gireve/src/main/kotlin/com/izivia/ocpi/toolkit/common/HttpUtils.kt b/ocpi-toolkit-2.1.1-gireve/src/main/kotlin/com/izivia/ocpi/toolkit/common/HttpUtils.kt
@@ -132,7 +132,7 @@ fun HttpRequest.parseAuthorizationHeader() = (headers["Authorization"] ?: header
  * @throws OcpiClientNotEnoughInformationException if the token is missing
  * @throws HttpException if the authorization header is missing
  */
-fun PlatformRepository.tokenFilter(httpRequest: HttpRequest) {
+fun PlatformRepository.checkToken(httpRequest: HttpRequest) {
     val token = httpRequest.parseAuthorizationHeader()
 
     if (!platformExistsWithTokenA(token) &&
@@ -143,9 +143,9 @@ fun PlatformRepository.tokenFilter(httpRequest: HttpRequest) {
     }
 }
 
-fun TransportClientBuilder.buildFor(module: ModuleID, platform: String, platformRepository: PlatformRepository) =
+fun TransportClientBuilder.buildFor(module: ModuleID, platformUrl: String, platformRepository: PlatformRepository) =
     platformRepository
-        .getEndpoints(platformUrl = platform)
+        .getEndpoints(platformUrl = platformUrl)
         .find { it.identifier == module }
         ?.let { build(baseUrl = it.url) }
         ?: throw OcpiToolkitUnknownEndpointException(endpointName = module.name)
diff --git a/....1-gireve/src/main/kotlin/com/izivia/ocpi/toolkit/modules/locations/LocationsCpoClient.kt b/....1-gireve/src/main/kotlin/com/izivia/ocpi/toolkit/modules/locations/LocationsCpoClient.kt
@@ -24,7 +24,7 @@ class LocationsCpoClient(
     private fun buildTransport(): TransportClient = transportClientBuilder
         .buildFor(
             module = ModuleID.locations,
-            platform = serverVersionsEndpointUrl,
+            platformUrl = serverVersionsEndpointUrl,
             platformRepository = platformRepository
         )
 
@@ -174,4 +174,4 @@ class LocationsCpoClient(
                 ).authenticate(platformRepository = platformRepository, baseUrl = serverVersionsEndpointUrl)
             )
             .parseBody()
-}
+}
diff --git a/....1-gireve/src/main/kotlin/com/izivia/ocpi/toolkit/modules/locations/LocationsCpoServer.kt b/....1-gireve/src/main/kotlin/com/izivia/ocpi/toolkit/modules/locations/LocationsCpoServer.kt
@@ -1,7 +1,7 @@
 package com.izivia.ocpi.toolkit.modules.locations
 
 import com.izivia.ocpi.toolkit.common.httpResponse
-import com.izivia.ocpi.toolkit.common.tokenFilter
+import com.izivia.ocpi.toolkit.common.checkToken
 import com.izivia.ocpi.toolkit.modules.credentials.repositories.PlatformRepository
 import com.izivia.ocpi.toolkit.transport.TransportServer
 import com.izivia.ocpi.toolkit.transport.domain.FixedPathSegment
@@ -28,7 +28,7 @@ class LocationsCpoServer(
                 method = HttpMethod.GET,
                 path = basePath,
                 queryParams = listOf("date_from", "date_to", "offset", "limit"),
-                filters = listOf(platformRepository::tokenFilter)
+                filters = listOf(platformRepository::checkToken)
             ) { req ->
                 req.httpResponse {
                     val dateFrom = req.queryParams["date_from"]
@@ -47,7 +47,7 @@ class LocationsCpoServer(
             transportServer.handle(
                 method = HttpMethod.GET,
                 path = basePath + VariablePathSegment("locationId"),
-                filters = listOf(platformRepository::tokenFilter)
+                filters = listOf(platformRepository::checkToken)
             ) { req ->
                 req.httpResponse {
                     service
@@ -63,7 +63,7 @@ class LocationsCpoServer(
                     VariablePathSegment("locationId"),
                     VariablePathSegment("evseUid")
                 ),
-                filters = listOf(platformRepository::tokenFilter)
+                filters = listOf(platformRepository::checkToken)
             ) { req ->
                 req.httpResponse {
                     service
@@ -81,7 +81,7 @@ class LocationsCpoServer(
                     VariablePathSegment("evseUid"),
                     VariablePathSegment("connectorId")
                 ),
-                filters = listOf(platformRepository::tokenFilter)
+                filters = listOf(platformRepository::checkToken)
             ) { req ->
                 req.httpResponse {
                     service

diff --git a/...1-gireve/src/main/kotlin/com/izivia/ocpi/toolkit/modules/locations/LocationsEmspClient.kt b/...1-gireve/src/main/kotlin/com/izivia/ocpi/toolkit/modules/locations/LocationsEmspClient.kt
@@ -27,7 +27,7 @@ class LocationsEmspClient(
     private fun buildTransport(): TransportClient = transportClientBuilder
         .buildFor(
             module = ModuleID.locations,
-            platform = serverVersionsEndpointUrl,
+            platformUrl = serverVersionsEndpointUrl,
             platformRepository = platformRepository
         )
 

diff --git a/...1-gireve/src/main/kotlin/com/izivia/ocpi/toolkit/modules/locations/LocationsEmspServer.kt b/...1-gireve/src/main/kotlin/com/izivia/ocpi/toolkit/modules/locations/LocationsEmspServer.kt
@@ -2,7 +2,7 @@ package com.izivia.ocpi.toolkit.modules.locations
 
 import com.izivia.ocpi.toolkit.common.httpResponse
 import com.izivia.ocpi.toolkit.common.mapper
-import com.izivia.ocpi.toolkit.common.tokenFilter
+import com.izivia.ocpi.toolkit.common.checkToken
 import com.izivia.ocpi.toolkit.modules.credentials.repositories.PlatformRepository
 import com.izivia.ocpi.toolkit.modules.locations.domain.*
 import com.izivia.ocpi.toolkit.transport.TransportServer
@@ -32,7 +32,7 @@ class LocationsEmspServer(
                     VariablePathSegment("partyId"),
                     VariablePathSegment("locationId")
                 ),
-                filters = listOf(platformRepository::tokenFilter)
+                filters = listOf(platformRepository::checkToken)
             ) { req ->
                 req.httpResponse {
                     service
@@ -52,7 +52,7 @@ class LocationsEmspServer(
                     VariablePathSegment("locationId"),
                     VariablePathSegment("evseUid")
                 ),
-                filters = listOf(platformRepository::tokenFilter)
+                filters = listOf(platformRepository::checkToken)
             ) { req ->
                 req.httpResponse {
                     service
@@ -74,7 +74,7 @@ class LocationsEmspServer(
                     VariablePathSegment("evseUid"),
                     VariablePathSegment("connectorId")
                 ),
-                filters = listOf(platformRepository::tokenFilter)
+                filters = listOf(platformRepository::checkToken)
             ) { req ->
                 req.httpResponse {
                     service
@@ -95,7 +95,7 @@ class LocationsEmspServer(
                     VariablePathSegment("partyId"),
                     VariablePathSegment("locationId")
                 ),
-                filters = listOf(platformRepository::tokenFilter)
+                filters = listOf(platformRepository::checkToken)
             ) { req ->
                 req.httpResponse {
                     service
@@ -116,7 +116,7 @@ class LocationsEmspServer(
                     VariablePathSegment("locationId"),
                     VariablePathSegment("evseUid")
                 ),
-                filters = listOf(platformRepository::tokenFilter)
+                filters = listOf(platformRepository::checkToken)
             ) { req ->
                 req.httpResponse {
                     service
@@ -139,7 +139,7 @@ class LocationsEmspServer(
                     VariablePathSegment("evseUid"),
                     VariablePathSegment("connectorId")
                 ),
-                filters = listOf(platformRepository::tokenFilter)
+                filters = listOf(platformRepository::checkToken)
             ) { req ->
                 req.httpResponse {
                     service
@@ -161,7 +161,7 @@ class LocationsEmspServer(
                     VariablePathSegment("partyId"),
                     VariablePathSegment("locationId")
                 ),
-                filters = listOf(platformRepository::tokenFilter)
+                filters = listOf(platformRepository::checkToken)
             ) { req ->
                 req.httpResponse {
                     service
@@ -182,7 +182,7 @@ class LocationsEmspServer(
                     VariablePathSegment("locationId"),
                     VariablePathSegment("evseUid")
                 ),
-                filters = listOf(platformRepository::tokenFilter)
+                filters = listOf(platformRepository::checkToken)
             ) { req ->
                 req.httpResponse {
                     service
@@ -205,7 +205,7 @@ class LocationsEmspServer(
                     VariablePathSegment("evseUid"),
                     VariablePathSegment("connectorId")
                 ),
-                filters = listOf(platformRepository::tokenFilter)
+                filters = listOf(platformRepository::checkToken)
             ) { req ->
                 req.httpResponse {
                     service

diff --git a/...it-2.1.1-gireve/src/main/kotlin/com/izivia/ocpi/toolkit/modules/tokens/TokensCpoClient.kt b/...it-2.1.1-gireve/src/main/kotlin/com/izivia/ocpi/toolkit/modules/tokens/TokensCpoClient.kt
@@ -22,7 +22,7 @@ class TokensCpoClient(
     private fun buildTransport(): TransportClient = transportClientBuilder
         .buildFor(
             module = ModuleID.tokens,
-            platform = serverVersionsEndpointUrl,
+            platformUrl = serverVersionsEndpointUrl,
             platformRepository = platformRepository
         )
 

diff --git a/...it-2.1.1-gireve/src/main/kotlin/com/izivia/ocpi/toolkit/modules/tokens/TokensCpoServer.kt b/...it-2.1.1-gireve/src/main/kotlin/com/izivia/ocpi/toolkit/modules/tokens/TokensCpoServer.kt
@@ -2,7 +2,7 @@ package com.izivia.ocpi.toolkit.modules.tokens
 
 import com.izivia.ocpi.toolkit.common.httpResponse
 import com.izivia.ocpi.toolkit.common.mapper
-import com.izivia.ocpi.toolkit.common.tokenFilter
+import com.izivia.ocpi.toolkit.common.checkToken
 import com.izivia.ocpi.toolkit.modules.credentials.repositories.PlatformRepository
 import com.izivia.ocpi.toolkit.modules.tokens.domain.Token
 import com.izivia.ocpi.toolkit.modules.tokens.domain.TokenPartial
@@ -29,7 +29,7 @@ class TokensCpoServer(
                     VariablePathSegment("partyId"),
                     VariablePathSegment("tokenUid")
                 ),
-                filters = listOf(platformRepository::tokenFilter)
+                filters = listOf(platformRepository::checkToken)
             ) { req ->
                 req.httpResponse {
                     service
@@ -48,7 +48,7 @@ class TokensCpoServer(
                     VariablePathSegment("partyId"),
                     VariablePathSegment("tokenUid")
                 ),
-                filters = listOf(platformRepository::tokenFilter)
+                filters = listOf(platformRepository::checkToken)
             ) { req ->
                 req.httpResponse {
                     service
@@ -68,7 +68,7 @@ class TokensCpoServer(
                     VariablePathSegment("partyId"),
                     VariablePathSegment("tokenUid")
                 ),
-                filters = listOf(platformRepository::tokenFilter)
+                filters = listOf(platformRepository::checkToken)
             ) { req ->
                 req.httpResponse {
                     service

diff --git a/...t-2.1.1-gireve/src/main/kotlin/com/izivia/ocpi/toolkit/modules/tokens/TokensEmspClient.kt b/...t-2.1.1-gireve/src/main/kotlin/com/izivia/ocpi/toolkit/modules/tokens/TokensEmspClient.kt
@@ -19,7 +19,7 @@ class TokensEmspClient(
     private fun buildTransport(): TransportClient = transportClientBuilder
         .buildFor(
             module = ModuleID.tokens,
-            platform = serverVersionsEndpointUrl,
+            platformUrl = serverVersionsEndpointUrl,
             platformRepository = platformRepository
         )
 

diff --git a/...t-2.1.1-gireve/src/main/kotlin/com/izivia/ocpi/toolkit/modules/tokens/TokensEmspServer.kt b/...t-2.1.1-gireve/src/main/kotlin/com/izivia/ocpi/toolkit/modules/tokens/TokensEmspServer.kt
@@ -2,7 +2,7 @@ package com.izivia.ocpi.toolkit.modules.tokens
 
 import com.izivia.ocpi.toolkit.common.httpResponse
 import com.izivia.ocpi.toolkit.common.mapper
-import com.izivia.ocpi.toolkit.common.tokenFilter
+import com.izivia.ocpi.toolkit.common.checkToken
 import com.izivia.ocpi.toolkit.modules.credentials.repositories.PlatformRepository
 import com.izivia.ocpi.toolkit.modules.tokens.domain.LocationReferences
 import com.izivia.ocpi.toolkit.modules.tokens.domain.TokenType
@@ -34,7 +34,7 @@ class TokensEmspServer(
                     "ocpi-to-country-code",
                     "ocpi-to-party-id"
                 ),
-                filters = listOf(platformRepository::tokenFilter)
+                filters = listOf(platformRepository::checkToken)
             ) { req ->
                 req.httpResponse {
                     val dateFrom = req.queryParams["date_from"]
@@ -58,7 +58,7 @@ class TokensEmspServer(
                     VariablePathSegment("tokenUid")
                 ),
                 queryParams = listOf("type"),
-                filters = listOf(platformRepository::tokenFilter)
+                filters = listOf(platformRepository::checkToken)
             ) { req ->
                 req.httpResponse {
                     service
@@ -76,7 +76,7 @@ class TokensEmspServer(
                     FixedPathSegment("authorize")
                 ),
                 queryParams = listOf("type"),
-                filters = listOf(platformRepository::tokenFilter)
+                filters = listOf(platformRepository::checkToken)
             ) { req ->
                 req.httpResponse {
                     service

diff --git a/...1-gireve/src/main/kotlin/com/izivia/ocpi/toolkit/modules/versions/VersionDetailsServer.kt b/...1-gireve/src/main/kotlin/com/izivia/ocpi/toolkit/modules/versions/VersionDetailsServer.kt
@@ -1,7 +1,7 @@
 package com.izivia.ocpi.toolkit.modules.versions
 
 import com.izivia.ocpi.toolkit.common.httpResponse
-import com.izivia.ocpi.toolkit.common.tokenFilter
+import com.izivia.ocpi.toolkit.common.checkToken
 import com.izivia.ocpi.toolkit.modules.credentials.repositories.PlatformRepository
 import com.izivia.ocpi.toolkit.modules.versions.validation.VersionDetailsValidationService
 import com.izivia.ocpi.toolkit.transport.TransportServer
@@ -23,7 +23,7 @@ class VersionDetailsServer(
                 path = basePath + listOf(
                     VariablePathSegment("versionNumber")
                 ),
-                filters = listOf(platformRepository::tokenFilter)
+                filters = listOf(platformRepository::checkToken)
             ) { req ->
                 req.httpResponse {
                     validationService.getVersionDetails(

diff --git a/...t-2.1.1-gireve/src/main/kotlin/com/izivia/ocpi/toolkit/modules/versions/VersionsServer.kt b/...t-2.1.1-gireve/src/main/kotlin/com/izivia/ocpi/toolkit/modules/versions/VersionsServer.kt
@@ -1,7 +1,7 @@
 package com.izivia.ocpi.toolkit.modules.versions
 
 import com.izivia.ocpi.toolkit.common.httpResponse
-import com.izivia.ocpi.toolkit.common.tokenFilter
+import com.izivia.ocpi.toolkit.common.checkToken
 import com.izivia.ocpi.toolkit.modules.credentials.repositories.PlatformRepository
 import com.izivia.ocpi.toolkit.modules.versions.validation.VersionsValidationService
 import com.izivia.ocpi.toolkit.transport.TransportServer
@@ -23,7 +23,7 @@ class VersionsServer(
             transportServer.handle(
                 method = HttpMethod.GET,
                 path = basePath,
-                filters = listOf(platformRepository::tokenFilter)
+                filters = listOf(platformRepository::checkToken)
             ) { req ->
                 req.httpResponse {
                     validationService.getVersions()

diff --git a/ocpi-toolkit-2.1.1/src/main/kotlin/com/izivia/ocpi/toolkit/common/HttpUtils.kt b/ocpi-toolkit-2.1.1/src/main/kotlin/com/izivia/ocpi/toolkit/common/HttpUtils.kt
@@ -132,7 +132,7 @@ fun HttpRequest.parseAuthorizationHeader() = (headers["Authorization"] ?: header
  * @throws OcpiClientNotEnoughInformationException if the token is missing
  * @throws HttpException if the authorization header is missing
  */
-fun PlatformRepository.tokenFilter(httpRequest: HttpRequest) {
+fun PlatformRepository.checkToken(httpRequest: HttpRequest) {
     val token = httpRequest.parseAuthorizationHeader()
 
     if (!platformExistsWithTokenA(token) &&
@@ -143,9 +143,9 @@ fun PlatformRepository.tokenFilter(httpRequest: HttpRequest) {
     }
 }
 
-fun TransportClientBuilder.buildFor(module: ModuleID, platform: String, platformRepository: PlatformRepository) =
+fun TransportClientBuilder.buildFor(module: ModuleID, platformUrl: String, platformRepository: PlatformRepository) =
     platformRepository
-        .getEndpoints(platformUrl = platform)
+        .getEndpoints(platformUrl = platformUrl)
         .find { it.identifier == module }
         ?.let { build(baseUrl = it.url) }
         ?: throw OcpiToolkitUnknownEndpointException(endpointName = module.name)
diff --git a/...kit-2.1.1/src/main/kotlin/com/izivia/ocpi/toolkit/modules/locations/LocationsCpoClient.kt b/...kit-2.1.1/src/main/kotlin/com/izivia/ocpi/toolkit/modules/locations/LocationsCpoClient.kt
@@ -24,7 +24,7 @@ class LocationsCpoClient(
     private fun buildTransport(): TransportClient = transportClientBuilder
         .buildFor(
             module = ModuleID.locations,
-            platform = serverVersionsEndpointUrl,
+            platformUrl = serverVersionsEndpointUrl,
             platformRepository = platformRepository
         )
 
@@ -174,4 +174,4 @@ class LocationsCpoClient(
                 ).authenticate(platformRepository = platformRepository, baseUrl = serverVersionsEndpointUrl)
             )
             .parseBody()
-}
+}
diff --git a/...kit-2.1.1/src/main/kotlin/com/izivia/ocpi/toolkit/modules/locations/LocationsCpoServer.kt b/...kit-2.1.1/src/main/kotlin/com/izivia/ocpi/toolkit/modules/locations/LocationsCpoServer.kt
@@ -1,7 +1,7 @@
 package com.izivia.ocpi.toolkit.modules.locations
 
 import com.izivia.ocpi.toolkit.common.httpResponse
-import com.izivia.ocpi.toolkit.common.tokenFilter
+import com.izivia.ocpi.toolkit.common.checkToken
 import com.izivia.ocpi.toolkit.modules.credentials.repositories.PlatformRepository
 import com.izivia.ocpi.toolkit.transport.TransportServer
 import com.izivia.ocpi.toolkit.transport.domain.FixedPathSegment
@@ -28,7 +28,7 @@ class LocationsCpoServer(
                 method = HttpMethod.GET,
                 path = basePath,
                 queryParams = listOf("date_from", "date_to", "offset", "limit"),
-                filters = listOf(platformRepository::tokenFilter)
+                filters = listOf(platformRepository::checkToken)
             ) { req ->
                 req.httpResponse {
                     val dateFrom = req.queryParams["date_from"]
@@ -47,7 +47,7 @@ class LocationsCpoServer(
             transportServer.handle(
                 method = HttpMethod.GET,
                 path = basePath + VariablePathSegment("locationId"),
-                filters = listOf(platformRepository::tokenFilter)
+                filters = listOf(platformRepository::checkToken)
             ) { req ->
                 req.httpResponse {
                     service
@@ -63,7 +63,7 @@ class LocationsCpoServer(
                     VariablePathSegment("locationId"),
                     VariablePathSegment("evseUid")
                 ),
-                filters = listOf(platformRepository::tokenFilter)
+                filters = listOf(platformRepository::checkToken)
             ) { req ->
                 req.httpResponse {
                     service
@@ -81,7 +81,7 @@ class LocationsCpoServer(
                     VariablePathSegment("evseUid"),
                     VariablePathSegment("connectorId")
                 ),
-                filters = listOf(platformRepository::tokenFilter)
+                filters = listOf(platformRepository::checkToken)
             ) { req ->
                 req.httpResponse {
                     service

diff --git a/...it-2.1.1/src/main/kotlin/com/izivia/ocpi/toolkit/modules/locations/LocationsEmspClient.kt b/...it-2.1.1/src/main/kotlin/com/izivia/ocpi/toolkit/modules/locations/LocationsEmspClient.kt
@@ -27,7 +27,7 @@ class LocationsEmspClient(
     private fun buildTransport(): TransportClient = transportClientBuilder
         .buildFor(
             module = ModuleID.locations,
-            platform = serverVersionsEndpointUrl,
+            platformUrl = serverVersionsEndpointUrl,
             platformRepository = platformRepository
         )