Merge branch 'develop' into main

SAP · Apr 20, 2021 · 552238e · 552238e
2 parents 0c126bf + 4ae43b9
commit 552238e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,10 +21,15 @@ Platform alignments
 # 0.0.4
 Core SDKS updates
 
-* Updated Swift SDK 1.2.0
-* Updated Android SDK 5.1.0
+* Updated Swift SDK 1.2.0.
+* Updated Android SDK 5.1.0.
 
 # 0.0.5
 Core SDKS update
 
-* Updated Android SDK 5.1.1 (security)
+* Updated Android SDK 5.1.1 (security).
+
+# 0.0.6
+Account Model Patch
+
+* Fix to main account model (sessionInfo type).
diff --git a/example/ios/Runner/UserHost.swift b/example/ios/Runner/UserHost.swift
@@ -66,4 +66,7 @@ struct UserHost: GigyaAccountProtocol {
         }
         return ""
     }
+
+    var sessionInfo: [String: AnyCodable]?
 }
+
diff --git a/lib/models/gigya_models.dart b/lib/models/gigya_models.dart
@@ -1,4 +1,4 @@
-import 'dart:convert';
+import 'dart:io';
 
 /// Available interruptions.
 enum Interruption {
@@ -149,12 +149,12 @@ class Account extends GigyaResponse {
 class SessionInfo {
   String sessionToken;
   String sessionSecret;
-  double expirationTime;
+  dynamic expiresIn;
 
   SessionInfo.fromJson(Map<String, dynamic> json) {
     sessionToken = json['sessionToken'];
     sessionSecret = json['sessionSecret'];
-    expirationTime = json['expires_in'];
+    expiresIn = json['expires_in'];
   }
 
   Map<String, dynamic> toJson() {
@@ -164,6 +164,8 @@ class SessionInfo {
     data['expires_in'] = this.expirationTime;
     return data;
   }
+
+  double get expirationTime => Platform.isIOS ? double.parse(expiresIn) : expiresIn;
 }
 
 /// Account profile schema object.

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: gigya_flutter_plugin
 description: SAP Gigya Flutter plugin
-version: 0.0.5
+version: 0.0.6
 homepage: https://github.com/SAP/gigya-flutter-plugin
 
 environment:
-Original file line number
+Diff line change
@@ Expand Up / @@ -66,4 +66,7 @@ struct UserHost: GigyaAccountProtocol { @@
             }
             return ""
         }
+        var sessionInfo: [String: AnyCodable]?
     }