v1.0.3

* added location request

* make headers be optional in doGet

* add capability of getting encrypted fingerprint

fix #8

---------

Co-authored-by: Alex Eduardo Chiaranda <aechiara@gmail.com>
Co-authored-by: Vitor Cardoso <vitor.cardoso@sec4you.com.br>

Author: 3 people

.editorconfig

@@ -8,7 +8,7 @@ root = true
 
 # Change these settings to your own preference
 indent_style = space
-indent_size = 2
+indent_size = 4
 
 # We recommend you to keep these unchanged
 end_of_line = lf

.idea/misc.xml

@@ -66,7 +66,7 @@ dependencies {
   debugImplementation("androidx.compose.ui:ui-test-manifest")
   implementation("androidx.navigation:navigation-compose:2.7.7")
 
-  implementation("com.google.android.gms:play-services-location:21.3.0")
+  implementation("com.google.android.gms:play-services-location:20.0.0")
 
   // corotines for http call
   implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")

app/build.gradle.kts

@@ -3,6 +3,11 @@
     xmlns:tools="http://schemas.android.com/tools">
 
   <uses-permission android:name="android.permission.INTERNET" />
+  <!-- Used by DNA -->
+  <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+  <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+  <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 
 
   <application

app/src/main/AndroidManifest.xml

@@ -1,10 +1,13 @@
 package br.com.sec4you.authfy.app
 
+import android.Manifest
+import android.content.pm.PackageManager
 import android.app.Activity
 import android.content.Context
 import android.net.Uri
 import android.util.Base64
 import android.util.Log
+import android.widget.Toast
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.ActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
@@ -37,6 +40,7 @@ import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -50,6 +54,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.core.content.ContextCompat
 import androidx.navigation.NavController
 import androidx.navigation.compose.rememberNavController
 import br.com.sec4you.authfy.app.ui.theme.AuthfySampleTheme
@@ -84,6 +89,71 @@ fun AuthScreen(
   val authService = remember { AuthorizationService(context) }
   var errorMessage by remember { mutableStateOf<String?>(null) }
 
+
+/* LOCATION */
+
+    // State to track if location permission is granted
+    val isLocationPermissionGranted = remember { mutableStateOf(false) }
+
+    // Function to get location (you'll implement this - same as in Activity example)
+    fun getLocation(context: android.content.Context) {
+        // Implement your location retrieval logic here using FusedLocationProviderClient etc.
+        // Make sure to use the 'context' passed to this function
+        Toast.makeText(context, "Getting Location... (AuthScreen)", Toast.LENGTH_SHORT).show()
+        // ... Location retrieval code (FusedLocationProviderClient) ...
+        // ... Remember to handle permission check *again* within getLocation() if necessary in more complex scenarios
+    }
+
+    // Launcher for requesting location permission
+    val locationPermissionLauncher = rememberLauncherForActivityResult(
+        ActivityResultContracts.RequestPermission()
+    ) { isGranted: Boolean ->
+        if (isGranted) {
+            isLocationPermissionGranted.value = true
+            Toast.makeText(context, "Location permission granted in AuthScreen", Toast.LENGTH_SHORT).show()
+            getLocation(context) // Call function to get location after permission is granted
+        } else {
+            isLocationPermissionGranted.value = false
+            Toast.makeText(context, "Location permission denied in AuthScreen", Toast.LENGTH_SHORT).show()
+            // Handle permission denial scenario - maybe explain why location is needed for some features
+        }
+    }
+
+    // Function to check location permission
+    fun checkLocationPermission() {
+        if (ContextCompat.checkSelfPermission(
+                context,
+                Manifest.permission.ACCESS_FINE_LOCATION
+            ) == PackageManager.PERMISSION_GRANTED
+        ) {
+            isLocationPermissionGranted.value = true
+            Toast.makeText(context, "Location permission already granted in AuthScreen", Toast.LENGTH_SHORT).show()
+            getLocation(context) // Permission already granted, get location directly
+        } else {
+            isLocationPermissionGranted.value = false // Not strictly needed, but for clarity
+        }
+    }
+
+    // Function to request location permission
+    fun requestLocationPermission() {
+        locationPermissionLauncher.launch(Manifest.permission.ACCESS_FINE_LOCATION)
+    }
+
+    // LaunchedEffect to run code when the Composable is launched (similar to onCreate in Activity)
+    LaunchedEffect(Unit) { // Unit means it runs only once on initial composition
+        checkLocationPermission() // Check permission when AuthScreen is displayed
+        if (!isLocationPermissionGranted.value) {
+            requestLocationPermission() // Request permission if not already granted
+        }
+        // ... other initialization logic for AuthScreen if needed ...
+    }
+
+
+/* LOCATION */
+
+
+
+
   if (authenticated) {
     navController.navigate(Screen.StartScreen.route)
     return

app/src/main/java/br/com/sec4you/authfy/app/AuthScreen.kt

@@ -26,17 +26,19 @@ object NetworkUtils {
   }
 
   suspend fun doGet(
-    urlString: String, headers: Map<String, String>
+    urlString: String, headers: Map<String, String>?
   ): NetworkResult<Map<String, Any>> {
     return withContext(Dispatchers.IO) {
       try {
       val url = URL(urlString)
       val connection = url.openConnection() as HttpURLConnection
 
       // Configurar headers
-      for ((key, value) in headers) {
-        connection.setRequestProperty(key, value)
-      }
+          if (headers != null) {
+              for ((key, value) in headers) {
+                  connection.setRequestProperty(key, value)
+              }
+          }
 
       try {
         connection.requestMethod = "GET"