From 57a993c1049e5225dd330c964a46f9773afcfd11 Mon Sep 17 00:00:00 2001
From: Nelson Lopes da Silva <5671236+nflsilva@users.noreply.github.com>
Date: Thu, 11 Jan 2024 11:49:20 +0000
Subject: [PATCH] RMET-2732 ::: Merge development with latest ecommerce
 features (#31)

* RMET-2112 FB Analytics - Return user's response to App Tracking Transparency prompt (#22)

* fix: add function for requestTrackingAuthorization without promise

References: https://outsystemsrd.atlassian.net/browse/RMET-2112

* fix: fixing function structure

* test: testing with promise

* test: testing with only 1 export

* test: use module.exports

* refactor: remove commented lines

* chore: update changelog

References: https://outsystemsrd.atlassian.net/browse/RMET-2112

* refactor: use constant

* RMET-2441 :: raise firebase-core version (#24)

* feat: raise firebase core version

* chore(release): raise to version 5.0.0-OS10

* RMET-2729 ::: JavaScript ::: Log e-commerce events  (#26)

* feat: added logECommerceEvent javascript function

* chore: updates CHANGELOG.md

* feat: changed how ecommerce arguments are passed to the native side

* feat: Add E-Commerce Events Logging on iOS (#27)

Implement the logic required to perform e-commerce event logging. The implementation is similar to the already existing logEvent but without any parameter number constraints.

Before logging, and considering that the Firebase Analytics library doesn't return any kind of error in case of any issues with the data, the implementation performs the following steps:
#1 - Flat the Key-Value pair information to a JSON Object. This is done on both Event Parameters and Items.
#2 - Validate if the event parameters and items are correctly constructed. Both validations are done isolated, with errors being handled and returned in case of occurrence.
#3 - Validate the event parameters and items are valid according to the event name. This time, the validation is done altogether, with errors being handled and returned in case of occurrence.
#4 - Merge event parameters and items into a single JSON object to be sent to Analytics for logging purposes.

The implementation, since it's done using Swift, involves adding the Swift dependency to the `plugin.xml`.

References: https://outsystemsrd.atlassian.net/browse/RMET-2731

* fix: Adjust Validations (#29)

Remove the default `quantity` value as this is already assured by Firebase.
Fix the `item_list_id` and `item_list_name` as only the property set on the event parameters should be removed and not both always.
File rename to match the structure name.

References: https://outsystemsrd.atlassian.net/browse/RMET-2731

* RMET-2730 ::: Android :::  E-Commerce events (#28)

* feat: added ecommerce events first version

* fix: added removed hook

* fix: fixed bugs with happy paths

* feat: added KDoc

* fix: removed unecessry verification

* chore: updated CHANGELOG

* fix: applied changes suggested on the PR comments

* fix: added missing bridge file

* fix: applied proposed changes

* fix: fixed class name (#30)

* chore(release): bump version to 5.0.0-OS11

---------

Co-authored-by: Alexandre Jacinto <alexandre.jacinto@outsystems.com>
Co-authored-by: Marta Carlos <101343976+OS-martacarlos@users.noreply.github.com>
Co-authored-by: Ricardo Silva <97543217+OS-ricardomoreirasilva@users.noreply.github.com>
---
 CHANGELOG.md                                  |  11 ++
 package.json                                  |   2 +-
 plugin.xml                                    |  40 ++++-
 .../analytics}/FirebaseAnalyticsPlugin.java   |  24 ++-
 .../firebase/analytics/OSFANLManager.kt       | 160 ++++++++++++++++++
 .../analytics/model/OSFANLBundle+putAny.kt    |  17 ++
 .../analytics/model/OSFANLDefaultValues.kt    |  12 ++
 .../firebase/analytics/model/OSFANLError.kt   |  88 ++++++++++
 .../analytics/model/OSFANLEventOutputModel.kt |  14 ++
 .../model/OSFANLInputDataFieldKey.kt          |  25 +++
 .../model/OSFANLJSONArray+extension.kt        |  23 +++
 .../validator/OSFANLEventItemsValidator.kt    | 119 +++++++++++++
 .../OSFANLEventParameterValidator.kt          | 105 ++++++++++++
 .../validator/OSFANLMinimumRequired.kt        |   8 +
 .../Common/Extensions/StringConvertable.swift |  20 +++
 src/ios/Common/OSFANLDefaultValues.swift      |   4 +
 src/ios/Common/OSFANLError.swift              |  45 +++++
 src/ios/Common/OSFANLInputDataFieldKey.swift  |  17 ++
 src/ios/FirebaseAnalyticsPlugin.h             |   1 +
 src/ios/FirebaseAnalyticsPlugin.m             |  34 ++++
 .../OSFANLInputTransformable.swift            |   3 +
 .../OSFANLInputTransformableModel.swift       |   9 +
 .../OSFANLInputTransformer.swift              |  84 +++++++++
 src/ios/Manager/OSFANLManageable.swift        |  17 ++
 .../OSFANLManager+EventValidationRules.swift  | 126 ++++++++++++++
 src/ios/Manager/OSFANLManager.swift           |  42 +++++
 src/ios/Manager/OSFANLManagerFactory.swift    |   7 +
 src/ios/Manager/OSFANLOutputModel.swift       |   9 +
 src/ios/Validator/OSFANLEventValidator.swift  |  12 ++
 www/FirebaseAnalytics.js                      |   4 +
 30 files changed, 1072 insertions(+), 10 deletions(-)
 rename src/android/{ => com/outsystems/firebase/analytics}/FirebaseAnalyticsPlugin.java (79%)
 create mode 100644 src/android/com/outsystems/firebase/analytics/OSFANLManager.kt
 create mode 100644 src/android/com/outsystems/firebase/analytics/model/OSFANLBundle+putAny.kt
 create mode 100644 src/android/com/outsystems/firebase/analytics/model/OSFANLDefaultValues.kt
 create mode 100644 src/android/com/outsystems/firebase/analytics/model/OSFANLError.kt
 create mode 100644 src/android/com/outsystems/firebase/analytics/model/OSFANLEventOutputModel.kt
 create mode 100644 src/android/com/outsystems/firebase/analytics/model/OSFANLInputDataFieldKey.kt
 create mode 100644 src/android/com/outsystems/firebase/analytics/model/OSFANLJSONArray+extension.kt
 create mode 100644 src/android/com/outsystems/firebase/analytics/validator/OSFANLEventItemsValidator.kt
 create mode 100644 src/android/com/outsystems/firebase/analytics/validator/OSFANLEventParameterValidator.kt
 create mode 100644 src/android/com/outsystems/firebase/analytics/validator/OSFANLMinimumRequired.kt
 create mode 100644 src/ios/Common/Extensions/StringConvertable.swift
 create mode 100644 src/ios/Common/OSFANLDefaultValues.swift
 create mode 100644 src/ios/Common/OSFANLError.swift
 create mode 100644 src/ios/Common/OSFANLInputDataFieldKey.swift
 create mode 100644 src/ios/InputTransformer/OSFANLInputTransformable.swift
 create mode 100644 src/ios/InputTransformer/OSFANLInputTransformableModel.swift
 create mode 100644 src/ios/InputTransformer/OSFANLInputTransformer.swift
 create mode 100644 src/ios/Manager/OSFANLManageable.swift
 create mode 100644 src/ios/Manager/OSFANLManager+EventValidationRules.swift
 create mode 100644 src/ios/Manager/OSFANLManager.swift
 create mode 100644 src/ios/Manager/OSFANLManagerFactory.swift
 create mode 100644 src/ios/Manager/OSFANLOutputModel.swift
 create mode 100644 src/ios/Validator/OSFANLEventValidator.swift

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a26da2f..9a55312e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,17 @@ The changes documented here do not include those from the original repository.
 
 ## [Unreleased]
 
+## 5.0.0-OS11
+
+### 2023-12-22
+- Feat: add new e-commerce logging method on Android (https://outsystemsrd.atlassian.net/browse/RMET-2730).
+
+### 2023-12-18
+- Feat: Implement e-commerce logging on iOS (https://outsystemsrd.atlassian.net/browse/RMET-2731).
+
+### 2023-12-13
+- Feat: add new e-commerce logging method (https://outsystemsrd.atlassian.net/browse/RMET-2729).
+
 ## 5.0.0-OS10
 
 ### 2023-08-11
diff --git a/package.json b/package.json
index 436a8259..1970cbbf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-firebase-analytics",
-  "version": "5.0.0-OS10",
+  "version": "5.0.0-OS11",
   "description": "Cordova plugin for Firebase Analytics",
   "cordova": {
     "id": "cordova-plugin-firebase-analytics",
diff --git a/plugin.xml b/plugin.xml
index dbe8aaa8..40492481 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -1,7 +1,7 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
 xmlns:android="http://schemas.android.com/apk/res/android"
            id="cordova-plugin-firebase-analytics"
-      version="5.0.0-OS10">
+      version="5.0.0-OS11">
 
     <name>FirebaseAnalyticsPlugin</name>
     <description>Cordova plugin for Firebase Analytics</description>
@@ -38,6 +38,8 @@ xmlns:android="http://schemas.android.com/apk/res/android"
             </feature>
         </config-file>
 
+        <dependency id="cordova-plugin-add-swift-support" url="https://github.com/OutSystems/cordova-plugin-add-swift-support.git#2.0.3-OS1"/>
+
         <!--
             use a bit hacky method to set boolean value as a string:
             https://developer.apple.com/documentation/foundation/nsstring/1409420-boolvalue?preferredLanguage=occ
@@ -55,6 +57,23 @@ xmlns:android="http://schemas.android.com/apk/res/android"
         <header-file src="src/ios/FirebaseAnalyticsPlugin.h" />
         <source-file src="src/ios/FirebaseAnalyticsPlugin.m" />
 
+        <source-file src="src/ios/Common/Extensions/StringConvertable.swift" target-dir="Common/Extensions" />
+        <source-file src="src/ios/Common/OSFANLDefaultValues.swift" target-dir="Common" />
+        <source-file src="src/ios/Common/OSFANLError.swift" target-dir="Common" />
+        <source-file src="src/ios/Common/OSFANLInputDataFieldKey.swift" target-dir="Common" />
+
+        <source-file src="src/ios/InputTransformer/OSFANLInputTransformable.swift" target-dir="InputTransformer" />
+        <source-file src="src/ios/InputTransformer/OSFANLInputTransformableModel.swift" target-dir="InputTransformer" />
+        <source-file src="src/ios/InputTransformer/OSFANLInputTransformer.swift" target-dir="InputTransformer" />
+
+        <source-file src="src/ios/Manager/OSFANLManageable.swift" target-dir="Manager" />
+        <source-file src="src/ios/Manager/OSFANLManager.swift" target-dir="Manager" />
+        <source-file src="src/ios/Manager/OSFANLManager+EventValidationRules.swift" target-dir="Manager" />
+        <source-file src="src/ios/Manager/OSFANLManagerFactory.swift" target-dir="Manager" />
+        <source-file src="src/ios/Manager/OSFANLOutputModel.swift" target-dir="Manager" />
+
+        <source-file src="src/ios/Validator/OSFANLEventValidator.swift" target-dir="Validator" />
+
         <podspec>
             <config>
                 <source url="https://cdn.cocoapods.org/"/>
@@ -69,11 +88,10 @@ xmlns:android="http://schemas.android.com/apk/res/android"
     <platform name="android">
         <preference name="ANDROID_FIREBASE_ANALYTICS_VERSION" default="21.1.1"/>
 
-        <hook type="before_plugin_install" src="hooks/android/build_gradle_add_dependency.js" />
 
         <config-file target="res/xml/config.xml" parent="/*">
             <feature name="FirebaseAnalytics">
-                <param name="android-package" value="by.chemerisuk.cordova.firebase.FirebaseAnalyticsPlugin" />
+                <param name="android-package" value="com.outsystems.plugins.firebase.analytics.FirebaseAnalyticsPlugin" />
                 <param name="onload" value="$ANALYTICS_COLLECTION_ENABLED" />
             </feature>
         </config-file>
@@ -92,8 +110,20 @@ xmlns:android="http://schemas.android.com/apk/res/android"
         <framework src="com.google.firebase:firebase-analytics:$ANDROID_FIREBASE_ANALYTICS_VERSION" />
         <framework src="build.gradle" custom="true" type="gradleReference" />
 
-        <source-file src="src/android/FirebaseAnalyticsPlugin.java"
-            target-dir="src/by/chemerisuk/cordova/firebase/" />
+        <source-file src="src/android/com/outsystems/firebase/analytics/FirebaseAnalyticsPlugin.java" target-dir="src/com/outsystems/plugins/firebase/analytics/" />
+        <source-file src="src/android/com/outsystems/firebase/analytics/model/OSFANLBundle+putAny.kt" target-dir="app/src/main/kotlin/com/outsystems/firebase/analytics/model/" />
+        <source-file src="src/android/com/outsystems/firebase/analytics/model/OSFANLJSONArray+extension.kt" target-dir="app/src/main/kotlin/com/outsystems/firebase/analytics/model/" />
+        <source-file src="src/android/com/outsystems/firebase/analytics/model/OSFANLDefaultValues.kt" target-dir="app/src/main/kotlin/com/outsystems/firebase/analytics/model/" />
+        <source-file src="src/android/com/outsystems/firebase/analytics/model/OSFANLError.kt" target-dir="app/src/main/kotlin/com/outsystems/firebase/analytics/model/" />
+        <source-file src="src/android/com/outsystems/firebase/analytics/model/OSFANLEventOutputModel.kt" target-dir="app/src/main/kotlin/com/outsystems/firebase/analytics/model/" />
+        <source-file src="src/android/com/outsystems/firebase/analytics/model/OSFANLInputDataFieldKey.kt" target-dir="app/src/main/kotlin/com/outsystems/firebase/analytics/model/" />
+
+        <source-file src="src/android/com/outsystems/firebase/analytics/validator/OSFANLEventItemsValidator.kt" target-dir="app/src/main/kotlin/com/outsystems/firebase/analytics/validator/" />
+        <source-file src="src/android/com/outsystems/firebase/analytics/validator/OSFANLEventParameterValidator.kt" target-dir="app/src/main/kotlin/com/outsystems/firebase/analytics/validator/" />
+        <source-file src="src/android/com/outsystems/firebase/analytics/validator/OSFANLMinimumRequired.kt" target-dir="app/src/main/kotlin/com/outsystems/firebase/analytics/validator/" />
+
+        <source-file src="src/android/com/outsystems/firebase/analytics/OSFANLManager.kt" target-dir="app/src/main/kotlin/com/outsystems/firebase/analytics/" />
+
     </platform>
 
 </plugin>
diff --git a/src/android/FirebaseAnalyticsPlugin.java b/src/android/com/outsystems/firebase/analytics/FirebaseAnalyticsPlugin.java
similarity index 79%
rename from src/android/FirebaseAnalyticsPlugin.java
rename to src/android/com/outsystems/firebase/analytics/FirebaseAnalyticsPlugin.java
index dcdd71bb..5bf7f58e 100644
--- a/src/android/FirebaseAnalyticsPlugin.java
+++ b/src/android/com/outsystems/firebase/analytics/FirebaseAnalyticsPlugin.java
@@ -1,4 +1,4 @@
-package by.chemerisuk.cordova.firebase;
+package com.outsystems.plugins.firebase.analytics;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -8,6 +8,9 @@
 import by.chemerisuk.cordova.support.ReflectiveCordovaPlugin;
 
 import com.google.firebase.analytics.FirebaseAnalytics;
+import com.outsystems.firebase.analytics.OSFANLManager;
+import com.outsystems.firebase.analytics.model.OSFANLError;
+import com.outsystems.firebase.analytics.model.OSFANLEventOutputModel;
 
 import org.apache.cordova.CallbackContext;
 import org.json.JSONException;
@@ -21,19 +24,18 @@ public class FirebaseAnalyticsPlugin extends ReflectiveCordovaPlugin {
 
     private FirebaseAnalytics firebaseAnalytics;
 
+    private OSFANLManager manager = new OSFANLManager();
+
     @Override
     protected void pluginInitialize() {
         Log.d(TAG, "Starting Firebase Analytics plugin");
-
         Context context = this.cordova.getActivity().getApplicationContext();
-
         this.firebaseAnalytics = FirebaseAnalytics.getInstance(context);
     }
 
     @CordovaMethod
     private void logEvent(String name, JSONObject params, CallbackContext callbackContext) throws JSONException {
         this.firebaseAnalytics.logEvent(name, parse(params));
-
         callbackContext.success();
     }
 
@@ -87,6 +89,20 @@ private void requestTrackingAuthorization(JSONObject params, CallbackContext cal
         callbackContext.success();
     }
 
+    @CordovaMethod
+    private void logECommerceEvent(JSONObject params, CallbackContext callbackContext) throws JSONException {
+        try {
+            OSFANLEventOutputModel output = manager.buildOutputEventFromInputJSON(params);
+            this.firebaseAnalytics.logEvent(output.getName(), output.getParameters());
+            callbackContext.success();
+        } catch (OSFANLError e) {
+            JSONObject result = new JSONObject();
+            result.put("code", e.getCode());
+            result.put("message", e.getMessage());
+            callbackContext.error(result);
+        }
+    }
+
     private static Bundle parse(JSONObject params) throws JSONException {
         Bundle bundle = new Bundle();
         Iterator<String> it = params.keys();
diff --git a/src/android/com/outsystems/firebase/analytics/OSFANLManager.kt b/src/android/com/outsystems/firebase/analytics/OSFANLManager.kt
new file mode 100644
index 00000000..94e9c919
--- /dev/null
+++ b/src/android/com/outsystems/firebase/analytics/OSFANLManager.kt
@@ -0,0 +1,160 @@
+package com.outsystems.firebase.analytics
+
+import android.os.Bundle
+import com.google.firebase.analytics.FirebaseAnalytics
+import com.outsystems.firebase.analytics.model.OSFANLError
+import com.outsystems.firebase.analytics.model.OSFANLEventOutputModel
+import com.outsystems.firebase.analytics.model.OSFANLInputDataFieldKey
+import com.outsystems.firebase.analytics.model.OSFANLInputDataFieldKey.EVENT
+import com.outsystems.firebase.analytics.model.OSFANLInputDataFieldKey.ITEMS
+import com.outsystems.firebase.analytics.model.OSFANLInputDataFieldKey.SHIPPING
+import com.outsystems.firebase.analytics.model.OSFANLInputDataFieldKey.TAX
+import com.outsystems.firebase.analytics.model.OSFANLInputDataFieldKey.TRANSACTION_ID
+import com.outsystems.firebase.analytics.model.OSFANLInputDataFieldKey.VALUE
+import com.outsystems.firebase.analytics.model.getArrayOrEmpty
+import com.outsystems.firebase.analytics.model.getStringOrNull
+import com.outsystems.firebase.analytics.validator.OSFANLEventItemsValidator
+import com.outsystems.firebase.analytics.validator.OSFANLEventParameterValidator
+import com.outsystems.firebase.analytics.validator.OSFANLMinimumRequired.AT_LEAST_ONE
+import com.outsystems.firebase.analytics.validator.OSFANLMinimumRequired.ONE
+import org.json.JSONArray
+import org.json.JSONObject
+import java.io.Serializable
+
+class OSFANLManager {
+    
+    @Throws(OSFANLError::class)
+    fun buildOutputEventFromInputJSON(input: JSONObject): OSFANLEventOutputModel {
+
+        val eventName = input.getStringOrNull(OSFANLInputDataFieldKey.EVENT.json) ?: throw OSFANLError.missing(EVENT.json)
+        val parameters = input.getArrayOrEmpty(OSFANLInputDataFieldKey.EVENT_PARAMETERS.json)
+        val items = input.getArrayOrEmpty(ITEMS.json)
+
+        val eventBuilderMethod = getEventBuilderMethod(eventName)
+        val eventBundle = eventBuilderMethod(this, parameters, items)
+
+        return OSFANLEventOutputModel(eventName, eventBundle)
+    }
+
+    private fun getEventBuilderMethod(
+        eventName: String
+    ): (OSFANLManager, JSONArray, JSONArray) -> Bundle {
+
+        when (eventName) {
+
+            FirebaseAnalytics.Event.PURCHASE ->
+                return OSFANLManager::buildBundleForPurchaseParametersEventType
+
+            FirebaseAnalytics.Event.REFUND ->
+                return OSFANLManager::buildBundleForRefundParametersEventType
+
+            FirebaseAnalytics.Event.SELECT_ITEM ->
+                return OSFANLManager::buildBundleForOneItemParametersEventType
+
+            FirebaseAnalytics.Event.SELECT_PROMOTION ->
+                return OSFANLManager::buildBundleForSelectPromotionParametersEventType
+
+            FirebaseAnalytics.Event.VIEW_ITEM_LIST ->
+                return OSFANLManager::buildBundleForViewItemListParametersEventType
+
+            FirebaseAnalytics.Event.VIEW_PROMOTION ->
+                return OSFANLManager::buildBundleForOneItemParametersEventType
+
+            else ->
+                return OSFANLManager::buildBundleForValueCurrencyAndMultipleItemsEventType
+        }
+    }
+
+    private fun buildBundleForValueCurrencyAndMultipleItemsEventType(
+        parameters: JSONArray,
+        items: JSONArray
+    ): Bundle {
+        return buildAndValidateParameterBundle(
+            parameters,
+            items,
+            OSFANLEventParameterValidator.Builder()
+                .requireCurrencyValue()
+                .build(),
+            OSFANLEventItemsValidator(minLimit = AT_LEAST_ONE)
+        )
+    }
+
+    private fun buildBundleForPurchaseParametersEventType(
+        parameters: JSONArray,
+        items: JSONArray
+    ): Bundle {
+        return buildAndValidateParameterBundle(
+            parameters,
+            items,
+            OSFANLEventParameterValidator.Builder()
+                .requireCurrencyValue()
+                .required(TRANSACTION_ID)
+                .number(SHIPPING, TAX)
+                .build(),
+            OSFANLEventItemsValidator(minLimit = AT_LEAST_ONE)
+        )
+    }
+
+    private fun buildBundleForRefundParametersEventType(
+        parameters: JSONArray,
+        items: JSONArray
+    ): Bundle {
+        return buildAndValidateParameterBundle(
+            parameters,
+            items,
+            OSFANLEventParameterValidator.Builder()
+                .requireCurrencyValue()
+                .required(TRANSACTION_ID)
+                .number(SHIPPING, TAX)
+                .build()
+        )
+    }
+
+    private fun buildBundleForOneItemParametersEventType(
+        parameters: JSONArray,
+        items: JSONArray
+    ): Bundle {
+        return buildAndValidateParameterBundle(
+            parameters,
+            items,
+            itemsValidator = OSFANLEventItemsValidator(minLimit = ONE)
+        )
+    }
+
+    private fun buildBundleForSelectPromotionParametersEventType(
+        parameters: JSONArray,
+        items: JSONArray
+    ): Bundle {
+        return buildAndValidateParameterBundle(parameters, items)
+    }
+
+    private fun buildBundleForViewItemListParametersEventType(
+        parameters: JSONArray,
+        items: JSONArray
+    ): Bundle {
+        return buildAndValidateParameterBundle(
+            parameters,
+            items,
+            itemsValidator = OSFANLEventItemsValidator(minLimit = AT_LEAST_ONE)
+        )
+    }
+
+    private fun buildAndValidateParameterBundle(
+        parameters: JSONArray,
+        items: JSONArray,
+        parametersValidator: OSFANLEventParameterValidator = OSFANLEventParameterValidator.Builder().build(),
+        itemsValidator: OSFANLEventItemsValidator = OSFANLEventItemsValidator()
+    ): Bundle {
+
+        // validate parameters
+        val parameterBundle = parametersValidator.validate(parameters)
+
+        // validate items
+        val itemsBundle = itemsValidator.validate(items)
+        if(itemsBundle.isNotEmpty())
+            parameterBundle.putSerializable(ITEMS.json, itemsBundle as Serializable)
+
+        return parameterBundle
+    }
+
+}
\ No newline at end of file
diff --git a/src/android/com/outsystems/firebase/analytics/model/OSFANLBundle+putAny.kt b/src/android/com/outsystems/firebase/analytics/model/OSFANLBundle+putAny.kt
new file mode 100644
index 00000000..23ec3335
--- /dev/null
+++ b/src/android/com/outsystems/firebase/analytics/model/OSFANLBundle+putAny.kt
@@ -0,0 +1,17 @@
+package com.outsystems.firebase.analytics.model
+
+import android.os.Bundle
+
+/**
+ * Adds a range of different types to a bundle. Accepted types are String, Int, Double and Long
+ * @param key the key in which to store the value
+ * @param value the value to store
+ */
+fun Bundle.putAny(key: String, value: Any) {
+    when (value) {
+        is String -> this.putString(key, value)
+        is Int -> this.putInt(key, value)
+        is Double -> this.putDouble(key, value)
+        is Long -> this.putLong(key, value)
+    }
+}
\ No newline at end of file
diff --git a/src/android/com/outsystems/firebase/analytics/model/OSFANLDefaultValues.kt b/src/android/com/outsystems/firebase/analytics/model/OSFANLDefaultValues.kt
new file mode 100644
index 00000000..7bd5cf49
--- /dev/null
+++ b/src/android/com/outsystems/firebase/analytics/model/OSFANLDefaultValues.kt
@@ -0,0 +1,12 @@
+package com.outsystems.firebase.analytics.model
+
+/**
+ * Holds the default size values for the input data
+ */
+class OSFANLDefaultValues {
+    companion object {
+        const val itemQuantity: Int = 1
+        const val itemCustomParametersMaximum: Int = 27
+        const val eventItemsMaximum: Int = 200
+    }
+}
\ No newline at end of file
diff --git a/src/android/com/outsystems/firebase/analytics/model/OSFANLError.kt b/src/android/com/outsystems/firebase/analytics/model/OSFANLError.kt
new file mode 100644
index 00000000..2b55389e
--- /dev/null
+++ b/src/android/com/outsystems/firebase/analytics/model/OSFANLError.kt
@@ -0,0 +1,88 @@
+package com.outsystems.firebase.analytics.model
+
+/**
+ * Represents an error thrown by the plugin
+ * @property code the error code
+ * @property message the error message
+ */
+class OSFANLError private constructor(
+    codeNumber: ErrorCodes,
+    override val message: String
+) : Exception() {
+
+    val code: String
+
+    init {
+        code = "OS-PLUG-FANL-${codeNumber.code.toString().padStart(4, '0')}"
+    }
+
+    companion object {
+        fun duplicateItemsIn(parameter: String): OSFANLError {
+            return OSFANLError(
+                ErrorCodes.DUPLICATE_ITEMS_IN,
+                "Parameter '$parameter' contains duplicate items."
+            )
+        }
+
+        fun duplicateKeys(): OSFANLError {
+            return OSFANLError(
+                ErrorCodes.DUPLICATE_KEYS,
+                "The dictionary contains duplicate keys"
+            )
+        }
+
+        fun invalidType(parameter: String, type: String): OSFANLError {
+            return OSFANLError(
+                ErrorCodes.INVALID_TYPE,
+                "Parameter '$parameter' must be of type '$type'"
+            )
+        }
+
+        fun logEcommerceEventInputArgumentsIssue(): OSFANLError {
+            return OSFANLError(
+                ErrorCodes.LOG_ECOMMERCE_EVENT_INPUT_ARGUMENTS_ISSUE,
+                "There's an issue with the `logECommerceEvent` input arguments."
+            )
+        }
+
+        fun missing(parameter: String): OSFANLError {
+            return OSFANLError(
+                ErrorCodes.MISSING,
+                "Required parameter '$parameter' is missing."
+            )
+        }
+
+        fun missingItemIdName(): OSFANLError {
+            return OSFANLError(
+                ErrorCodes.MISSING_ITEM_ID_NAME,
+                "Item requires an ID or a Name."
+            )
+        }
+
+        fun tooMany(parameter: String, limit: Int): OSFANLError {
+            return OSFANLError(
+                ErrorCodes.TOO_MANY,
+                "Parameter '$parameter' must be set to a maximum number of $limit."
+            )
+        }
+
+        fun unexpected(event: String): OSFANLError {
+            return OSFANLError(
+                ErrorCodes.UNEXPECTED,
+                "Event '$event' is not valid."
+            )
+        }
+    }
+
+    private enum class ErrorCodes(val code: Int) {
+        DUPLICATE_ITEMS_IN(1),
+        DUPLICATE_KEYS(2),
+        INVALID_TYPE(3),
+        LOG_ECOMMERCE_EVENT_INPUT_ARGUMENTS_ISSUE(4),
+        MISSING(5),
+        MISSING_ITEM_ID_NAME(6),
+        TOO_MANY(7),
+        UNEXPECTED(8)
+    }
+
+}
\ No newline at end of file
diff --git a/src/android/com/outsystems/firebase/analytics/model/OSFANLEventOutputModel.kt b/src/android/com/outsystems/firebase/analytics/model/OSFANLEventOutputModel.kt
new file mode 100644
index 00000000..bcf5c1ef
--- /dev/null
+++ b/src/android/com/outsystems/firebase/analytics/model/OSFANLEventOutputModel.kt
@@ -0,0 +1,14 @@
+package com.outsystems.firebase.analytics.model
+
+import android.os.Bundle
+
+/**
+ * Represents the output from the validation of an event to log
+ * @property name the name of the event to log
+ * @property parameters a bundle of parameters to log with the event.
+ * This also contains the items and custom items as well.
+ */
+data class OSFANLEventOutputModel(
+    val name: String,
+    val parameters: Bundle
+)
diff --git a/src/android/com/outsystems/firebase/analytics/model/OSFANLInputDataFieldKey.kt b/src/android/com/outsystems/firebase/analytics/model/OSFANLInputDataFieldKey.kt
new file mode 100644
index 00000000..84af8526
--- /dev/null
+++ b/src/android/com/outsystems/firebase/analytics/model/OSFANLInputDataFieldKey.kt
@@ -0,0 +1,25 @@
+package com.outsystems.firebase.analytics.model
+
+/**
+ * Represents all supported analytics events keys
+ * @property json the json value for each event key
+ */
+enum class OSFANLInputDataFieldKey(val json: String) {
+    CUSTOM_PARAMETERS("custom_parameters"),
+    CURRENCY("currency"),
+    EVENT("event"),
+    EVENT_PARAMETERS("eventParameters"),
+    ITEM("item"),
+    ITEM_ID("item_id"),
+    ITEM_LIST_ID("item_list_id"),
+    ITEM_LIST_NAME("item_list_name"),
+    ITEM_NAME("item_name"),
+    ITEMS("items"),
+    KEY("key"),
+    QUANTITY("quantity"),
+    SHIPPING("shipping"),
+    TAX("tax"),
+    TRANSACTION_ID("transaction_id"),
+    VALUE("value"),
+    TYPE_NUMBER("number")
+}
\ No newline at end of file
diff --git a/src/android/com/outsystems/firebase/analytics/model/OSFANLJSONArray+extension.kt b/src/android/com/outsystems/firebase/analytics/model/OSFANLJSONArray+extension.kt
new file mode 100644
index 00000000..c423d9af
--- /dev/null
+++ b/src/android/com/outsystems/firebase/analytics/model/OSFANLJSONArray+extension.kt
@@ -0,0 +1,23 @@
+package com.outsystems.firebase.analytics.model
+
+import org.json.JSONArray
+import org.json.JSONObject
+
+/**
+ * Gets a JSONArray from a JSONObject
+ * @param name the key to use
+ * @return the JSONArray or an empty one if the key isn't present
+ */
+fun JSONObject.getArrayOrEmpty(name: String): JSONArray {
+    return if(this.has(name)) { JSONArray(this.getString(name)) } else { JSONArray() }
+}
+
+/**
+ * Gets a String from a JSONObject
+ * @param name the key to use
+ * @return the String or null if the key isn't present
+ */
+fun JSONObject.getStringOrNull(name: String): String? {
+    return if(this.has(name)) { this.getString(name) } else { null }
+}
+
diff --git a/src/android/com/outsystems/firebase/analytics/validator/OSFANLEventItemsValidator.kt b/src/android/com/outsystems/firebase/analytics/validator/OSFANLEventItemsValidator.kt
new file mode 100644
index 00000000..e0732fcc
--- /dev/null
+++ b/src/android/com/outsystems/firebase/analytics/validator/OSFANLEventItemsValidator.kt
@@ -0,0 +1,119 @@
+package com.outsystems.firebase.analytics.validator
+
+import android.os.Bundle
+import com.outsystems.firebase.analytics.model.OSFANLDefaultValues
+import com.outsystems.firebase.analytics.model.OSFANLError
+import com.outsystems.firebase.analytics.model.OSFANLInputDataFieldKey.CUSTOM_PARAMETERS
+import com.outsystems.firebase.analytics.model.OSFANLInputDataFieldKey.ITEMS
+import com.outsystems.firebase.analytics.model.OSFANLInputDataFieldKey.ITEM_ID
+import com.outsystems.firebase.analytics.model.OSFANLInputDataFieldKey.ITEM_NAME
+import com.outsystems.firebase.analytics.model.OSFANLInputDataFieldKey.KEY
+import com.outsystems.firebase.analytics.model.OSFANLInputDataFieldKey.VALUE
+import com.outsystems.firebase.analytics.model.putAny
+import org.json.JSONArray
+
+/**
+ * Responsible for validating the Event items
+ * @property minLimit the minimum expected number of items
+ */
+class OSFANLEventItemsValidator(
+    private var minLimit: OSFANLMinimumRequired = OSFANLMinimumRequired.NONE
+) {
+
+    /**
+     * Validates a JSONArray of items
+     * @param items the array of items to validate
+     * @return a list of bundles, each representing a validated item
+     */
+    fun validate(items: JSONArray): List<Bundle> {
+
+        var inputItems = items
+        val result = mutableListOf<Bundle>()
+
+        // validate minimum limit
+        if(inputItems.length() == 0 && minLimit != OSFANLMinimumRequired.NONE) {
+            throw OSFANLError.missing(ITEMS.json)
+        }
+
+        if (inputItems.length() > 1 && minLimit == OSFANLMinimumRequired.ONE) {
+            inputItems = JSONArray().apply { put(inputItems.getJSONObject(0)) }
+        }
+
+        // validate maximum limit
+        if (inputItems.length() >= OSFANLDefaultValues.eventItemsMaximum)
+            throw OSFANLError.tooMany(ITEMS.json, OSFANLDefaultValues.eventItemsMaximum)
+
+        for (i in 0 until inputItems.length()) {
+            val item = inputItems.getJSONObject(i)
+
+            val itemKeySet = mutableSetOf<String>()
+            var hasId = false
+            var hasName = false
+
+            val itemBundle = Bundle()
+            for (key in item.keys()) {
+                val value = item[key]
+
+                hasId = hasId || key == ITEM_ID.json
+                hasName = hasName || key == ITEM_NAME.json
+
+                if (key == CUSTOM_PARAMETERS.json) {
+                    validateCustomParameters(itemKeySet, item.getJSONArray(key))
+                    continue
+                }
+
+                // validate duplicate keys
+                if (itemKeySet.contains(key))
+                    throw OSFANLError.duplicateKeys()
+
+                itemKeySet.add(key)
+                itemBundle.putAny(key, value)
+            }
+
+            // should have at least one of itemId / itemName
+            if (!hasId && !hasName)
+                throw OSFANLError.missingItemIdName()
+
+            result.add(itemBundle)
+        }
+
+        return result
+    }
+
+    /**
+     * Validates a JSONArray of custom items
+     * @param itemKeySet a set of already processed keys
+     * @param customParameters the array of custom parameters to validate
+     * @return a list of bundles, each representing a validated item
+     */
+    private fun validateCustomParameters(
+        itemKeySet: Set<String>,
+        customParameters: JSONArray
+    ): Bundle {
+
+        // validate custom parameters max size
+        if (customParameters.length() >= OSFANLDefaultValues.itemCustomParametersMaximum)
+            throw OSFANLError.tooMany(
+                CUSTOM_PARAMETERS.json,
+                OSFANLDefaultValues.itemCustomParametersMaximum
+            )
+
+        // validate custom parameters content
+        val result = Bundle()
+        val itemsKeys: MutableSet<String> = mutableSetOf()
+        for (k in 0 until customParameters.length()) {
+            val parameter = customParameters.getJSONObject(k)
+            val key = parameter.getString(KEY.json)
+            val value = parameter.getString(VALUE.json)
+
+            // validate duplicate keys
+            if (itemsKeys.contains(key) || itemKeySet.contains(key))
+                throw OSFANLError.duplicateItemsIn(key)
+
+            itemsKeys.add(key)
+            result.putAny(key, value)
+        }
+        return result
+    }
+
+}
\ No newline at end of file
diff --git a/src/android/com/outsystems/firebase/analytics/validator/OSFANLEventParameterValidator.kt b/src/android/com/outsystems/firebase/analytics/validator/OSFANLEventParameterValidator.kt
new file mode 100644
index 00000000..3cd61de0
--- /dev/null
+++ b/src/android/com/outsystems/firebase/analytics/validator/OSFANLEventParameterValidator.kt
@@ -0,0 +1,105 @@
+package com.outsystems.firebase.analytics.validator
+
+import android.os.Bundle
+import com.outsystems.firebase.analytics.model.OSFANLError
+import com.outsystems.firebase.analytics.model.OSFANLInputDataFieldKey
+import com.outsystems.firebase.analytics.model.OSFANLInputDataFieldKey.CURRENCY
+import com.outsystems.firebase.analytics.model.OSFANLInputDataFieldKey.EVENT_PARAMETERS
+import com.outsystems.firebase.analytics.model.OSFANLInputDataFieldKey.KEY
+import com.outsystems.firebase.analytics.model.OSFANLInputDataFieldKey.TYPE_NUMBER
+import com.outsystems.firebase.analytics.model.OSFANLInputDataFieldKey.VALUE
+import com.outsystems.firebase.analytics.model.putAny
+import org.json.JSONArray
+
+/**
+ * Gets a String from a JSONObject
+ * @property requiredKeys a list of keys which should be required
+ * @property requireValueCurrency indicates if value and currency should be validated
+ * @property numberKeys indicates the keys which should be validated as numbers
+ * @property maxLimit indicates the maximum limit of parameters
+ * @return the String or null if the key isn't present
+ */
+class OSFANLEventParameterValidator private constructor(
+    private val requiredKeys: List<String>,
+    private val requireValueCurrency: Boolean,
+    private val numberKeys: List<String>,
+    private var maxLimit: Int? = null
+) {
+
+    class Builder {
+        private val requiredKeys = mutableListOf<String>()
+        private val numberKeys = mutableListOf<String>()
+        private var requireValueCurrency = false
+        private var maxLimit: Int? = null
+
+        fun required(vararg keys: OSFANLInputDataFieldKey) =
+            apply { keys.forEach { requiredKeys.add(it.json) } }
+        fun number(vararg keys: OSFANLInputDataFieldKey) =
+            apply { keys.forEach { numberKeys.add(it.json) } }
+        fun requireCurrencyValue() = apply { requireValueCurrency = true }
+        fun max(limit: Int) = apply { this.maxLimit = limit }
+
+        fun build() = OSFANLEventParameterValidator(
+            requiredKeys,
+            requireValueCurrency,
+            numberKeys,
+            maxLimit
+        )
+    }
+
+    /**
+     * Validates a JSONArray of parameters
+     * @param input the array of parameters to validate
+     * @return a bundle of parameters to send with the log event
+     */
+    fun validate(input: JSONArray): Bundle {
+
+        // validate maximum limit
+        maxLimit?.let {
+            if (input.length() >= it) throw OSFANLError.tooMany(EVENT_PARAMETERS.json, it)
+        }
+
+        val result = Bundle()
+        val parameterKeySet = mutableSetOf<String>()
+        var hasValue = false
+        var hasCurrency = false
+        for (i in 0 until input.length()) {
+            val parameter = input.getJSONObject(i)
+            val key = parameter.getString(KEY.json)
+            val value = parameter.getString(VALUE.json)
+
+            // validate type, if needed
+            if (numberKeys.contains(key) && value.toFloatOrNull() == null)
+                throw OSFANLError.invalidType(key, TYPE_NUMBER.json)
+
+            // validate duplicate keys
+            if (parameterKeySet.contains(key))
+                throw OSFANLError.duplicateKeys()
+
+            // validate value type
+            if (requireValueCurrency && key == VALUE.json && value.toFloatOrNull() == null)
+                throw OSFANLError.invalidType(VALUE.json, TYPE_NUMBER.json)
+
+            // search for value / currency
+            hasValue = hasValue || key == VALUE.json
+            hasCurrency = hasCurrency || key == CURRENCY.json
+
+            parameterKeySet.add(key)
+            result.putAny(key, value)
+        }
+
+        // validate value / currency
+        // if value is present, currency is required
+        if (requireValueCurrency && hasValue && !hasCurrency)
+            throw OSFANLError.missing(CURRENCY.json)
+
+        // validate required keys
+        requiredKeys.forEach {
+            if (!parameterKeySet.contains(it))
+                throw OSFANLError.missing(it)
+        }
+
+        return result
+    }
+
+}
\ No newline at end of file
diff --git a/src/android/com/outsystems/firebase/analytics/validator/OSFANLMinimumRequired.kt b/src/android/com/outsystems/firebase/analytics/validator/OSFANLMinimumRequired.kt
new file mode 100644
index 00000000..c44ddf39
--- /dev/null
+++ b/src/android/com/outsystems/firebase/analytics/validator/OSFANLMinimumRequired.kt
@@ -0,0 +1,8 @@
+package com.outsystems.firebase.analytics.validator
+
+/**
+ * Represents the types of minimum required items validation
+ */
+enum class OSFANLMinimumRequired {
+    ONE, AT_LEAST_ONE, NONE
+}
\ No newline at end of file
diff --git a/src/ios/Common/Extensions/StringConvertable.swift b/src/ios/Common/Extensions/StringConvertable.swift
new file mode 100644
index 00000000..b4de8fc1
--- /dev/null
+++ b/src/ios/Common/Extensions/StringConvertable.swift
@@ -0,0 +1,20 @@
+protocol StringConvertable {
+    static var variableType: String { get }
+    init?(value: String)
+}
+
+extension Decimal: StringConvertable {
+    static var variableType: String { "Decimal" }
+    
+    init?(value: String) {
+        self.init(string: value)
+    }
+}
+
+extension String: StringConvertable {
+    static var variableType: String { "Text" }
+    
+    init?(value: String) {
+        self.init(stringLiteral: value)
+    }
+}
diff --git a/src/ios/Common/OSFANLDefaultValues.swift b/src/ios/Common/OSFANLDefaultValues.swift
new file mode 100644
index 00000000..2d7f55a1
--- /dev/null
+++ b/src/ios/Common/OSFANLDefaultValues.swift
@@ -0,0 +1,4 @@
+struct OSFANLDefaultValues {
+    static let itemCustomParametersMaximum: Int = 27
+    static let eventItemsMaximum: Int = 200
+}
diff --git a/src/ios/Common/OSFANLError.swift b/src/ios/Common/OSFANLError.swift
new file mode 100644
index 00000000..b7f6ba9d
--- /dev/null
+++ b/src/ios/Common/OSFANLError.swift
@@ -0,0 +1,45 @@
+enum OSFANLError: Error {
+    case duplicateItemsIn(parameter: String)
+    case duplicateKeys
+    case invalidType(_ parameter: String, type: String)
+    case logEcommerceEventInputArgumentsIssue
+    case missing(_ parameter: String)
+    case missingItemIdName
+    case tooMany(parameter: String, limit: Int)
+    case unexpected(_ event: String)
+}
+
+extension OSFANLError: CustomNSError {
+    var errorCode: Int {
+        switch self {
+        case .duplicateItemsIn: return 1
+        case .duplicateKeys: return 2
+        case .invalidType: return 3
+        case .logEcommerceEventInputArgumentsIssue: return 4
+        case .missing: return 5
+        case .missingItemIdName: return 6
+        case .tooMany: return 7
+        case .unexpected: return 8
+        }
+    }
+    
+    var errorDescription: String? {
+        switch self {
+        case .duplicateItemsIn(let parameter): return "Parameter '\(parameter)' contains duplicate items."
+        case .duplicateKeys: return "The dictionary contains duplicate keys"
+        case .invalidType(let parameter, let type): return "Parameter '\(parameter)' must be of type '\(type)'"
+        case .logEcommerceEventInputArgumentsIssue: return "There's an issue with the `logECommerceEvent` input arguments."
+        case .missing(let parameter): return "Required parameter '\(parameter)' is missing."
+        case .missingItemIdName: return "Item requires an ID or a Name."
+        case .tooMany(let parameter, let limit): return "Parameter '\(parameter)' must be set to a maximum number of \(limit)."
+        case .unexpected(let event): return "Event '\(event)' is not valid."
+        }
+    }
+    
+    var errorUserInfo: [String: Any] {
+        [
+            "code": "OS-PLUG-FANL-\(String(format: "%04d", self.errorCode))",
+            "message": self.errorDescription ?? ""
+        ]
+    }
+}
diff --git a/src/ios/Common/OSFANLInputDataFieldKey.swift b/src/ios/Common/OSFANLInputDataFieldKey.swift
new file mode 100644
index 00000000..b1778650
--- /dev/null
+++ b/src/ios/Common/OSFANLInputDataFieldKey.swift
@@ -0,0 +1,17 @@
+enum OSFANLInputDataFieldKey: String {
+    case customParameters = "custom_parameters"
+    case currency
+    case event
+    case eventParameters
+    case item
+    case itemId = "item_id"
+    case itemListId = "item_list_id"
+    case itemListName = "item_list_name"
+    case itemName = "item_name"
+    case items
+    case key
+    case shipping
+    case tax
+    case transactionId = "transaction_id"
+    case value
+}
diff --git a/src/ios/FirebaseAnalyticsPlugin.h b/src/ios/FirebaseAnalyticsPlugin.h
index b48ff2bc..9f89b026 100644
--- a/src/ios/FirebaseAnalyticsPlugin.h
+++ b/src/ios/FirebaseAnalyticsPlugin.h
@@ -3,6 +3,7 @@
 @interface FirebaseAnalyticsPlugin : CDVPlugin
 
 - (void)logEvent:(CDVInvokedUrlCommand*)command;
+- (void)logECommerceEvent:(CDVInvokedUrlCommand *)command;
 - (void)setUserId:(CDVInvokedUrlCommand*)command;
 - (void)setUserProperty:(CDVInvokedUrlCommand*)command;
 - (void)setEnabled:(CDVInvokedUrlCommand*)command;
diff --git a/src/ios/FirebaseAnalyticsPlugin.m b/src/ios/FirebaseAnalyticsPlugin.m
index 53416b6a..51bb6bad 100644
--- a/src/ios/FirebaseAnalyticsPlugin.m
+++ b/src/ios/FirebaseAnalyticsPlugin.m
@@ -1,8 +1,15 @@
 #import "FirebaseAnalyticsPlugin.h"
+#import "OutSystems-Swift.h"
 
 @import Firebase;
 @import AppTrackingTransparency;
 
+@interface FirebaseAnalyticsPlugin ()
+
+@property (strong, nonatomic) id<OSFANLManageable> manager;
+
+@end
+
 @implementation FirebaseAnalyticsPlugin
 
 - (void)pluginInitialize {
@@ -11,6 +18,8 @@ - (void)pluginInitialize {
     if(![FIRApp defaultApp]) {
         [FIRApp configure];
     }
+    
+    self.manager = [OSFANLManagerFactory createManager];
 }
 
 - (void)logEvent:(CDVInvokedUrlCommand *)command {
@@ -23,6 +32,20 @@ - (void)logEvent:(CDVInvokedUrlCommand *)command {
     [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 }
 
+- (void)logECommerceEvent:(CDVInvokedUrlCommand *)command {
+    NSDictionary *argumentsDictionary = [command argumentAtIndex:0];
+    NSError *error;
+    
+    OSFANLOutputModel *outputModel = [self.manager createEventModelFor:argumentsDictionary error:&error];
+    if (!outputModel && error) {
+        [self sendError:error forCallbackId:command.callbackId];
+        return;
+    }
+    
+    [FIRAnalytics logEventWithName:outputModel.name parameters:outputModel.parameters];
+    [self sendSuccessfulResultforCallbackId:command.callbackId];
+}
+
 - (void)setUserId:(CDVInvokedUrlCommand *)command {
     NSString* id = [command.arguments objectAtIndex:0];
 
@@ -141,6 +164,17 @@ - (void)showPermissionInformationPopup:
     [self.viewController presentViewController:alert animated:YES completion:nil];
 }
 
+#pragma mark - Result Callback Methods (used for `LogECommerceEvent`)
+
+- (void)sendSuccessfulResultforCallbackId:(NSString *)callbackId {
+    CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+    [self.commandDelegate sendPluginResult:pluginResult callbackId:callbackId];
+}
+
+- (void)sendError:(NSError *)error forCallbackId:(NSString *)callbackId {
+    CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:error.userInfo];
+    [self.commandDelegate sendPluginResult:pluginResult callbackId:callbackId];
+}
 
 
 @end
diff --git a/src/ios/InputTransformer/OSFANLInputTransformable.swift b/src/ios/InputTransformer/OSFANLInputTransformable.swift
new file mode 100644
index 00000000..867574d9
--- /dev/null
+++ b/src/ios/InputTransformer/OSFANLInputTransformable.swift
@@ -0,0 +1,3 @@
+protocol OSFANLInputTransformable {
+    func transform(_ eventParameterArray: [InputParameterData]?, _ itemArray: [InputItemData]?) throws -> OSFANLInputTransformableModel
+}
diff --git a/src/ios/InputTransformer/OSFANLInputTransformableModel.swift b/src/ios/InputTransformer/OSFANLInputTransformableModel.swift
new file mode 100644
index 00000000..a401a1c7
--- /dev/null
+++ b/src/ios/InputTransformer/OSFANLInputTransformableModel.swift
@@ -0,0 +1,9 @@
+struct OSFANLInputTransformableModel {
+    let eventParameterData: InputParameterData?
+    var itemArray: [InputItemData]?
+    
+    init(_ eventParameterData: InputParameterData?, _ itemArray: [InputItemData]?) {
+        self.eventParameterData = eventParameterData
+        self.itemArray = itemArray
+    }
+}
diff --git a/src/ios/InputTransformer/OSFANLInputTransformer.swift b/src/ios/InputTransformer/OSFANLInputTransformer.swift
new file mode 100644
index 00000000..89a7f6cb
--- /dev/null
+++ b/src/ios/InputTransformer/OSFANLInputTransformer.swift
@@ -0,0 +1,84 @@
+struct OSFANLInputTransformer: OSFANLInputTransformable {
+    func transform(_ eventParameterArray: [InputParameterData]?, _ itemArray: [InputItemData]?) throws -> OSFANLInputTransformableModel {
+        var eventParameterData: InputParameterData?
+        if let eventParameterArray {
+            guard let flatResult = try? self.flat(keyValueMapArray: eventParameterArray) else {
+                throw OSFANLError.duplicateItemsIn(parameter: OSFANLInputDataFieldKey.eventParameters.rawValue)
+            }
+            eventParameterData = flatResult
+        }
+        let itemArray = try self.transform(itemArray)
+        
+        return .init(eventParameterData, itemArray)
+    }
+}
+
+private extension OSFANLInputTransformer {
+    func flat(keyValueMapArray array: [InputParameterData]) throws -> InputParameterData {
+        let flatKeyValueArray = array.map {
+            [$0[OSFANLInputDataFieldKey.key.rawValue, default: ""]: $0[OSFANLInputDataFieldKey.value.rawValue, default: ""]]
+        }
+        let flatKeyValueDictionary = self.flat(dictionaryArray: flatKeyValueArray)
+        
+        if flatKeyValueDictionary.count != flatKeyValueArray.count { throw OSFANLError.duplicateKeys }
+        return flatKeyValueDictionary
+    }
+    
+    func transform(_ itemArray: [InputItemData]?) throws -> [InputItemData]? {
+        // if nil or empty, just return it as there's nothing to do here.
+        guard let itemArray, !itemArray.isEmpty else {
+            return itemArray
+        }
+        // if there's more than the expected maximum, return the error
+        guard itemArray.count <= OSFANLDefaultValues.eventItemsMaximum else {
+            throw OSFANLError.tooMany(parameter: OSFANLInputDataFieldKey.items.rawValue, limit: OSFANLDefaultValues.eventItemsMaximum)
+        }
+        
+        var resultArray: [InputItemData] = []
+        for itemData in itemArray {
+            // there needs to be at least one `item_id` or `item_name`
+            guard itemData.keys.contains(where: { [OSFANLInputDataFieldKey.itemId, .itemName].map(\.rawValue).contains($0) }) else {
+                throw OSFANLError.missingItemIdName
+            }
+            
+            var resultItem: InputItemData = [:]
+            
+            let customParametersSplit = Dictionary(grouping: itemData) { $0.key == OSFANLInputDataFieldKey.customParameters.rawValue }
+            if let regularParameterArray = customParametersSplit[false] { resultItem += self.flat(tupleArray: regularParameterArray) }
+            
+            if let customParameterArray = customParametersSplit[true]?.first?.value as? [InputParameterData], !customParameterArray.isEmpty {
+                // if there's more than the expected maximum, return the error
+                guard customParameterArray.count <= OSFANLDefaultValues.itemCustomParametersMaximum else {
+                    throw OSFANLError.tooMany(
+                        parameter: OSFANLInputDataFieldKey.customParameters.rawValue, limit: OSFANLDefaultValues.itemCustomParametersMaximum
+                    )
+                }
+                guard let customParameterDictionary = try? self.flat(keyValueMapArray: customParameterArray) else {
+                    throw OSFANLError.duplicateItemsIn(parameter: OSFANLInputDataFieldKey.customParameters.rawValue)
+                }
+                // check if there are repeated keys. If so, return an error.
+                if !resultItem.keys.filter({ customParameterDictionary.keys.contains($0) }).isEmpty {
+                    throw OSFANLError.duplicateItemsIn(parameter: OSFANLInputDataFieldKey.item.rawValue)
+                }
+                resultItem += customParameterDictionary
+            }
+            
+            resultArray.append(resultItem)
+        }
+        
+        return resultArray
+    }
+}
+
+private extension OSFANLInputTransformer {
+    func flat<Key, Value>(dictionaryArray: [[Key: Value]]) -> [Key: Value] {
+        dictionaryArray
+            .flatMap { $0 }
+            .reduce(into: [Key: Value]()) { $0[$1.key] = $1.value }
+    }
+    
+    func flat<Key, Value>(tupleArray: [(Key, Value)]) -> [Key: Value] {
+        tupleArray
+            .reduce(into: [Key: Value]()) { $0[$1.0] = $1.1 }
+    }
+}
diff --git a/src/ios/Manager/OSFANLManageable.swift b/src/ios/Manager/OSFANLManageable.swift
new file mode 100644
index 00000000..714579ee
--- /dev/null
+++ b/src/ios/Manager/OSFANLManageable.swift
@@ -0,0 +1,17 @@
+typealias DefaultKeyValueData = [String: Any]
+
+extension DefaultKeyValueData {
+    static func += <K, V>(left: inout [K: V], right: [K: V]) {
+        for (key, value) in right {
+            left[key] = value
+        }
+    }
+}
+
+typealias InputParameterData = [String: String]
+typealias InputItemData = DefaultKeyValueData
+typealias OutputParameterData = DefaultKeyValueData
+
+@objc protocol OSFANLManageable {
+    func createEventModel(for inputArgument: InputParameterData) throws -> OSFANLOutputModel
+}
diff --git a/src/ios/Manager/OSFANLManager+EventValidationRules.swift b/src/ios/Manager/OSFANLManager+EventValidationRules.swift
new file mode 100644
index 00000000..d72bb689
--- /dev/null
+++ b/src/ios/Manager/OSFANLManager+EventValidationRules.swift
@@ -0,0 +1,126 @@
+import FirebaseAnalytics
+
+typealias ValidationMethod = (InputParameterData?, inout [InputItemData]?) throws -> Void
+
+extension OSFANLManager {
+    convenience init(_ inputTransformer: OSFANLInputTransformable) {
+        let eventValidationRulesDictionary = [
+            AnalyticsEventAddPaymentInfo: Self.validateValueCurrencyAndMultipleItemsParameters(eventData:itemsData:),
+            AnalyticsEventAddShippingInfo: Self.validateValueCurrencyAndMultipleItemsParameters(eventData:itemsData:),
+            AnalyticsEventAddToCart: Self.validateValueCurrencyAndMultipleItemsParameters(eventData:itemsData:),
+            AnalyticsEventAddToWishlist: Self.validateValueCurrencyAndMultipleItemsParameters(eventData:itemsData:),
+            AnalyticsEventBeginCheckout: Self.validateValueCurrencyAndMultipleItemsParameters(eventData:itemsData:),
+            AnalyticsEventPurchase: Self.validatePurchaseParameters(eventData:itemsData:),
+            AnalyticsEventRefund: Self.validateRefundParameters(eventData:itemsData:),
+            AnalyticsEventRemoveFromCart: Self.validateValueCurrencyAndMultipleItemsParameters(eventData:itemsData:),
+            AnalyticsEventSelectItem: Self.validateOneItemParameters(eventData:itemsData:),
+            AnalyticsEventSelectPromotion: Self.validateSelectPromotionParameters(eventData:itemsData:),
+            AnalyticsEventViewCart: Self.validateValueCurrencyAndMultipleItemsParameters(eventData:itemsData:),
+            AnalyticsEventViewItem: Self.validateValueCurrencyAndMultipleItemsParameters(eventData:itemsData:),
+            AnalyticsEventViewItemList: Self.validateViewItemListParameters(eventData:itemsData:),
+            AnalyticsEventViewPromotion: Self.validateOneItemParameters(eventData:itemsData:)
+        ]
+        
+        let eventValidator = OSFANLEventValidator(eventValidatorMapping: eventValidationRulesDictionary)
+        self.init(inputTransformer, eventValidator)
+    }
+}
+
+private extension OSFANLManager {
+    struct ParameterToValidate: OptionSet {
+        let rawValue: Int
+        
+        static let currency         = Self(rawValue: 1 << 0)    // required if value is set
+        static let shipping         = Self(rawValue: 1 << 1)    // always optional
+        static let tax              = Self(rawValue: 1 << 2)    // always optional
+        static let transactionId    = Self(rawValue: 1 << 3)    // always required
+        static let value            = Self(rawValue: 1 << 4)    // optional
+        
+        static let currencyAndValue: Self = [.currency, .value]
+    }
+
+    enum ItemsRequired {
+        case none
+        case one
+        case atLeastOne
+    }
+    
+    static func validate(_ eventData: InputParameterData?, _ itemsData: inout [InputItemData]?, parameters: ParameterToValidate? = nil, itemsRequired: ItemsRequired) throws {
+        // Validate parameters first
+        if let parameters {
+            if parameters.contains(.currencyAndValue) {
+                let valueContainsValue = try self.validate(parameter: OSFANLInputDataFieldKey.value.rawValue, ofType: Decimal.self, eventData)
+                try self.validate(
+                    parameter: OSFANLInputDataFieldKey.currency.rawValue, ofType: String.self, isRequired: valueContainsValue, eventData
+                )
+            }
+            if parameters.contains(.transactionId) {
+                try self.validate(parameter: OSFANLInputDataFieldKey.transactionId.rawValue, ofType: String.self, isRequired: true, eventData)
+            }
+            if parameters.contains(.shipping) {
+                try self.validate(parameter: OSFANLInputDataFieldKey.shipping.rawValue, ofType: Decimal.self, eventData)
+            }
+            if parameters.contains(.tax) {
+                try self.validate(parameter: OSFANLInputDataFieldKey.tax.rawValue, ofType: Decimal.self, eventData)
+            }
+        }
+        
+        if itemsRequired != .none, itemsData?.count ?? 0 < 1 { throw OSFANLError.missing(OSFANLInputDataFieldKey.items.rawValue) }
+        
+        if case .one = itemsRequired, let nonNilItemsData = itemsData, nonNilItemsData.count > 1 {
+            itemsData?.removeLast(nonNilItemsData.count - 1)
+        }
+        
+        if let eventData, let nonNilItemsData = itemsData {
+            let itemListKey: [String] = [OSFANLInputDataFieldKey.itemListId, .itemListName].map(\.rawValue).filter { eventData.keys.contains($0) }
+            
+            if !itemListKey.isEmpty {
+                for (index, itemData) in nonNilItemsData.enumerated() where itemData.keys.contains(where: { itemListKey.contains($0) }) {
+                    if let firstItemListKey = itemListKey.first {
+                        itemsData?[index][firstItemListKey] = nil
+                        if let lastItemListKey = itemListKey.last, lastItemListKey != firstItemListKey {
+                            itemsData?[index][lastItemListKey] = nil
+                        }
+                    }
+                }
+            }
+        }
+    }
+    
+    private static func validateValueCurrencyAndMultipleItemsParameters(eventData: InputParameterData?, itemsData: inout [InputItemData]?) throws {
+        try self.validate(eventData, &itemsData, parameters: .currencyAndValue, itemsRequired: .atLeastOne)
+    }
+    
+    private static func validatePurchaseParameters(eventData: InputParameterData?, itemsData: inout [InputItemData]?) throws {
+        try self.validate(eventData, &itemsData, parameters: [.currencyAndValue, .transactionId, .shipping, .tax], itemsRequired: .atLeastOne)
+    }
+    
+    private static func validateRefundParameters(eventData: InputParameterData?, itemsData: inout [InputItemData]?) throws {
+        try self.validate(eventData, &itemsData, parameters: [.currencyAndValue, .transactionId, .shipping, .tax], itemsRequired: .none)
+    }
+    
+    private static func validateOneItemParameters(eventData: InputParameterData?, itemsData: inout [InputItemData]?) throws {
+        try self.validate(eventData, &itemsData, itemsRequired: .one)
+    }
+    
+    private static func validateSelectPromotionParameters(eventData: InputParameterData?, itemsData: inout [InputItemData]?) throws {
+        try self.validate(eventData, &itemsData, itemsRequired: .none)
+    }
+    
+    private static func validateViewItemListParameters(eventData: InputParameterData?, itemsData: inout [InputItemData]?) throws {
+        try self.validate(eventData, &itemsData, itemsRequired: .atLeastOne)
+    }
+    
+    @discardableResult
+    private static func validate<T: CustomStringConvertible & StringConvertable>(parameter: String, ofType type: T.Type, isRequired: Bool = false, _ eventData: InputParameterData?) throws -> Bool {
+        func espace(_ isRequired: Bool, parameterMissing parameter: String) throws -> Bool {
+            if isRequired { throw OSFANLError.missing(parameter) }
+            return false // indicates that there's no value associated to `parameter`
+        }
+        
+        guard let eventData, !eventData.isEmpty else { return try espace(isRequired, parameterMissing: "eventParameters") }
+        guard let parameterStringValue = eventData[parameter] else { return try espace(isRequired, parameterMissing: parameter) }
+        if T(value: parameterStringValue) == nil { throw OSFANLError.invalidType(parameter, type: T.variableType) }
+        return true // indicates that there's a value associated to `parameter`
+    }
+}
diff --git a/src/ios/Manager/OSFANLManager.swift b/src/ios/Manager/OSFANLManager.swift
new file mode 100644
index 00000000..7059f0f2
--- /dev/null
+++ b/src/ios/Manager/OSFANLManager.swift
@@ -0,0 +1,42 @@
+class OSFANLManager {
+    private let inputTransformer: OSFANLInputTransformable
+    private let eventValidator: OSFANLEventValidator
+    
+    init(_ inputTransformer: OSFANLInputTransformable, _ eventValidator: OSFANLEventValidator) {
+        self.inputTransformer = inputTransformer
+        self.eventValidator = eventValidator
+    }
+}
+
+extension OSFANLManager: OSFANLManageable {
+    private func convert<T>(jsonString: String) -> T? {
+        guard let jsonData = jsonString.data(using: .utf8) else { return nil }
+        return try? JSONSerialization.jsonObject(with: jsonData, options: .fragmentsAllowed) as? T
+    }
+    
+    func createEventModel(for inputArgument: InputParameterData) throws -> OSFANLOutputModel {
+        guard let eventName = inputArgument[OSFANLInputDataFieldKey.event.rawValue], !eventName.isEmpty else {
+            throw OSFANLError.missing(OSFANLInputDataFieldKey.event.rawValue)
+        }
+        
+        var eventParameterArray: [InputParameterData]?
+        if let eventParameterString = inputArgument[OSFANLInputDataFieldKey.eventParameters.rawValue] {
+            eventParameterArray = self.convert(jsonString: eventParameterString)
+        }
+        
+        var itemArray: [InputItemData]?
+        if let itemString = inputArgument[OSFANLInputDataFieldKey.items.rawValue] {
+            itemArray = self.convert(jsonString: itemString)
+        }
+        
+        var inputModel = try self.inputTransformer.transform(eventParameterArray, itemArray)
+        try self.eventValidator.validate(event: eventName, inputModel.eventParameterData, &inputModel.itemArray)
+        
+        var outputModelParameterData: OutputParameterData = inputModel.eventParameterData ?? [:]
+        if let inputModelItemArray = inputModel.itemArray, !inputModelItemArray.isEmpty {
+            outputModelParameterData += [OSFANLInputDataFieldKey.items.rawValue: inputModelItemArray]
+        }
+        
+        return .init(eventName, outputModelParameterData)
+    }
+}
diff --git a/src/ios/Manager/OSFANLManagerFactory.swift b/src/ios/Manager/OSFANLManagerFactory.swift
new file mode 100644
index 00000000..6ccbdc84
--- /dev/null
+++ b/src/ios/Manager/OSFANLManagerFactory.swift
@@ -0,0 +1,7 @@
+@objc class OSFANLManagerFactory: NSObject {
+    @objc static func createManager() -> OSFANLManageable {
+        let inputTransformer = OSFANLInputTransformer()
+        
+        return OSFANLManager(inputTransformer)
+    }
+}
diff --git a/src/ios/Manager/OSFANLOutputModel.swift b/src/ios/Manager/OSFANLOutputModel.swift
new file mode 100644
index 00000000..15aa8445
--- /dev/null
+++ b/src/ios/Manager/OSFANLOutputModel.swift
@@ -0,0 +1,9 @@
+@objc class OSFANLOutputModel: NSObject {
+    @objc let name: String
+    @objc let parameters: [String: Any]
+    
+    init(_ name: String, _ parameters: [String: Any]) {
+        self.name = name
+        self.parameters = parameters
+    }
+}
diff --git a/src/ios/Validator/OSFANLEventValidator.swift b/src/ios/Validator/OSFANLEventValidator.swift
new file mode 100644
index 00000000..ffda6ea5
--- /dev/null
+++ b/src/ios/Validator/OSFANLEventValidator.swift
@@ -0,0 +1,12 @@
+struct OSFANLEventValidator {
+    private let eventValidatorMapping: [String: ValidationMethod]
+    
+    init(eventValidatorMapping: [String: ValidationMethod]) {
+        self.eventValidatorMapping = eventValidatorMapping
+    }
+    
+    func validate(event: String, _ eventParameterData: InputParameterData?, _ itemArray: inout [InputItemData]?) throws {
+        guard let eventValidation = self.eventValidatorMapping[event] else { throw OSFANLError.unexpected(event) }
+        try eventValidation(eventParameterData, &itemArray)
+    }
+}
diff --git a/www/FirebaseAnalytics.js b/www/FirebaseAnalytics.js
index 38ca37db..d2d980fa 100644
--- a/www/FirebaseAnalytics.js
+++ b/www/FirebaseAnalytics.js
@@ -51,5 +51,9 @@ module.exports = {
     },
     requestTrackingAuthorization: function(showInformation, title, message, buttonTitle, success, error) {
         exec(success, error, PLUGIN_NAME, 'requestTrackingAuthorization', [showInformation, title, message, buttonTitle]);
+    },
+    logECommerceEvent: function(event, eventParameters, items, success, error) {
+        let args = [{event, eventParameters, items}];
+        exec(success, error, PLUGIN_NAME, 'logECommerceEvent', args);
     }
 };