arti/Estonian-ID-card-mobile-authenticator-POC
1
0
Fork 0
mirror of https://github.com/TanelOrumaa/Estonian-ID-card-mobile-authenticator-POC.git synced 2024-12-22 12:30:16 +02:00
Code Packages Releases Wiki Activity

small changes to the return data to the test mobile app

Browse Source
This commit is contained in:
Henrik Lepson 2022-01-17 17:13:40 +02:00
parent b889b9cda7
commit 32336ffb2b
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/ResultFragment.kt
View File

@ -47,17 +47,20 @@ class ResultFragment : Fragment() {
/** /**
* Only used when the MobileAuthApp was launched by an app. Not for website use. * Only used when the MobileAuthApp was launched by an app. Not for website use.
* Not really the safest way of doing things, but sufficient for POC purposes.
*/ */
private fun createResponse( private fun createResponse(
success: Boolean = true, success: Boolean = true,
idCode: String = "noCode", idCode: String = "noCode",
name: String = "noName" name: String = "noName",
authority: String = "noAuthority"
) { ) {
val responseCode = val responseCode =
if (success) AppCompatActivity.RESULT_OK else AppCompatActivity.RESULT_CANCELED if (success) AppCompatActivity.RESULT_OK else AppCompatActivity.RESULT_CANCELED
val resultIntent = Intent() val resultIntent = Intent()
resultIntent.putExtra("idCode", idCode) resultIntent.putExtra("idCode", idCode)
resultIntent.putExtra("name", name) resultIntent.putExtra("name", name)
resultIntent.putExtra("authority", authority)
requireActivity().setResult(responseCode, resultIntent) requireActivity().setResult(responseCode, resultIntent)
requireActivity().finish() requireActivity().finish()
} }
@ -82,6 +85,7 @@ class ResultFragment : Fragment() {
.setJsonObjectBody(json) .setJsonObjectBody(json)
.asJsonObject() .asJsonObject()
.setCallback { e, result -> .setCallback { e, result ->
Log.i("resultTag", result.toString())
if (result == null) { if (result == null) {
if (args.mobile) { if (args.mobile) {
createResponse(false) createResponse(false)
@ -90,11 +94,11 @@ class ResultFragment : Fragment() {
} }
} else { } else {
if (args.mobile) { if (args.mobile) {
Log.i("myResultTag", result.toString())
val userData = result.asJsonObject["userData"] val userData = result.asJsonObject["userData"]
val idCode = userData.asJsonObject["idCode"].asString val idCode = userData.asJsonObject["idCode"].asString
val name = userData.asJsonObject["name"].asString val name = userData.asJsonObject["name"].asString
createResponse(true, idCode, name) val authority = result.asJsonObject["roles"].asJsonArray[0].asJsonObject["authority"].asString
createResponse(true, idCode, name, authority)
} else { } else {
requireActivity().finishAndRemoveTask() requireActivity().finishAndRemoveTask()
} }

3
TestMobileApp/app/src/main/java/com/example/testmobileapp/MainActivity.kt
View File

@ -14,7 +14,7 @@ import org.json.JSONObject
/** /**
* Base url where the requests should be made. Add yours here. It must use https. * Base url where the requests should be made. Add yours here. It must use https.
*/ */
private const val BASE_URL = "https://e871-2001-7d0-88a4-b880-d085-ba91-1799-76e7.ngrok.io" private const val BASE_URL = "https://a0fe-2001-7d0-88ab-b880-7571-cba0-5db2-11b7.ngrok.io"
private const val AUTH_URL = "$BASE_URL/auth/login" private const val AUTH_URL = "$BASE_URL/auth/login"
private const val CHALLENGE_URL = "$BASE_URL/auth/challenge" private const val CHALLENGE_URL = "$BASE_URL/auth/challenge"
@ -38,6 +38,7 @@ class MainActivity : AppCompatActivity() {
// Logs are used to show what information can be retrieved from the mobileauthapp. // Logs are used to show what information can be retrieved from the mobileauthapp.
Log.i("getResult", response.data?.getStringExtra("idCode").toString()) Log.i("getResult", response.data?.getStringExtra("idCode").toString())
Log.i("getResult", response.data?.getStringExtra("name").toString()) Log.i("getResult", response.data?.getStringExtra("name").toString())
Log.i("getResult", response.data?.getStringExtra("authority").toString())
var user = "" var user = ""
try { try {
user = response.data?.getStringExtra("name").toString() user = response.data?.getStringExtra("name").toString()