Add Login Options to Dev Menu

libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.kt

@@ -102,13 +102,15 @@ import com.salesforce.androidsdk.auth.idp.interfaces.IDPManager
 import com.salesforce.androidsdk.auth.idp.interfaces.SPManager
 import com.salesforce.androidsdk.config.AdminPermsManager
 import com.salesforce.androidsdk.config.AdminSettingsManager
+import com.salesforce.androidsdk.config.BootConfig
 import com.salesforce.androidsdk.config.BootConfig.getBootConfig
 import com.salesforce.androidsdk.config.LoginServerManager
 import com.salesforce.androidsdk.config.LoginServerManager.PRODUCTION_LOGIN_URL
 import com.salesforce.androidsdk.config.LoginServerManager.SANDBOX_LOGIN_URL
 import com.salesforce.androidsdk.config.LoginServerManager.WELCOME_LOGIN_URL
 import com.salesforce.androidsdk.config.RuntimeConfig.ConfigKey.IDPAppPackageName
 import com.salesforce.androidsdk.config.RuntimeConfig.getRuntimeConfig
+import com.salesforce.androidsdk.developer.support.DevSupportInfo
 import com.salesforce.androidsdk.developer.support.notifications.local.ShowDeveloperSupportNotifier.Companion.BROADCAST_INTENT_ACTION_SHOW_DEVELOPER_SUPPORT
 import com.salesforce.androidsdk.developer.support.notifications.local.ShowDeveloperSupportNotifier.Companion.hideDeveloperSupportNotification
 import com.salesforce.androidsdk.developer.support.notifications.local.ShowDeveloperSupportNotifier.Companion.showDeveloperSupportNotification
@@ -1338,6 +1340,10 @@ open class SalesforceSDKManager protected constructor(
     }
 
     /** Information to display in the developer support dialog */
+    @Deprecated(
+        "Will be removed in Mobile SDK 14.0, please use the new data class representation.",
+        ReplaceWith("devSupportInfo")
+    )
     open val devSupportInfos: List<String>
         get() = mutableListOf(
             "SDK Version", SDK_VERSION,
@@ -1377,6 +1383,25 @@ open class SalesforceSDKManager protected constructor(
             }
         }
 
