Native Login (#28)

Author: smashedr

README.md

@@ -84,34 +84,35 @@ To use, share or open any file and choose the Django Files app.
 The app will then upload the file to your Django Files server.
 Additionally, the URL is copied to the clipboard and the preview show in the app.
 
-> [!IMPORTANT]  
-> If you use 2Factor, Local or GitHub OAuth is recommended.
-
 ## Features
 
-- Share or Open any file (or multiple) and automatically copy the URL to the clipboard.
+- Share or Open any file and automatically copy the URL to the clipboard.
 - Ability to add multiple servers and switch on the fly from the Server List menu.
-- Supports Local Login, GitHub OAuth, Google OAuth, Discord OAuth (w/o passkeys).
+- Supports Native Local Login, GitHub OAuth, Google OAuth, and Discord OAuth.
 - Native Upload feature from Navigation Drawer and Upload Shortcut on Icon long press.
-- Basic Native File List with Share/Open links, Infinite Scroll, Custom Per Page option.
+- Basic Native File List with Links, Preview, Infinite Scroll, Custom Per Page option.
 
 ### Planned
 
-- Ability to Shorten URL's.
-- Widget with Stats and quick options.
-- Option to Disable Preview for files and links.
-- Option to Preview file(s) before uploading w/ server selector and upload options.
-- Native App Login to support Discord passkeys and Google App Authentication.
-- Ability to Authenticate if your session (cookie) is expired or invalidated.
+- Add Default Upload Options.
+- Add Custom Options to Preview page.
+- Option to Disable Preview Page on Open, Share, and for Links.
+- Ability to Authenticate if/when your session (cookie) is expired.
+- Files List
+  - File Options on Preview
+  - Context Menu Button w/ Options
+  - Multi-Select w/ Options
+  - Response Caching for Infinite Scroll
 
 ### Known Issues
 
-- Login with Discord OAuth passkeys does not work.
-- Login with Google OAuth gives an error; however, may succeed if you wait ~30 seconds.
 - The app gets logged out if the session expires; however, sharing continues to work.
-  - Upon logging back in, you may need to leave the app open (in the background) for ~30 seconds to allow the cookie to be saved.
-- Deleting the active server does not deactivate it, and it remains active until selecting another server.
-- Uploading files from the website works; however, taking picture and recording video and audio does not.
+- Uploading files from the website works; however, taking picture and recording video/audio does not.
+- Logging out and deleting servers may have some unexpected results but should work.
+
+Note: If the app gets in a bad state, clear the app data or reinstall the application.
+
+For more planned features you can check out the internal [TODO.md](TODO.md).
 
 # Development
 

TODO.md

@@ -1,18 +1,22 @@
 # TODO
 
-- Implement Retrofit into Current Settings
-- ❓ Implement Room into Retrofit (or keep separate)
-- ❓ Replace SettingsActivity with a SettingsFragment
+## Upload
 
-## Layouts
+- Add Upload Options to Previews
+- Add Support for Multiple Files
 
-- Server Setup (Login)
-- Text Preview
-- Add Server
-- Edit Server
+## File List
 
-# Retrofit
+- Add Context Menu
+- Add Multi-Select
+- Add Options to Preview
+- Add Swiper to Preview
 
-- Server and Version Check
-- Authentication
-- ❓ Server Settings
+## Settings
+
+- Overhaul Server Selector
+- Add Default Upload Options
+
+## Retrofit
+
+- Implement Version Check

app/build.gradle.kts

@@ -2,9 +2,8 @@ plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.ksp)
-    alias(libs.plugins.kotlin.parcelize).apply {
-        javaClass.getDeclaredField("version").apply { isAccessible = true }.set(this, null)
-    }
+    //alias(libs.plugins.kotlin.kapt)
+    alias(libs.plugins.kotlin.parcelize)
     //alias(libs.plugins.androidx.navigation.safeargs.kotlin-gradle-plugin)
     //id("androidx.navigation.safeargs.kotlin") version "2.8.9" // Use the correct version
 }
@@ -48,6 +47,7 @@ android {
     }
     buildFeatures {
         viewBinding = true
+        //dataBinding = true
     }
 }
 

app/src/main/java/com/djangofiles/djangofiles/MainActivity.kt

@@ -11,21 +11,28 @@ import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.util.Log
+import android.webkit.CookieManager
 import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.edit
+import androidx.core.net.toUri
 import androidx.core.view.GravityCompat
 import androidx.drawerlayout.widget.DrawerLayout
