From 86f0f98973da8cabcceb2712f45192bbc3432039 Mon Sep 17 00:00:00 2001 From: Michiel Vrins Date: Thu, 23 Mar 2023 15:20:37 +0100 Subject: [PATCH 1/2] Update generated code --- .../mobile/sdk/flutter/pigeonPlugin/Pigeon.kt | 68 +++------- ios/Classes/Pigeon.swift | 118 +++++++++--------- lib/pigeon.dart | 2 +- 3 files changed, 79 insertions(+), 109 deletions(-) diff --git a/android/src/main/kotlin/com/onegini/mobile/sdk/flutter/pigeonPlugin/Pigeon.kt b/android/src/main/kotlin/com/onegini/mobile/sdk/flutter/pigeonPlugin/Pigeon.kt index c275e6db..ac850844 100644 --- a/android/src/main/kotlin/com/onegini/mobile/sdk/flutter/pigeonPlugin/Pigeon.kt +++ b/android/src/main/kotlin/com/onegini/mobile/sdk/flutter/pigeonPlugin/Pigeon.kt @@ -1,4 +1,4 @@ -// Autogenerated from Pigeon (v9.0.2), do not edit directly. +// Autogenerated from Pigeon (v9.1.1), do not edit directly. // See also: https://pub.dev/packages/pigeon package com.onegini.mobile.sdk.flutter.pigeonPlugin @@ -31,6 +31,12 @@ private fun wrapError(exception: Throwable): List { } } +/** + * Error class for passing custom error details to Flutter via a thrown PlatformException. + * @property code The error code. + * @property message The error message. + * @property details The error details. Must be a datatype supported by the api codec. + */ class FlutterError ( val code: String, override val message: String? = null, @@ -96,7 +102,7 @@ data class OWCustomInfo ( @Suppress("UNCHECKED_CAST") fun fromList(list: List): OWCustomInfo { val status = list[0].let { if (it is Int) it.toLong() else it as Long } - val data = list[1] as? String + val data = list[1] as String? return OWCustomInfo(status, data) } } @@ -193,7 +199,7 @@ data class OWRegistrationResponse ( @Suppress("UNCHECKED_CAST") fun fromList(list: List): OWRegistrationResponse { val userProfile = OWUserProfile.fromList(list[0] as List) - val customInfo: OWCustomInfo? = (list[1] as? List)?.let { + val customInfo: OWCustomInfo? = (list[1] as List?)?.let { OWCustomInfo.fromList(it) } return OWRegistrationResponse(userProfile, customInfo) @@ -201,7 +207,7 @@ data class OWRegistrationResponse ( } fun toList(): List { return listOf( - userProfile?.toList(), + userProfile.toList(), customInfo?.toList(), ) } @@ -220,15 +226,15 @@ data class OWRequestDetails ( fun fromList(list: List): OWRequestDetails { val path = list[0] as String val method = HttpRequestMethod.ofRaw(list[1] as Int)!! - val headers = list[2] as? Map - val body = list[3] as? String + val headers = list[2] as Map? + val body = list[3] as String? return OWRequestDetails(path, method, headers, body) } } fun toList(): List { return listOf( path, - method?.raw, + method.raw, headers, body, ) @@ -438,10 +444,9 @@ interface UserClientApi { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.UserClientApi.registerUser", codec) if (api != null) { channel.setMessageHandler { message, reply -> - var wrapped = listOf() val args = message as List - val identityProviderIdArg = args[0] as? String - val scopesArg = args[1] as? List + val identityProviderIdArg = args[0] as String? + val scopesArg = args[1] as List? api.registerUser(identityProviderIdArg, scopesArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { @@ -460,7 +465,6 @@ interface UserClientApi { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.UserClientApi.handleRegisteredUserUrl", codec) if (api != null) { channel.setMessageHandler { message, reply -> - var wrapped = listOf() val args = message as List val urlArg = args[0] as String val signInTypeArg = args[1].let { if (it is Int) it.toLong() else it as Long } @@ -481,7 +485,6 @@ interface UserClientApi { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.UserClientApi.getIdentityProviders", codec) if (api != null) { channel.setMessageHandler { _, reply -> - var wrapped = listOf() api.getIdentityProviders() { result: Result> -> val error = result.exceptionOrNull() if (error != null) { @@ -500,7 +503,6 @@ interface UserClientApi { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.UserClientApi.deregisterUser", codec) if (api != null) { channel.setMessageHandler { message, reply -> - var wrapped = listOf() val args = message as List val profileIdArg = args[0] as String api.deregisterUser(profileIdArg) { result: Result -> @@ -520,7 +522,6 @@ interface UserClientApi { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.UserClientApi.getRegisteredAuthenticators", codec) if (api != null) { channel.setMessageHandler { message, reply -> - var wrapped = listOf() val args = message as List val profileIdArg = args[0] as String api.getRegisteredAuthenticators(profileIdArg) { result: Result> -> @@ -541,7 +542,6 @@ interface UserClientApi { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.UserClientApi.getAllAuthenticators", codec) if (api != null) { channel.setMessageHandler { message, reply -> - var wrapped = listOf() val args = message as List val profileIdArg = args[0] as String api.getAllAuthenticators(profileIdArg) { result: Result> -> @@ -562,7 +562,6 @@ interface UserClientApi { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.UserClientApi.getAuthenticatedUserProfile", codec) if (api != null) { channel.setMessageHandler { _, reply -> - var wrapped = listOf() api.getAuthenticatedUserProfile() { result: Result -> val error = result.exceptionOrNull() if (error != null) { @@ -581,10 +580,9 @@ interface UserClientApi { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.UserClientApi.authenticateUser", codec) if (api != null) { channel.setMessageHandler { message, reply -> - var wrapped = listOf() val args = message as List val profileIdArg = args[0] as String - val registeredAuthenticatorIdArg = args[1] as? String + val registeredAuthenticatorIdArg = args[1] as String? api.authenticateUser(profileIdArg, registeredAuthenticatorIdArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { @@ -603,7 +601,6 @@ interface UserClientApi { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.UserClientApi.getNotRegisteredAuthenticators", codec) if (api != null) { channel.setMessageHandler { message, reply -> - var wrapped = listOf() val args = message as List val profileIdArg = args[0] as String api.getNotRegisteredAuthenticators(profileIdArg) { result: Result> -> @@ -624,7 +621,6 @@ interface UserClientApi { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.UserClientApi.changePin", codec) if (api != null) { channel.setMessageHandler { _, reply -> - var wrapped = listOf() api.changePin() { result: Result -> val error = result.exceptionOrNull() if (error != null) { @@ -642,7 +638,6 @@ interface UserClientApi { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.UserClientApi.setPreferredAuthenticator", codec) if (api != null) { channel.setMessageHandler { message, reply -> - var wrapped = listOf() val args = message as List val authenticatorIdArg = args[0] as String api.setPreferredAuthenticator(authenticatorIdArg) { result: Result -> @@ -662,7 +657,6 @@ interface UserClientApi { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.UserClientApi.deregisterAuthenticator", codec) if (api != null) { channel.setMessageHandler { message, reply -> - var wrapped = listOf() val args = message as List val authenticatorIdArg = args[0] as String api.deregisterAuthenticator(authenticatorIdArg) { result: Result -> @@ -682,7 +676,6 @@ interface UserClientApi { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.UserClientApi.registerAuthenticator", codec) if (api != null) { channel.setMessageHandler { message, reply -> - var wrapped = listOf() val args = message as List val authenticatorIdArg = args[0] as String api.registerAuthenticator(authenticatorIdArg) { result: Result -> @@ -702,7 +695,6 @@ interface UserClientApi { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.UserClientApi.logout", codec) if (api != null) { channel.setMessageHandler { _, reply -> - var wrapped = listOf() api.logout() { result: Result -> val error = result.exceptionOrNull() if (error != null) { @@ -720,7 +712,6 @@ interface UserClientApi { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.UserClientApi.enrollMobileAuthentication", codec) if (api != null) { channel.setMessageHandler { _, reply -> - var wrapped = listOf() api.enrollMobileAuthentication() { result: Result -> val error = result.exceptionOrNull() if (error != null) { @@ -738,7 +729,6 @@ interface UserClientApi { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.UserClientApi.handleMobileAuthWithOtp", codec) if (api != null) { channel.setMessageHandler { message, reply -> - var wrapped = listOf() val args = message as List val dataArg = args[0] as String api.handleMobileAuthWithOtp(dataArg) { result: Result -> @@ -758,7 +748,6 @@ interface UserClientApi { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.UserClientApi.getAppToWebSingleSignOn", codec) if (api != null) { channel.setMessageHandler { message, reply -> - var wrapped = listOf() val args = message as List val urlArg = args[0] as String api.getAppToWebSingleSignOn(urlArg) { result: Result -> @@ -779,7 +768,6 @@ interface UserClientApi { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.UserClientApi.getAccessToken", codec) if (api != null) { channel.setMessageHandler { _, reply -> - var wrapped = listOf() api.getAccessToken() { result: Result -> val error = result.exceptionOrNull() if (error != null) { @@ -798,7 +786,6 @@ interface UserClientApi { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.UserClientApi.getRedirectUrl", codec) if (api != null) { channel.setMessageHandler { _, reply -> - var wrapped = listOf() api.getRedirectUrl() { result: Result -> val error = result.exceptionOrNull() if (error != null) { @@ -817,7 +804,6 @@ interface UserClientApi { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.UserClientApi.getUserProfiles", codec) if (api != null) { channel.setMessageHandler { _, reply -> - var wrapped = listOf() api.getUserProfiles() { result: Result> -> val error = result.exceptionOrNull() if (error != null) { @@ -836,7 +822,6 @@ interface UserClientApi { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.UserClientApi.validatePinWithPolicy", codec) if (api != null) { channel.setMessageHandler { message, reply -> - var wrapped = listOf() val args = message as List val pinArg = args[0] as String api.validatePinWithPolicy(pinArg) { result: Result -> @@ -856,9 +841,8 @@ interface UserClientApi { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.UserClientApi.authenticateDevice", codec) if (api != null) { channel.setMessageHandler { message, reply -> - var wrapped = listOf() val args = message as List - val scopesArg = args[0] as? List + val scopesArg = args[0] as List? api.authenticateDevice(scopesArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { @@ -876,10 +860,9 @@ interface UserClientApi { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.UserClientApi.authenticateUserImplicitly", codec) if (api != null) { channel.setMessageHandler { message, reply -> - var wrapped = listOf() val args = message as List val profileIdArg = args[0] as String - val scopesArg = args[1] as? List + val scopesArg = args[1] as List? api.authenticateUserImplicitly(profileIdArg, scopesArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { @@ -897,10 +880,9 @@ interface UserClientApi { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.UserClientApi.submitCustomRegistrationAction", codec) if (api != null) { channel.setMessageHandler { message, reply -> - var wrapped = listOf() val args = message as List val identityProviderIdArg = args[0] as String - val dataArg = args[1] as? String + val dataArg = args[1] as String? api.submitCustomRegistrationAction(identityProviderIdArg, dataArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { @@ -918,7 +900,6 @@ interface UserClientApi { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.UserClientApi.cancelCustomRegistrationAction", codec) if (api != null) { channel.setMessageHandler { message, reply -> - var wrapped = listOf() val args = message as List val identityProviderIdArg = args[0] as String val errorArg = args[1] as String @@ -939,7 +920,6 @@ interface UserClientApi { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.UserClientApi.fingerprintFallbackToPin", codec) if (api != null) { channel.setMessageHandler { _, reply -> - var wrapped = listOf() api.fingerprintFallbackToPin() { result: Result -> val error = result.exceptionOrNull() if (error != null) { @@ -957,7 +937,6 @@ interface UserClientApi { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.UserClientApi.fingerprintDenyAuthenticationRequest", codec) if (api != null) { channel.setMessageHandler { _, reply -> - var wrapped = listOf() api.fingerprintDenyAuthenticationRequest() { result: Result -> val error = result.exceptionOrNull() if (error != null) { @@ -975,7 +954,6 @@ interface UserClientApi { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.UserClientApi.fingerprintAcceptAuthenticationRequest", codec) if (api != null) { channel.setMessageHandler { _, reply -> - var wrapped = listOf() api.fingerprintAcceptAuthenticationRequest() { result: Result -> val error = result.exceptionOrNull() if (error != null) { @@ -993,7 +971,6 @@ interface UserClientApi { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.UserClientApi.otpDenyAuthenticationRequest", codec) if (api != null) { channel.setMessageHandler { _, reply -> - var wrapped = listOf() api.otpDenyAuthenticationRequest() { result: Result -> val error = result.exceptionOrNull() if (error != null) { @@ -1011,7 +988,6 @@ interface UserClientApi { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.UserClientApi.otpAcceptAuthenticationRequest", codec) if (api != null) { channel.setMessageHandler { _, reply -> - var wrapped = listOf() api.otpAcceptAuthenticationRequest() { result: Result -> val error = result.exceptionOrNull() if (error != null) { @@ -1029,7 +1005,6 @@ interface UserClientApi { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.UserClientApi.pinDenyAuthenticationRequest", codec) if (api != null) { channel.setMessageHandler { _, reply -> - var wrapped = listOf() api.pinDenyAuthenticationRequest() { result: Result -> val error = result.exceptionOrNull() if (error != null) { @@ -1047,7 +1022,6 @@ interface UserClientApi { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.UserClientApi.pinAcceptAuthenticationRequest", codec) if (api != null) { channel.setMessageHandler { message, reply -> - var wrapped = listOf() val args = message as List val pinArg = args[0] as String api.pinAcceptAuthenticationRequest(pinArg) { result: Result -> @@ -1067,7 +1041,6 @@ interface UserClientApi { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.UserClientApi.pinDenyRegistrationRequest", codec) if (api != null) { channel.setMessageHandler { _, reply -> - var wrapped = listOf() api.pinDenyRegistrationRequest() { result: Result -> val error = result.exceptionOrNull() if (error != null) { @@ -1085,7 +1058,6 @@ interface UserClientApi { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.UserClientApi.pinAcceptRegistrationRequest", codec) if (api != null) { channel.setMessageHandler { message, reply -> - var wrapped = listOf() val args = message as List val pinArg = args[0] as String api.pinAcceptRegistrationRequest(pinArg) { result: Result -> @@ -1105,7 +1077,6 @@ interface UserClientApi { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.UserClientApi.cancelBrowserRegistration", codec) if (api != null) { channel.setMessageHandler { _, reply -> - var wrapped = listOf() api.cancelBrowserRegistration() { result: Result -> val error = result.exceptionOrNull() if (error != null) { @@ -1170,7 +1141,6 @@ interface ResourceMethodApi { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.ResourceMethodApi.requestResource", codec) if (api != null) { channel.setMessageHandler { message, reply -> - var wrapped = listOf() val args = message as List val typeArg = ResourceRequestType.ofRaw(args[0] as Int)!! val detailsArg = args[1] as OWRequestDetails diff --git a/ios/Classes/Pigeon.swift b/ios/Classes/Pigeon.swift index ed09e387..72fa631e 100644 --- a/ios/Classes/Pigeon.swift +++ b/ios/Classes/Pigeon.swift @@ -1,4 +1,4 @@ -// Autogenerated from Pigeon (v9.0.2), do not edit directly. +// Autogenerated from Pigeon (v9.1.1), do not edit directly. // See also: https://pub.dev/packages/pigeon import Foundation @@ -51,7 +51,7 @@ enum ResourceRequestType: Int { struct OWUserProfile { var profileId: String - static func fromList(_ list: [Any?]) -> OWUserProfile? { + static func fromList(_ list: [Any]) -> OWUserProfile? { let profileId = list[0] as! String return OWUserProfile( @@ -67,12 +67,12 @@ struct OWUserProfile { /// Generated class from Pigeon that represents data sent in messages. struct OWCustomInfo { - var status: Int32 + var status: Int64 var data: String? = nil - static func fromList(_ list: [Any?]) -> OWCustomInfo? { - let status = list[0] as! Int32 - let data = list[1] as? String + static func fromList(_ list: [Any]) -> OWCustomInfo? { + let status = list[0] as! Int64 + let data = list[1] as! String? return OWCustomInfo( status: status, @@ -92,7 +92,7 @@ struct OWIdentityProvider { var id: String var name: String - static func fromList(_ list: [Any?]) -> OWIdentityProvider? { + static func fromList(_ list: [Any]) -> OWIdentityProvider? { let id = list[0] as! String let name = list[1] as! String @@ -115,14 +115,14 @@ struct OWAuthenticator { var name: String var isRegistered: Bool var isPreferred: Bool - var authenticatorType: Int32 + var authenticatorType: Int64 - static func fromList(_ list: [Any?]) -> OWAuthenticator? { + static func fromList(_ list: [Any]) -> OWAuthenticator? { let id = list[0] as! String let name = list[1] as! String let isRegistered = list[2] as! Bool let isPreferred = list[3] as! Bool - let authenticatorType = list[4] as! Int32 + let authenticatorType = list[4] as! Int64 return OWAuthenticator( id: id, @@ -148,7 +148,7 @@ struct OWAppToWebSingleSignOn { var token: String var redirectUrl: String - static func fromList(_ list: [Any?]) -> OWAppToWebSingleSignOn? { + static func fromList(_ list: [Any]) -> OWAppToWebSingleSignOn? { let token = list[0] as! String let redirectUrl = list[1] as! String @@ -170,11 +170,11 @@ struct OWRegistrationResponse { var userProfile: OWUserProfile var customInfo: OWCustomInfo? = nil - static func fromList(_ list: [Any?]) -> OWRegistrationResponse? { - let userProfile = OWUserProfile.fromList(list[0] as! [Any?])! + static func fromList(_ list: [Any]) -> OWRegistrationResponse? { + let userProfile = OWUserProfile.fromList(list[0] as! [Any])! var customInfo: OWCustomInfo? = nil - if let customInfoList = list[1] as? [Any?] { - customInfo = OWCustomInfo.fromList(customInfoList) + if let customInfoList = list[1] as! [Any]? { + customInfo = OWCustomInfo.fromList(customInfoList as [Any]) } return OWRegistrationResponse( @@ -197,11 +197,11 @@ struct OWRequestDetails { var headers: [String?: String?]? = nil var body: String? = nil - static func fromList(_ list: [Any?]) -> OWRequestDetails? { + static func fromList(_ list: [Any]) -> OWRequestDetails? { let path = list[0] as! String let method = HttpRequestMethod(rawValue: list[1] as! Int)! - let headers = list[2] as? [String?: String?] - let body = list[3] as? String + let headers = list[2] as! [String?: String?]? + let body = list[3] as! String? return OWRequestDetails( path: path, @@ -225,13 +225,13 @@ struct OWRequestResponse { var headers: [String?: String?] var body: String var ok: Bool - var status: Int32 + var status: Int64 - static func fromList(_ list: [Any?]) -> OWRequestResponse? { + static func fromList(_ list: [Any]) -> OWRequestResponse? { let headers = list[0] as! [String?: String?] let body = list[1] as! String let ok = list[2] as! Bool - let status = list[3] as! Int32 + let status = list[3] as! Int64 return OWRequestResponse( headers: headers, @@ -252,14 +252,14 @@ struct OWRequestResponse { /// Generated class from Pigeon that represents data sent in messages. struct OWAuthenticationAttempt { - var failedAttempts: Int32 - var maxAttempts: Int32 - var remainingAttempts: Int32 + var failedAttempts: Int64 + var maxAttempts: Int64 + var remainingAttempts: Int64 - static func fromList(_ list: [Any?]) -> OWAuthenticationAttempt? { - let failedAttempts = list[0] as! Int32 - let maxAttempts = list[1] as! Int32 - let remainingAttempts = list[2] as! Int32 + static func fromList(_ list: [Any]) -> OWAuthenticationAttempt? { + let failedAttempts = list[0] as! Int64 + let maxAttempts = list[1] as! Int64 + let remainingAttempts = list[2] as! Int64 return OWAuthenticationAttempt( failedAttempts: failedAttempts, @@ -278,11 +278,11 @@ struct OWAuthenticationAttempt { /// Generated class from Pigeon that represents data sent in messages. struct OWOneginiError { - var code: Int32 + var code: Int64 var message: String - static func fromList(_ list: [Any?]) -> OWOneginiError? { - let code = list[0] as! Int32 + static func fromList(_ list: [Any]) -> OWOneginiError? { + let code = list[0] as! Int64 let message = list[1] as! String return OWOneginiError( @@ -364,7 +364,7 @@ class UserClientApiCodec: FlutterStandardMessageCodec { /// Generated protocol from Pigeon that represents a handler of messages from Flutter. protocol UserClientApi { func registerUser(identityProviderId: String?, scopes: [String]?, completion: @escaping (Result) -> Void) - func handleRegisteredUserUrl(url: String, signInType: Int32, completion: @escaping (Result) -> Void) + func handleRegisteredUserUrl(url: String, signInType: Int64, completion: @escaping (Result) -> Void) func getIdentityProviders(completion: @escaping (Result<[OWIdentityProvider], Error>) -> Void) func deregisterUser(profileId: String, completion: @escaping (Result) -> Void) func getRegisteredAuthenticators(profileId: String, completion: @escaping (Result<[OWAuthenticator], Error>) -> Void) @@ -415,9 +415,9 @@ class UserClientApiSetup { let registerUserChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.UserClientApi.registerUser", binaryMessenger: binaryMessenger, codec: codec) if let api = api { registerUserChannel.setMessageHandler { message, reply in - let args = message as! [Any?] - let identityProviderIdArg = args[0] as? String - let scopesArg = args[1] as? [String] + let args = message as! [Any] + let identityProviderIdArg = args[0] as! String? + let scopesArg = args[1] as! [String]? api.registerUser(identityProviderId: identityProviderIdArg, scopes: scopesArg) { result in switch result { case .success(let res): @@ -433,9 +433,9 @@ class UserClientApiSetup { let handleRegisteredUserUrlChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.UserClientApi.handleRegisteredUserUrl", binaryMessenger: binaryMessenger, codec: codec) if let api = api { handleRegisteredUserUrlChannel.setMessageHandler { message, reply in - let args = message as! [Any?] + let args = message as! [Any] let urlArg = args[0] as! String - let signInTypeArg = args[1] as! Int32 + let signInTypeArg = (args[1] is Int) ? Int64(args[1] as! Int) : args[1] as! Int64 api.handleRegisteredUserUrl(url: urlArg, signInType: signInTypeArg) { result in switch result { case .success: @@ -466,7 +466,7 @@ class UserClientApiSetup { let deregisterUserChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.UserClientApi.deregisterUser", binaryMessenger: binaryMessenger, codec: codec) if let api = api { deregisterUserChannel.setMessageHandler { message, reply in - let args = message as! [Any?] + let args = message as! [Any] let profileIdArg = args[0] as! String api.deregisterUser(profileId: profileIdArg) { result in switch result { @@ -483,7 +483,7 @@ class UserClientApiSetup { let getRegisteredAuthenticatorsChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.UserClientApi.getRegisteredAuthenticators", binaryMessenger: binaryMessenger, codec: codec) if let api = api { getRegisteredAuthenticatorsChannel.setMessageHandler { message, reply in - let args = message as! [Any?] + let args = message as! [Any] let profileIdArg = args[0] as! String api.getRegisteredAuthenticators(profileId: profileIdArg) { result in switch result { @@ -500,7 +500,7 @@ class UserClientApiSetup { let getAllAuthenticatorsChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.UserClientApi.getAllAuthenticators", binaryMessenger: binaryMessenger, codec: codec) if let api = api { getAllAuthenticatorsChannel.setMessageHandler { message, reply in - let args = message as! [Any?] + let args = message as! [Any] let profileIdArg = args[0] as! String api.getAllAuthenticators(profileId: profileIdArg) { result in switch result { @@ -532,9 +532,9 @@ class UserClientApiSetup { let authenticateUserChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.UserClientApi.authenticateUser", binaryMessenger: binaryMessenger, codec: codec) if let api = api { authenticateUserChannel.setMessageHandler { message, reply in - let args = message as! [Any?] + let args = message as! [Any] let profileIdArg = args[0] as! String - let registeredAuthenticatorIdArg = args[1] as? String + let registeredAuthenticatorIdArg = args[1] as! String? api.authenticateUser(profileId: profileIdArg, registeredAuthenticatorId: registeredAuthenticatorIdArg) { result in switch result { case .success(let res): @@ -550,7 +550,7 @@ class UserClientApiSetup { let getNotRegisteredAuthenticatorsChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.UserClientApi.getNotRegisteredAuthenticators", binaryMessenger: binaryMessenger, codec: codec) if let api = api { getNotRegisteredAuthenticatorsChannel.setMessageHandler { message, reply in - let args = message as! [Any?] + let args = message as! [Any] let profileIdArg = args[0] as! String api.getNotRegisteredAuthenticators(profileId: profileIdArg) { result in switch result { @@ -582,7 +582,7 @@ class UserClientApiSetup { let setPreferredAuthenticatorChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.UserClientApi.setPreferredAuthenticator", binaryMessenger: binaryMessenger, codec: codec) if let api = api { setPreferredAuthenticatorChannel.setMessageHandler { message, reply in - let args = message as! [Any?] + let args = message as! [Any] let authenticatorIdArg = args[0] as! String api.setPreferredAuthenticator(authenticatorId: authenticatorIdArg) { result in switch result { @@ -599,7 +599,7 @@ class UserClientApiSetup { let deregisterAuthenticatorChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.UserClientApi.deregisterAuthenticator", binaryMessenger: binaryMessenger, codec: codec) if let api = api { deregisterAuthenticatorChannel.setMessageHandler { message, reply in - let args = message as! [Any?] + let args = message as! [Any] let authenticatorIdArg = args[0] as! String api.deregisterAuthenticator(authenticatorId: authenticatorIdArg) { result in switch result { @@ -616,7 +616,7 @@ class UserClientApiSetup { let registerAuthenticatorChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.UserClientApi.registerAuthenticator", binaryMessenger: binaryMessenger, codec: codec) if let api = api { registerAuthenticatorChannel.setMessageHandler { message, reply in - let args = message as! [Any?] + let args = message as! [Any] let authenticatorIdArg = args[0] as! String api.registerAuthenticator(authenticatorId: authenticatorIdArg) { result in switch result { @@ -663,7 +663,7 @@ class UserClientApiSetup { let handleMobileAuthWithOtpChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.UserClientApi.handleMobileAuthWithOtp", binaryMessenger: binaryMessenger, codec: codec) if let api = api { handleMobileAuthWithOtpChannel.setMessageHandler { message, reply in - let args = message as! [Any?] + let args = message as! [Any] let dataArg = args[0] as! String api.handleMobileAuthWithOtp(data: dataArg) { result in switch result { @@ -680,7 +680,7 @@ class UserClientApiSetup { let getAppToWebSingleSignOnChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.UserClientApi.getAppToWebSingleSignOn", binaryMessenger: binaryMessenger, codec: codec) if let api = api { getAppToWebSingleSignOnChannel.setMessageHandler { message, reply in - let args = message as! [Any?] + let args = message as! [Any] let urlArg = args[0] as! String api.getAppToWebSingleSignOn(url: urlArg) { result in switch result { @@ -742,7 +742,7 @@ class UserClientApiSetup { let validatePinWithPolicyChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.UserClientApi.validatePinWithPolicy", binaryMessenger: binaryMessenger, codec: codec) if let api = api { validatePinWithPolicyChannel.setMessageHandler { message, reply in - let args = message as! [Any?] + let args = message as! [Any] let pinArg = args[0] as! String api.validatePinWithPolicy(pin: pinArg) { result in switch result { @@ -759,8 +759,8 @@ class UserClientApiSetup { let authenticateDeviceChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.UserClientApi.authenticateDevice", binaryMessenger: binaryMessenger, codec: codec) if let api = api { authenticateDeviceChannel.setMessageHandler { message, reply in - let args = message as! [Any?] - let scopesArg = args[0] as? [String] + let args = message as! [Any] + let scopesArg = args[0] as! [String]? api.authenticateDevice(scopes: scopesArg) { result in switch result { case .success: @@ -776,9 +776,9 @@ class UserClientApiSetup { let authenticateUserImplicitlyChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.UserClientApi.authenticateUserImplicitly", binaryMessenger: binaryMessenger, codec: codec) if let api = api { authenticateUserImplicitlyChannel.setMessageHandler { message, reply in - let args = message as! [Any?] + let args = message as! [Any] let profileIdArg = args[0] as! String - let scopesArg = args[1] as? [String] + let scopesArg = args[1] as! [String]? api.authenticateUserImplicitly(profileId: profileIdArg, scopes: scopesArg) { result in switch result { case .success: @@ -795,9 +795,9 @@ class UserClientApiSetup { let submitCustomRegistrationActionChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.UserClientApi.submitCustomRegistrationAction", binaryMessenger: binaryMessenger, codec: codec) if let api = api { submitCustomRegistrationActionChannel.setMessageHandler { message, reply in - let args = message as! [Any?] + let args = message as! [Any] let identityProviderIdArg = args[0] as! String - let dataArg = args[1] as? String + let dataArg = args[1] as! String? api.submitCustomRegistrationAction(identityProviderId: identityProviderIdArg, data: dataArg) { result in switch result { case .success: @@ -813,7 +813,7 @@ class UserClientApiSetup { let cancelCustomRegistrationActionChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.UserClientApi.cancelCustomRegistrationAction", binaryMessenger: binaryMessenger, codec: codec) if let api = api { cancelCustomRegistrationActionChannel.setMessageHandler { message, reply in - let args = message as! [Any?] + let args = message as! [Any] let identityProviderIdArg = args[0] as! String let errorArg = args[1] as! String api.cancelCustomRegistrationAction(identityProviderId: identityProviderIdArg, error: errorArg) { result in @@ -924,7 +924,7 @@ class UserClientApiSetup { let pinAcceptAuthenticationRequestChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.UserClientApi.pinAcceptAuthenticationRequest", binaryMessenger: binaryMessenger, codec: codec) if let api = api { pinAcceptAuthenticationRequestChannel.setMessageHandler { message, reply in - let args = message as! [Any?] + let args = message as! [Any] let pinArg = args[0] as! String api.pinAcceptAuthenticationRequest(pin: pinArg) { result in switch result { @@ -957,7 +957,7 @@ class UserClientApiSetup { let pinAcceptRegistrationRequestChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.UserClientApi.pinAcceptRegistrationRequest", binaryMessenger: binaryMessenger, codec: codec) if let api = api { pinAcceptRegistrationRequestChannel.setMessageHandler { message, reply in - let args = message as! [Any?] + let args = message as! [Any] let pinArg = args[0] as! String api.pinAcceptRegistrationRequest(pin: pinArg) { result in switch result { @@ -1044,7 +1044,7 @@ class ResourceMethodApiSetup { let requestResourceChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.ResourceMethodApi.requestResource", binaryMessenger: binaryMessenger, codec: codec) if let api = api { requestResourceChannel.setMessageHandler { message, reply in - let args = message as! [Any?] + let args = message as! [Any] let typeArg = ResourceRequestType(rawValue: args[0] as! Int)! let detailsArg = args[1] as! OWRequestDetails api.requestResource(type: typeArg, details: detailsArg) { result in diff --git a/lib/pigeon.dart b/lib/pigeon.dart index dea384c5..40d69d1d 100644 --- a/lib/pigeon.dart +++ b/lib/pigeon.dart @@ -1,4 +1,4 @@ -// Autogenerated from Pigeon (v9.0.2), do not edit directly. +// Autogenerated from Pigeon (v9.1.1), do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import From 3dddec1c5afcb548fb81f2dc1f083e6a67c134b2 Mon Sep 17 00:00:00 2001 From: Michiel Vrins Date: Thu, 23 Mar 2023 15:25:43 +0100 Subject: [PATCH 2/2] Update Int32() to Int64() --- ios/Classes/NativeBridge/Handlers/LoginHandler.swift | 6 +++--- ios/Classes/NativeBridge/Handlers/RegistrationHandler.swift | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ios/Classes/NativeBridge/Handlers/LoginHandler.swift b/ios/Classes/NativeBridge/Handlers/LoginHandler.swift index 930103c0..0dc23509 100644 --- a/ios/Classes/NativeBridge/Handlers/LoginHandler.swift +++ b/ios/Classes/NativeBridge/Handlers/LoginHandler.swift @@ -30,9 +30,9 @@ class LoginHandler: NSObject { return } let authAttempt = OWAuthenticationAttempt( - failedAttempts: Int32(challenge.previousFailureCount), - maxAttempts: Int32(challenge.maxFailureCount), - remainingAttempts: Int32(challenge.remainingFailureCount)) + failedAttempts: Int64(challenge.previousFailureCount), + maxAttempts: Int64(challenge.maxFailureCount), + remainingAttempts: Int64(challenge.remainingFailureCount)) SwiftOneginiPlugin.flutterApi?.n2fNextAuthenticationAttempt(authenticationAttempt: authAttempt) {} } diff --git a/ios/Classes/NativeBridge/Handlers/RegistrationHandler.swift b/ios/Classes/NativeBridge/Handlers/RegistrationHandler.swift index afc195f2..3e258a2a 100644 --- a/ios/Classes/NativeBridge/Handlers/RegistrationHandler.swift +++ b/ios/Classes/NativeBridge/Handlers/RegistrationHandler.swift @@ -107,7 +107,7 @@ class RegistrationHandler: NSObject, BrowserHandlerToRegisterHandlerProtocol { createPinChallenge = challenge if let pinError = mapErrorFromPinChallenge(challenge) { // FIXME: I believe we are dealing here with an invalid pin that was supplied, we should send such an event. FP-34 - SwiftOneginiPlugin.flutterApi?.n2fShowError(error: OWOneginiError(code: Int32(pinError.code), message: pinError.errorDescription)) {} + SwiftOneginiPlugin.flutterApi?.n2fShowError(error: OWOneginiError(code: Int64(pinError.code), message: pinError.errorDescription)) {} } else { // FIXME: we should be sending the pin length here. SwiftOneginiPlugin.flutterApi?.n2fOpenPinRequestScreen {}