feat: update models to comply with ocpi 2.2.1 (#37)

energywebfoundation · Aug 13, 2024 · 79afba6 · 79afba6
1 parent c2d8a90
commit 79afba6
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 69 deletions.
diff --git a/src/main/kotlin/snc/openchargingnetwork/node/config/NodeProperties.kt b/src/main/kotlin/snc/openchargingnetwork/node/config/NodeProperties.kt
@@ -18,12 +18,15 @@ package snc.openchargingnetwork.node.config
 
 import org.springframework.boot.context.properties.ConfigurationProperties
 import snc.openchargingnetwork.node.tools.generateUUIDv4Token
+import javax.annotation.PostConstruct
 
 @ConfigurationProperties("ocn.node")
 class NodeProperties {
 
     var apikey: String = generateUUIDv4Token()
 
+    var base64apiKey: String = "";
+
     var dev: Boolean = false
 
     var privateKey: String? = null
@@ -55,4 +58,9 @@ class NodeProperties {
     var plannedPartySearchEnabled: Boolean = true
 
     var serviceInterfaceEnabled: Boolean = true
+
+    @PostConstruct
+    fun init() {
+        base64apiKey = java.util.Base64.getEncoder().encodeToString(apikey.toByteArray());
+    }
 }
diff --git a/src/main/kotlin/snc/openchargingnetwork/node/controllers/AdminController.kt b/src/main/kotlin/snc/openchargingnetwork/node/controllers/AdminController.kt
@@ -41,7 +41,7 @@ class AdminController(private val platformRepo: PlatformRepository,
                       private val properties: NodeProperties) {
 
     fun isAuthorized(authorization: String): Boolean {
-        return authorization == "Token ${properties.apikey}"
+        return authorization == "Token ${properties.apikey}" || authorization == "Bearer ${properties.base64apiKey}"
     }
 
     @GetMapping("/connection-status/{countryCode}/{partyID}")

diff --git a/src/main/kotlin/snc/openchargingnetwork/node/models/ocpi/Commands.kt b/src/main/kotlin/snc/openchargingnetwork/node/models/ocpi/Commands.kt
@@ -45,6 +45,7 @@ data class StartSession(@JsonProperty("response_url") var responseURL: String,
                         @JsonProperty("token") val token: Token,
                         @JsonProperty("location_id") val locationID: String,
                         @JsonProperty("evse_uid") val evseUID: String? = null,
+                        @JsonProperty("connector_id") val connectorID: String? = null,
                         @JsonProperty("authorization_reference") val authorizationReference: String? = null)
 
 data class StopSession(@JsonProperty("response_url") var responseURL: String,

diff --git a/src/main/kotlin/snc/openchargingnetwork/node/services/HttpService.kt b/src/main/kotlin/snc/openchargingnetwork/node/services/HttpService.kt
@@ -25,6 +25,7 @@ import snc.openchargingnetwork.node.models.*
 import snc.openchargingnetwork.node.models.exceptions.OcpiServerGenericException
 import snc.openchargingnetwork.node.models.exceptions.OcpiServerUnusableApiException
 import snc.openchargingnetwork.node.models.ocpi.*
+import snc.openchargingnetwork.node.tools.generateUUIDv4Token
 import snc.openchargingnetwork.node.tools.urlJoin
 
 
@@ -96,7 +97,11 @@ class HttpService {
      */
     fun getVersions(url: String, authorization: String): List<Version> {
         try {
-            val response = khttp.get(url = url, headers = mapOf("Authorization" to "Token $authorization"))
+            val response = khttp.get(url = url, headers = mapOf(
+                "Authorization" to "Token $authorization",
+                "X-Correlation-ID" to generateUUIDv4Token(),
+                "X-Request-ID" to generateUUIDv4Token()
+            ))
             val body: OcpiResponse<List<Version>> = mapper.readValue(response.text)
 
             return if (response.statusCode == 200 && body.statusCode == 1000) {
@@ -117,7 +122,11 @@ class HttpService {
      */
     fun getVersionDetail(url: String, authorization: String): VersionDetail {
         try {
-            val response = khttp.get(url = url, headers = mapOf("Authorization" to "Token $authorization"))
+            val response = khttp.get(url = url, headers = mapOf(
+                "Authorization" to "Token $authorization",
+                "X-Correlation-ID" to generateUUIDv4Token(),
+                "X-Request-ID" to generateUUIDv4Token()
+            ))
             val body: OcpiResponse<VersionDetail> = mapper.readValue(response.text)
 
             return if (response.statusCode == 200 && body.statusCode == 1000) {

diff --git a/...st/kotlin/snc/openchargingnetwork/node/controllers/ocpi/v2_2/CredentialsControllerTest.kt b/...st/kotlin/snc/openchargingnetwork/node/controllers/ocpi/v2_2/CredentialsControllerTest.kt
@@ -185,7 +185,7 @@ class CredentialsControllerTest(@Autowired val mockMvc: MockMvc) {
                 .header("Authorization", "Token ${platform.auth.tokenC}")
                 .contentType(MediaType.APPLICATION_JSON)
                 .content(jacksonObjectMapper().writeValueAsString(Credentials(
-                        token = tokenB!!,
+                        token = tokenB,
                         url = versionsUrl,
                         roles = listOf(role1, role2)))))
                 .andExpect(status().isOk)

diff --git a/src/test/kotlin/snc/openchargingnetwork/node/integration/AppInterfaceTest.kt b/src/test/kotlin/snc/openchargingnetwork/node/integration/AppInterfaceTest.kt