Merge pull request #64 from kartverket/convertAirtableTokenToEnvVariable

Convert airtable token to env variable

backend/Dockerfile

@@ -11,7 +11,6 @@ WORKDIR /app
 
 # Copy the built jar file from the build stage
 COPY --from=build /home/gradle/src/build/libs/*.jar /app/backend.jar
-COPY config.properties /app/
 COPY application.properties /app/
 
 # Specify the command to run the application

backend/README.md

@@ -39,6 +39,8 @@ Set up as follows:
 Working directory: <root of project>/backend
 Use classpath of module: spire-kk.backend.main
 
+Set the environment variable `AIRTABLE_ACCESS_TOKEN` in `Run -> Edit Configurations...`. You can get the value from one of your teammates.
+
 ## Run the application
 
 To set up an IntelliJ project, New Project from existing sources -> <root directory

backend/src/main/kotlin/no/bekk/AirTableController.kt

@@ -24,7 +24,7 @@ class AirTableController {
         install(Auth) {
             bearer {
                 loadTokens {
-                    BearerTokens(accessToken, "")
+                    BearerTokens(airtableAccessToken, "")
                 }
             }
         }
@@ -82,7 +82,7 @@ class AirTableController {
         }
         val response: HttpResponse = client.get(url) {
             headers {
-                append("Authorization", "Bearer $accessToken")
+                append("Authorization", "Bearer $airtableAccessToken")
             }
         }
         val responseBody = response.bodyAsText()

backend/src/main/kotlin/no/bekk/Application.kt

@@ -2,7 +2,6 @@ package no.bekk
 
 import no.bekk.plugins.*
 import io.ktor.server.application.*
-import org.flywaydb.core.Flyway
 import java.io.FileInputStream
 import java.util.*
 
@@ -12,9 +11,7 @@ fun loadConfig(filePath: String): Properties {
     return props
 }
 
-val props = loadConfig("config.properties")
-val accessToken = props.getProperty("accessToken")
-
+val airtableAccessToken = System.getenv("AIRTABLE_ACCESS_TOKEN")
 val applicationProperties = loadConfig("application.properties")
 val metadataAddress = applicationProperties.getProperty("metadataAddress")
 val metodeverkAddress = applicationProperties.getProperty("metodeverkAddress")