diff --git a/Authing/Authing.xcodeproj/project.pbxproj b/Authing/Authing.xcodeproj/project.pbxproj index 7769552..d29375a 100644 --- a/Authing/Authing.xcodeproj/project.pbxproj +++ b/Authing/Authing.xcodeproj/project.pbxproj @@ -650,7 +650,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited)"; LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 1.0.0; + MARKETING_VERSION = 1.0.1; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-ObjC"; PRODUCT_BUNDLE_IDENTIFIER = cn.authing.sdk.v3; @@ -693,7 +693,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited)"; LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 1.0.0; + MARKETING_VERSION = 1.0.1; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-ObjC"; PRODUCT_BUNDLE_IDENTIFIER = cn.authing.sdk.v3; diff --git a/Authing/Authing/Network/AuthClient.swift b/Authing/Authing/Network/AuthClient.swift index 9fbb70f..2d9a089 100644 --- a/Authing/Authing/Network/AuthClient.swift +++ b/Authing/Authing/Network/AuthClient.swift @@ -811,7 +811,7 @@ public class AuthClient: Client { } //MARK: ---------- subEvent ---------- - public func subEvent(eventCode: String, completion: @escaping (String?) -> Void) { + public func subEvent(eventCode: String, completion: @escaping (Int, String?) -> Void) { if let currentUser = Authing.getCurrentUser(), let token = currentUser.accessToken { let eventUri = "\(Authing.getWebsocketHost())/events/v1/authentication/sub?code=\(eventCode)&token=\(token)" diff --git a/Authing/Authing/Network/AuthingWebsocketClient.swift b/Authing/Authing/Network/AuthingWebsocketClient.swift index 78b7cd4..f4fd4bc 100644 --- a/Authing/Authing/Network/AuthingWebsocketClient.swift +++ b/Authing/Authing/Network/AuthingWebsocketClient.swift @@ -14,12 +14,14 @@ public class AuthingWebsocketClient: NSObject { private var urlString: String = "" private var retryCount: Int = 3 private var retryTimes: Int = 0 + private var receiveCallBack: ((Int, String?) -> Void)? public func setRetryCount(_ count: Int) { retryCount = count } - public func initWebSocket(urlString: String, completion: @escaping (String?) -> Void) { + public func initWebSocket(urlString: String, completion: @escaping (Int, String?) -> Void) { + self.receiveCallBack = completion self.urlString = urlString guard let url = URL(string: urlString) else { ALog.e(AuthingWebsocketClient.self, "Error: can not create URL") @@ -36,15 +38,16 @@ public class AuthingWebsocketClient: NSObject { switch message { case .string(let text): ALog.d(AuthingWebsocketClient.self, text) - completion(text) + self.receiveCallBack?(200, text) case .data(let data): ALog.d(AuthingWebsocketClient.self, "\(data)") + self.receiveCallBack?(200, "\(data)") @unknown default: fatalError() } case .failure(let error): ALog.e(AuthingWebsocketClient.self, error) - completion(error.localizedDescription) + self.receiveCallBack?((error as NSError).code, (error as NSError).debugDescription) self.retryTimes += 1 self.reconnect(url: self.urlString, retryTimes: self.retryTimes) } @@ -57,7 +60,7 @@ public class AuthingWebsocketClient: NSObject { } DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 2) { - self.initWebSocket(urlString: url) { message in + self.initWebSocket(urlString: url) { code, message in } } } diff --git a/Package.swift b/Package.swift index 0eb9d0f..06927d2 100644 --- a/Package.swift +++ b/Package.swift @@ -17,8 +17,8 @@ let package = Package( targets: [ .binaryTarget( name: "Authing", - url: "https://github.com/Authing/authing-ios-sdk-v3/releases/download/1.0.0/Authing.xcframework.zip", - checksum: "a5606e64d470eef06771fae771892e44de0e1dd589039411caaa600fc9ec8e57" + url: "https://github.com/Authing/authing-ios-sdk-v3/releases/download/1.0.1/Authing.xcframework.zip", + checksum: "16552b2d9e4eeeaf50a672ee338bd2785a31bcfcf0bf7539c1f24b2ef73255f4" ) ] )