Added Multi App Support

frontegg · Jul 22, 2024 · edb1520 · edb1520
1 parent 89730e5
commit edb1520
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 8 deletions.
diff --git a/android/src/main/java/com/frontegg/android/FronteggApp.kt b/android/src/main/java/com/frontegg/android/FronteggApp.kt
@@ -14,6 +14,7 @@ class FronteggApp private constructor(
     val context: Context,
     var baseUrl: String,
     var clientId: String,
+    var applicationId: String?,
     val isEmbeddedMode: Boolean = true,
     val regions: List<RegionConfig> = listOf(),
     val selectedRegion: RegionConfig? = null,
@@ -27,7 +28,7 @@ class FronteggApp private constructor(
 
     val credentialManager: CredentialManager = CredentialManager(context)
     val auth: FronteggAuth =
-        FronteggAuth(baseUrl, clientId, credentialManager, regions, selectedRegion)
+        FronteggAuth(baseUrl, clientId, applicationId, credentialManager, regions, selectedRegion)
     val packageName: String = context.packageName
 
     companion object {
@@ -47,6 +48,7 @@ class FronteggApp private constructor(
         public fun init(
             fronteggDomain: String,
             clientId: String,
+            applicationId: String? = null,
             context: Context,
             useAssetsLinks: Boolean = false,
             useChromeCustomTabs: Boolean = false
@@ -62,6 +64,7 @@ class FronteggApp private constructor(
                 context = context,
                 baseUrl = baseUrl,
                 clientId = clientId,
+                applicationId = applicationId,
                 isEmbeddedMode = isEmbeddedMode,
                 useAssetsLinks = useAssetsLinks,
                 useChromeCustomTabs = useChromeCustomTabs
@@ -85,6 +88,7 @@ class FronteggApp private constructor(
                         context = context,
                         baseUrl = regionConfig.baseUrl,
                         clientId = regionConfig.clientId,
+                        applicationId = regionConfig.applicationId,
                         isEmbeddedMode = isEmbeddedMode,
                         regions = regions,
                         selectedRegion = regionConfig,
@@ -99,6 +103,7 @@ class FronteggApp private constructor(
                 context = context,
                 baseUrl = "",
                 clientId = "",
+                applicationId = null,
                 isEmbeddedMode = isEmbeddedMode,
                 regions = regions,
                 useAssetsLinks = useAssetsLinks,

diff --git a/android/src/main/java/com/frontegg/android/FronteggAuth.kt b/android/src/main/java/com/frontegg/android/FronteggAuth.kt
@@ -31,7 +31,7 @@ import kotlin.concurrent.schedule
 class FronteggAuth(
     var baseUrl: String,
     var clientId: String,
-
+    var applicationId: String?,
     val credentialManager: CredentialManager,
     val regions: List<RegionConfig>,
     var selectedRegion: RegionConfig?
@@ -71,7 +71,7 @@ class FronteggAuth(
 
     val api: Api
         get() = (if (this._api == null) {
-            this._api = Api(this.baseUrl, this.clientId, credentialManager)
+            this._api = Api(this.baseUrl, this.applicationId, credentialManager)
             this._api
         } else {
             this._api
@@ -83,6 +83,7 @@ class FronteggAuth(
 
         this.baseUrl = region.baseUrl
         this.clientId = region.clientId
+        this.applicationId = region.applicationId
 
         this.initializeSubscriptions()
     }

diff --git a/android/src/main/java/com/frontegg/android/regions/RegionConfig.kt b/android/src/main/java/com/frontegg/android/regions/RegionConfig.kt
@@ -1,7 +1,13 @@
 package com.frontegg.android.regions
 
-class RegionConfig(val key: String, baseUrl: String, val clientId: String) {
+class RegionConfig(
+    val key: String,
+    baseUrl: String,
+    val clientId: String,
+    val applicationId: String?
+) {
     val baseUrl: String
+
     init {
 
         this.baseUrl = if (baseUrl.startsWith("http")) {

diff --git a/android/src/main/java/com/frontegg/android/services/Api.kt b/android/src/main/java/com/frontegg/android/services/Api.kt
@@ -21,7 +21,7 @@ import java.lang.Exception
 
 open class Api(
     private var baseUrl: String,
-    private var clientId: String,
+    private var applicationId: String?,
     private var credentialManager: CredentialManager
 ) {
     private var httpClient: OkHttpClient = OkHttpClient()
@@ -39,6 +39,11 @@ open class Api(
             Pair("Origin", this.baseUrl)
         )
 
+        val applicationId = this.applicationId
+        if (applicationId != null) {
+            headers["frontegg-requested-application-id"] = applicationId
+        }
+
         additionalHeaders.forEach {
             headers[it.key] = it.value
         }

diff --git a/android/src/main/java/com/frontegg/android/utils/AuthorizeUrlGenerator.kt b/android/src/main/java/com/frontegg/android/utils/AuthorizeUrlGenerator.kt
@@ -4,14 +4,15 @@ import android.net.Uri
 import android.util.Log
 import com.frontegg.android.FronteggApp
 import java.security.MessageDigest
-import java.util.*
+import java.util.Base64
 
 class AuthorizeUrlGenerator {
     companion object {
         private val TAG = AuthorizeUrlGenerator::class.java.simpleName
     }
 
     private var clientId: String = FronteggApp.getInstance().clientId
+    private var applicationId: String? = FronteggApp.getInstance().applicationId
     private var baseUrl: String = FronteggApp.getInstance().baseUrl
 
     private fun createRandomString(length: Int = 16): String {
@@ -44,7 +45,7 @@ class AuthorizeUrlGenerator {
         val credentialManager = FronteggApp.getInstance().credentialManager
 
 
-        val codeVerifier:String = if (preserveCodeVerifier == true) {
+        val codeVerifier: String = if (preserveCodeVerifier == true) {
             credentialManager.getCodeVerifier()!!
         } else {
             val code = createRandomString()
@@ -60,7 +61,7 @@ class AuthorizeUrlGenerator {
             .encodedPath(baseUrl)
             .appendEncodedPath("oauth/authorize")
             .appendQueryParameter("response_type", "code")
-            .appendQueryParameter("client_id", clientId)
+            .appendQueryParameter("client_id", applicationId ?: clientId)
             .appendQueryParameter("scope", "openid email profile")
             .appendQueryParameter("redirect_uri", redirectUrl)
             .appendQueryParameter("code_challenge", codeChallenge)

diff --git a/app/build.gradle b/app/build.gradle
@@ -5,6 +5,7 @@ plugins {
 
 def fronteggDomain = "auth.davidantoon.me"
 def fronteggClientId = "b6adfe4c-d695-4c04-b95f-3ec9fd0c6cca"
+def fronteggApplicationId = "16407b9a-5b6c-43de-9f58-6a1d1e0077f8"
 
 android {
     namespace 'com.frontegg.demo'
@@ -28,6 +29,7 @@ android {
 
         buildConfigField "String", 'FRONTEGG_DOMAIN', "\"$fronteggDomain\""
         buildConfigField "String", 'FRONTEGG_CLIENT_ID', "\"$fronteggClientId\""
+        buildConfigField "String", 'FRONTEGG_APPLOCATION_ID', "\"$fronteggApplicationId\""
     }
 
     buildTypes {

diff --git a/app/src/main/java/com/frontegg/demo/App.kt b/app/src/main/java/com/frontegg/demo/App.kt
@@ -16,6 +16,7 @@ class App : Application() {
         FronteggApp.init(
             BuildConfig.FRONTEGG_DOMAIN,
             BuildConfig.FRONTEGG_CLIENT_ID,
+            BuildConfig.FRONTEGG_APPLOCATION_ID,
             this,
         )
     }

diff --git a/embedded/src/main/java/com/frontegg/demo/App.kt b/embedded/src/main/java/com/frontegg/demo/App.kt
@@ -15,6 +15,7 @@ class App : Application() {
         FronteggApp.init(
             BuildConfig.FRONTEGG_DOMAIN,
             BuildConfig.FRONTEGG_CLIENT_ID,
+            BuildConfig.FRONTEGG_APPLICATION_ID,
             this,
             useAssetsLinks = true,
             useChromeCustomTabs = true