Updated issuing country fetching (#44)

Author: oleksandrsarapulovgl

decoder/src/main/java/dgca/verifier/app/decoder/cbor/CborService.kt

@@ -27,6 +27,7 @@ import dgca.verifier.app.decoder.model.VerificationResult
 import java.time.ZonedDateTime
 
 data class GreenCertificateData(
+    val issuingCountry: String?,
     val hcertJson: String,
     val greenCertificate: GreenCertificate,
     val issuedAt: ZonedDateTime,

decoder/src/main/java/dgca/verifier/app/decoder/cbor/DefaultCborService.kt

@@ -48,6 +48,8 @@ class DefaultCborService : CborService {
         return try {
             val map = CBORObject.DecodeFromBytes(input)
 
+            val issuingCountry: String? = map[CwtHeaderKeys.ISSUING_COUNTRY.asCBOR()]?.AsString()
+
             val issuedAt = Instant.ofEpochSecond(map[CwtHeaderKeys.ISSUED_AT.asCBOR()].AsInt64())
             verificationResult.isIssuedTimeCorrect = issuedAt.isBefore(Instant.now())
 
@@ -62,7 +64,7 @@ class DefaultCborService : CborService {
             val greenCertificate: GreenCertificate = CBORMapper()
                 .readValue(hcertv1, GreenCertificate::class.java)
                 .also { verificationResult.cborDecoded = true }
-            GreenCertificateData(cborObject.toString(), greenCertificate, issuedAt.atZone(ZoneOffset.UTC), expirationTime.atZone(ZoneOffset.UTC))
+            GreenCertificateData(issuingCountry, cborObject.toString(), greenCertificate, issuedAt.atZone(ZoneOffset.UTC), expirationTime.atZone(ZoneOffset.UTC))
         } catch (e: Throwable) {
             null
         }

decoder/src/main/java/dgca/verifier/app/decoder/cwt/CwtHeaderKeys.kt

@@ -36,6 +36,7 @@ sealed class CwtHeaderKeys(value: Int) {
         return value
     }
 
+    object ISSUING_COUNTRY : CwtHeaderKeys(1)
     object EXPIRATION : CwtHeaderKeys(4)
     object ISSUED_AT : CwtHeaderKeys(6)
     object HCERT : CwtHeaderKeys(-260)