add flexo auth env var, update docker compose to have token good for 1 year

Author: Doris Lam

Dockerfile

@@ -6,6 +6,6 @@ RUN ./gradlew installDist
 FROM openjdk:17.0.2-jdk-slim
 WORKDIR application
 RUN apt-get update && apt-get install -y procps
-COPY --from=build application/build/install/flexo-sysmlv2/ .
-ENTRYPOINT ["./bin/flexo-sysmlv2"]
+COPY --from=build application/build/install/org.openmbee.flexo.sysmlv2/ .
+ENTRYPOINT ["./bin/org.openmbee.flexo.sysmlv2"]
 EXPOSE 8080

docker-compose/docker-compose.yml

@@ -84,16 +84,13 @@ services:
     image: openmbee/flexo-sysmlv2:demo
     hostname: flexo-sysmlv2
     container_name: flexo-sysmlv2
-    environment:
-      - FLEXO_HOST=layer1-service
-      - FLEXO_PROTOCOL=http
-      - FLEXO_PORT=8080
-      - FLEXO_SYSMLV2_ORG=sysmlv2
+    env_file:
+      - ./env/flexo-sysmlv2.env
     depends_on:
       - layer1-service
     ports:
       - 8083:8080
-      
+
 networks:
   default:
     name: flexo-mms-test-network

docker-compose/env/flexo-sysmlv2.env

@@ -0,0 +1,5 @@
+FLEXO_HOST=layer1-service
+FLEXO_PROTOCOL=http
+FLEXO_PORT=8080
+FLEXO_SYSMLV2_ORG=sysmlv2
+FLEXO_AUTH="Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJmbGV4by1tbXMtYXVkaWVuY2UiLCJpc3MiOiJodHRwOi8vZmxleG8tbW1zLXNlcnZpY2VzIiwidXNlcm5hbWUiOiJ1c2VyMDEiLCJncm91cHMiOlsic3VwZXJfYWRtaW5zIl0sImV4cCI6MTc2OTY3MzYwMH0.UqU5KOPSCbYyqbj3BBZs4u7lWbpHyDHPEd7Tbd4wWsM"

src/main/kotlin/org/openmbee/flexo/sysmlv2/AppMain.kt

@@ -75,7 +75,8 @@ data class FlexoConfig(
     val host: String,
     val port: Int,
     val org: String,
-    val defaultTimeout: Long
+    val defaultTimeout: Long,
+    val auth: String
 )
 
 /**
@@ -88,6 +89,6 @@ val Application.flexoConfig: FlexoConfig
         val port = property("flexo.port")?.getString()?.toInt() ?: 8080
         val org = property("flexo.org")?.getString() ?: "sysmlv2"
         val defaultTimeout = property("flexo.defaultTimeout")?.getString()?.toLong() ?: 60_000L
-
-        return FlexoConfig(protocol, host, port, org, defaultTimeout)
+        val auth = property("flexo.auth")?.getString() ?: ""
+        return FlexoConfig(protocol, host, port, org, defaultTimeout, auth)
     }

src/main/kotlin/org/openmbee/flexo/sysmlv2/Flexo.kt

@@ -248,9 +248,9 @@ suspend fun PipelineContext<*, ApplicationCall>.flexoRequest(method: HttpMethod,
 
     // create request builder
     val builder = FlexoRequestBuilder(method)
-
+    val auth = call.request.headers["Authorization"]?: GlobalFlexoConfig.auth
     // forward auth header from client
-    builder.addHeaders(HttpHeaders.Authorization to (call.request.headers["Authorization"]?: ""))
+    builder.addHeaders(HttpHeaders.Authorization to auth)
 
     // apply caller setup
     setup(builder)