#00000 - Platform alignments + mapped field.

Author: tal-mi

CHANGELOG.md

@@ -10,4 +10,10 @@ Inital release.
 Example & documentation.
 
 * Example application updates.
-* Documentation updates.
+* Documentation updates.
+
+# 0.0.3
+Platform alignments
+
+* Fixed Android error not mapped correctly.
+* Added dynamic "mapped" field to base GigyaResponse.

android/build.gradle

@@ -44,7 +44,6 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     // Gigya SDK core implementation.
-    //api 'com.github.SAP.gigya-android-sdk::core-v5.0.0'
     api 'com.github.SAP.gigya-android-sdk:gigya-android-sdk-core:core-v5.0.1'
     api 'com.google.code.gson:gson:2.8.6'
 }

android/src/main/kotlin/com/sap/gigya_flutter_plugin/GigyaSDKWrapper.kt

@@ -66,7 +66,7 @@ class GigyaSDKWrapper<T : GigyaAccount>(application: Application, accountObj: Cl
 
             override fun onError(p0: GigyaError?) {
                 p0?.let {
-                    channelResult.error(p0.errorCode.toString(), p0.localizedMessage, p0.data)
+                    channelResult.error(p0.errorCode.toString(), p0.localizedMessage, mapJson(p0.data))
                 } ?: channelResult.notImplemented()
             }
 
@@ -103,7 +103,7 @@ class GigyaSDKWrapper<T : GigyaAccount>(application: Application, accountObj: Cl
 
             override fun onError(p0: GigyaError?) {
                 p0?.let {
-                    currentResult!!.error(p0.errorCode.toString(), p0.localizedMessage, p0.data)
+                    currentResult!!.error(p0.errorCode.toString(), p0.localizedMessage, mapJson(p0.data))
                 } ?: currentResult!!.notImplemented()
             }
 
@@ -150,7 +150,7 @@ class GigyaSDKWrapper<T : GigyaAccount>(application: Application, accountObj: Cl
 
             override fun onError(p0: GigyaError?) {
                 p0?.let {
-                    currentResult!!.error(p0.errorCode.toString(), p0.localizedMessage, p0.data)
+                    currentResult!!.error(p0.errorCode.toString(), p0.localizedMessage, mapJson(p0.data))
                 } ?: currentResult!!.notImplemented()
             }
 
@@ -193,7 +193,7 @@ class GigyaSDKWrapper<T : GigyaAccount>(application: Application, accountObj: Cl
 
             override fun onError(p0: GigyaError?) {
                 p0?.let {
-                    channelResult.error(p0.errorCode.toString(), p0.localizedMessage, p0.data)
+                    channelResult.error(p0.errorCode.toString(), p0.localizedMessage, mapJson(p0.data))
                 } ?: channelResult.notImplemented()
             }
 
@@ -217,7 +217,7 @@ class GigyaSDKWrapper<T : GigyaAccount>(application: Application, accountObj: Cl
 
             override fun onError(p0: GigyaError?) {
                 p0?.let {
-                    channelResult.error(p0.errorCode.toString(), p0.localizedMessage, p0.data)
+                    channelResult.error(p0.errorCode.toString(), p0.localizedMessage, mapJson(p0.data))
                 } ?: channelResult.notImplemented()
             }
 
@@ -235,7 +235,7 @@ class GigyaSDKWrapper<T : GigyaAccount>(application: Application, accountObj: Cl
 
             override fun onError(p0: GigyaError?) {
                 p0?.let {
-                    channelResult.error(p0.errorCode.toString(), p0.localizedMessage, p0.data)
+                    channelResult.error(p0.errorCode.toString(), p0.localizedMessage, mapJson(p0.data))
                 } ?: channelResult.notImplemented()
             }
 
@@ -263,7 +263,7 @@ class GigyaSDKWrapper<T : GigyaAccount>(application: Application, accountObj: Cl
 
             override fun onError(p0: GigyaError?) {
                 p0?.let {
-                    currentResult!!.error(p0.errorCode.toString(), p0.localizedMessage, p0.data)
+                    currentResult!!.error(p0.errorCode.toString(), p0.localizedMessage, mapJson(p0.data))
                 } ?: currentResult!!.notImplemented()
             }
 
@@ -306,7 +306,7 @@ class GigyaSDKWrapper<T : GigyaAccount>(application: Application, accountObj: Cl
 
             override fun onError(p0: GigyaError?) {
                 p0?.let {
-                    channelResult.error(p0.errorCode.toString(), p0.localizedMessage, p0.data)
+                    channelResult.error(p0.errorCode.toString(), p0.localizedMessage, mapJson(p0.data))
                 } ?: channelResult.notImplemented()
             }
 
@@ -336,7 +336,7 @@ class GigyaSDKWrapper<T : GigyaAccount>(application: Application, accountObj: Cl
 
             override fun onError(p0: GigyaError?) {
                 p0?.let {
-                    channelResult.error(p0.errorCode.toString(), p0.localizedMessage, p0.data)
+                    channelResult.error(p0.errorCode.toString(), p0.localizedMessage, mapJson(p0.data))
                 } ?: channelResult.notImplemented()
             }
 
@@ -520,6 +520,15 @@ class GigyaSDKWrapper<T : GigyaAccount>(application: Application, accountObj: Cl
         return gson.fromJson(jsonString, object : TypeToken<Map<String, Any>>() {}.type)
     }
 
+    /**
+     * Map a JSON string to a Map<String, Any> object in order to pass on to
+     * the method channel response.
+     */
+    private fun mapJson(jsonString: String): Map<String, Any> {
+        return gson.fromJson(jsonString, object : TypeToken<Map<String, Any>>() {}.type)
+
+    }
+
     companion object {
 
         const val GENERAL_ERROR = "700"

example/pubspec.lock

@@ -74,46 +74,13 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  flutter_web_plugins:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
   gigya_flutter_plugin:
     dependency: "direct main"
     description:
       path: ".."
       relative: true
     source: path
-    version: "0.0.2"
-  google_sign_in:
-    dependency: "direct main"
-    description:
-      name: google_sign_in
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "4.5.6"
-  google_sign_in_platform_interface:
-    dependency: transitive
-    description:
-      name: google_sign_in_platform_interface
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.1.2"
-  google_sign_in_web:
-    dependency: transitive
-    description:
-      name: google_sign_in_web
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.9.2"
-  js:
-    dependency: transitive
-    description:
-      name: js
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.6.2"
+    version: "0.0.3"
   matcher:
     dependency: transitive
     description:
@@ -135,13 +102,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.8.0-nullsafety.1"
-  quiver:
-    dependency: transitive
-    description:
-      name: quiver
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.5"
   sky_engine:
     dependency: transitive
     description: flutter

example/pubspec.yaml

@@ -23,7 +23,6 @@ dependencies:
     # the parent directory to use the current plugin's version.
     path: ../
 
-  google_sign_in: ^4.5.6
   flutter_facebook_login: ^3.0.0
 
   # The following adds the Cupertino Icons font to your application.

lib/models/gigya_models.dart

@@ -16,6 +16,7 @@ class GigyaResponse {
   String statusReason;
   int apiVersion;
   String regToken;
+  dynamic mapped;
 
   Interruption getInterruption() {
     switch (errorCode) {
@@ -37,7 +38,8 @@ class GigyaResponse {
         errorDetails = json['errorDetails'],
         statusReason = json['statusReason'],
         apiVersion = json['apiVersion'],
-        regToken = json['regToken'];
+        regToken = json['regToken'],
+        mapped = json;
 
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> data = {};
@@ -48,6 +50,7 @@ class GigyaResponse {
     data['statusReason'] = statusReason;
     data['apiVersion'] = apiVersion;
     data['regToken'] = regToken;
+    data['mapped'] = mapped;
     return data;
   }
 }

pubspec.yaml

@@ -1,6 +1,6 @@
 name: gigya_flutter_plugin
 description: SAP Gigya Flutter plugin
-version: 0.0.2
+version: 0.0.3
 homepage: https://github.com/SAP/gigya-flutter-plugin
 
 environment: