Beta Release: FlowVault (FlowDB) SDK

.gitignore

@@ -14,3 +14,5 @@
 .externalNativeBuild
 .cxx
 local.properties
+
+flowvault-samples/

Skyflow/build.gradle

@@ -8,7 +8,7 @@ ext {
     mGroupId = "com.skyflowapi.android"
     mArtifactId = "skyflow-android-sdk"
     mVersionCode = 1
-    mVersionName = "1.27.0"
+    mVersionName = "1.27.0-dev.7df0e54"
 
     mLibraryName = "skyflow-android"
     mLibraryDescription = "Skyflow’s android SDK can be used to securely collect, tokenize, and display sensitive data in the mobile without exposing your front-end infrastructure to sensitive data."
@@ -17,6 +17,7 @@ ext {
 android {
     namespace "com.skyflow_android"
     compileSdk 35
+    buildToolsVersion "35.0.0"
 
     defaultConfig {
         minSdk 21

Skyflow/src/main/kotlin/Skyflow/AdditionalFields.kt

@@ -0,0 +1,9 @@
+package Skyflow
+
+data class AdditionalFields(val records: List<AdditionalFieldsRecord>)
+
+data class AdditionalFieldsRecord(
+    val tableName: String,
+    val data: Map<String, Any>,
+    val skyflowId: String? = null
+)

Skyflow/src/main/kotlin/Skyflow/Client.kt

@@ -2,234 +2,41 @@ package Skyflow
 
 import Skyflow.core.*
 import Skyflow.core.Logger
-import Skyflow.get.GetOptions
-import Skyflow.reveal.GetByIdRecord
-import Skyflow.soap.SoapConnectionConfig
 import Skyflow.utils.Utils
 import android.content.Context
 import com.Skyflow.core.container.ContainerProtocol
-import org.json.JSONArray
 import org.json.JSONObject
-import org.xml.sax.InputSource
-import java.io.StringReader
-import javax.xml.parsers.DocumentBuilderFactory
-import kotlin.Exception
 import kotlin.reflect.KClass
 
 class Client internal constructor(
     val configuration: Configuration,
-){
+) {
     internal val tag = Client::class.qualifiedName
 
-    internal val apiClient = APIClient(configuration.vaultID, configuration.vaultURL,
-        configuration.tokenProvider,configuration.options.logLevel)
+    internal val apiClient = FlowDBAPIClient(
+        configuration.vaultID,
+        configuration.vaultURL,
+        configuration.tokenProvider,
+        configuration.options.logLevel,
+        okHttpClient = configuration.okHttpClient
+    )
 
-    internal val elementMap = HashMap<String,Any>()
-    fun insert(records:  JSONObject, options: InsertOptions? = InsertOptions(), callback: Callback){
-        try {
-            Utils.checkVaultDetails(configuration)
-            Logger.info(tag, Messages.INSERTING_RECORDS.getMessage(configuration.vaultID), configuration.options.logLevel)
-            apiClient.post(records, loggingCallback(callback, Messages.INSERTING_RECORDS_SUCCESS.getMessage(configuration.vaultID)), options!!)
-        }
-        catch (e:Exception)
-        {
-            callback.onFailure(e)
-        }
-    }
-    fun detokenize(records: JSONObject, callback: Callback) {
-        try {
-            Utils.checkVaultDetails(configuration)
-            this.apiClient.get(records,loggingCallback(callback, Messages.DETOKENIZE_SUCCESS.getMessage()))
-        }
-        catch (e:Exception)
-        {
-            callback.onFailure(Utils.constructError(e))
-        }
-    }
-
-    fun getById(records: JSONObject, callback: Callback)
-    {
-        Logger.info(tag, Messages.GET_BY_ID_CALLED.getMessage(), configuration.options.logLevel)
-        try {
-            Utils.checkVaultDetails(configuration)
-            Logger.info(tag, Messages.GET_BY_ID_CALLED.getMessage(), configuration.options.logLevel)
-            val result = constructBodyForGetById(records)
-            this.apiClient.getById(result, callback)
-        } catch (e: Exception) {
-            callback.onFailure(Utils.constructError(e))
-        }
-    }
-
-    fun get(records: JSONObject, options: GetOptions?, callback: Callback) {
-        Logger.info(tag, Messages.GET_CALLED.getMessage(), configuration.options.logLevel)
-        try {
-            Utils.checkVaultDetails(configuration)
-            Logger.info(tag, Messages.GETTING_RECORDS.getMessage(), configuration.options.logLevel)
-            this.apiClient.get(records, options, callback)
-        } catch (e: Exception) {
-            callback.onFailure(Utils.constructError(e))
-        }
-    }
+    internal val elementMap = HashMap<String, Any>()
 
-    @Deprecated("Support for this method will be removed soon. Please use any of the Server Side SDKs to invoke a connection", level = DeprecationLevel.WARNING)
-    internal fun invokeConnection(connectionConfig: ConnectionConfig, callback: Callback) {
-        try {
-            Logger.info(tag, Messages.INVOKE_CONNECTION_CALLED.getMessage(), configuration.options.logLevel)
-            val checkUrl = Utils.checkUrl(connectionConfig.connectionURL)
-            if(connectionConfig.connectionURL.isEmpty())
-             throw SkyflowError(SkyflowErrorCode.EMPTY_CONNECTION_URL,tag, configuration.options.logLevel)
-            if (!checkUrl)
-                throw SkyflowError(SkyflowErrorCode.INVALID_CONNECTION_URL,tag, configuration.options.logLevel, arrayOf(connectionConfig.connectionURL))
-            this.apiClient.invokeConnection(connectionConfig, callback,this)
-        }
-        catch (e:Exception)
-        {
-            callback.onFailure(Utils.constructError(e))
-        }
+    // Internal stub kept for dormant PDB code (ConnectionApiCallback, SoapApiCallback) to compile.
+    // Not part of the public API and not called by any live code path.
+    @Suppress("unused")
+    internal fun detokenize(records: JSONObject, callback: Callback) {
+        callback.onFailure(Utils.constructError(Exception("detokenize is not available in FlowDB mode")))
     }
 
-    @Deprecated("Support for this method will be removed soon. Please contact admin", level = DeprecationLevel.WARNING)
-    internal fun invokeSoapConnection(soapConnectionConfig: SoapConnectionConfig,callback: Callback) {
-        try {
-            validateSoapConnectionDetails(soapConnectionConfig)
-            this.apiClient.invokeSoapConnection(soapConnectionConfig, this, callback)
-        }
-        catch (e: Exception){
-            callback.onFailure(e)
-        }
-    }
-    internal fun validateSoapConnectionDetails(soapConnectionConfig: SoapConnectionConfig)
-    {
-        if (soapConnectionConfig.connectionURL.isEmpty()) {
-            throw SkyflowError(SkyflowErrorCode.EMPTY_CONNECTION_URL, Utils.tag, configuration.options.logLevel)
-        }
-        if (!Utils.checkUrl(soapConnectionConfig.connectionURL)) {
-            throw SkyflowError(SkyflowErrorCode.INVALID_CONNECTION_URL,
-                Utils.tag, configuration.options.logLevel, params = arrayOf(soapConnectionConfig.connectionURL))
-        }
-        if (soapConnectionConfig.requestXML.trim().isEmpty()) {
-            throw SkyflowError(SkyflowErrorCode.EMPTY_REQUEST_XML, Utils.tag, configuration.options.logLevel)
-        }
-        if (soapConnectionConfig.requestXML.trim().isNotEmpty()) {
-            try {
-                DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(InputSource(StringReader(soapConnectionConfig.requestXML)));
-            } catch (e: Exception) {
-                throw SkyflowError(SkyflowErrorCode.INVALID_REQUEST_XML, Utils.tag, configuration.options.logLevel, params = arrayOf(e.message.toString()))
-            }
-        }
-        if (soapConnectionConfig.responseXML.trim().isNotEmpty()) {
-            try {
-                DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(InputSource(StringReader(soapConnectionConfig.responseXML)));
-            } catch (e: Exception) {
-                throw SkyflowError(SkyflowErrorCode.INVALID_RESPONSE_XML, Utils.tag, configuration.options.logLevel, params = arrayOf(e.message.toString()))
-            }
-        }
-    }
-
-    internal fun constructBodyForGetById(records: JSONObject): MutableList<GetByIdRecord> {
-        if (!records.has("records"))
-            throw SkyflowError(
-                SkyflowErrorCode.RECORDS_KEY_NOT_FOUND,
-                tag, configuration.options.logLevel
-            )
-        else if (records.get("records") !is JSONArray)
-            throw SkyflowError(SkyflowErrorCode.INVALID_RECORDS, tag, configuration.options.logLevel)
-        val jsonArray = records.getJSONArray("records")
-        if (jsonArray.length() == 0)
-            throw SkyflowError(SkyflowErrorCode.EMPTY_RECORDS, tag, configuration.options.logLevel)
-        var i = 0
-        val result = mutableListOf<GetByIdRecord>()
-        while (i < jsonArray.length()) {
-            val jsonObj = jsonArray.getJSONObject(i)
-            if (jsonObj == {})
-                throw SkyflowError(
-                    SkyflowErrorCode.EMPTY_RECORD_OBJECT, tag, configuration.options.logLevel,
-                    arrayOf("$i")
-                )
-            else if (!jsonObj.has("table")) {
-                throw SkyflowError(
-                    SkyflowErrorCode.TABLE_KEY_NOY_FOUND, tag, configuration.options.logLevel,
-                    arrayOf("$i")
-                )
-            } else if (jsonObj.get("table") !is String) {
-                throw SkyflowError(
-                    SkyflowErrorCode.INVALID_TABLE_NAME, tag, configuration.options.logLevel,
-                    arrayOf("$i")
-                )
-            } else if (!jsonObj.has("redaction")) {
-                throw SkyflowError(
-                    SkyflowErrorCode.REDACTION_KEY_NOT_FOUND, tag, configuration.options.logLevel,
-                    arrayOf("$i")
-                )
-            } else if (!jsonObj.has("ids")) {
-                throw SkyflowError(
-                    SkyflowErrorCode.IDS_KEY_NOT_FOUND, tag, configuration.options.logLevel,
-                    arrayOf("$i")
-                )
-            } else if (jsonObj.getString("table").isEmpty()) {
-                throw SkyflowError(
-                    SkyflowErrorCode.EMPTY_TABLE_KEY, tag, configuration.options.logLevel,
-                    arrayOf("$i")
-                )
-            } else if (jsonObj.getString("redaction").isEmpty()) {
-                throw SkyflowError(
-                    SkyflowErrorCode.EMPTY_REDACTION_VALUE, tag, configuration.options.logLevel,
-                    arrayOf("$i")
-                )
-            } else if (!(jsonObj.get("redaction").toString() == "PLAIN_TEXT" ||
-                        jsonObj.get("redaction").toString() == "DEFAULT" ||
-                        jsonObj.get("redaction").toString() == "MASKED" ||
-                        jsonObj.get("redaction").toString() == "REDACTED")
-            ) {
-                throw SkyflowError(
-                    SkyflowErrorCode.INVALID_REDACTION_TYPE, tag, configuration.options.logLevel,
-                    arrayOf("$i")
-                )
-            } else {
-                var skyflowIds = jsonObj.get("ids")
-                try {
-                    skyflowIds = skyflowIds as ArrayList<String>
-                } catch (e: Exception) {
-                    throw SkyflowError(
-                        SkyflowErrorCode.INVALID_IDS, tag, configuration.options.logLevel,
-                        arrayOf("$i")
-                    )
-                }
-                if (skyflowIds.isEmpty()) {
-                    throw SkyflowError(
-                        SkyflowErrorCode.EMPTY_RECORD_IDS, tag, configuration.options.logLevel,
-                        arrayOf("$i")
-                    )
-                }
-                for (j in 0 until skyflowIds.size) {
-                    if (skyflowIds[j].isEmpty()) {
-                        throw SkyflowError(
-                            SkyflowErrorCode.EMPTY_ID_IN_RECORD_IDS,
-                            tag, configuration.options.logLevel,
-                            arrayOf("$i")
-                        )
-                    }
-                }
-                val record = GetByIdRecord(
-                    skyflowIds,
-                    jsonObj.get("table").toString(),
-                    jsonObj.get("redaction").toString()
-                )
-                result.add(record)
-            }
-            i++
-        }
-        return result
-    }
-
-    fun <T:ContainerProtocol> container(type: KClass<T>) : Container<T>{
-        if(type == ContainerType.COLLECT){
+    fun <T : ContainerProtocol> container(type: KClass<T>): Container<T> {
+        if (type == ContainerType.COLLECT) {
             Logger.info(tag, Messages.COLLECT_CONTAINER_CREATED.getMessage(), configuration.options.logLevel)
-        }
-        else if(type == ContainerType.REVEAL){
+        } else if (type == ContainerType.REVEAL) {
             Logger.info(tag, Messages.REVEAL_CONTAINER_CREATED.getMessage(), configuration.options.logLevel)
         }
-        return Container<T>(configuration,this)
+        return Container<T>(configuration, this)
     }
 
     fun <T : ContainerProtocol> container(
@@ -249,20 +56,4 @@ class Client internal constructor(
         }
         return Container(configuration, this, context, options)
     }
-
-    inner class loggingCallback(
-        private val clientCallback: Callback,
-        private val successMessage: String,
-    ) : Callback {
-        override fun onSuccess(responseBody: Any) {
-            Logger.info(tag, successMessage, configuration.options.logLevel)
-            clientCallback.onSuccess(responseBody)
-        }
-        override fun onFailure(exception: Any) {
-            clientCallback.onFailure(exception)
-        }
-    }
 }
-
-
-