MOB-41 fixed some remaining issues

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

@@ -11,6 +11,12 @@ import androidx.activity.result.contract.ActivityResultContracts
 import com.example.testmobileapp.databinding.ActivityMainBinding
 import com.google.gson.JsonObject
 import com.koushikdutta.ion.Ion
+import org.json.JSONObject
+
+/**
+ * Base url where the requests should be made. Add yours here. It must use https.
+ */
+private const val BASE_URL = "https-base-url-here"
 
 /**
  * Test mobile app to demonstrate how other applications can use MobileAuthApp.
@@ -32,6 +38,24 @@ class MainActivity : AppCompatActivity() {
                 // Currently we are not actually checking whether we get a valid token.
                 // For testing purposes only, to make sure that we are able to get a response at all.
                 binding.loginTextView.text = getString(R.string.auth_success)
+                Log.i("getResult", response.data?.getStringExtra("token").toString())
+                Log.i("getResult", response.data?.getStringExtra("result").toString())
+                var user = ""
+                try {
+                    val resultObject = JSONObject(response.data?.getStringExtra("result").toString())
+                    user = resultObject.getString("principal")
+                } catch (e: Exception) {
+                    Log.i("getResult", "unable to retrieve name from principal")
+                }
+                showResult(user)
+                /*
+                binding.loginOptionNfcButton.text = "Log Out"
+                binding.loginOptionNfcButton.setOnClickListener {
+                    binding.loginOptionNfcButton.text = "NFC auth"
+                    binding.loginOptionNfcButton.setOnClickListener { getData() }
+                }
+
+                 */
             }
             if (response.resultCode == Activity.RESULT_CANCELED) {
                 binding.loginTextView.text = getString(R.string.auth_failure)
@@ -64,9 +88,7 @@ class MainActivity : AppCompatActivity() {
      */
     private fun getData() {
         // Enter the server endpoint address to here
-        //val originUrl = "enter-base-url-here"
+        val url = "$BASE_URL/auth/challenge"
-        val originUrl = "https://5d0c-85-253-195-195.ngrok.io"
-        val url = "$originUrl/auth/challenge"
         Ion.getDefault(this).conscryptMiddleware.enable(false)
         Ion.with(applicationContext)
             .load(url)
@@ -76,7 +98,7 @@ class MainActivity : AppCompatActivity() {
                     // Get data from the result and call launchAuth method
                     val challenge = result.asJsonObject["nonce"].toString().replace("\"", "")
                     Log.v("Challenge", challenge)
-                    launchAuth(challenge, originUrl, "/auth/authentication")
+                    launchAuth(challenge, BASE_URL, "/auth/authentication")
                 } catch (e: Exception) {
                     Log.i("GETrequest", "was unsuccessful")
                 }
@@ -87,14 +109,12 @@ class MainActivity : AppCompatActivity() {
         binding.loginOptions.visibility = View.VISIBLE
     }
 
-    private fun showResult(resultObject: String, token: String) {
+    private fun showResult(user: String) {
         binding.loginOptions.visibility = View.GONE
         binding.resultLayout.visibility = View.VISIBLE
-        binding.resultObject.text = resultObject
+        binding.resultObject.text = getString(R.string.hello, user)
-        binding.resultToken.text = token
         binding.buttonForget.setOnClickListener {
             binding.resultObject.text = ""
-            binding.resultToken.text = ""
             binding.resultLayout.visibility = View.GONE
             binding.loginOptions.visibility = View.VISIBLE
         }

TestMobileApp/app/src/main/res/layout/activity_main.xml

@@ -52,7 +52,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/login_text_view"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         android:visibility="gone">
@@ -64,14 +64,7 @@
             android:layout_margin="6dp"
             android:textSize="18sp"/>
 
-        <TextView
+        <Button
-            android:id="@+id/result_token"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="6dp"
-            android:textSize="18sp"/>
-
-        <TextView
             android:id="@+id/button_forget"
             android:text="@string/forget_button"
             android:layout_width="wrap_content"

TestMobileApp/app/src/main/res/values-en/strings.xml

@@ -4,7 +4,8 @@
     <string name="login_text">Login</string>
     <string name="choose_login_method">Choose login method</string>
     <string name="method_nfc">NFC auth</string>
-    <string name="auth_success">Successful response</string>
+    <string name="auth_success">Logged in</string>
     <string name="auth_failure">Response failed</string>
     <string name="forget_button">Forget</string>
+    <string name="hello">Hello, %s!</string>
 </resources>

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

@@ -4,7 +4,8 @@
     <string name="login_text">Logi sisse</string>
     <string name="choose_login_method">Vali sobiv meetod</string>
     <string name="method_nfc">NFC auth</string>
-    <string name="auth_success">Vastus kätte saadud</string>
+    <string name="auth_success">Sisse logimine õnnestus</string>
     <string name="auth_failure">Vastust ei õnnestunud kätte saada</string>
     <string name="forget_button">Unusta</string>
+    <string name="hello">Tere, %s!</string>
 </resources>

TestMobileApp/app/src/main/res/values/strings.xml

@@ -3,7 +3,8 @@
     <string name="login_text">Login</string>
     <string name="choose_login_method">Choose login method</string>
     <string name="method_nfc">NFC auth</string>
-    <string name="auth_success">Successful response</string>
+    <string name="auth_success">Logged in</string>
     <string name="auth_failure">Response failed</string>
     <string name="forget_button">Forget</string>
+    <string name="hello">Hello, %s!</string>
 </resources>