+    open val devSupportInfo
+        get() = DevSupportInfo(
+            SDK_VERSION,
+            appType,
+            userAgent,
+            userAccountManager.authenticatedUsers ?: emptyList(),
+            authConfig = listOf(
+                "Use Web Server Authentication" to "$useWebServerAuthentication",
+                "Use Hybrid Authentication Token" to "$useHybridAuthentication",
+                "Support Welcome Discovery" to "$supportsWelcomeDiscovery",
+                "Browser Login Enabled" to "$isBrowserLoginEnabled",
+                "IDP Enabled" to "$isIDPLoginFlowEnabled",
+                "Identity Provider" to "$isIdentityProvider",
+            ),
+            BootConfig.getBootConfig(appContext),
+            userAccountManager.currentUser,
+            getRuntimeConfig(appContext),
+        )
+
     private fun accessTokenExpiration(): String {
         val currentUser = userAccountManager.cachedCurrentUser
         var expiration = "Unknown"
@@ -1418,6 +1443,20 @@ open class SalesforceSDKManager protected constructor(
         return devInfos
     }
 
+    /**
+     * Returns a string representation of the provided users.
+     * @param userAccounts The user accounts
+     * @return A string representation of the provided users.
+     */
+    private fun usersToString(
+        vararg userAccounts: UserAccount
+    ) = join(
+        ", ",
+        userAccounts.map { userAccount ->
+            userAccount.accountName
+        }
+    )
+
     /**
      * Returns a string representation of the provided users.
      * @param userAccounts The user accounts
@@ -1426,9 +1465,7 @@ open class SalesforceSDKManager protected constructor(
     private fun usersToString(
         userAccounts: List<UserAccount>?
     ) = userAccounts?.toTypedArray<UserAccount>()?.let {
-        join(", ", it.map { userAccount ->
-            userAccount.accountName
-        })
+        usersToString(*it)
     } ?: ""
 
     /** Sends the logout completed intent */

libs/SalesforceSDK/src/com/salesforce/androidsdk/developer/support/DevSupportInfo.kt

@@ -0,0 +1,101 @@
+package com.salesforce.androidsdk.developer.support
+
+import com.salesforce.androidsdk.accounts.UserAccount
+import com.salesforce.androidsdk.auth.JwtAccessToken
+import com.salesforce.androidsdk.config.BootConfig
+import com.salesforce.androidsdk.config.RuntimeConfig
+import java.text.SimpleDateFormat
+import java.util.Locale
+
+data class DevSupportInfo(
+    val sdkVersion: String,
+    val appType: String,
+    val userAgent: String,
+    val authenticatedUsers: List<UserAccount>,
+    val authConfig: List<Pair<String, String>>,
+    val bootConfig: BootConfig,
+    val currentUser: UserAccount?,
+    val runtimeConfig: RuntimeConfig,
+) {
+    val bootConfigValues: List<Pair<String, String>> by lazy {
+        with(bootConfig) {
+            val values = mutableListOf(
+                "Consumer Key" to remoteAccessConsumerKey,
+                "Redirect URI" to oauthRedirectURI,
+                "Scopes" to oauthScopes.joinToString(separator = " "),
+            )
+
+            if (appType == "Hybrid") {
+                values.addAll(
+                    listOf(
+                        "Local" to isLocal.toString(),
+                        "Start Page" to startPage,
+                        "Unauthenticated Start Page" to unauthenticatedStartPage,
+                        "Error Page" to errorPage,
+                        "Should Authenticate" to shouldAuthenticate().toString(),
+                        "Attempt Offline Load" to attemptOfflineLoad().toString(),
+                    )
+                )
+            }
+
+            return@lazy values
+        }
+    }
+
+    val authenticatedUsersString: String = authenticatedUsers.joinToString(separator = ",\n") {
+        "${it.displayName} (${it.username})"
+    }
+
+    val currentUserInfo:  List<Pair<String, String>> by lazy {
+        if (currentUser != null) {
+            with(currentUser) {
+                return@lazy mutableListOf(
+                    "Username" to username,
+                    "Consumer Key" to clientId,
+                    "Scopes" to scope,
+                    "Instance URL" to instanceServer,
+                    "Token Format" to tokenFormat,
+                    "Access Token Expiration" to accessTokenExpiration,
+                    "Beacon Child Consumer Key" to beaconChildConsumerKey,
+                )
+            }
+        } else {
+            emptyList()
+        }
+    }
+
+    val runtimeConfigValues: List<Pair<String, String>> by lazy {
+        with(runtimeConfig) {
+            val values = mutableListOf(
+                "Managed App" to isManagedApp.toString()
+            )
+
+            if (isManagedApp) {
+                values.addAll(listOf(
+                    "OAuth ID" to (getString(RuntimeConfig.ConfigKey.ManagedAppOAuthID) ?: "N/A"),
+                    "Callback URL" to (getString(RuntimeConfig.ConfigKey.ManagedAppCallbackURL) ?: "N/A"),
+                    "Require Cert Auth" to getBoolean(RuntimeConfig.ConfigKey.RequireCertAuth).toString(),
+                    "Only Show Authorized Hosts" to getBoolean(RuntimeConfig.ConfigKey.OnlyShowAuthorizedHosts).toString(),
+                ))
+            }
+
+            return@lazy values
+        }
+    }
+
+    val accessTokenExpiration: String
+        get() {
+            var expiration = "Unknown"
+
+            if (currentUser?.tokenFormat == "jwt") {
+                val jwtAccessToken = JwtAccessToken(currentUser.authToken)
+                val expirationDate = jwtAccessToken.expirationDate()
+                if (expirationDate != null) {
+                    val dateFormatter = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())
+                    expiration = dateFormatter.format(expirationDate)
+                }
+            }
+
+            return expiration
+    }
+}