Skip to content
Snippets Groups Projects
Unverified Commit 0ddb4195 authored by Kolya Opahle's avatar Kolya Opahle Committed by GitHub
Browse files

Fixing tele tan registration (#45)


* Fixed teleTAN based device registration

Signed-off-by: default avatarKolya Opahle <k.opahle@sap.com>

* allowed excluded tan chars for testing

Signed-off-by: default avatarKolya Opahle <k.opahle@sap.com>

* Revert "allowed excluded tan chars for testing"

This reverts commit 253ede4ea9c8ba2b5e6dd324680eed0f8f7e74c1.
parent c96ede02
No related branches found
No related tags found
No related merge requests found
......@@ -10,6 +10,7 @@ import com.android.volley.RetryPolicy
import com.android.volley.toolbox.HttpHeaderParser
import de.rki.coronawarnapp.exception.ExceptionCategory.HTTP
import de.rki.coronawarnapp.exception.report
import de.rki.coronawarnapp.service.submission.SubmissionConstants
import org.json.JSONException
import org.json.JSONObject
import java.io.UnsupportedEncodingException
......@@ -37,12 +38,17 @@ class RegistrationTokenRequest(
override fun getBody(): ByteArray {
val body = JSONObject()
val md = MessageDigest.getInstance("SHA-256")
val keyDigest = md.digest(key.toByteArray())
var keyStr = ""
for (b in keyDigest) {
keyStr += String.format("%02x", b)
if (keyType == SubmissionConstants.QR_CODE_KEY_TYPE) {
val md = MessageDigest.getInstance("SHA-256")
val keyDigest = md.digest(key.toByteArray())
for (b in keyDigest) {
keyStr += String.format("%02x", b)
}
} else {
keyStr = key
}
body.put("keyType", keyType)
......
......@@ -14,7 +14,7 @@ object SubmissionConstants {
private val VERSIONED_VERIFICATION_CDN_URL = "$VERIFICATION_CDN_URL/$VERSION/$CURRENT_VERSION"
const val QR_CODE_KEY_TYPE = "GUID"
const val TELE_TAN__KEY_TYPE = "teleTAN"
const val TELE_TAN_KEY_TYPE = "TELETAN"
val REGISTRATION_TOKEN_URL = "$VERSIONED_VERIFICATION_CDN_URL/$REGISTRATION_TOKEN"
val TEST_RESULT_URL = "$VERSIONED_VERIFICATION_CDN_URL/$TEST_RESULT"
......
......@@ -8,7 +8,7 @@ import de.rki.coronawarnapp.service.submission.SubmissionConstants.QR_CODE_KEY_T
import de.rki.coronawarnapp.service.submission.SubmissionConstants.QR_CODE_VALIDATION_REGEX
import de.rki.coronawarnapp.service.submission.SubmissionConstants.REGISTRATION_TOKEN_URL
import de.rki.coronawarnapp.service.submission.SubmissionConstants.TAN_REQUEST_URL
import de.rki.coronawarnapp.service.submission.SubmissionConstants.TELE_TAN__KEY_TYPE
import de.rki.coronawarnapp.service.submission.SubmissionConstants.TELE_TAN_KEY_TYPE
import de.rki.coronawarnapp.storage.LocalData
import de.rki.coronawarnapp.transaction.SubmitDiagnosisKeysTransaction
......@@ -41,7 +41,7 @@ object SubmissionService {
WebRequestBuilder.asyncGetRegistrationToken(
REGISTRATION_TOKEN_URL,
tan,
TELE_TAN__KEY_TYPE
TELE_TAN_KEY_TYPE
)
LocalData.registrationToken(registrationToken)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment