FR-17035 - Add support for navigate to specific activity after authen…

…tication
frontegg · Jul 14, 2024 · 248e0a6 · 248e0a6
1 parent b0b75ed
commit 248e0a6
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 10 deletions.
diff --git a/android/src/main/java/com/frontegg/android/EmbeddedAuthActivity.kt b/android/src/main/java/com/frontegg/android/EmbeddedAuthActivity.kt
@@ -43,8 +43,10 @@ class EmbeddedAuthActivity : Activity() {
         val intentLaunched =
             intent.extras?.getBoolean(AUTH_LAUNCHED, false) ?: false
 
-        this.directLoginLaunched = intent.extras?.getBoolean(DIRECT_LOGIN_ACTION_LAUNCHED, false) ?: false
-        this.directLoginLaunchedDone = intent.extras?.getBoolean(DIRECT_LOGIN_ACTION_LAUNCHED_DONE, false) ?: false
+        this.directLoginLaunched =
+            intent.extras?.getBoolean(DIRECT_LOGIN_ACTION_LAUNCHED, false) ?: false
+        this.directLoginLaunchedDone =
+            intent.extras?.getBoolean(DIRECT_LOGIN_ACTION_LAUNCHED_DONE, false) ?: false
 
 
         if (directLoginLaunchedDone || intent.extras == null) {
@@ -118,8 +120,15 @@ class EmbeddedAuthActivity : Activity() {
     }
 
     private fun navigateToAuthenticated() {
-        setResult(RESULT_OK)
-        finish()
+        val mainActivityClass = FronteggApp.getInstance().mainActivityClass
+        if (mainActivityClass != null) {
+            val intent = Intent(this, mainActivityClass)
+            startActivity(intent)
+            finish()
+        } else {
+            setResult(RESULT_OK)
+            finish()
+        }
     }
 
     override fun onResume() {

diff --git a/android/src/main/java/com/frontegg/android/FronteggApp.kt b/android/src/main/java/com/frontegg/android/FronteggApp.kt
@@ -23,6 +23,7 @@ class FronteggApp private constructor(
     var shouldPromptSocialLoginConsent: Boolean = true,
     val useAssetsLinks: Boolean = false,
     var useChromeCustomTabs: Boolean = false,
+    var mainActivityClass: Class<*>? = null
 ) {
 
     val credentialManager: CredentialManager = CredentialManager(context)
@@ -49,7 +50,8 @@ class FronteggApp private constructor(
             clientId: String,
             context: Context,
             useAssetsLinks: Boolean = false,
-            useChromeCustomTabs: Boolean = false
+            useChromeCustomTabs: Boolean = false,
+            mainActivityClass: Class<*>? = null
         ) {
             val baseUrl: String = if (fronteggDomain.startsWith("https")) {
                 fronteggDomain
@@ -64,15 +66,17 @@ class FronteggApp private constructor(
                 clientId = clientId,
                 isEmbeddedMode = isEmbeddedMode,
                 useAssetsLinks = useAssetsLinks,
-                useChromeCustomTabs = useChromeCustomTabs
+                useChromeCustomTabs = useChromeCustomTabs,
+                mainActivityClass = mainActivityClass
             )
         }
 
         public fun initWithRegions(
             regions: List<RegionConfig>,
             context: Context,
             useAssetsLinks: Boolean = false,
-            useChromeCustomTabs: Boolean = false
+            useChromeCustomTabs: Boolean = false,
+            mainActivityClass: Class<*>? = null
         ): FronteggApp {
 
             val isEmbeddedMode = isActivityEnabled(context, EmbeddedAuthActivity::class.java.name)
@@ -89,7 +93,8 @@ class FronteggApp private constructor(
                         regions = regions,
                         selectedRegion = regionConfig,
                         useAssetsLinks = useAssetsLinks,
-                        useChromeCustomTabs = useChromeCustomTabs
+                        useChromeCustomTabs = useChromeCustomTabs,
+                        mainActivityClass = mainActivityClass
                     )
                     instance = newInstance
                     return newInstance
@@ -102,7 +107,8 @@ class FronteggApp private constructor(
                 isEmbeddedMode = isEmbeddedMode,
                 regions = regions,
                 useAssetsLinks = useAssetsLinks,
-                useChromeCustomTabs = useChromeCustomTabs
+                useChromeCustomTabs = useChromeCustomTabs,
+                mainActivityClass = mainActivityClass
             )
             instance = newInstance
             return newInstance

diff --git a/embedded/src/main/AndroidManifest.xml b/embedded/src/main/AndroidManifest.xml
@@ -16,6 +16,7 @@
         <activity
             android:name=".NavigationActivity"
             android:exported="true"
+            android:launchMode="singleTop"
             android:label="@string/title_activity_navigation">
 
             <intent-filter>

diff --git a/embedded/src/main/java/com/frontegg/demo/App.kt b/embedded/src/main/java/com/frontegg/demo/App.kt
@@ -17,7 +17,9 @@ class App : Application() {
             BuildConfig.FRONTEGG_CLIENT_ID,
             this,
             useAssetsLinks = true,
-            useChromeCustomTabs = true
+            useChromeCustomTabs = true,
+            mainActivityClass = NavigationActivity::class.java
+
         )
     }
 }