+import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavController
 import androidx.navigation.NavOptions
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.ui.NavigationUI
 import com.djangofiles.djangofiles.databinding.ActivityMainBinding
 import com.djangofiles.djangofiles.ui.home.HomeViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import java.net.URL
 
 class MainActivity : AppCompatActivity() {
@@ -149,29 +156,35 @@ class MainActivity : AppCompatActivity() {
 
     private fun handleIntent(intent: Intent, savedInstanceState: Bundle?) {
         Log.d("handleIntent", "intent: $intent")
-        Log.d("handleIntent", "intent.data: ${intent.data}")
-        Log.d("handleIntent", "intent.type: ${intent.type}")
-        Log.d("handleIntent", "intent.action: ${intent.action}")
+        val data = intent.data
+        val type = intent.type
+        val action = intent.action
+        Log.d("handleIntent", "data: $data")
+        Log.d("handleIntent", "type: $type")
+        Log.d("handleIntent", "action: $action")
 
         val extraText = intent.getStringExtra(Intent.EXTRA_TEXT)
         Log.d("handleIntent", "extraText: $extraText")
 
         val sharedPreferences = getSharedPreferences("AppPreferences", MODE_PRIVATE)
         val savedUrl = sharedPreferences.getString("saved_url", null)
         Log.d("handleIntent", "savedUrl: $savedUrl")
+        Log.d("handleIntent", "data?.host: ${data?.host}")
         //val authToken = sharedPreferences.getString("auth_token", null)
         //Log.d("handleIntent", "authToken: $authToken")
 
-        if (savedUrl.isNullOrEmpty()) {
-            Log.i("handleIntent", "Missing Saved URL or Token...")
+        Log.d("handleIntent", "data?.host: ${data?.host}")
+        if (data?.host != "oauth" && savedUrl.isNullOrEmpty()) {
+            Log.i("handleIntent", "Missing Saved URL or Token! Showing Login...")
 
+            setDrawerLockMode(false)
             navController.navigate(
-                R.id.nav_item_setup, null, NavOptions.Builder()
+                R.id.nav_item_login, null, NavOptions.Builder()
                     .setPopUpTo(R.id.nav_item_home, true)
                     .build()
             )
 
-        } else if (Intent.ACTION_MAIN == intent.action) {
+        } else if (Intent.ACTION_MAIN == action) {
             Log.d("handleIntent", "ACTION_MAIN: ${savedInstanceState?.size()}")
 
             binding.drawerLayout.closeDrawers()
@@ -207,7 +220,7 @@ class MainActivity : AppCompatActivity() {
                 filePickerLauncher.launch(arrayOf("*/*"))
             }
 
-        } else if (Intent.ACTION_SEND == intent.action) {
+        } else if (Intent.ACTION_SEND == action) {
             Log.d("handleIntent", "ACTION_SEND")
 
             val fileUri = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
@@ -243,10 +256,10 @@ class MainActivity : AppCompatActivity() {
                     Log.w("handleIntent", "NOT IMPLEMENTED")
                 }
             } else {
-                showPreview(fileUri, intent.type)
+                showPreview(fileUri, type)
             }
 
-        } else if (Intent.ACTION_SEND_MULTIPLE == intent.action) {
+        } else if (Intent.ACTION_SEND_MULTIPLE == action) {
             Log.d("handleIntent", "ACTION_SEND_MULTIPLE")
 
             val fileUris = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
@@ -267,27 +280,35 @@ class MainActivity : AppCompatActivity() {
             Toast.makeText(this, "Not Yet Implemented!", Toast.LENGTH_LONG).show()
             Log.w("handleIntent", "NOT IMPLEMENTED")
 
-        } else if (Intent.ACTION_VIEW == intent.action) {
+        } else if (Intent.ACTION_VIEW == action) {
             Log.d("handleIntent", "ACTION_VIEW")
 
-            if ("djangofiles" == intent.data?.scheme) {
-                Log.d("handleIntent", "scheme: ${intent.data?.scheme}")
-                val host = intent.data?.host
-                Log.d("handleIntent", "host: $host")
-                if ("serverlist" == host) {
+            if (data == null) {
+                Toast.makeText(this, "That's a Bug!", Toast.LENGTH_LONG).show()
+                Log.e("handleIntent", "BUG: UNKNOWN action: $action")
+                return
+            }
+            if ("djangofiles" == data.scheme) {
+                Log.d("handleIntent", "scheme: ${data.scheme}")
+                Log.d("handleIntent", "host: ${data.host}")
+                if ("serverlist" == data.host) {
                     Log.d("handleIntent", "djangofiles://serverlist")
                     navController.navigate(R.id.nav_item_settings)
+                } else if ("logout" == data.host) {
+                    processLogout()
+                } else if ("oauth" == data.host) {
+                    processOauth(data)
                 } else {
                     Toast.makeText(this, "Unknown DeepLink!", Toast.LENGTH_LONG).show()
                     Log.w("handleIntent", "Unknown DeepLink!")
                 }
             } else {
-                Log.d("handleIntent", "File URI: ${intent.data}")
-                showPreview(intent.data, intent.type)
+                Log.d("handleIntent", "File URI: $data")
+                showPreview(data, type)
             }
         } else {
             Toast.makeText(this, "That's a Bug!", Toast.LENGTH_LONG).show()
-            Log.e("handleIntent", "BUG: UNKNOWN intent.action: ${intent.action}")
+            Log.e("handleIntent", "BUG: UNKNOWN action: $action")
         }
     }
 
@@ -315,6 +336,112 @@ class MainActivity : AppCompatActivity() {
         //    .build()
         //navController.navigate(R.id.nav_item_preview, bundle, navOptions)
     }
+
+    private fun processOauth(data: Uri) {
+        // TODO: Can do this in a fragment to show loading screen/errors eventually...
+        Log.d("handleIntent", "processOauth: data: $data")
+        val token = data.getQueryParameter("token")
+        val sessionKey = data.getQueryParameter("session_key")
+        val error = data.getQueryParameter("error")
+
+        // TODO: Handle null data and errors
+        Log.d("handleIntent", "token: $token")
+        Log.d("handleIntent", "session_key: $sessionKey")
+        Log.d("handleIntent", "error: $error")
+
+        // TODO: Determine how to better get oauthUrl
+        val sharedPreferences = this.getSharedPreferences("AppPreferences", MODE_PRIVATE)
+        val oauthUrl = sharedPreferences.getString("oauth_host", null)
+        Log.d("handleIntent", "oauthUrl: $oauthUrl")
+        if (oauthUrl == null) {
+            // TODO: Handle this error...
+            Log.e("handleIntent", "oauthUrl is null")
+            return
+        }
+
+        sharedPreferences.edit {
+            putString("saved_url", oauthUrl)
+            putString("auth_token", token)
+        }
+        lifecycleScope.launch {
+            val dao: ServerDao =
+                ServerDatabase.getInstance(this@MainActivity).serverDao()
+            withContext(Dispatchers.IO) {
+                dao.add(Server(url = oauthUrl, token = token!!, active = true))
+            }
+        }
+
+        val cookieManager = CookieManager.getInstance()
+        //cookieManager.setAcceptThirdPartyCookies(webView, true)
+        val cookie = "sessionid=$sessionKey; Path=/; HttpOnly; Secure"
+        Log.d("handleIntent", "cookie: $cookie")
+
+        val uri = oauthUrl.toUri()
+        val origin = "${uri.scheme}://${uri.authority}"
+        Log.d("handleIntent", "origin: $origin")
+        cookieManager.setCookie(origin, cookie) { cookieManager.flush() }
+
+        Log.d("handleIntent", "navigate: nav_item_home - setPopUpTo: nav_item_login")
+        setDrawerLockMode(true)
+        navController.navigate(
+            R.id.nav_item_home, null, NavOptions.Builder()
+                .setPopUpTo(R.id.nav_item_login, true)
+                .build()
+        )
+    }
+
+    private fun processLogout() {
+        val sharedPreferences = this.getSharedPreferences("AppPreferences", MODE_PRIVATE)
+        val savedUrl = sharedPreferences.getString("saved_url", null)
+        Log.d("processLogout", "savedUrl: $savedUrl")
+        sharedPreferences.edit {
+            remove("saved_url")
+            remove("auth_token")
+        }
+        val dao: ServerDao = ServerDatabase.getInstance(this).serverDao()
+        lifecycleScope.launch {
+            if (savedUrl != null) {
+                Log.d("processLogout", "dao.delete: $savedUrl")
+                val server = Server(url = savedUrl)
+                Log.d("processLogout", "server: $server")
+                withContext(Dispatchers.IO) { dao.delete(server) }
+            }
+            val servers = withContext(Dispatchers.IO) { dao.getAll() }
+            Log.d("processLogout", "servers: $servers")
+            if (servers.isEmpty()) {
+                Log.d("processLogout", "NO MORE SERVERS - LOCK TO LOGIN")
+                //(requireActivity() as MainActivity).setDrawerLockMode(false)
+                setDrawerLockMode(false)
+                // TODO: Confirm this removes history and locks user to login
+                navController.navigate(
+                    R.id.nav_item_login, null, NavOptions.Builder()
+                        .setPopUpTo(R.id.nav_item_home, true)
+                        .build()
+                )
+            } else {
+                Log.d("processLogout", "MORE SERVERS - ACTIVATE ONE")
+                //servers.firstOrNull()?.let { dao.activate(it.url) }
+                val server = servers.first()
+                Log.d("processLogout", "server: $server")
+                withContext(Dispatchers.IO) { dao.activate(server.url) }
+
+                sharedPreferences.edit().apply {
+                    putString("saved_url", server.url)
+                    putString("auth_token", server.token)
+                    apply()
+                }
+
+                Log.d("processLogout", "navigate: nav_item_login")
+                // TODO: Determine proper navigate call here...
+                navController.navigate(R.id.nav_item_settings)
+                //findNavController().navigate(
+                //    R.id.nav_item_settings, null, NavOptions.Builder()
+                //        .setPopUpTo(R.id.nav_item_home, true)
+                //        .build()
+                //)
+            }
+        }
+    }
 }
 
 fun copyToClipboard(context: Context, url: String) {

app/src/main/java/com/djangofiles/djangofiles/RoomData.kt

@@ -29,6 +29,9 @@ interface ServerDao {
     @Insert
     fun add(server: Server)
 
+    @Query("UPDATE server SET active = 1 WHERE url = :url")
+    fun activate(url: String)
+
     @Delete
     fun delete(server: Server)
 }