Skip to content

Commit eb40759

Browse files
NFC-83 Typo fix. Remove signingCert sending from sign payload.
1 parent 3379e60 commit eb40759

3 files changed

Lines changed: 5 additions & 6 deletions

File tree

app/src/main/res/values-et/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,7 @@
674674
<string name="web_eid_sign">Allkirjastamine</string>
675675
<string name="web_eid_sign_title">Allkirjasta ID-kaardiga</string>
676676
<string name="web_eid_cert_request_from">Sertifikaadipäring:</string>
677-
<string name="web_eid_sign_request_from">Allirjastamispäring:</string>
677+
<string name="web_eid_sign_request_from">Allkirjastamispäring:</string>
678678
<string name="web_eid_cancel">Tühista</string>
679679
<string name="web_eid_invalid_request_error">Vigane Web eID päring</string>
680680
<string name="web_eid_request_error">Päringu viga</string>

web-eid-lib/src/androidTest/java/ee/ria/DigiDoc/webEid/WebEidSignServiceTest.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@ class WebEidSignServiceTest {
8888
val signatureBytes = byteArrayOf(11, 22, 33, 44, 55)
8989
val result = service.buildSignPayload(signingCertBase64, signatureBytes)
9090

91-
assertTrue(result.has("signature"))
92-
assertTrue(result.has("signatureAlgorithm"))
93-
assertTrue(result.has("signingCertificate"))
94-
assertEquals(signingCertBase64, result.getString("signingCertificate"))
91+
assertEquals(
92+
setOf("signature", "signatureAlgorithm"),
93+
result.keys().asSequence().toSet(),
94+
)
9595

9696
val expectedSignature = Base64.getEncoder().encodeToString(signatureBytes)
9797
assertEquals(expectedSignature, result.getString("signature"))

web-eid-lib/src/main/java/ee/ria/DigiDoc/webEid/WebEidSignServiceImpl.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ class WebEidSignServiceImpl
6464
return JSONObject().apply {
6565
put("signature", Base64.getEncoder().encodeToString(signature))
6666
put("signatureAlgorithm", algorithm)
67-
put("signingCertificate", signingCert)
6867
}
6968
}
7069
}

0 commit comments

Comments
 (0)