Skip to content

Commit b9f2417

Browse files
sagishmsagishm
committed
Merge branch 'develop' into main
2 parents c4956ef + 26ebbc9 commit b9f2417

File tree

4 files changed

+95
-88
lines changed

4 files changed

+95
-88
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,9 @@ Developer Preview 0.1.2
5555
* Updated Android Core SDK v5.1.4
5656
* Forgot password bug fix.
5757
* Added manual initSDK interface.
58+
59+
# 0.1.3
60+
Developer Preview 0.1.3
61+
62+
* iOS: Fixed crash in forgotPassword.
63+
* iOS: Fixed bug in link account.

‎ios/Classes/GigyaSdkWrapper.swift‎

Lines changed: 86 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class GigyaSdkWrapper<T: GigyaAccountProtocol> :GigyaInstanceProtocol {
1818

1919
init(accountSchema: T.Type) {
2020
// Initializing the Gigya SDK instance.
21-
GigyaDefinitions.versionPrefix = "flutter_0.1.2_"
21+
GigyaDefinitions.versionPrefix = "flutter_0.1.3_"
2222
sdk = Gigya.sharedInstance(accountSchema)
2323
}
2424

@@ -31,9 +31,9 @@ public class GigyaSdkWrapper<T: GigyaAccountProtocol> :GigyaInstanceProtocol {
3131
func sendRequest(arguments: [String: Any], result: @escaping FlutterResult) {
3232
guard let endpoint = arguments["endpoint"] as? String,
3333
let parameters = arguments["parameters"] as? [String:Any] else {
34-
result(FlutterError(code: PluginErrors.missingParameterError, message: PluginErrors.missingParameterMessage, details: nil))
35-
return
36-
}
34+
result(FlutterError(code: PluginErrors.missingParameterError, message: PluginErrors.missingParameterMessage, details: nil))
35+
return
36+
}
3737

3838
sdk?.send(api: endpoint, params: parameters) { (gigyaResponse) in
3939
switch gigyaResponse {
@@ -57,9 +57,9 @@ public class GigyaSdkWrapper<T: GigyaAccountProtocol> :GigyaInstanceProtocol {
5757
func loginWithCredentials(arguments: [String: Any], result: @escaping FlutterResult) {
5858
guard let loginId = arguments["loginId"] as? String,
5959
let password = arguments["password"] as? String else {
60-
result(FlutterError(code: PluginErrors.missingParameterError, message: PluginErrors.missingParameterMessage, details: nil))
61-
return
62-
}
60+
result(FlutterError(code: PluginErrors.missingParameterError, message: PluginErrors.missingParameterMessage, details: nil))
61+
return
62+
}
6363

6464
resolverHelper.currentResult = result
6565

@@ -91,9 +91,9 @@ public class GigyaSdkWrapper<T: GigyaAccountProtocol> :GigyaInstanceProtocol {
9191
func registerWithCredentials(arguments: [String: Any], result: @escaping FlutterResult) {
9292
guard let email = arguments["email"] as? String,
9393
let password = arguments["password"] as? String else {
94-
result(FlutterError(code: PluginErrors.missingParameterError, message: PluginErrors.missingParameterMessage, details: nil))
95-
return
96-
}
94+
result(FlutterError(code: PluginErrors.missingParameterError, message: PluginErrors.missingParameterMessage, details: nil))
95+
return
96+
}
9797

9898
resolverHelper.currentResult = result
9999

@@ -198,10 +198,11 @@ public class GigyaSdkWrapper<T: GigyaAccountProtocol> :GigyaInstanceProtocol {
198198
result(FlutterError(code: PluginErrors.missingParameterError, message: PluginErrors.missingParameterMessage, details: nil))
199199
return
200200
}
201-
sdk?.forgotPassword(loginId: loginId, completion: { gigyaResponse in
201+
sdk?.forgotPassword(loginId: loginId, completion: { [weak self] gigyaResponse in
202202
switch gigyaResponse {
203203
case .success(let data):
204-
result(data)
204+
let mapped = self?.mapObject(data)
205+
result(mapped)
205206
case .failure(let error):
206207
switch error {
207208
case .gigyaError(let d):
@@ -212,7 +213,7 @@ public class GigyaSdkWrapper<T: GigyaAccountProtocol> :GigyaInstanceProtocol {
212213
}
213214
})
214215
}
215-
216+
216217
/**
217218
Init SDK
218219
*/
@@ -226,7 +227,7 @@ public class GigyaSdkWrapper<T: GigyaAccountProtocol> :GigyaInstanceProtocol {
226227
return
227228
}
228229
sdk?.initFor(apiKey: apiKey, apiDomain: apiDomain)
229-
230+
230231
result(["success": true])
231232
}
232233

@@ -251,24 +252,24 @@ public class GigyaSdkWrapper<T: GigyaAccountProtocol> :GigyaInstanceProtocol {
251252
with: provider,
252253
viewController: viewController,
253254
params: parameters) { [weak self] (gigyaResponse) in
254-
switch gigyaResponse {
255-
case .success(let data):
256-
257-
let mapped = self?.mapObject(data)
258-
self?.resolverHelper.currentResult?(mapped)
259-
260-
self?.resolverHelper.dispose()
261-
case .failure(let error):
262-
self?.saveResolvesIfNeeded(interruption: error.interruption)
263-
264-
switch error.error {
265-
case .gigyaError(let d):
266-
self?.resolverHelper.currentResult?(FlutterError(code: "\(d.errorCode)", message: d.errorMessage, details: d.toDictionary()))
267-
default:
268-
self?.resolverHelper.currentResult?(FlutterError(code: "", message: error.error.localizedDescription, details: nil))
255+
switch gigyaResponse {
256+
case .success(let data):
257+
258+
let mapped = self?.mapObject(data)
259+
self?.resolverHelper.currentResult?(mapped)
260+
261+
self?.resolverHelper.dispose()
262+
case .failure(let error):
263+
self?.saveResolvesIfNeeded(interruption: error.interruption)
264+
265+
switch error.error {
266+
case .gigyaError(let d):
267+
self?.resolverHelper.currentResult?(FlutterError(code: "\(d.errorCode)", message: d.errorMessage, details: d.toDictionary()))
268+
default:
269+
self?.resolverHelper.currentResult?(FlutterError(code: "", message: error.error.localizedDescription, details: nil))
270+
}
269271
}
270272
}
271-
}
272273
}
273274

274275
func addConnection(arguments: [String: Any], result: @escaping FlutterResult) {
@@ -287,20 +288,20 @@ public class GigyaSdkWrapper<T: GigyaAccountProtocol> :GigyaInstanceProtocol {
287288
provider: provider,
288289
viewController: viewController,
289290
params: parameters) { [weak self] gigyaResponse in
290-
switch gigyaResponse {
291-
case .success(let data):
292-
293-
let mapped = self?.mapObject(data)
294-
result(mapped)
295-
case .failure(let error):
296-
switch error {
297-
case .gigyaError(let d):
298-
result(FlutterError(code: "\(d.errorCode)", message: d.errorMessage, details: d.toDictionary()))
299-
default:
300-
result(FlutterError(code: PluginErrors.generalError, message: error.localizedDescription, details: nil))
291+
switch gigyaResponse {
292+
case .success(let data):
293+
294+
let mapped = self?.mapObject(data)
295+
result(mapped)
296+
case .failure(let error):
297+
switch error {
298+
case .gigyaError(let d):
299+
result(FlutterError(code: "\(d.errorCode)", message: d.errorMessage, details: d.toDictionary()))
300+
default:
301+
result(FlutterError(code: PluginErrors.generalError, message: error.localizedDescription, details: nil))
302+
}
301303
}
302304
}
303-
}
304305
}
305306

306307
func removeConnection(arguments: [String: Any], result: @escaping FlutterResult) {
@@ -337,11 +338,11 @@ public class GigyaSdkWrapper<T: GigyaAccountProtocol> :GigyaInstanceProtocol {
337338
guard
338339
let viewController = getDisplayedViewController(),
339340
let screenSet = arguments["screenSet"] as? String else {
340-
return
341-
}
342-
341+
return
342+
}
343+
343344
let parameters = arguments["parameters"] as? [String: Any] ?? [:]
344-
345+
345346
// Create streamer
346347
var screenSetsEventHandler: ScreenSetsStreamHandler? = ScreenSetsStreamHandler()
347348
let eventChannel = FlutterEventChannel(name: "screensetEvents", binaryMessenger: SwiftGigyaFlutterPlugin.registrar!.messenger())
@@ -356,43 +357,43 @@ public class GigyaSdkWrapper<T: GigyaAccountProtocol> :GigyaInstanceProtocol {
356357
with: screenSet,
357358
viewController: viewController,
358359
params: parameters) { [weak self] event in
359-
switch event {
360-
case .error(let event):
361-
screenSetsEventHandler?.sink?(["event":"onError", "data" : event])
362-
case .onHide(let event):
363-
screenSetsEventHandler?.sink?(["event":"onHide", "data" : event])
364-
screenSetsEventHandler?.destroy()
365-
screenSetsEventHandler = nil
366-
case .onLogin(account: let account):
367-
screenSetsEventHandler?.sink?(["event":"onLogin", "data" : self?.mapObject(account) ?? [:]])
368-
case .onLogout:
369-
screenSetsEventHandler?.sink?(["event":"onLogout"])
370-
case .onConnectionAdded:
371-
screenSetsEventHandler?.sink?(["event":"onConnectionAdded"])
372-
case .onConnectionRemoved:
373-
screenSetsEventHandler?.sink?(["event":"onConnectionRemoved"])
374-
case .onBeforeScreenLoad(let event):
375-
screenSetsEventHandler?.sink?(["event":"onBeforeScreenLoad", "data" : event])
376-
case .onAfterScreenLoad(let event):
377-
screenSetsEventHandler?.sink?(["event":"onAfterScreenLoad", "data" : event])
378-
case .onBeforeValidation(let event):
379-
screenSetsEventHandler?.sink?(["event":"onBeforeValidation", "data" : event])
380-
case .onAfterValidation(let event):
381-
screenSetsEventHandler?.sink?(["event":"onAfterValidation", "data" : event])
382-
case .onBeforeSubmit(let event):
383-
screenSetsEventHandler?.sink?(["event":"onBeforeSubmit", "data" : event])
384-
case .onSubmit(let event):
385-
screenSetsEventHandler?.sink?(["event":"onSubmit", "data" : event])
386-
case .onAfterSubmit(let event):
387-
screenSetsEventHandler?.sink?(["event":"onAfterSubmit", "data" : event])
388-
case .onFieldChanged(let event):
389-
screenSetsEventHandler?.sink?(["event":"onFieldChanged", "data" : event])
390-
case .onCanceled:
391-
screenSetsEventHandler?.sink?(["event":"onCanceled", "data" : [:]])
392-
screenSetsEventHandler?.destroy()
393-
screenSetsEventHandler = nil
360+
switch event {
361+
case .error(let event):
362+
screenSetsEventHandler?.sink?(["event":"onError", "data" : event])
363+
case .onHide(let event):
364+
screenSetsEventHandler?.sink?(["event":"onHide", "data" : event])
365+
screenSetsEventHandler?.destroy()
366+
screenSetsEventHandler = nil
367+
case .onLogin(account: let account):
368+
screenSetsEventHandler?.sink?(["event":"onLogin", "data" : self?.mapObject(account) ?? [:]])
369+
case .onLogout:
370+
screenSetsEventHandler?.sink?(["event":"onLogout"])
371+
case .onConnectionAdded:
372+
screenSetsEventHandler?.sink?(["event":"onConnectionAdded"])
373+
case .onConnectionRemoved:
374+
screenSetsEventHandler?.sink?(["event":"onConnectionRemoved"])
375+
case .onBeforeScreenLoad(let event):
376+
screenSetsEventHandler?.sink?(["event":"onBeforeScreenLoad", "data" : event])
377+
case .onAfterScreenLoad(let event):
378+
screenSetsEventHandler?.sink?(["event":"onAfterScreenLoad", "data" : event])
379+
case .onBeforeValidation(let event):
380+
screenSetsEventHandler?.sink?(["event":"onBeforeValidation", "data" : event])
381+
case .onAfterValidation(let event):
382+
screenSetsEventHandler?.sink?(["event":"onAfterValidation", "data" : event])
383+
case .onBeforeSubmit(let event):
384+
screenSetsEventHandler?.sink?(["event":"onBeforeSubmit", "data" : event])
385+
case .onSubmit(let event):
386+
screenSetsEventHandler?.sink?(["event":"onSubmit", "data" : event])
387+
case .onAfterSubmit(let event):
388+
screenSetsEventHandler?.sink?(["event":"onAfterSubmit", "data" : event])
389+
case .onFieldChanged(let event):
390+
screenSetsEventHandler?.sink?(["event":"onFieldChanged", "data" : event])
391+
case .onCanceled:
392+
screenSetsEventHandler?.sink?(["event":"onCanceled", "data" : [:]])
393+
screenSetsEventHandler?.destroy()
394+
screenSetsEventHandler = nil
395+
}
394396
}
395-
}
396397
}
397398

398399

@@ -428,9 +429,9 @@ extension GigyaSdkWrapper {
428429
guard
429430
let loginId = arguments["loginId"] as? String ,
430431
let password = arguments["password"] as? String else {
431-
result(FlutterError(code: PluginErrors.generalError, message: PluginErrors.generalErrorMessage, details: nil))
432-
return
433-
}
432+
result(FlutterError(code: PluginErrors.generalError, message: PluginErrors.generalErrorMessage, details: nil))
433+
return
434+
}
434435

435436
resolver.linkToSite(loginId: loginId, password: password)
436437

‎ios/Classes/SwiftGigyaFlutterPluginTyped.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class SwiftGigyaFlutterPluginTyped<T: GigyaAccountProtocol> : NSObject, F
2121
// intteruptions cases
2222
case getConflictingAccounts
2323
case linkToSite
24-
case linkToScoial
24+
case linkToSocial
2525
case resolveSetAccount
2626
case forgotPassword
2727
}
@@ -89,7 +89,7 @@ public class SwiftGigyaFlutterPluginTyped<T: GigyaAccountProtocol> : NSObject, F
8989
sdk?.removeConnection(arguments: args, result: result)
9090
case .linkToSite:
9191
sdk?.resolveLinkToSite(arguments: args, result: result)
92-
case .linkToScoial:
92+
case .linkToSocial:
9393
sdk?.resolveLinkToSocial(arguments: args, result: result)
9494
case .resolveSetAccount:
9595
sdk?.resolveSetAccount(arguments: args, result: result)

‎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
22
description: SAP Gigya Flutter plugin
3-
version: 0.1.2
3+
version: 0.1.3
44
homepage: https://github.com/SAP/gigya-flutter-plugin
55

66
environment:

0 commit comments

Comments
 (0)