Feature/revocation configs

branches/dcc/revocation/build.gradle

@@ -54,11 +54,9 @@ android {
     productFlavors {
         tst {
             dimension "version"
-            buildConfigField "String", "REVOCATION_SERVICE_HOST", "\"https://dgca-revocation-service-eu-test.cfapps.eu10.hana.ondemand.com\""
         }
         acc {
             dimension "version"
-            buildConfigField "String", "REVOCATION_SERVICE_HOST", "\"https://dgca-revocation-service-eu-acc.cfapps.eu10.hana.ondemand.com\""
         }
         bloom {
             dimension "revocationDataSliceType"

branches/dcc/revocation/src/main/java/dcc/app/revocation/data/network/RevocationService.kt

@@ -31,57 +31,50 @@ import retrofit2.http.*
 
 interface RevocationService {
 
-    @GET("/lists")
+    @GET
     suspend fun getRevocationLists(
-        @Header("If-None-Match") eTag: String
+        @Header("If-None-Match") eTag: String,
+        @Url url: String
     ): Response<List<RevocationKIDResponse>>
 
-    @GET("/lists/{kid}/partitions")
+    @GET
     suspend fun getRevocationListPartitions(
         @Header("if-Match") eTag: String,
         @Header("if-modified-since") modifiedSince: String?,
         @Header("X-SLICE-FILTER-TYPE") type: SliceType,
-        @Path("kid") kid: String
+        @Url url: String
     ): Response<List<RevocationPartitionResponse>>
 
-    @POST("/lists/{kid}/partitions/{id}/slices")
+    @POST
     suspend fun getRevocationPartitionChunks(
         @Header("if-Match") eTag: String,
         @Header("X-SLICE-FILTER-TYPE") type: SliceType,
-        @Path("kid") kid: String,
-        @Path("id") partitionId: String,
+        @Url url: String,
         @Body cidList: List<String>
     ): Response<ResponseBody>
 
-    @GET("/lists/{kid}/partitions/{id}/chunks/{cid}/slices")
+    @GET
     suspend fun getRevocationChunk(
         @Header("If-Match") eTag: String,
         @Header("if-modified-since") modifiedSince: String,
         @Header("X-SLICE-FILTER-TYPE") type: SliceType,
-        @Path("kid") kid: String,
-        @Path("id") id: String,
-        @Path("cid") chunkId: String
+        @Url url: String
     ): Response<ResponseBody>
 
-    @POST("/lists/{kid}/partitions/{id}/chunks/{cid}/slices")
+    @POST
     suspend fun getRevocationChunkSlices(
         @Header("if-Match") eTag: String,
         @Header("if-modified-since") modifiedSince: String,
         @Header("X-SLICE-FILTER-TYPE") type: SliceType,
-        @Path("kid") kid: String,
-        @Path("id") partitionId: String,
-        @Path("cid") cid: String,
+        @Url url: String,
         @Body sidList: List<String>
     ): Response<ResponseBody>
 
-    @GET("/lists/{kid}/partitions/{id}/chunks/{cid}/slices/{sid}")
+    @GET
     suspend fun getRevocationChunkSlice(
         @Header("If-Match") eTag: String,
         @Header("if-modified-since") modifiedSince: String,
         @Header("X-SLICE-FILTER-TYPE") type: SliceType,
-        @Path("kid") kid: String,
-        @Path("id") id: String,
-        @Path("cid") chunkId: String,
-        @Path("sid") sid: String
+        @Url url: String
     ): Response<ResponseBody>
 }

branches/dcc/revocation/src/main/java/dcc/app/revocation/domain/RevocationRepository.kt

@@ -33,17 +33,19 @@ import okhttp3.ResponseBody
 interface RevocationRepository {
 
     @Throws(Exception::class)
-    suspend fun getRevocationLists(): List<RevocationKidData>?
+    suspend fun getRevocationLists(baseUrl: String): List<RevocationKidData>?
 
     @Throws(Exception::class)
     suspend fun getRevocationPartitions(
+        baseUrl: String,
         lastUpdated: String?,
         sliceType: SliceType,
         kid: String,
     ): List<RevocationPartitionResponse>?
 
     @Throws(Exception::class)
     suspend fun getPartitionChunks(
+        baseUrl: String,
         sliceType: SliceType,
         kid: String,
         partitionId: String?,
@@ -52,6 +54,7 @@ interface RevocationRepository {
 
     @Throws(Exception::class)
     suspend fun getRevocationChunk(
+        baseUrl: String,
         lastUpdated: String,
         sliceType: SliceType,
         kid: String,
@@ -61,6 +64,7 @@ interface RevocationRepository {
 
     @Throws(Exception::class)
     suspend fun getRevocationChunkSlices(
+        baseUrl: String,
         lastUpdated: String,
         sliceType: SliceType,
         kid: String,
@@ -71,6 +75,7 @@ interface RevocationRepository {
 
     @Throws(Exception::class)
     suspend fun getSlice(
+        baseUrl: String,
         lastUpdated: String,
         sliceType: SliceType,
         kid: String,

branches/dcc/revocation/src/main/java/dcc/app/revocation/domain/usacase/GetRevocationBaseUr.kt

@@ -0,0 +1,28 @@
+/*
+ *  ---license-start
+ *  eu-digital-covid-certificates / dcc-verifier-app-android
+ *  ---
+ *  Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ *  ---
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *  ---license-end
+ *
+ *  Created by osarapulov on 5/25/22, 8:12 AM
+ */
+
+package dcc.app.revocation.domain.usacase
+
+interface GetRevocationBaseUr {
+
+    suspend fun invoke(): String
+}

branches/dcc/revocation/src/main/java/dcc/app/revocation/domain/usacase/GetRevocationDataUseCase.kt

@@ -24,6 +24,7 @@ package dcc.app.revocation.domain.usacase
 
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
+import dcc.app.revocation.BuildConfig
 import dcc.app.revocation.data.RevocationPreferences
 import dcc.app.revocation.data.network.model.RevocationPartitionResponse
 import dcc.app.revocation.data.network.model.Slice
@@ -50,6 +51,7 @@ import java.util.zip.GZIPInputStream
 import javax.inject.Inject
 
 class GetRevocationDataUseCase @Inject constructor(
+    private val getRevocationBaseUr: GetRevocationBaseUr,
     private val repository: RevocationRepository,
     private val revocationPreferences: RevocationPreferences,
     dispatcher: CoroutineDispatcher,
@@ -61,8 +63,10 @@ class GetRevocationDataUseCase @Inject constructor(
     override suspend fun invoke(params: Any) {
         revocationPreferences.lastRevocationSyncTimeMillis = System.currentTimeMillis()
 
+        val baseUrl = getRevocationBaseUr.invoke()
+
         // Load list of KIDs
-        val newKidItems = repository.getRevocationLists() ?: return
+        val newKidItems = repository.getRevocationLists(baseUrl) ?: return
 
         // Remove all entities not matching KIDs from list
         repository.deleteOutdatedKidItems(newKidItems.map { it.kid })
@@ -116,7 +120,9 @@ class GetRevocationDataUseCase @Inject constructor(
 
     private suspend fun getPartitions(kid: String, lastUpdated: String? = null) {
         val kidUrlSafe = kid.toBase64Url()
+        val baseUrl = getRevocationBaseUr.invoke()
         repository.getRevocationPartitions(
+            baseUrl = baseUrl,
             sliceType = sliceType,
             kid = kidUrlSafe,
             lastUpdated = lastUpdated
@@ -132,9 +138,12 @@ class GetRevocationDataUseCase @Inject constructor(
             val lastUpdated = localPartition.lastUpdated.toUtcString()
             compareChunksWithLocal(kid, localPartition, remotePartition, lastUpdated)
         } else {
+            val baseUrl = getRevocationBaseUr.invoke()
+
             // Initial sync. load all chunks for partition
             val result =
                 repository.getPartitionChunks(
+                    baseUrl = baseUrl,
                     sliceType = sliceType,
                     kid = kid.toBase64Url(),
                     partitionId = remotePartition.id,
@@ -161,12 +170,14 @@ class GetRevocationDataUseCase @Inject constructor(
         val type: Type = object : TypeToken<Map<String, Map<String, Slice>>>() {}.type
         val localChunks =
             Gson().fromJson<Map<String, Map<String, Slice>>>(localPartition.chunks, type)
+        val baseUrl = getRevocationBaseUr.invoke()
 
         remotePartition.chunks.forEach { (remoteChunkKey, remoteChunkValue) ->
             val localSlices = localChunks[remoteChunkKey]
             if (localSlices == null) {
                 // When chunk not found load from api
                 val response = repository.getRevocationChunk(
+                    baseUrl = baseUrl,
                     lastUpdated = lastUpdated,
                     sliceType = sliceType,
                     kid = kid.toBase64Url(),
@@ -190,6 +201,7 @@ class GetRevocationDataUseCase @Inject constructor(
                 if (slices.size < remoteChunkValue.size / 2) {
                     // Load updated or missing slices by sid list.
                     val response = repository.getRevocationChunkSlices(
+                        baseUrl = baseUrl,
                         lastUpdated = lastUpdated,
                         sliceType = sliceType,
                         kid = kid.toBase64Url(),
@@ -200,6 +212,7 @@ class GetRevocationDataUseCase @Inject constructor(
                     handlePartitionSlices(kid, remotePartition, response)
                 } else {
                     val response = repository.getRevocationChunk(
+                        baseUrl = baseUrl,
                         lastUpdated = lastUpdated,
                         sliceType = sliceType,
                         kid = kid.toBase64Url(),

branches/dcc/revocation/src/main/java/dcc/app/revocation/repository/RevocationRepositoryImpl.kt

@@ -22,6 +22,7 @@
 
 package dcc.app.revocation.repository
 
+import dcc.app.revocation.BuildConfig
 import dcc.app.revocation.data.RevocationPreferences
 import dcc.app.revocation.data.containsServerError
 import dcc.app.revocation.data.local.DccRevocationLocalDataSource
@@ -47,9 +48,10 @@ class RevocationRepositoryImpl @Inject constructor(
 ) : RevocationRepository {
 
     @Throws(Exception::class)
-    override suspend fun getRevocationLists(): List<RevocationKidData>? {
+    override suspend fun getRevocationLists(baseUrl: String): List<RevocationKidData>? {
         val eTag = revocationPreferences.eTag ?: ""
-        val response = revocationService.getRevocationLists(eTag)
+        val url = "$baseUrl/lists"
+        val response = revocationService.getRevocationLists(eTag, url)
 
         if (response.containsServerError()) {
             throw HttpException(response)
@@ -65,16 +67,18 @@ class RevocationRepositoryImpl @Inject constructor(
 
     @Throws(Exception::class)
     override suspend fun getRevocationPartitions(
+        baseUrl: String,
         lastUpdated: String?,
         sliceType: SliceType,
         kid: String
     ): List<RevocationPartitionResponse>? {
         val eTag = revocationPreferences.eTag ?: ""
+        val url = "$baseUrl/lists/$kid/partitions"
         val response = revocationService.getRevocationListPartitions(
             eTag = eTag,
             modifiedSince = lastUpdated,
+            url = url,
             type = sliceType,
-            kid = kid
         )
 
         if (response.containsServerError()) {
@@ -86,17 +90,18 @@ class RevocationRepositoryImpl @Inject constructor(
 
     @Throws(Exception::class)
     override suspend fun getPartitionChunks(
+        baseUrl: String,
         sliceType: SliceType,
         kid: String,
         partitionId: String?,
         cidList: List<String>
     ): ResponseBody? {
         val eTag = revocationPreferences.eTag ?: ""
+        val url = "$baseUrl/lists/$kid/partitions/$partitionId/slices"
         val response = revocationService.getRevocationPartitionChunks(
             eTag = eTag,
             type = sliceType,
-            kid = kid,
-            partitionId = partitionId ?: "null",
+            url = url,
             cidList = cidList
         )
 
@@ -109,20 +114,20 @@ class RevocationRepositoryImpl @Inject constructor(
 
     @Throws(Exception::class)
     override suspend fun getRevocationChunk(
+        baseUrl: String,
         lastUpdated: String,
         sliceType: SliceType,
         kid: String,
         id: String?,
         chunkId: String
     ): ResponseBody? {
         val eTag = revocationPreferences.eTag ?: ""
+        val url = "$baseUrl/lists/$kid/partitions/$id/chunks/$chunkId/slices"
         val response = revocationService.getRevocationChunk(
             eTag = eTag,
             modifiedSince = lastUpdated,
             type = sliceType,
-            kid = kid,
-            id = id ?: "null",
-            chunkId = chunkId
+            url = url
         )
 
         if (response.containsServerError()) {
@@ -134,6 +139,7 @@ class RevocationRepositoryImpl @Inject constructor(
 
     @Throws(Exception::class)
     override suspend fun getRevocationChunkSlices(
+        baseUrl: String,
         lastUpdated: String,
         sliceType: SliceType,
         kid: String,
@@ -142,13 +148,12 @@ class RevocationRepositoryImpl @Inject constructor(
         sidList: List<String>
     ): ResponseBody? {
         val eTag = revocationPreferences.eTag ?: ""
+        val url = "$baseUrl/lists/$kid/partitions/$partitionId/chunks/$cid/slices"
         val response = revocationService.getRevocationChunkSlices(
             eTag = eTag,
             modifiedSince = lastUpdated,
             type = sliceType,
-            kid = kid,
-            partitionId = partitionId ?: "null",
-            cid = cid,
+            url = url,
             sidList = sidList
         )
 
@@ -161,6 +166,7 @@ class RevocationRepositoryImpl @Inject constructor(
 
     @Throws(Exception::class)
     override suspend fun getSlice(
+        baseUrl: String,
         lastUpdated: String,
         sliceType: SliceType,
         kid: String,
@@ -169,14 +175,12 @@ class RevocationRepositoryImpl @Inject constructor(
         sid: String
     ): ResponseBody? {
         val eTag = revocationPreferences.eTag ?: ""
+        val url = "$baseUrl/lists/$kid/partitions/$partitionId/chunks/$cid/slices/$sid"
         val response = revocationService.getRevocationChunkSlice(
             eTag = eTag,
             modifiedSince = lastUpdated,
             type = sliceType,
-            kid = kid,
-            id = partitionId ?: "null",
-            chunkId = cid,
-            sid = sid
+            url = url
         )
 
         if (response.containsServerError()) {

branches/dcc/src/acc/assets/verifier-context.jsonc

@@ -45,6 +45,13 @@
             "lKdU1EbQubxyDDm2q3N8KclZ2C94Num3xXjG0pk+3eI=",
             "r/mIkG3eEpVdm+u/ko/cwxzOMo1bk4TyHIlByibiA5E="
           ]
+        },
+        "revocation": {
+          "url": "https://dgca-revocation-service-eu-acc.cfapps.eu10.hana.ondemand.com",
+          "pubKeys": [
+            "lKdU1EbQubxyDDm2q3N8KclZ2C94Num3xXjG0pk+3eI=",
+            "r/mIkG3eEpVdm+u/ko/cwxzOMo1bk4TyHIlByibiA5E="
+          ]
         }
       }
     },