Skip to content

Commit 73bc42e

Browse files
tal-mital-mi
committed
Merge branch 'us/CXCDC-26358-current-result-interruption-revamp'
2 parents 1087239 + 76b3d63 commit 73bc42e

File tree

12 files changed

+248
-182
lines changed

12 files changed

+248
-182
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# 1.0.8
2+
1.0.8
3+
4+
* Updated Android core 7.1.3 - https://github.com/SAP/gigya-android-sdk/releases/tag/core-v7.1.3
5+
* Updated Swift Core 1.7.1 - https://github.com/SAP/gigya-swift-sdk/releases/tag/core%2Fv1.7.1
6+
* Fixed interruption flows causing channel result error.
7+
18
# 1.0.7
29
1.0.7
310

‎android/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ dependencies {
6060
// Gigya SDK core implementation.
6161
api 'com.sap.oss.gigya-android-sdk:sdk-core:7.1.+'
6262
api 'com.github.SAP.gigya-android-sdk:sdk-auth:auth-v2.2.0'
63-
api 'com.github.SAP.gigya-android-sdk:sdk-biometric:bio-v2.1.2'
63+
api 'com.github.SAP.gigya-android-sdk:sdk-biometric:bio-v2.1.+'
6464

6565
api 'com.google.code.gson:gson:2.8.9'
6666

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

Lines changed: 145 additions & 121 deletions
Large diffs are not rendered by default.

‎example/android/app/src/main/res/values/strings.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
<string name="google_client_id">GOOGLE-CLIENT-ID-HERE(WEB)</string>
55
<string name="facebook_app_id">FACEBOOK-APP-ID-HERE</string>
6+
<string name="fb_login_protocol_scheme">fbFACEBOOK-APP-ID-HERE</string>
67
<string name="facebook_client_token">FACEBOOK-CLIENT-TOKEN-HERE</string>
78

9+
810
</resources>

‎example/ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
1414
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
1515
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
16+
D58CE0182CB52A9100C59BAB /* FacebookWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = D58CE0172CB52A9100C59BAB /* FacebookWrapper.swift */; };
1617
D5A996442670ADC30074D677 /* GoogleWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5A996432670ADC30074D677 /* GoogleWrapper.swift */; };
1718
F53B1CBD8447B46F82ED76E6 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F4639B1E2013107FEB628B5 /* Pods_Runner.framework */; };
1819
/* End PBXBuildFile section */
@@ -47,8 +48,8 @@
4748
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
4849
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
4950
D373D3D2892FDD1E688AF746 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
51+
D58CE0172CB52A9100C59BAB /* FacebookWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FacebookWrapper.swift; sourceTree = "<group>"; };
5052
D5A996432670ADC30074D677 /* GoogleWrapper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GoogleWrapper.swift; sourceTree = "<group>"; };
51-
E71BB5D125750B5A0021E592 /* FacebookWrapper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FacebookWrapper.swift; sourceTree = "<group>"; };
5253
E74339DC28F6AE4A003FB9B2 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
5354
EFFE4046AB3295E3F8058E27 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
5455
/* End PBXFileReference section */
@@ -134,7 +135,7 @@
134135
isa = PBXGroup;
135136
children = (
136137
D5A996432670ADC30074D677 /* GoogleWrapper.swift */,
137-
E71BB5D125750B5A0021E592 /* FacebookWrapper.swift */,
138+
D58CE0172CB52A9100C59BAB /* FacebookWrapper.swift */,
138139
);
139140
path = GigyaProviders;
140141
sourceTree = "<group>";
@@ -154,6 +155,7 @@
154155
9705A1C41CF9048500538489 /* Embed Frameworks */,
155156
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
156157
9C8466B21C7583AF924027DF /* [CP] Embed Pods Frameworks */,
158+
ECD7BB6BC8993EAACD4444A2 /* [CP] Copy Pods Resources */,
157159
);
158160
buildRules = (
159161
);
@@ -170,7 +172,7 @@
170172
97C146E61CF9000F007C117D /* Project object */ = {
171173
isa = PBXProject;
172174
attributes = {
173-
LastUpgradeCheck = 1430;
175+
LastUpgradeCheck = 1510;
174176
ORGANIZATIONNAME = "";
175177
TargetAttributes = {
176178
97C146ED1CF9000F007C117D = {
@@ -282,6 +284,23 @@
282284
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
283285
showEnvVarsInLog = 0;
284286
};
287+
ECD7BB6BC8993EAACD4444A2 /* [CP] Copy Pods Resources */ = {
288+
isa = PBXShellScriptBuildPhase;
289+
buildActionMask = 2147483647;
290+
files = (
291+
);
292+
inputFileListPaths = (
293+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
294+
);
295+
name = "[CP] Copy Pods Resources";
296+
outputFileListPaths = (
297+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
298+
);
299+
runOnlyForDeploymentPostprocessing = 0;
300+
shellPath = /bin/sh;
301+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
302+
showEnvVarsInLog = 0;
303+
};
285304
/* End PBXShellScriptBuildPhase section */
286305

287306
/* Begin PBXSourcesBuildPhase section */
@@ -291,6 +310,7 @@
291310
files = (
292311
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */,
293312
D5A996442670ADC30074D677 /* GoogleWrapper.swift in Sources */,
313+
D58CE0182CB52A9100C59BAB /* FacebookWrapper.swift in Sources */,
294314
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
295315
);
296316
runOnlyForDeploymentPostprocessing = 0;
@@ -358,7 +378,7 @@
358378
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
359379
GCC_WARN_UNUSED_FUNCTION = YES;
360380
GCC_WARN_UNUSED_VARIABLE = YES;
361-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
381+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
362382
MTL_ENABLE_DEBUG_INFO = NO;
363383
SDKROOT = iphoneos;
364384
SUPPORTED_PLATFORMS = iphoneos;
@@ -447,7 +467,7 @@
447467
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
448468
GCC_WARN_UNUSED_FUNCTION = YES;
449469
GCC_WARN_UNUSED_VARIABLE = YES;
450-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
470+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
451471
MTL_ENABLE_DEBUG_INFO = YES;
452472
ONLY_ACTIVE_ARCH = YES;
453473
SDKROOT = iphoneos;
@@ -496,7 +516,7 @@
496516
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
497517
GCC_WARN_UNUSED_FUNCTION = YES;
498518
GCC_WARN_UNUSED_VARIABLE = YES;
499-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
519+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
500520
MTL_ENABLE_DEBUG_INFO = NO;
501521
SDKROOT = iphoneos;
502522
SUPPORTED_PLATFORMS = iphoneos;

‎example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1430"
3+
LastUpgradeVersion = "1510"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎example/ios/Runner/GigyaProviders/FacebookWrapper.swift‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,10 @@ class FacebookWrapper: ProviderWrapperProtocol {
4242
if let error = error {
4343
completion(nil, error.localizedDescription)
4444
}
45+
let expiration: Int = Int(result?.token?.expirationDate.timeIntervalSince1970 ?? 0)
46+
47+
let jsonData: [String: Any] = ["authToken": result?.token?.tokenString ?? "", "idToken": result?.authenticationToken?.tokenString ?? "", "tokenExpiration": expiration > Int32.max ? Int32.max : expiration]
4548

46-
let jsonData: [String: Any] = ["authToken": result?.token?.tokenString ?? "", "idToken": result?.authenticationToken?.tokenString ?? "", "tokenExpiration": Int32(result?.token?.expirationDate.timeIntervalSince1970 ?? 0)]
47-
4849
completion(jsonData, nil)
4950
}
5051
}

‎example/pubspec.lock‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ packages:
7878
path: ".."
7979
relative: true
8080
source: path
81-
version: "1.0.6"
81+
version: "1.0.7"
8282
google_sign_in:
8383
dependency: "direct main"
8484
description:
@@ -131,18 +131,18 @@ packages:
131131
dependency: transitive
132132
description:
133133
name: leak_tracker
134-
sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
134+
sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
135135
url: "https://pub.dev"
136136
source: hosted
137-
version: "10.0.4"
137+
version: "10.0.5"
138138
leak_tracker_flutter_testing:
139139
dependency: transitive
140140
description:
141141
name: leak_tracker_flutter_testing
142-
sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
142+
sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
143143
url: "https://pub.dev"
144144
source: hosted
145-
version: "3.0.3"
145+
version: "3.0.5"
146146
leak_tracker_testing:
147147
dependency: transitive
148148
description:
@@ -171,18 +171,18 @@ packages:
171171
dependency: transitive
172172
description:
173173
name: material_color_utilities
174-
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
174+
sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
175175
url: "https://pub.dev"
176176
source: hosted
177-
version: "0.8.0"
177+
version: "0.11.1"
178178
meta:
179179
dependency: transitive
180180
description:
181181
name: meta
182-
sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
182+
sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
183183
url: "https://pub.dev"
184184
source: hosted
185-
version: "1.12.0"
185+
version: "1.15.0"
186186
path:
187187
dependency: transitive
188188
description:
@@ -248,10 +248,10 @@ packages:
248248
dependency: transitive
249249
description:
250250
name: test_api
251-
sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
251+
sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
252252
url: "https://pub.dev"
253253
source: hosted
254-
version: "0.7.0"
254+
version: "0.7.2"
255255
vector_math:
256256
dependency: transitive
257257
description:
@@ -264,10 +264,10 @@ packages:
264264
dependency: transitive
265265
description:
266266
name: vm_service
267-
sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
267+
sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
268268
url: "https://pub.dev"
269269
source: hosted
270-
version: "14.2.1"
270+
version: "14.2.5"
271271
sdks:
272272
dart: ">=3.4.0 <4.0.0"
273273
flutter: ">=3.22.0"

‎example/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: gigya_flutter_plugin_example
22
description: Demonstrates how to use the gigya_flutter_plugin plugin.
3-
version: 1.0.7
3+
version: 1.0.8
44
homepage: https://www.sap.com
55
publish_to: none
66

0 commit comments

Comments
 (0)